summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <gregory-tde@laposte.net>2021-09-03 16:04:23 +0200
committergregory guy <gregory-tde@laposte.net>2021-09-09 11:09:25 +0200
commit2bc7596862c583eb4361aad66371faaa6db1c813 (patch)
tree64faedcfe209ddce828c0b379db2fa02d17d2dbb
parentdaac380b7cb568cc9af037675ab9c13c08bd224b (diff)
downloadkftpgrabber-2bc75968.tar.gz
kftpgrabber-2bc75968.zip
Conversion to the cmake building system.
Add a man page taken from the Debian packaging. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> Signed-off-by: gregory guy <gregory-tde@laposte.net>
-rw-r--r--CMakeLists.txt83
-rw-r--r--ConfigureChecks.cmake85
-rw-r--r--config.h.cmake41
-rw-r--r--doc/man/kftpgrabber.1107
-rw-r--r--kftpgrabber/CMakeLists.txt1
-rw-r--r--kftpgrabber/src/CMakeLists.txt81
-rw-r--r--kftpgrabber/src/directoryscanner.cpp2
-rw-r--r--kftpgrabber/src/engine/CMakeLists.txt40
-rw-r--r--kftpgrabber/src/engine/connectionretry.cpp2
-rw-r--r--kftpgrabber/src/engine/directorylisting.h14
-rw-r--r--kftpgrabber/src/engine/event.cpp2
-rw-r--r--kftpgrabber/src/engine/ftpsocket.cpp4
-rw-r--r--kftpgrabber/src/engine/sftpsocket.cpp2
-rw-r--r--kftpgrabber/src/engine/socket.cpp2
-rw-r--r--kftpgrabber/src/engine/speedlimiter.cpp2
-rw-r--r--kftpgrabber/src/kftpbookmarks.cpp2
-rw-r--r--kftpgrabber/src/kftpqueue.cpp2
-rw-r--r--kftpgrabber/src/kftpsession.cpp2
-rw-r--r--kftpgrabber/src/kftptransfer.cpp2
-rw-r--r--kftpgrabber/src/kftptransferfile.cpp2
-rw-r--r--kftpgrabber/src/main.cpp2
-rw-r--r--kftpgrabber/src/mainactions.cpp8
-rw-r--r--kftpgrabber/src/mainwindow.cpp2
-rw-r--r--kftpgrabber/src/mainwindow.h2
-rw-r--r--kftpgrabber/src/misc/CMakeLists.txt52
-rw-r--r--kftpgrabber/src/misc/Makefile.am2
-rw-r--r--kftpgrabber/src/misc/configbase.cpp2
-rw-r--r--kftpgrabber/src/misc/customcommands/CMakeLists.txt36
-rw-r--r--kftpgrabber/src/misc/interfaces/CMakeLists.txt44
-rw-r--r--kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h2
-rw-r--r--kftpgrabber/src/misc/kftpconfig.kcfgc (renamed from kftpgrabber/src/misc/config.kcfgc)0
-rw-r--r--kftpgrabber/src/misc/libs/CMakeLists.txt1
-rw-r--r--kftpgrabber/src/misc/libs/ssh/CMakeLists.txt25
-rw-r--r--kftpgrabber/src/misc/libs/ssh/libssh.h4
-rw-r--r--kftpgrabber/src/misc/libs/ssh/priv.h21
-rw-r--r--kftpgrabber/src/misc/plugins/CMakeLists.txt1
-rw-r--r--kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt4
-rw-r--r--kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt37
-rw-r--r--kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt36
-rw-r--r--kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt37
-rw-r--r--kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt37
-rw-r--r--kftpgrabber/src/queuegroup.cpp2
-rw-r--r--kftpgrabber/src/ui/CMakeLists.txt36
-rw-r--r--kftpgrabber/src/widgets/CMakeLists.txt52
-rw-r--r--kftpgrabber/src/widgets/bookmarks/CMakeLists.txt32
-rw-r--r--kftpgrabber/src/widgets/bookmarks/editor.cpp2
-rw-r--r--kftpgrabber/src/widgets/browser/CMakeLists.txt35
-rw-r--r--kftpgrabber/src/widgets/browser/actions.cpp2
-rw-r--r--kftpgrabber/src/widgets/browser/detailsview.cpp2
-rw-r--r--kftpgrabber/src/widgets/browser/view.cpp2
-rw-r--r--kftpgrabber/src/widgets/configdialog.cpp2
-rw-r--r--kftpgrabber/src/widgets/configfilter.cpp2
-rw-r--r--kftpgrabber/src/widgets/logview.cpp2
-rw-r--r--kftpgrabber/src/widgets/queueview/CMakeLists.txt31
-rw-r--r--kftpgrabber/src/widgets/queueview/queueview.cpp2
-rw-r--r--kftpgrabber/src/widgets/quickconnect.cpp2
-rw-r--r--kftpgrabber/src/widgets/systemtray.cpp2
-rw-r--r--kftpgrabber/src/widgets/widgetlister.cpp2
58 files changed, 1008 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..a77d746
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,83 @@
+############################################
+# #
+# Improvements and feedbacks are welcome #
+# #
+# This file is released under GPL >= 3 #
+# #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8.12 )
+
+
+#### general package setup
+
+project( kftpgrabber )
+set( VERSION R14.1.0 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig )
+include( CheckFunctionExists )
+include( CheckSymbolExists )
+include( CheckIncludeFile )
+include( CheckIncludeFiles )
+include( CheckLibraryExists )
+include( CheckCSourceCompiles )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON )
+option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( kftpgrabber )
+
+
+##### other data
+
+tde_conditional_add_project_docs( BUILD_DOC )
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 0000000..2678958
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,85 @@
+###########################################
+# #
+# Improvements and feedback are welcome #
+# #
+# This file is released under GPL >= 3 #
+# #
+###########################################
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+ tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
+
+
+##### check for OpenSSL
+
+find_package( OpenSSL )
+
+if( NOT OPENSSL_FOUND )
+ check_include_file( openssl/err.h HAVE_OPENSSL_H )
+ check_library_exists( ssl OPENSSL_init_ssl "" HAVE_LIBSSL_11 )
+ check_library_exists( crypto EVP_EncryptInit_ex "" HAVE_LIBCRYPTO )
+
+ if( NOT HAVE_LIBSSL_11 )
+ check_library_exists( ssl SSL_library_init "" HAVE_LIBSSL )
+ endif()
+
+ if( HAVE_OPENSSL_H AND HAVE_LIBCRYPTO AND (HAVE_LIBSSL_11 OR HAVE_LIBSSL) )
+ set( SSL_FOUND 1 CACHE INTERNAL "" FORCE )
+ find_file( OPENSSLV_H openssl/opensslv.h )
+ file( STRINGS "${OPENSSLV_H}" SSL_VERSION REGEX "#[ \t]*define[ \t]*OPENSSL_VERSION_TEXT" )
+ string( REGEX REPLACE "# *define[ \t]*OPENSSL_VERSION_TEXT[ \t]*\"[^0-9 ]* *([^ ]*).*" "\\1" SSL_VERSION "${SSL_VERSION}" )
+ set( SSL_VERSION "${SSL_VERSION}" CACHE INTERNAL "" FORCE )
+ message( STATUS "Found OpenSSL: version ${SSL_VERSION}" )
+ set( OPENSSL_LIBRARIES "ssl;crypto" CACHE INTERNAL "ssl and crypto libs" FORCE )
+ endif()
+endif( NOT OPENSSL_FOUND )
+
+if( NOT OPENSSL_FOUND )
+ tde_message_fatal( "OpenSSL support is required but OpenSSL was not found on your system" )
+ else()
+ check_include_file( "openssl/aes.h" HAVE_OPENSSL_AES_H )
+ check_include_file( "openssl/blowfish.h" HAVE_OPENSSL_BLOWFISH_H )
+endif( NOT OPENSSL_FOUND )
+
+
+##### check for zlib
+
+find_package( ZLIB )
+
+if( ZLIB_FOUND )
+ set( HAVE_LIBZ 1 )
+endif( ZLIB_FOUND )
+
+
+##### check for functions
+
+check_function_exists( poll HAVE_POLL )
+check_function_exists( select HAVE_SELECT )
+
+
+##### check headers
+
+check_include_file( "sys/time.h" HAVE_SYS_TIME_H )
+check_include_files( "sys/time.h;time.h" TIME_WITH_SYS_TIME )
+check_include_files( "sys/poll.h" HAVE_SYS_POLL_H )
+
+
+##### check for symbols
+
+check_symbol_exists( gethostbyname "netdb.h" HAVE_GETHOSTBYNAME )
+check_symbol_exists( gethostbyaddr "netdb.h" HAVE_GETHOSTBYADDR )
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..469bbe4
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,41 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
+
+/* Defined if you have the gethostbyname function */
+#cmakedefine HAVE_GETHOSTBYNAME 1
+
+/* Defined if you have the gethostbyaddr function */
+#cmakedefine HAVE_GETHOSTBYADDR 1
+
+/* Defined if you have the OpenSSL library */
+#cmakedefine OPENSSL_CRYPTO 1
+
+/* Defined if you have the <openssl/aes.h> header */
+#cmakedefine HAVE_OPENSSL_AES_H 1
+
+/* Defined if you have the <openssl/blowfish.h> header */
+#cmakedefine HAVE_OPENSSL_BLOWFISH_H 1
+
+/* Defined if you have the <sys/time.h> header */
+#cmakedefine HAVE_SYS_TIME_H 1
+
+/* Defined if you have both <sys/time.h> and <time.h> headers */
+#cmakedefine TIME_WITH_SYS_TIME 1
+
+/* Defined if you have the Zlib library */
+#cmakedefine HAVE_LIBZ 1
+
+/* Defined if you have the <sys/poll.h> header */
+#cmakedefine HAVE_SYS_POLL_H 1
+
+/* Defined if you have the poll function */
+#cmakedefine HAVE_POLL 1
+
+/* Defined if you have the select function */
+#cmakedefine HAVE_SELECT 1
diff --git a/doc/man/kftpgrabber.1 b/doc/man/kftpgrabber.1
new file mode 100644
index 0000000..6a60204
--- /dev/null
+++ b/doc/man/kftpgrabber.1
@@ -0,0 +1,107 @@
+'\" -*- coding: us-ascii -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH kftpgrabber 1 "mars 17, 2006" "" ""
+.SH NAME
+kftpgrabber \- ftp client for TDE
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBkftpgrabber\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[\fB\fIoptions\fB\fR]
+'in \n(.iu-\nxu
+.ad b
+'hy
+.SH DESCRIPTION
+\fBkftpgrabber\fR is a graphical ftp client for TDE.
+It supports technologies like ZeroConf, TLS/SSL and FXP
+.PP
+Some features:
+
+- Multiple FTP sessions (tabs)
+.br
+- Transfer queue
+.br
+- TLS/SSL support for encrypted connections (implicit and explicit)
+.br
+- Partial X509 certificate support for authentication
+.br
+- File eXchange Protocol (FXP) transfer support
+.br
+- One Time Password (OTP) support - S/Key, MD5, RMD160, SHA1
+.br
+- Drag and Drop support
+.br
+- Site bookmarking
+.br
+- Encrypted bookmark support (password can be saved to TDEWallet)
+.br
+- Distributed FTP support (PRET)
+.br
+- SSCN and CPSV support
+.br
+- Skiplist
+.br
+- ZeroConf (aka. Rendezvous) support for local site discovery
+.br
+- Bookmark sharing with Kopete contacts
+.br
+- Bookmark import plugins
+.br
+- Support for SFTP protocol
+.br
+- Traffic graph
+.br
+- Speed limiting
+.br
+- Priority and skip lists
+.br
+- Fast directory listings via control channel on servers that support STAT
+.br
+- Integrated SFV checksum verifier
+.br
+- Ability to view/edit remote files
+.br
+- Exporting of directory listings into text files
+.br
+- "On file exists" action matrix for Download, Upload and FXP transfers
+.SH OPTIONS
+All TDE and Qt programs accept some common command-line options.
+\fBkftpgrabber\fR has no application-specific options.
+.TP
+\*(T<\fB\-\-help\fR\*(T>
+Show help about options
+.TP
+\*(T<\fB\-\-help\-qt\fR\*(T>
+Show Qt specific options
+.TP
+\*(T<\fB\-\-help\-tde\fR\*(T>
+Show TDE specific options
+.TP
+\*(T<\fB\-\-help\-all\fR\*(T>
+Show all options
+.TP
+\*(T<\fB\-\-author\fR\*(T>
+Show author information
+.TP
+\*(T<\fB\-v\fR\*(T> \*(T<\fB\-\-version\fR\*(T>
+Show version information
+.TP
+\*(T<\fB\-\-license\fR\*(T>
+Show license information
+.SH AUTHOR
+This manual page was written by Fathi Boudra <<\*(T<fboudra@free.fr\*(T>>> for
+the Debian system (but may be used by others). Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
diff --git a/kftpgrabber/CMakeLists.txt b/kftpgrabber/CMakeLists.txt
new file mode 100644
index 0000000..d4fb658
--- /dev/null
+++ b/kftpgrabber/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( src )
diff --git a/kftpgrabber/src/CMakeLists.txt b/kftpgrabber/src/CMakeLists.txt
new file mode 100644
index 0000000..a358109
--- /dev/null
+++ b/kftpgrabber/src/CMakeLists.txt
@@ -0,0 +1,81 @@
+add_subdirectory( misc )
+add_subdirectory( engine )
+add_subdirectory( ui )
+add_subdirectory( widgets )
+
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kftpgrabber (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+ SOURCES
+ main.cpp
+ mainwindow.cpp
+ checksumverifier.cpp
+ kftpbookmarks.cpp
+ kftpqueue.cpp
+ mainactions.cpp
+ kftpbookmarkaction.cpp
+ kftpqueueprocessor.cpp
+ kftpsession.cpp
+ kftpqueueconverter.cpp
+ kftptransfer.cpp
+ kftptransferfile.cpp
+ kftptransferdir.cpp
+ kftpfileexistsactions.cpp
+ statistics.cpp site.cpp
+ queueobject.cpp
+ queuegroup.cpp
+ directoryscanner.cpp
+ LINK
+ tdeui-shared
+ tdeio-shared
+ tdecore-shared
+ tdeparts-shared
+ tdednssd-shared
+ bookmarkwidgets-static
+ browser-static
+ queueviewwidget-static
+ widgets-static
+ engine-static
+ kftpgrabbercore-static
+ customcommands-static
+ ui-static
+ kftpinterfaces-shared
+ tdewalletclient-shared
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( ${PROJECT_NAME} )
+
+
+##### other data
+
+tde_create_translated_desktop( ${PROJECT_NAME}.desktop )
+
+
+install(
+ FILES kftpgrabber-bi-wizard.png kftpgrabber-logo.png kftpgrabberui.rc
+ DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
diff --git a/kftpgrabber/src/directoryscanner.cpp b/kftpgrabber/src/directoryscanner.cpp
index 6c64b1d..1e0ac97 100644
--- a/kftpgrabber/src/directoryscanner.cpp
+++ b/kftpgrabber/src/directoryscanner.cpp
@@ -36,7 +36,7 @@
#include "directoryscanner.h"
#include "kftpqueue.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc/filter.h"
#include <tdefileitem.h>
diff --git a/kftpgrabber/src/engine/CMakeLists.txt b/kftpgrabber/src/engine/CMakeLists.txt
new file mode 100644
index 0000000..e5e2f3b
--- /dev/null
+++ b/kftpgrabber/src/engine/CMakeLists.txt
@@ -0,0 +1,40 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${OPENSSL_INCLUDE_DIR}
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### engine (static)
+
+tde_add_library( engine STATIC_PIC AUTOMOC
+
+ SOURCES
+ socket.cpp
+ thread.cpp
+ directorylisting.cpp
+ commands.cpp
+ event.cpp
+ ftpsocket.cpp
+ ftpdirectoryparser.cpp
+ cache.cpp
+ sftpsocket.cpp
+ connectionretry.cpp
+ speedlimiter.cpp
+ ssl.cpp
+ LINK
+ ssh-static
+
+ DEPENDENCIES kftpgrabbercore-static
+)
diff --git a/kftpgrabber/src/engine/connectionretry.cpp b/kftpgrabber/src/engine/connectionretry.cpp
index d682fbe..bddb796 100644
--- a/kftpgrabber/src/engine/connectionretry.cpp
+++ b/kftpgrabber/src/engine/connectionretry.cpp
@@ -110,3 +110,5 @@ void ConnectionRetry::slotEngineEvent(KFTPEngine::Event *event)
}
}
+
+#include "connectionretry.moc"
diff --git a/kftpgrabber/src/engine/directorylisting.h b/kftpgrabber/src/engine/directorylisting.h
index 51112f5..58b2f3f 100644
--- a/kftpgrabber/src/engine/directorylisting.h
+++ b/kftpgrabber/src/engine/directorylisting.h
@@ -37,14 +37,26 @@
#ifndef KFTPNETWORKDIRECTORYLISTING_H
#define KFTPNETWORKDIRECTORYLISTING_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <tdeio/global.h>
#include <kurl.h>
#include <ntqvaluelist.h>
#include <ntqptrlist.h>
-#include <time.h>
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
+#else
+#include <time.h>
+#endif // HAVE_SYS_TIME_H
+#endif // TIME_WITH_SYS_TIME
typedef unsigned long long int filesize_t;
diff --git a/kftpgrabber/src/engine/event.cpp b/kftpgrabber/src/engine/event.cpp
index 844bffc..d49f4bc 100644
--- a/kftpgrabber/src/engine/event.cpp
+++ b/kftpgrabber/src/engine/event.cpp
@@ -164,3 +164,5 @@ void EventHandler::customEvent(TQCustomEvent *e)
}
}
+
+#include "event.moc"
diff --git a/kftpgrabber/src/engine/ftpsocket.cpp b/kftpgrabber/src/engine/ftpsocket.cpp
index dce9f99..8912874 100644
--- a/kftpgrabber/src/engine/ftpsocket.cpp
+++ b/kftpgrabber/src/engine/ftpsocket.cpp
@@ -42,7 +42,7 @@
#include "ssl.h"
#include "misc/kftpotpgenerator.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include <ntqdir.h>
@@ -2749,3 +2749,5 @@ void FtpSocket::protoKeepAlive()
}
}
+
+#include "ftpsocket.moc"
diff --git a/kftpgrabber/src/engine/sftpsocket.cpp b/kftpgrabber/src/engine/sftpsocket.cpp
index cbde3fa..58b6f0a 100644
--- a/kftpgrabber/src/engine/sftpsocket.cpp
+++ b/kftpgrabber/src/engine/sftpsocket.cpp
@@ -36,7 +36,7 @@
#include "sftpsocket.h"
#include "cache.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include <ntqdir.h>
diff --git a/kftpgrabber/src/engine/socket.cpp b/kftpgrabber/src/engine/socket.cpp
index afc5341..736164c 100644
--- a/kftpgrabber/src/engine/socket.cpp
+++ b/kftpgrabber/src/engine/socket.cpp
@@ -39,7 +39,7 @@
#include "speedlimiter.h"
#include "cache.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include <tdelocale.h>
diff --git a/kftpgrabber/src/engine/speedlimiter.cpp b/kftpgrabber/src/engine/speedlimiter.cpp
index fba03c0..27b3a87 100644
--- a/kftpgrabber/src/engine/speedlimiter.cpp
+++ b/kftpgrabber/src/engine/speedlimiter.cpp
@@ -34,7 +34,7 @@
* files in the program, then also delete it here.
*/
#include "speedlimiter.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include <kstaticdeleter.h>
diff --git a/kftpgrabber/src/kftpbookmarks.cpp b/kftpgrabber/src/kftpbookmarks.cpp
index 144ad37..0f221c5 100644
--- a/kftpgrabber/src/kftpbookmarks.cpp
+++ b/kftpgrabber/src/kftpbookmarks.cpp
@@ -44,7 +44,7 @@
#include "kftpsession.h"
#include "bookmarks/listview.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "engine/thread.h"
#include "engine/ftpsocket.h"
diff --git a/kftpgrabber/src/kftpqueue.cpp b/kftpgrabber/src/kftpqueue.cpp
index 3d0f7ff..679c45f 100644
--- a/kftpgrabber/src/kftpqueue.cpp
+++ b/kftpgrabber/src/kftpqueue.cpp
@@ -41,7 +41,7 @@
#include "kftpqueueprocessor.h"
#include "kftpsession.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc/filter.h"
#include <tdemessagebox.h>
diff --git a/kftpgrabber/src/kftpsession.cpp b/kftpgrabber/src/kftpsession.cpp
index 23cd64a..c6697bd 100644
--- a/kftpgrabber/src/kftpsession.cpp
+++ b/kftpgrabber/src/kftpsession.cpp
@@ -43,7 +43,7 @@
#include "widgets/systemtray.h"
#include "mainactions.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc/filter.h"
#include <ntqdir.h>
diff --git a/kftpgrabber/src/kftptransfer.cpp b/kftpgrabber/src/kftptransfer.cpp
index ba23c3d..82d44b7 100644
--- a/kftpgrabber/src/kftptransfer.cpp
+++ b/kftpgrabber/src/kftptransfer.cpp
@@ -39,7 +39,7 @@
#include "kftpqueue.h"
#include "kftpsession.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include <tdelocale.h>
diff --git a/kftpgrabber/src/kftptransferfile.cpp b/kftpgrabber/src/kftptransferfile.cpp
index bbc2b5d..fa8d9c2 100644
--- a/kftpgrabber/src/kftptransferfile.cpp
+++ b/kftpgrabber/src/kftptransferfile.cpp
@@ -40,7 +40,7 @@
#include "engine/thread.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include <tdemessagebox.h>
#include <tdelocale.h>
diff --git a/kftpgrabber/src/main.cpp b/kftpgrabber/src/main.cpp
index 346671f..3af1a3d 100644
--- a/kftpgrabber/src/main.cpp
+++ b/kftpgrabber/src/main.cpp
@@ -35,7 +35,7 @@
*/
#include "mainwindow.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include <kuniqueapplication.h>
#include <tdeaboutdata.h>
diff --git a/kftpgrabber/src/mainactions.cpp b/kftpgrabber/src/mainactions.cpp
index a00335a..b40c655 100644
--- a/kftpgrabber/src/mainactions.cpp
+++ b/kftpgrabber/src/mainactions.cpp
@@ -34,9 +34,11 @@
* files in the program, then also delete it here.
*/
-#include "mainactions.h"
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "mainactions.h"
#include "misc.h"
#include "kftpapi.h"
#include "kftpqueue.h"
@@ -48,7 +50,7 @@
#include "widgets/browser/detailsview.h"
#include "widgets/browser/propsplugin.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc/filter.h"
#include <tdemainwindow.h>
diff --git a/kftpgrabber/src/mainwindow.cpp b/kftpgrabber/src/mainwindow.cpp
index add3751..6ebb5c6 100644
--- a/kftpgrabber/src/mainwindow.cpp
+++ b/kftpgrabber/src/mainwindow.cpp
@@ -83,7 +83,7 @@
#include "sidebar.h"
// Other KFTPGrabber stuff
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc/customcommands/manager.h"
#include "mainwindow.h"
diff --git a/kftpgrabber/src/mainwindow.h b/kftpgrabber/src/mainwindow.h
index ac860a6..5b9bcb7 100644
--- a/kftpgrabber/src/mainwindow.h
+++ b/kftpgrabber/src/mainwindow.h
@@ -38,7 +38,7 @@
#define MAINWINDOW_H_
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <ntqtimer.h>
diff --git a/kftpgrabber/src/misc/CMakeLists.txt b/kftpgrabber/src/misc/CMakeLists.txt
new file mode 100644
index 0000000..a9b5cbf
--- /dev/null
+++ b/kftpgrabber/src/misc/CMakeLists.txt
@@ -0,0 +1,52 @@
+add_subdirectory( interfaces )
+add_subdirectory( plugins )
+add_subdirectory( libs )
+add_subdirectory( customcommands )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces
+ ${OPENSSL_INCLUDE_DIR}
+ ${X11_INCLUDE_DIR}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kftpgrabbercore (static)
+
+tde_add_library( kftpgrabbercore STATIC_PIC AUTOMOC
+
+ SOURCES
+ misc.cpp
+ kftpotpgenerator.cpp
+ kftpapi.cpp
+ desencryptor.cpp
+ kftpwalletconnection.cpp
+ kftppluginmanager.cpp
+ kftpzeroconf.cpp
+ kftpconfig.kcfgc
+ configbase.cpp
+ filter.cpp
+ filterwidgethandler.cpp
+ LINK
+ kftpinterfaces-shared
+ customcommands-static
+ ${OPENSSL_LIBRARIES}
+)
+
+
+##### other data
+
+install(
+ FILES kftpgrabber.kcfg
+ DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/kftpgrabber/src/misc/Makefile.am b/kftpgrabber/src/misc/Makefile.am
index b334505..7da83f8 100644
--- a/kftpgrabber/src/misc/Makefile.am
+++ b/kftpgrabber/src/misc/Makefile.am
@@ -10,7 +10,7 @@ noinst_LIBRARIES = libkftpgrabbercore.a
libkftpgrabbercore_a_SOURCES = misc.cpp kftpotpgenerator.cpp \
kftpapi.cpp desencryptor.cpp kftpwalletconnection.cpp \
kftppluginmanager.cpp \
- kftpzeroconf.cpp config.kcfgc configbase.cpp filter.cpp \
+ kftpzeroconf.cpp kftpconfig.kcfgc configbase.cpp filter.cpp \
filterwidgethandler.cpp
libkftpgrabbercore_a_LIBADD = interfaces/libkftpinterfaces.la customcommands/libcustomcommands.a
diff --git a/kftpgrabber/src/misc/configbase.cpp b/kftpgrabber/src/misc/configbase.cpp
index e2a81f4..c9632e3 100644
--- a/kftpgrabber/src/misc/configbase.cpp
+++ b/kftpgrabber/src/misc/configbase.cpp
@@ -35,7 +35,7 @@
*/
#include "configbase.h"
-#include "config.h"
+#include "kftpconfig.h"
#include "kftpapi.h"
#include "filter.h"
diff --git a/kftpgrabber/src/misc/customcommands/CMakeLists.txt b/kftpgrabber/src/misc/customcommands/CMakeLists.txt
new file mode 100644
index 0000000..0253b11
--- /dev/null
+++ b/kftpgrabber/src/misc/customcommands/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### customcommands (static)
+
+tde_add_library( customcommands STATIC_PIC AUTOMOC
+
+ SOURCES
+ handlers.cpp
+ entry.cpp
+ manager.cpp
+ parameterentrydialog.cpp
+ responsedialog.cpp
+)
+
+
+##### other data
+
+install(
+ FILES commands.xml
+ DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
diff --git a/kftpgrabber/src/misc/interfaces/CMakeLists.txt b/kftpgrabber/src/misc/interfaces/CMakeLists.txt
new file mode 100644
index 0000000..0f2f983
--- /dev/null
+++ b/kftpgrabber/src/misc/interfaces/CMakeLists.txt
@@ -0,0 +1,44 @@
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kftpinterfaces (shared)
+
+tde_add_library( kftpinterfaces SHARED AUTOMOC
+
+ SOURCES
+ kftpbookmarkimportplugin.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeparts-shared
+
+ VERSION 0.0.0
+
+ DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+ SOURCE kftpbookmarkimportplugin.desktop
+ DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
+
+
+install(
+ FILES kftpbookmarkimportplugin.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}
+)
diff --git a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h
index 5f42ccf..033ce2b 100644
--- a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h
+++ b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h
@@ -43,7 +43,7 @@
*
* @author Jernej Kos
*/
-class KFTPBookmarkImportPlugin : public KParts::Plugin {
+class KDE_EXPORT KFTPBookmarkImportPlugin : public KParts::Plugin {
Q_OBJECT
public:
KFTPBookmarkImportPlugin(TQObject *parent, const char *name = 0);
diff --git a/kftpgrabber/src/misc/config.kcfgc b/kftpgrabber/src/misc/kftpconfig.kcfgc
index d8ca269..d8ca269 100644
--- a/kftpgrabber/src/misc/config.kcfgc
+++ b/kftpgrabber/src/misc/kftpconfig.kcfgc
diff --git a/kftpgrabber/src/misc/libs/CMakeLists.txt b/kftpgrabber/src/misc/libs/CMakeLists.txt
new file mode 100644
index 0000000..ebd49d3
--- /dev/null
+++ b/kftpgrabber/src/misc/libs/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( ssh )
diff --git a/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt b/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt
new file mode 100644
index 0000000..8af7109
--- /dev/null
+++ b/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt
@@ -0,0 +1,25 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${OPENSSL_INCLUDE_DIR}
+ ${ZLIB_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### ssh (static)
+
+tde_add_library( ssh STATIC_PIC
+
+ SOURCES
+ auth.c base64.c buffer.c channels.c client.c connect.c
+ crypt.c dh.c error.c gzip.c kex.c keyfiles.c keys.c misc.c
+ options.c packet.c sftp.c string.c wrapper.c
+)
diff --git a/kftpgrabber/src/misc/libs/ssh/libssh.h b/kftpgrabber/src/misc/libs/ssh/libssh.h
index 7fdc939..81c586d 100644
--- a/kftpgrabber/src/misc/libs/ssh/libssh.h
+++ b/kftpgrabber/src/misc/libs/ssh/libssh.h
@@ -20,7 +20,11 @@ MA 02110-1301, USA. */
#ifndef _LIBSSH_H
#define _LIBSSH_H
+
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#include <unistd.h>
#include <sys/select.h> /* for fd_set * */
#include <sys/types.h>
diff --git a/kftpgrabber/src/misc/libs/ssh/priv.h b/kftpgrabber/src/misc/libs/ssh/priv.h
index 2c93081..95e43bc 100644
--- a/kftpgrabber/src/misc/libs/ssh/priv.h
+++ b/kftpgrabber/src/misc/libs/ssh/priv.h
@@ -25,6 +25,11 @@ MA 02110-1301, USA. */
#ifndef _LIBSSH_PRIV_H
#define _LIBSSH_PRIV_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "libssh.h"
/* Debugging constants */
@@ -43,11 +48,10 @@ MA 02110-1301, USA. */
#define TYPE_RSA 2
#define TYPE_RSA1 3
-/* profiling constants. Don't touch them unless you know what you do */
+/* profiling constants. Don't touch them unless you know what you do */
#define OPENSSL_CRYPTO
#define OPENSSL_BIGNUMS
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -88,11 +92,18 @@ typedef BN_CTX* bignum_CTX;
#define bignum_num_bits(num) BN_num_bits(num)
#define bignum_is_bit_set(num,bit) BN_is_bit_set(num,bit)
#define bignum_bn2bin(num,ptr) BN_bn2bin(num,ptr)
-
#endif /* OPENSSL_BIGNUMS */
-#ifdef HAVE_SYS_TIME_H
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
-#endif
+#else
+#include <time.h>
+#endif // HAVE_SYS_TIME_H
+#endif // TIME_WITH_SYS_TIME
/* wrapper.c */
MD5CTX *md5_init(void);
diff --git a/kftpgrabber/src/misc/plugins/CMakeLists.txt b/kftpgrabber/src/misc/plugins/CMakeLists.txt
new file mode 100644
index 0000000..45d895c
--- /dev/null
+++ b/kftpgrabber/src/misc/plugins/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( bookmarkimport )
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt
new file mode 100644
index 0000000..8969a38
--- /dev/null
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory( gftp )
+add_subdirectory( ncftp )
+add_subdirectory( kftp )
+add_subdirectory( filezilla3 )
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt
new file mode 100644
index 0000000..7fd9672
--- /dev/null
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt
@@ -0,0 +1,37 @@
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kftpimportplugin_filezilla3 (kpart)
+
+tde_add_kpart( kftpimportplugin_filezilla3 AUTOMOC
+
+ SOURCES
+ kftpimportfz3plugin.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ kftpinterfaces-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+ SOURCE kftpimportplugin_filezilla3.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt
new file mode 100644
index 0000000..e777c1b
--- /dev/null
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kftpimportplugin_gftp (kpart)
+
+tde_add_kpart( kftpimportplugin_gftp AUTOMOC
+
+ SOURCES
+ kftpimportgftpplugin.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ kftpinterfaces-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+ SOURCE kftpimportplugin_gftp.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt
new file mode 100644
index 0000000..8337c19
--- /dev/null
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt
@@ -0,0 +1,37 @@
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kftpimportplugin_kftp (kpart)
+
+tde_add_kpart( kftpimportplugin_kftp AUTOMOC
+
+ SOURCES
+ kftpimportkftpplugin.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ kftpinterfaces-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+ SOURCE kftpimportplugin_kftp.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt
new file mode 100644
index 0000000..f669049
--- /dev/null
+++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt
@@ -0,0 +1,37 @@
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kftpimportplugin_ncftp (kpart)
+
+tde_add_kpart( kftpimportplugin_ncftp AUTOMOC
+
+ SOURCES
+ kftpimportncftpplugin.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ kftpinterfaces-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+ SOURCE kftpimportplugin_ncftp.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kftpgrabber/src/queuegroup.cpp b/kftpgrabber/src/queuegroup.cpp
index d13da15..ae8caf8 100644
--- a/kftpgrabber/src/queuegroup.cpp
+++ b/kftpgrabber/src/queuegroup.cpp
@@ -126,3 +126,5 @@ void QueueGroup::incrementAndExecute()
}
}
+
+#include "queuegroup.moc"
diff --git a/kftpgrabber/src/ui/CMakeLists.txt b/kftpgrabber/src/ui/CMakeLists.txt
new file mode 100644
index 0000000..d06df85
--- /dev/null
+++ b/kftpgrabber/src/ui/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### ui (static)
+
+tde_add_library( ui STATIC_PIC AUTOMOC
+
+ SOURCES
+ bookmark_properties.ui
+ kftpfilteraddpatternlayout.ui
+ kftpquickconnectlayout.ui
+ kftpqueueeditorlayout.ui
+ kftpsearchlayout.ui
+ kftpbookmarkimportlayout.ui
+ kftpbookmarkeditortlswidget.ui
+ config_general.ui
+ config_transfers.ui
+ config_log.ui
+ config_display.ui
+ config_filters.ui
+ foobar.cpp
+ checksum_verifier.ui
+)
diff --git a/kftpgrabber/src/widgets/CMakeLists.txt b/kftpgrabber/src/widgets/CMakeLists.txt
new file mode 100644
index 0000000..46f2d80
--- /dev/null
+++ b/kftpgrabber/src/widgets/CMakeLists.txt
@@ -0,0 +1,52 @@
+add_subdirectory( queueview )
+add_subdirectory( browser )
+add_subdirectory( bookmarks )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### widgets (static)
+
+tde_add_library( widgets STATIC_PIC AUTOMOC
+
+ SOURCES
+ logview.cpp
+ kftpselectserverdialog.cpp
+ kftpserverlineedit.cpp
+ listview.cpp
+ quickconnect.cpp
+ systemtray.cpp
+ balloon.cpp
+ searchdialog.cpp
+ kftpzeroconflistview.cpp
+ trafficgraph.cpp
+ kftptabwidget.cpp
+ failedtransfers.cpp
+ listviewitem.cpp
+ sidebar.cpp
+ multitabbar.cpp
+ configdialog.cpp
+ configfilter.cpp
+ verifier.cpp
+ filtereditor.cpp
+ widgetlister.cpp
+ overlaywidget.cpp
+ popupmessage.cpp
+
+ DEPENDENCIES kftpgrabbercore-static ui-static
+)
diff --git a/kftpgrabber/src/widgets/bookmarks/CMakeLists.txt b/kftpgrabber/src/widgets/bookmarks/CMakeLists.txt
new file mode 100644
index 0000000..834698d
--- /dev/null
+++ b/kftpgrabber/src/widgets/bookmarks/CMakeLists.txt
@@ -0,0 +1,32 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### bookmarkwidgets (static)
+
+tde_add_library( bookmarkwidgets STATIC_PIC AUTOMOC
+
+ SOURCES
+ editor.cpp
+ editortls.cpp
+ listview.cpp
+ importwizard.cpp
+ sidebar.cpp
+
+ DEPENDENCIES kftpgrabbercore-static ui-static
+)
diff --git a/kftpgrabber/src/widgets/bookmarks/editor.cpp b/kftpgrabber/src/widgets/bookmarks/editor.cpp
index d5bc467..a7cd7cc 100644
--- a/kftpgrabber/src/widgets/bookmarks/editor.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/editor.cpp
@@ -59,7 +59,7 @@
#include "kftpapi.h"
#include "kftpbookmarks.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc.h"
#include "editor.h"
diff --git a/kftpgrabber/src/widgets/browser/CMakeLists.txt b/kftpgrabber/src/widgets/browser/CMakeLists.txt
new file mode 100644
index 0000000..593c243
--- /dev/null
+++ b/kftpgrabber/src/widgets/browser/CMakeLists.txt
@@ -0,0 +1,35 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/engine
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### browser (static)
+
+tde_add_library( browser STATIC_PIC AUTOMOC
+
+ SOURCES
+ view.cpp actions.cpp
+ treeview.cpp
+ propsplugin.cpp
+ filterwidget.cpp
+ detailsview.cpp
+ locationnavigator.cpp
+ dirlister.cpp
+
+ DEPENDENCIES kftpgrabbercore-static ui-static
+)
diff --git a/kftpgrabber/src/widgets/browser/actions.cpp b/kftpgrabber/src/widgets/browser/actions.cpp
index 11fb08c..ba9c663 100644
--- a/kftpgrabber/src/widgets/browser/actions.cpp
+++ b/kftpgrabber/src/widgets/browser/actions.cpp
@@ -50,7 +50,7 @@
#include "mainactions.h"
#include "misc.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc/filter.h"
#include "misc/customcommands/manager.h"
diff --git a/kftpgrabber/src/widgets/browser/detailsview.cpp b/kftpgrabber/src/widgets/browser/detailsview.cpp
index 80f8588..29bcf69 100644
--- a/kftpgrabber/src/widgets/browser/detailsview.cpp
+++ b/kftpgrabber/src/widgets/browser/detailsview.cpp
@@ -40,7 +40,7 @@
#include "browser/dirlister.h"
#include "browser/actions.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc/kftpapi.h"
#include "misc/filter.h"
diff --git a/kftpgrabber/src/widgets/browser/view.cpp b/kftpgrabber/src/widgets/browser/view.cpp
index f4b1393..da031d6 100644
--- a/kftpgrabber/src/widgets/browser/view.cpp
+++ b/kftpgrabber/src/widgets/browser/view.cpp
@@ -40,7 +40,7 @@
#include "browser/filterwidget.h"
#include "kftpbookmarks.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "kftpsession.h"
#include "ftpsocket.h"
diff --git a/kftpgrabber/src/widgets/configdialog.cpp b/kftpgrabber/src/widgets/configdialog.cpp
index bd3170e..d3f0acb 100644
--- a/kftpgrabber/src/widgets/configdialog.cpp
+++ b/kftpgrabber/src/widgets/configdialog.cpp
@@ -35,7 +35,7 @@
#include "configdialog.h"
#include "misc.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "widgets/systemtray.h"
#include <tdelocale.h>
diff --git a/kftpgrabber/src/widgets/configfilter.cpp b/kftpgrabber/src/widgets/configfilter.cpp
index 48f068a..38360e9 100644
--- a/kftpgrabber/src/widgets/configfilter.cpp
+++ b/kftpgrabber/src/widgets/configfilter.cpp
@@ -37,7 +37,7 @@
#include "configfilter.h"
#include "filtereditor.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "misc.h"
#include <tdelistview.h>
diff --git a/kftpgrabber/src/widgets/logview.cpp b/kftpgrabber/src/widgets/logview.cpp
index 1d1c57f..a3db4c7 100644
--- a/kftpgrabber/src/widgets/logview.cpp
+++ b/kftpgrabber/src/widgets/logview.cpp
@@ -34,7 +34,7 @@
*/
#include "logview.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "kftpapi.h"
#include <tdelocale.h>
diff --git a/kftpgrabber/src/widgets/queueview/CMakeLists.txt b/kftpgrabber/src/widgets/queueview/CMakeLists.txt
new file mode 100644
index 0000000..bd4af3c
--- /dev/null
+++ b/kftpgrabber/src/widgets/queueview/CMakeLists.txt
@@ -0,0 +1,31 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${OPENSSL_INCLUDE_DIR}
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc
+ ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets
+ ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### queueviewwidget (static)
+
+tde_add_library( queueviewwidget STATIC_PIC AUTOMOC
+
+ SOURCES
+ queueeditor.cpp
+ queueview.cpp
+ threadview.cpp
+
+ DEPENDENCIES kftpgrabbercore-static ui-static
+)
diff --git a/kftpgrabber/src/widgets/queueview/queueview.cpp b/kftpgrabber/src/widgets/queueview/queueview.cpp
index daec26e..756ac36 100644
--- a/kftpgrabber/src/widgets/queueview/queueview.cpp
+++ b/kftpgrabber/src/widgets/queueview/queueview.cpp
@@ -42,7 +42,7 @@
#include "kftpapi.h"
#include "queueeditor.h"
#include "widgets/searchdialog.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include <tdeapplication.h>
#include <tdefiledialog.h>
diff --git a/kftpgrabber/src/widgets/quickconnect.cpp b/kftpgrabber/src/widgets/quickconnect.cpp
index 0a62f8d..ad17a5c 100644
--- a/kftpgrabber/src/widgets/quickconnect.cpp
+++ b/kftpgrabber/src/widgets/quickconnect.cpp
@@ -36,7 +36,7 @@
#include "widgets/quickconnect.h"
#include "bookmarks/editortls.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
#include "kftpbookmarks.h"
#include "misc.h"
diff --git a/kftpgrabber/src/widgets/systemtray.cpp b/kftpgrabber/src/widgets/systemtray.cpp
index 7cd851d..ca4c91d 100644
--- a/kftpgrabber/src/widgets/systemtray.cpp
+++ b/kftpgrabber/src/widgets/systemtray.cpp
@@ -44,7 +44,7 @@
#include "kftpbookmarks.h"
#include "kftpqueue.h"
#include "misc.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
using namespace KFTPGrabberBase;
diff --git a/kftpgrabber/src/widgets/widgetlister.cpp b/kftpgrabber/src/widgets/widgetlister.cpp
index 933101e..dc0ca29 100644
--- a/kftpgrabber/src/widgets/widgetlister.cpp
+++ b/kftpgrabber/src/widgets/widgetlister.cpp
@@ -170,3 +170,5 @@ void WidgetLister::enableControls()
}
}
+
+#include "widgetlister.moc"