12 files changed, 92 insertions, 74 deletions
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/Makefile.am b/kftpgrabber/src/widgets/bookmarks/Makefile.am
deleted file mode 100644
index d47c128..0000000
--- a/kftpgrabber/src/widgets/bookmarks/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES = -I$(top_builddir)/kftpgrabber/src \
-           -I$(srcdir)/../.. \
-           -I$(srcdir)/../../engine \
-	   -I$(srcdir)/../../misc \
-	   -I$(srcdir)/../../widgets \
-	   -I$(srcdir)/../../widgets/browser \
-	   -I$(srcdir)/../../ui \
-	   -I$(top_builddir)/kftpgrabber/src/ui \
-	   -I$(top_builddir) \
-	   $(all_includes)
-METASOURCES = AUTO
-noinst_LIBRARIES = libbookmarkwidgets.a
-noinst_HEADERS = editor.h editortls.h listview.h importwizard.h sidebar.h
-libbookmarkwidgets_a_SOURCES = editor.cpp editortls.cpp listview.cpp importwizard.cpp sidebar.cpp
diff --git a/kftpgrabber/src/widgets/bookmarks/editor.cpp b/kftpgrabber/src/widgets/bookmarks/editor.cpp
index d5bc467..74bf68b 100644
--- a/kftpgrabber/src/widgets/bookmarks/editor.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/editor.cpp
@@ -34,14 +34,14 @@
  * files in the program, then also delete it here.
  */
 
-#include <ntqlayout.h>
-#include <ntqpushbutton.h>
-#include <ntqcheckbox.h>
-#include <ntqgroupbox.h>
-#include <ntqspinbox.h>
-#include <ntqsplitter.h>
-#include <ntqtextedit.h>
-#include <ntqtabwidget.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqspinbox.h>
+#include <tqsplitter.h>
+#include <tqtextedit.h>
+#include <tqtabwidget.h>
 
 #include <tdeglobal.h>
 #include <kcharsets.h>
@@ -59,7 +59,7 @@
 
 #include "kftpapi.h"
 #include "kftpbookmarks.h"
-#include "misc/config.h"
+#include "misc/kftpconfig.h"
 #include "misc.h"
 
 #include "editor.h"
@@ -100,15 +100,15 @@ BookmarkEditor::BookmarkEditor(TQWidget *parent, const char *name)
 
   initDialog();
 
-  connect(this, SIGNAL(user1Clicked()), this, SLOT(slotImportWizard()));
-  connect(this, SIGNAL(user2Clicked()), this, SLOT(slotExportWizard()));
+  connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotImportWizard()));
+  connect(this, TQ_SIGNAL(user2Clicked()), this, TQ_SLOT(slotExportWizard()));
 
-  connect(m_tree, SIGNAL(bookmarkClicked(TQListViewItem*)), this, SLOT(slotTreeClicked(TQListViewItem*)));
-  connect(m_tree, SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*)));
-  connect(m_tree, SIGNAL(bookmarkDuplicated(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotDuplicateAction(ListViewItem*, KFTPBookmarks::Site*)));
-  connect(m_tree, SIGNAL(bookmarkDeleted()), this, SLOT(slotDeleteAction()));
-  connect(m_tree, SIGNAL(bookmarkMoved()), this, SLOT(refresh()));
-  connect(m_tree, SIGNAL(categoryRenamed()), this, SLOT(refresh()));
+  connect(m_tree, TQ_SIGNAL(bookmarkClicked(TQListViewItem*)), this, TQ_SLOT(slotTreeClicked(TQListViewItem*)));
+  connect(m_tree, TQ_SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, TQ_SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*)));
+  connect(m_tree, TQ_SIGNAL(bookmarkDuplicated(ListViewItem*, KFTPBookmarks::Site*)), this, TQ_SLOT(slotDuplicateAction(ListViewItem*, KFTPBookmarks::Site*)));
+  connect(m_tree, TQ_SIGNAL(bookmarkDeleted()), this, TQ_SLOT(slotDeleteAction()));
+  connect(m_tree, TQ_SIGNAL(bookmarkMoved()), this, TQ_SLOT(refresh()));
+  connect(m_tree, TQ_SIGNAL(categoryRenamed()), this, TQ_SLOT(refresh()));
 
   // Get the new bookmark data
   m_tree->fillBookmarkData();
@@ -153,15 +153,15 @@ void BookmarkEditor::initDialog()
   m_properties->retryGroup->setEnabled(false);
   m_properties->defLocalDir->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
 
-  connect(m_properties->anonLogin, SIGNAL(clicked()), this, SLOT(slotChangeAnonLogin()));
-  connect(m_properties->doRetry, SIGNAL(clicked()), this, SLOT(slotChangeActiveRetryGroup()));
-  connect(m_properties->doKeepalive, SIGNAL(clicked()), this, SLOT(slotChangeActiveKeepaliveGroup()));
-  connect(m_properties->protoAdvanced, SIGNAL(clicked()), this, SLOT(slotProtoAdvancedClicked()));
-  connect(m_properties->serverProtocol, SIGNAL(activated(int)), this, SLOT(slotChangeServerProtocol(int)));
-  connect(m_properties->serverPort, SIGNAL(valueChanged(int)), this, SLOT(slotPortChanged()));
+  connect(m_properties->anonLogin, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeAnonLogin()));
+  connect(m_properties->doRetry, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeActiveRetryGroup()));
+  connect(m_properties->doKeepalive, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeActiveKeepaliveGroup()));
+  connect(m_properties->protoAdvanced, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotProtoAdvancedClicked()));
+  connect(m_properties->serverProtocol, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeServerProtocol(int)));
+  connect(m_properties->serverPort, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotPortChanged()));
 
-  connect(this, SIGNAL(applyClicked()), this, SLOT(slotSaveActiveNode()));
-  connect(this, SIGNAL(okClicked()), this, SLOT(slotSaveActiveNode()));
+  connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotSaveActiveNode()));
+  connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSaveActiveNode()));
 
   // Populate charsets
   TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames();
diff --git a/kftpgrabber/src/widgets/bookmarks/editor.h b/kftpgrabber/src/widgets/bookmarks/editor.h
index f2aa9b0..4c5b492 100644
--- a/kftpgrabber/src/widgets/bookmarks/editor.h
+++ b/kftpgrabber/src/widgets/bookmarks/editor.h
@@ -42,8 +42,8 @@
 #include <tdeaction.h>
 #include <kdialogbase.h>
 
-#include <ntqlistview.h>
-#include <ntqdom.h>
+#include <tqlistview.h>
+#include <tqdom.h>
 
 namespace KFTPBookmarks {
   class Manager;
@@ -62,7 +62,7 @@ class ListView;
 */
 class BookmarkEditor : public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     BookmarkEditor(TQWidget *parent = 0, const char *name = 0);
     BookmarkEditor(ListViewItem *item, TQWidget *parent = 0, const char *name = 0);
diff --git a/kftpgrabber/src/widgets/bookmarks/editortls.cpp b/kftpgrabber/src/widgets/bookmarks/editortls.cpp
index da8d898..b8d6867 100644
--- a/kftpgrabber/src/widgets/bookmarks/editortls.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/editortls.cpp
@@ -34,7 +34,7 @@
  * files in the program, then also delete it here.
  */
 
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 
 #include <kcombobox.h>
 #include <tdelocale.h>
@@ -65,7 +65,7 @@ BookmarkEditorTLS::BookmarkEditorTLS(TQWidget *parent, const char *name)
   setCaption(i18n("SSL/TLS Settings"));
   showButtonApply(false);
 
-  connect(m_mainWidget->useCert, SIGNAL(clicked()), this, SLOT(slotChangeActiveX509Group()));
+  connect(m_mainWidget->useCert, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeActiveX509Group()));
 }
 
 BookmarkEditorTLS::~BookmarkEditorTLS()
diff --git a/kftpgrabber/src/widgets/bookmarks/editortls.h b/kftpgrabber/src/widgets/bookmarks/editortls.h
index f10243c..ba72ca5 100644
--- a/kftpgrabber/src/widgets/bookmarks/editortls.h
+++ b/kftpgrabber/src/widgets/bookmarks/editortls.h
@@ -43,8 +43,8 @@
 #include <tdeaction.h>
 #include <kdialogbase.h>
 
-#include <ntqlistview.h>
-#include <ntqdom.h>
+#include <tqlistview.h>
+#include <tqdom.h>
 
 namespace KFTPWidgets {
 
@@ -55,7 +55,7 @@ namespace Bookmarks {
 */
 class BookmarkEditorTLS : public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     BookmarkEditorTLS(TQWidget *parent = 0, const char *name = 0);
     ~BookmarkEditorTLS();
diff --git a/kftpgrabber/src/widgets/bookmarks/importwizard.cpp b/kftpgrabber/src/widgets/bookmarks/importwizard.cpp
index a40b07f..fc51a2d 100644
--- a/kftpgrabber/src/widgets/bookmarks/importwizard.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/importwizard.cpp
@@ -40,8 +40,8 @@
 #include "misc.h"
 #include "kftpbookmarks.h"
 
-#include <ntqfileinfo.h>
-#include <ntqlabel.h>
+#include <tqfileinfo.h>
+#include <tqlabel.h>
 
 #include <kurlrequester.h>
 #include <tdemessagebox.h>
@@ -67,7 +67,7 @@ ImportWizard::ImportWizard(TQWidget *parent, const char *name)
   m_pluginList->setFullWidth(true);
   m_pluginList->setAllColumnsShowFocus(true);
 
-  connect(m_pluginList, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotPluginsSelectionChanged(TQListViewItem*)));
+  connect(m_pluginList, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotPluginsSelectionChanged(TQListViewItem*)));
 
   setNextEnabled(Step1, false);
 
@@ -116,7 +116,7 @@ void ImportWizard::next()
     // Start the import
     setBackEnabled(Step3, false);
 
-    connect(m_plugin, SIGNAL(progress(int)), this, SLOT(slotImportProgress(int)));
+    connect(m_plugin, TQ_SIGNAL(progress(int)), this, TQ_SLOT(slotImportProgress(int)));
     m_plugin->import(m_importUrl->url());
   }
 }
diff --git a/kftpgrabber/src/widgets/bookmarks/importwizard.h b/kftpgrabber/src/widgets/bookmarks/importwizard.h
index 956991a..85d1c1c 100644
--- a/kftpgrabber/src/widgets/bookmarks/importwizard.h
+++ b/kftpgrabber/src/widgets/bookmarks/importwizard.h
@@ -63,7 +63,7 @@ private:
  */
 class ImportWizard : public KFTPBookmarkImportLayout
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     ImportWizard(TQWidget *parent = 0, const char *name = 0);
 private:
diff --git a/kftpgrabber/src/widgets/bookmarks/listview.cpp b/kftpgrabber/src/widgets/bookmarks/listview.cpp
index 59d4ce6..bbc5f6b 100644
--- a/kftpgrabber/src/widgets/bookmarks/listview.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/listview.cpp
@@ -40,7 +40,7 @@
 #include "kftpsession.h"
 #include "misc.h"
 
-#include <ntqdragobject.h>
+#include <tqdragobject.h>
 
 #include <tdeaction.h>
 #include <kinputdialog.h>
@@ -103,17 +103,17 @@ ListView::ListView(KFTPBookmarks::Manager *bookmarks, TQWidget *parent, const ch
   // Init auto open timer
   m_openTimer = new TQTimer(this);
 
-  connect(this, SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
-  connect(this, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*)));
-  connect(this, SIGNAL(doubleClicked(TQListViewItem*)), this, SLOT(slotDoubleClicked(TQListViewItem*)));
-  connect(this, SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int)));
+  connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
+  connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotClicked(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)));
+  connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int)));
 
   /* Init the actions */
-  m_newAction = new TDEAction(i18n("&New..."), "document-new", TDEShortcut(), this, SLOT(slotNewAction()), actionCollection(), "bookmark_new");
-  m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(), this, SLOT(slotRenameAction()), actionCollection(), "bookmark_rename");
-  m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(), this, SLOT(slotDeleteAction()), actionCollection(), "bookmark_delete");
-  m_subCatAction = new TDEAction(i18n("&Create Subcategory..."), "folder-new", TDEShortcut(), this, SLOT(slotSubCatAction()), actionCollection(), "bookmark_subcat");
-  m_copyAction = new TDEAction(i18n("&Duplicate"), TDEShortcut(), this, SLOT(slotDuplicateAction()), actionCollection(), "bookmark_duplicate");
+  m_newAction = new TDEAction(i18n("&New..."), "document-new", TDEShortcut(), this, TQ_SLOT(slotNewAction()), actionCollection(), "bookmark_new");
+  m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(), this, TQ_SLOT(slotRenameAction()), actionCollection(), "bookmark_rename");
+  m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(), this, TQ_SLOT(slotDeleteAction()), actionCollection(), "bookmark_delete");
+  m_subCatAction = new TDEAction(i18n("&Create Subcategory..."), "folder-new", TDEShortcut(), this, TQ_SLOT(slotSubCatAction()), actionCollection(), "bookmark_subcat");
+  m_copyAction = new TDEAction(i18n("&Duplicate"), TDEShortcut(), this, TQ_SLOT(slotDuplicateAction()), actionCollection(), "bookmark_duplicate");
 }
 
 TDEActionCollection *ListView::actionCollection()
@@ -126,7 +126,7 @@ void ListView::setAutoUpdate(bool value)
   m_autoUpdate = value;
 
   if (value)
-    connect(m_bookmarks, SIGNAL(update()), this, SLOT(slotAutoUpdate()));
+    connect(m_bookmarks, TQ_SIGNAL(update()), this, TQ_SLOT(slotAutoUpdate()));
 
   slotAutoUpdate();
 }
@@ -136,7 +136,7 @@ void ListView::setConnectBookmark(bool value)
   m_connectBookmark = value;
 
   if (value)
-    connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotBookmarkExecuted(TQListViewItem*)));
+    connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotBookmarkExecuted(TQListViewItem*)));
 }
 
 void ListView::setEditMenuItem(bool value)
diff --git a/kftpgrabber/src/widgets/bookmarks/listview.h b/kftpgrabber/src/widgets/bookmarks/listview.h
index da8c524..11f7f55 100644
--- a/kftpgrabber/src/widgets/bookmarks/listview.h
+++ b/kftpgrabber/src/widgets/bookmarks/listview.h
@@ -37,8 +37,8 @@
 #ifndef KFTPBOOKMARKEDITORLISTVIEW_H
 #define KFTPBOOKMARKEDITORLISTVIEW_H
 
-#include <ntqdom.h>
-#include <ntqtimer.h>
+#include <tqdom.h>
+#include <tqtimer.h>
 
 #include "../listview.h"
 
@@ -84,7 +84,7 @@ private:
 */
 class ListView : public KFTPWidgets::ListView
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     ListView(KFTPBookmarks::Manager *bookmarks, TQWidget *parent = 0, const char *name = 0);
 
diff --git a/kftpgrabber/src/widgets/bookmarks/sidebar.cpp b/kftpgrabber/src/widgets/bookmarks/sidebar.cpp
index 1762e20..3e19e09 100644
--- a/kftpgrabber/src/widgets/bookmarks/sidebar.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/sidebar.cpp
@@ -33,9 +33,9 @@
  * files in the program, then also delete it here.
  */
 
-#include <ntqlayout.h>
-#include <ntqsplitter.h>
-#include <ntqvbox.h>
+#include <tqlayout.h>
+#include <tqsplitter.h>
+#include <tqvbox.h>
 
 #include <tdeaction.h>
 #include <tdelocale.h>
@@ -77,9 +77,9 @@ Sidebar::Sidebar(TQWidget *parent, const char *name)
 
   layout->addWidget(m_tree);
 
-  m_editAction = new TDEAction(i18n("&Edit..."), "edit", TDEShortcut(), this, SLOT(slotEditAction()), actionCollection(), "bookmark_edit2");
-  connect(m_tree, SIGNAL(bookmarkClicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*)));
-  connect(m_tree, SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*)));
+  m_editAction = new TDEAction(i18n("&Edit..."), "edit", TDEShortcut(), this, TQ_SLOT(slotEditAction()), actionCollection(), "bookmark_edit2");
+  connect(m_tree, TQ_SIGNAL(bookmarkClicked(TQListViewItem*)), this, TQ_SLOT(slotClicked(TQListViewItem*)));
+  connect(m_tree, TQ_SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, TQ_SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*)));
 
   // Get the new bookmark data
   m_tree->fillBookmarkData();
diff --git a/kftpgrabber/src/widgets/bookmarks/sidebar.h b/kftpgrabber/src/widgets/bookmarks/sidebar.h
index 19b51aa..822362f 100644
--- a/kftpgrabber/src/widgets/bookmarks/sidebar.h
+++ b/kftpgrabber/src/widgets/bookmarks/sidebar.h
@@ -55,7 +55,7 @@ class ListView;
 */
 class Sidebar : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     Sidebar(TQWidget *parent = 0, const char *name = 0);
     ~Sidebar();