diff options
Diffstat (limited to 'kftpgrabber/src/widgets')
86 files changed, 621 insertions, 551 deletions
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/Makefile.am b/kftpgrabber/src/widgets/Makefile.am deleted file mode 100644 index 1dec2ff..0000000 --- a/kftpgrabber/src/widgets/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -INCLUDES = -I$(srcdir)/.. \ - -I$(srcdir)/../engine \ - -I$(srcdir)/../misc \ - -I$(srcdir)/../widgets/browser \ - -I.. \ - -I../ui \ - -I$(top_builddir) \ - -I$(top_builddir)/kftpgrabber/src \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = -noinst_LIBRARIES = libwidgets.a -libwidgets_a_SOURCES = logview.cpp kftpselectserverdialog.cpp \ - kftpselectserverdialog.h kftpserverlineedit.cpp kftpserverlineedit.h 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 - -SUBDIRS = queueview browser bookmarks - -noinst_HEADERS = listview.h quickconnect.h systemtray.h searchdialog.h \ - kftpzeroconflistview.h trafficgraph.h kftptabwidget.h \ - logview.h failedtransfers.h listviewitem.h sidebar.h multitabbar.h \ - multitabbar_p.h configdialog.h configfilter.h verifier.h balloon.h filtereditor.h \ - widgetlister.h overlaywidget.h popupmessage.h - diff --git a/kftpgrabber/src/widgets/balloon.cpp b/kftpgrabber/src/widgets/balloon.cpp index e2b135f..31be4bd 100644 --- a/kftpgrabber/src/widgets/balloon.cpp +++ b/kftpgrabber/src/widgets/balloon.cpp @@ -34,11 +34,11 @@ * files in the program, then also delete it here.
*/
-#include <ntqpointarray.h>
-#include <ntqpushbutton.h>
-#include <ntqtooltip.h>
-#include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqpointarray.h>
+#include <tqpushbutton.h>
+#include <tqtooltip.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <tdeapplication.h>
#include <kdialog.h>
@@ -81,9 +81,9 @@ Balloon::Balloon(const TQString &text, const TQString &pix) setPalette(TQToolTip::palette());
setAutoMask(true);
- connect(caption, SIGNAL(clicked(int, int)), this, SIGNAL(signalBalloonClicked()));
- connect(caption, SIGNAL(linkClicked(const TQString &)), this, SIGNAL(signalIgnoreButtonClicked()));
- connect(caption, SIGNAL(linkClicked(const TQString &)), this, SLOT(deleteLater()));
+ connect(caption, TQ_SIGNAL(clicked(int, int)), this, TQ_SIGNAL(signalBalloonClicked()));
+ connect(caption, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SIGNAL(signalIgnoreButtonClicked()));
+ connect(caption, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(deleteLater()));
}
void Balloon::mousePressEvent(TQMouseEvent *e)
diff --git a/kftpgrabber/src/widgets/balloon.h b/kftpgrabber/src/widgets/balloon.h index 502452c..afa018c 100644 --- a/kftpgrabber/src/widgets/balloon.h +++ b/kftpgrabber/src/widgets/balloon.h @@ -37,7 +37,7 @@ #ifndef KFTPWIDGETSBALLOON_H #define KFTPWIDGETSBALLOON_H -#include <ntqwidget.h> +#include <tqwidget.h> namespace KFTPWidgets { @@ -50,7 +50,7 @@ namespace KFTPWidgets { */ class Balloon : public TQWidget { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. 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(); 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/Makefile.am b/kftpgrabber/src/widgets/browser/Makefile.am deleted file mode 100644 index 0522960..0000000 --- a/kftpgrabber/src/widgets/browser/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = -I$(srcdir)/../.. -I../.. \ - -I$(srcdir)/../../engine \ - -I$(srcdir)/../../misc \ - -I$(srcdir)/.. \ - -I$(srcdir)/../../ui -I../../ui \ - -I$(top_builddir) \ - -I$(top_builddir)/kftpgrabber/src \ - $(all_includes) - -METASOURCES = AUTO -noinst_LIBRARIES = libbrowser.a -noinst_HEADERS = view.h actions.h treeview.h propsplugin.h \ - filterwidget.h detailsview.h locationnavigator.h dirlister.h -libbrowser_a_SOURCES = view.cpp actions.cpp treeview.cpp \ - propsplugin.cpp filterwidget.cpp detailsview.cpp locationnavigator.cpp dirlister.cpp diff --git a/kftpgrabber/src/widgets/browser/actions.cpp b/kftpgrabber/src/widgets/browser/actions.cpp index 11fb08c..2eb9dcd 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" @@ -69,8 +69,8 @@ #include <tdefiledialog.h> #include <kstandarddirs.h> -#include <ntqdir.h> -#include <ntqclipboard.h> +#include <tqdir.h> +#include <tqclipboard.h> using namespace KFTPGrabberBase; using namespace KFTPEngine; @@ -92,52 +92,52 @@ void Actions::initActions() m_actionCollection = new TDEActionCollection(m_view, this); // Create all the actions - m_goUpAction = KStdAction::up(this, SLOT(slotGoUp()), m_actionCollection, "go_up"); - m_goBackAction = KStdAction::back(this, SLOT(slotGoBack()), m_actionCollection, "go_back"); - m_goForwardAction = KStdAction::forward(this, SLOT(slotGoForward()), m_actionCollection, "go_forward"); - m_goHomeAction = KStdAction::home(this, SLOT(slotGoHome()), m_actionCollection, "go_home"); + m_goUpAction = KStdAction::up(this, TQ_SLOT(slotGoUp()), m_actionCollection, "go_up"); + m_goBackAction = KStdAction::back(this, TQ_SLOT(slotGoBack()), m_actionCollection, "go_back"); + m_goForwardAction = KStdAction::forward(this, TQ_SLOT(slotGoForward()), m_actionCollection, "go_forward"); + m_goHomeAction = KStdAction::home(this, TQ_SLOT(slotGoHome()), m_actionCollection, "go_home"); - m_reloadAction = KStdAction::redisplay(this, SLOT(slotReload()), m_actionCollection, "reload"); + m_reloadAction = KStdAction::redisplay(this, TQ_SLOT(slotReload()), m_actionCollection, "reload"); m_reloadAction->setText(i18n("&Reload")); m_reloadAction->setShortcut(TDEShortcut(TQt::Key_F5)); - m_abortAction = new TDEAction(i18n("&Abort"), "process-stop", TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort"); - m_toggleTreeViewAction = new TDEToggleAction(i18n("&Show Tree View"), "view_tree", TDEShortcut(), this, SLOT(slotShowHideTree()), m_actionCollection, "toggle_tree_view"); - m_toggleFilterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotShowHideFilter()), m_actionCollection, "toggle_filter"); + m_abortAction = new TDEAction(i18n("&Abort"), "process-stop", TDEShortcut(), this, TQ_SLOT(slotAbort()), m_actionCollection, "abort"); + m_toggleTreeViewAction = new TDEToggleAction(i18n("&Show Tree View"), "view_tree", TDEShortcut(), this, TQ_SLOT(slotShowHideTree()), m_actionCollection, "toggle_tree_view"); + m_toggleFilterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, TQ_SLOT(slotShowHideFilter()), m_actionCollection, "toggle_filter"); - m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(TQt::Key_F2), this, SLOT(slotRename()), m_actionCollection, "edit_rename"); - m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotDelete()), m_actionCollection, "edit_delete"); - m_propsAction = new TDEAction(i18n("&Properties"), TDEShortcut(), this, SLOT(slotProps()), m_actionCollection, "edit_properties"); - m_shredAction = new TDEAction(i18n("&Shred"), "editshred", TDEShortcut(), this, SLOT(slotShred()), m_actionCollection, "edit_shred"); + m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(TQt::Key_F2), this, TQ_SLOT(slotRename()), m_actionCollection, "edit_rename"); + m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, TQ_SLOT(slotDelete()), m_actionCollection, "edit_delete"); + m_propsAction = new TDEAction(i18n("&Properties"), TDEShortcut(), this, TQ_SLOT(slotProps()), m_actionCollection, "edit_properties"); + m_shredAction = new TDEAction(i18n("&Shred"), "editshred", TDEShortcut(), this, TQ_SLOT(slotShred()), m_actionCollection, "edit_shred"); - m_copyAction = KStdAction::copy(this, SLOT(slotCopy()), m_actionCollection, "edit_copy"); - m_pasteAction = KStdAction::paste(this, SLOT(slotPaste()), m_actionCollection, "edit_paste"); + m_copyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), m_actionCollection, "edit_copy"); + m_pasteAction = KStdAction::paste(this, TQ_SLOT(slotPaste()), m_actionCollection, "edit_paste"); m_filterActions = new TDEActionMenu(i18n("&Filter Options"), "", m_actionCollection, "edit_filter_options"); - m_alwaysSkipAction = new TDEAction(i18n("Always &skip this file when queuing"), TDEShortcut(), this, SLOT(slotAlwaysSkip()), m_actionCollection); - m_topPriorityAction = new TDEAction(i18n("Make this file &top priority"), TDEShortcut(), this, SLOT(slotTopPriority()), m_actionCollection); - m_lowPriorityAction = new TDEAction(i18n("Make this file &lowest priority"), TDEShortcut(), this, SLOT(slotLowPriority()), m_actionCollection); + m_alwaysSkipAction = new TDEAction(i18n("Always &skip this file when queuing"), TDEShortcut(), this, TQ_SLOT(slotAlwaysSkip()), m_actionCollection); + m_topPriorityAction = new TDEAction(i18n("Make this file &top priority"), TDEShortcut(), this, TQ_SLOT(slotTopPriority()), m_actionCollection); + m_lowPriorityAction = new TDEAction(i18n("Make this file &lowest priority"), TDEShortcut(), this, TQ_SLOT(slotLowPriority()), m_actionCollection); m_filterActions->insert(m_alwaysSkipAction); m_filterActions->insert(m_topPriorityAction); m_filterActions->insert(m_lowPriorityAction); - m_transferAction = new TDEAction(i18n("&Transfer"), TDEShortcut(), this, SLOT(slotTransfer()), m_actionCollection, "transfer"); - m_queueTransferAction = new TDEAction(i18n("&Queue Transfer"), "queue", TDEShortcut(), this, SLOT(slotQueueTransfer()), m_actionCollection, "queue_transfer"); - m_createDirAction = new TDEAction(i18n("&Create Directory..."), "folder-new", TDEShortcut(), this, SLOT(slotCreateDir()), m_actionCollection, "create_dir"); - m_fileEditAction = new TDEAction(i18n("&Open file"), "document-open", TDEShortcut(), this, SLOT(slotFileEdit()), m_actionCollection, "open_file"); - m_verifyAction = new TDEAction(i18n("&Verify..."), "ok", TDEShortcut(), this, SLOT(slotVerify()), m_actionCollection, "verify"); + m_transferAction = new TDEAction(i18n("&Transfer"), TDEShortcut(), this, TQ_SLOT(slotTransfer()), m_actionCollection, "transfer"); + m_queueTransferAction = new TDEAction(i18n("&Queue Transfer"), "queue", TDEShortcut(), this, TQ_SLOT(slotQueueTransfer()), m_actionCollection, "queue_transfer"); + m_createDirAction = new TDEAction(i18n("&Create Directory..."), "folder-new", TDEShortcut(), this, TQ_SLOT(slotCreateDir()), m_actionCollection, "create_dir"); + m_fileEditAction = new TDEAction(i18n("&Open file"), "document-open", TDEShortcut(), this, TQ_SLOT(slotFileEdit()), m_actionCollection, "open_file"); + m_verifyAction = new TDEAction(i18n("&Verify..."), "ok", TDEShortcut(), this, TQ_SLOT(slotVerify()), m_actionCollection, "verify"); populateEncodings(); m_moreActions = new TDEActionMenu(i18n("&More Actions"), "configure", this); - m_rawCmdAction = new TDEAction(i18n("&Manual Command Entry..."), "openterm", TDEShortcut(), this, SLOT(slotRawCmd()), m_actionCollection, "send_raw_cmd"); - m_exportListingAction = new TDEAction(i18n("&Export Directory Listing..."), "", TDEShortcut(), this, SLOT(slotExportListing()), m_actionCollection, "export_listing"); - m_showHiddenFilesAction = new TDEToggleAction(i18n("Show &Hidden Files && Directories"), TDEShortcut(), this, SLOT(slotShowHiddenFiles()), m_actionCollection, "show_hidden"); - m_openExternalAction = new TDEAction(i18n("Open current directory in &Konqueror..."), "konqueror", TDEShortcut(), this, SLOT(slotOpenExternal()), m_actionCollection, "open_konqi"); + m_rawCmdAction = new TDEAction(i18n("&Manual Command Entry..."), "openterm", TDEShortcut(), this, TQ_SLOT(slotRawCmd()), m_actionCollection, "send_raw_cmd"); + m_exportListingAction = new TDEAction(i18n("&Export Directory Listing..."), "", TDEShortcut(), this, TQ_SLOT(slotExportListing()), m_actionCollection, "export_listing"); + m_showHiddenFilesAction = new TDEToggleAction(i18n("Show &Hidden Files && Directories"), TDEShortcut(), this, TQ_SLOT(slotShowHiddenFiles()), m_actionCollection, "show_hidden"); + m_openExternalAction = new TDEAction(i18n("Open current directory in &Konqueror..."), "konqueror", TDEShortcut(), this, TQ_SLOT(slotOpenExternal()), m_actionCollection, "open_konqi"); - m_markItemsAction = new TDEAction(i18n("Compare &selected items"), "", TDEShortcut(TQt::Key_Space), this, SLOT(slotMarkItems()), m_actionCollection, "compare_selected"); - m_compareAction = new TDEAction(i18n("Compare &directories"), "", TDEShortcut(), this, SLOT(slotCompare()), m_actionCollection, "compare_dirs"); + m_markItemsAction = new TDEAction(i18n("Compare &selected items"), "", TDEShortcut(TQt::Key_Space), this, TQ_SLOT(slotMarkItems()), m_actionCollection, "compare_selected"); + m_compareAction = new TDEAction(i18n("Compare &directories"), "", TDEShortcut(), this, TQ_SLOT(slotCompare()), m_actionCollection, "compare_dirs"); m_showHiddenFilesAction->setChecked(KFTPCore::Config::showHiddenFiles()); @@ -159,9 +159,9 @@ void Actions::initActions() m_moreActions->setDelayed(false); m_siteChangeAction = new TDEActionMenu(i18n("&Change Site"), "goto", this); - m_quickConnectAction = new TDEAction(i18n("&Quick Connect..."), "connect_creating", TDEShortcut(), this, SLOT(slotQuickConnect()), m_actionCollection, "quick_connect"); + m_quickConnectAction = new TDEAction(i18n("&Quick Connect..."), "connect_creating", TDEShortcut(), this, TQ_SLOT(slotQuickConnect()), m_actionCollection, "quick_connect"); m_connectAction = new TDEActionMenu(i18n("&Connect To"), this); - m_disconnectAction = new TDEAction(i18n("&Disconnect"), "connect_no", TDEShortcut(), this, SLOT(slotDisconnect()), m_actionCollection, "disconnect"); + m_disconnectAction = new TDEAction(i18n("&Disconnect"), "connect_no", TDEShortcut(), this, TQ_SLOT(slotDisconnect()), m_actionCollection, "disconnect"); m_siteChangeAction->insert(m_quickConnectAction); m_siteChangeAction->insert(m_connectAction); @@ -185,10 +185,10 @@ void Actions::populateEncodings() TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames(); int count = 0; for (TQStringList::iterator i = charsets.begin(); i != charsets.end(); ++i) - menu->insertItem(*i, this, SLOT(slotCharsetChanged(int)), 0, ++count); + menu->insertItem(*i, this, TQ_SLOT(slotCharsetChanged(int)), 0, ++count); menu->insertSeparator(); - menu->insertItem(i18n("Default"), this, SLOT(slotCharsetReset(int)), 0, ++count); + menu->insertItem(i18n("Default"), this, TQ_SLOT(slotCharsetReset(int)), 0, ++count); menu->setItemChecked(count, true); m_defaultCharsetOption = count; diff --git a/kftpgrabber/src/widgets/browser/actions.h b/kftpgrabber/src/widgets/browser/actions.h index 6267fbe..96d4111 100644 --- a/kftpgrabber/src/widgets/browser/actions.h +++ b/kftpgrabber/src/widgets/browser/actions.h @@ -36,7 +36,7 @@ #ifndef KFTPFILEDIRVIEWACTIONS_H #define KFTPFILEDIRVIEWACTIONS_H -#include <ntqobject.h> +#include <tqobject.h> #include <tdeaction.h> #include <krun.h> #include <kservice.h> @@ -55,7 +55,7 @@ class View; */ class Actions : public TQObject { -Q_OBJECT +TQ_OBJECT friend class View; friend class DetailsView; public: diff --git a/kftpgrabber/src/widgets/browser/detailsview.cpp b/kftpgrabber/src/widgets/browser/detailsview.cpp index 80f8588..1fc1cdc 100644 --- a/kftpgrabber/src/widgets/browser/detailsview.cpp +++ b/kftpgrabber/src/widgets/browser/detailsview.cpp @@ -40,14 +40,14 @@ #include "browser/dirlister.h" #include "browser/actions.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc/kftpapi.h" #include "misc/filter.h" #include "kftpqueue.h" -#include <ntqheader.h> -#include <ntqpainter.h> +#include <tqheader.h> +#include <tqpainter.h> #include <tdepopupmenu.h> #include <kurldrag.h> @@ -67,32 +67,32 @@ DetailsView::DetailsView(TQWidget *parent, View *view, KFTPSession::Session *ses m_autoResizeEnabled(true) { m_resizeTimer = new TQTimer(this); - connect(m_resizeTimer, SIGNAL(timeout()), this, SLOT(updateColumnWidths())); + connect(m_resizeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateColumnWidths())); m_dirLister = new DirLister(this); m_dirLister->setSession(session); - connect(m_dirLister, SIGNAL(clear()), this, SLOT(slotClear())); - connect(m_dirLister, SIGNAL(completed()), this, SLOT(slotCompleted())); - connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)), this, SLOT(slotDeleteItem(KFileItem*))); - connect(m_dirLister, SIGNAL(refreshItems()), this, SLOT(slotRefreshItems())); - connect(m_dirLister, SIGNAL(siteChanged(const KURL&)), this, SLOT(slotSiteChanged(const KURL&))); + connect(m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear())); + connect(m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(m_dirLister, TQ_SIGNAL(deleteItem(KFileItem*)), this, TQ_SLOT(slotDeleteItem(KFileItem*))); + connect(m_dirLister, TQ_SIGNAL(refreshItems()), this, TQ_SLOT(slotRefreshItems())); + connect(m_dirLister, TQ_SIGNAL(siteChanged(const KURL&)), this, TQ_SLOT(slotSiteChanged(const KURL&))); m_navigator = new LocationNavigator(this); - connect(m_navigator, SIGNAL(urlChanged(const KURL&)), this, SLOT(slotUrlChanged(const KURL&))); + connect(m_navigator, TQ_SIGNAL(urlChanged(const KURL&)), this, TQ_SLOT(slotUrlChanged(const KURL&))); - connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotItemExecuted())); - connect(this, SIGNAL(returnPressed(TQListViewItem*)), this, SLOT(slotItemExecuted())); - connect(this, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), this, SLOT(slotItemRenamed(TQListViewItem*, const TQString&))); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted())); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted())); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString&))); // Setup the header TQHeader *viewHeader = header(); viewHeader->setResizeEnabled(true); viewHeader->setMovingEnabled(false); - connect(viewHeader, SIGNAL(sizeChange(int, int, int)), this, SLOT(slotHeaderResized(int))); + connect(viewHeader, TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(slotHeaderResized(int))); // Set column width setColumnWidthMode(NameColumn, TQListView::Manual); @@ -153,7 +153,7 @@ void DetailsView::setTreeView(TreeView *tree) { m_treeView = tree; - connect(m_treeView, SIGNAL(pathChanged(const KURL&)), this, SLOT(openUrl(const KURL&))); + connect(m_treeView, TQ_SIGNAL(pathChanged(const KURL&)), this, TQ_SLOT(openUrl(const KURL&))); } void DetailsView::setHomeUrl(const KURL &url) @@ -247,7 +247,7 @@ void DetailsView::slotCompleted() void DetailsView::slotRefreshItems() { - TQTimer::singleShot(0, this, SLOT(reload())); + TQTimer::singleShot(0, this, TQ_SLOT(reload())); } void DetailsView::reload() diff --git a/kftpgrabber/src/widgets/browser/detailsview.h b/kftpgrabber/src/widgets/browser/detailsview.h index a06f16b..bd7aef5 100644 --- a/kftpgrabber/src/widgets/browser/detailsview.h +++ b/kftpgrabber/src/widgets/browser/detailsview.h @@ -61,7 +61,7 @@ class View; * @author Jernej Kos */ class DetailsView : public KFileDetailView { -Q_OBJECT +TQ_OBJECT public: /** * Maps the column indices of KFileDetailView to a diff --git a/kftpgrabber/src/widgets/browser/dirlister.cpp b/kftpgrabber/src/widgets/browser/dirlister.cpp index 9336a59..b28e15e 100644 --- a/kftpgrabber/src/widgets/browser/dirlister.cpp +++ b/kftpgrabber/src/widgets/browser/dirlister.cpp @@ -99,10 +99,10 @@ void DirLister::enableLocal() m_localLister->stop(); m_localLister->TQObject::disconnect(this); - connect(m_localLister, SIGNAL(clear()), this, SIGNAL(clear())); - connect(m_localLister, SIGNAL(completed()), this, SIGNAL(completed())); - connect(m_localLister, SIGNAL(deleteItem(KFileItem*)), this, SIGNAL(deleteItem(KFileItem*))); - connect(m_localLister, SIGNAL(refreshItems(const KFileItemList&)), this, SIGNAL(refreshItems())); + connect(m_localLister, TQ_SIGNAL(clear()), this, TQ_SIGNAL(clear())); + connect(m_localLister, TQ_SIGNAL(completed()), this, TQ_SIGNAL(completed())); + connect(m_localLister, TQ_SIGNAL(deleteItem(KFileItem*)), this, TQ_SIGNAL(deleteItem(KFileItem*))); + connect(m_localLister, TQ_SIGNAL(refreshItems(const KFileItemList&)), this, TQ_SIGNAL(refreshItems())); } void DirLister::enableRemote() @@ -111,7 +111,7 @@ void DirLister::enableRemote() m_localLister->TQObject::disconnect(this); m_remoteSession->getClient()->eventHandler()->TQObject::disconnect(this); - connect(m_remoteSession->getClient()->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotRemoteEngineEvent(KFTPEngine::Event*))); + connect(m_remoteSession->getClient()->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), this, TQ_SLOT(slotRemoteEngineEvent(KFTPEngine::Event*))); } void DirLister::disableRemote() diff --git a/kftpgrabber/src/widgets/browser/dirlister.h b/kftpgrabber/src/widgets/browser/dirlister.h index fae0872..81d5a1c 100644 --- a/kftpgrabber/src/widgets/browser/dirlister.h +++ b/kftpgrabber/src/widgets/browser/dirlister.h @@ -36,7 +36,7 @@ #ifndef KFTPWIDGETS_BROWSERDIRLISTER_H #define KFTPWIDGETS_BROWSERDIRLISTER_H -#include <ntqobject.h> +#include <tqobject.h> #include <kurl.h> #include <kdirlister.h> @@ -60,7 +60,7 @@ namespace Browser { * @author Jernej Kos */ class DirLister : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. diff --git a/kftpgrabber/src/widgets/browser/filterwidget.cpp b/kftpgrabber/src/widgets/browser/filterwidget.cpp index 0dda482..387fd9d 100644 --- a/kftpgrabber/src/widgets/browser/filterwidget.cpp +++ b/kftpgrabber/src/widgets/browser/filterwidget.cpp @@ -36,9 +36,9 @@ #include "browser/filterwidget.h" #include "browser/detailsview.h" -#include <ntqlistview.h> -#include <ntqregexp.h> -#include <ntqpopupmenu.h> +#include <tqlistview.h> +#include <tqregexp.h> +#include <tqpopupmenu.h> #include <tdelocale.h> @@ -52,7 +52,7 @@ FilterWidget::FilterWidget(TQWidget *parent, DetailsView *view) m_filterSymlinks(true), m_caseSensitive(false) { - connect(view, SIGNAL(itemsChanged()), this, SLOT(updateSearch())); + connect(view, TQ_SIGNAL(itemsChanged()), this, TQ_SLOT(updateSearch())); } bool FilterWidget::itemMatches(const TQListViewItem *item, const TQString &pattern) const @@ -82,7 +82,7 @@ TQPopupMenu *FilterWidget::createPopupMenu() TQPopupMenu *popup = KLineEdit::createPopupMenu(); TQPopupMenu *subMenu = new TQPopupMenu(popup); - connect(subMenu, SIGNAL(activated(int)), this, SLOT(slotOptionsMenuActivated(int))); + connect(subMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOptionsMenuActivated(int))); popup->insertSeparator(); popup->insertItem(i18n("Filter Options"), subMenu); diff --git a/kftpgrabber/src/widgets/browser/filterwidget.h b/kftpgrabber/src/widgets/browser/filterwidget.h index 8d7a208..611df63 100644 --- a/kftpgrabber/src/widgets/browser/filterwidget.h +++ b/kftpgrabber/src/widgets/browser/filterwidget.h @@ -52,7 +52,7 @@ class DetailsView; * @author Jernej Kos <kostko@jweb-network.net> */ class FilterWidget : public TDEListViewSearchLine { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. diff --git a/kftpgrabber/src/widgets/browser/locationnavigator.cpp b/kftpgrabber/src/widgets/browser/locationnavigator.cpp index 35d3e87..2f885e2 100644 --- a/kftpgrabber/src/widgets/browser/locationnavigator.cpp +++ b/kftpgrabber/src/widgets/browser/locationnavigator.cpp @@ -60,7 +60,7 @@ LocationNavigator::LocationNavigator(DetailsView *view) : m_view(view), m_historyIndex(0) { - connect(view, SIGNAL(contentsMoved(int, int)), this, SLOT(slotContentsMoved(int, int))); + connect(view, TQ_SIGNAL(contentsMoved(int, int)), this, TQ_SLOT(slotContentsMoved(int, int))); } void LocationNavigator::setUrl(const KURL &url) diff --git a/kftpgrabber/src/widgets/browser/locationnavigator.h b/kftpgrabber/src/widgets/browser/locationnavigator.h index d709938..a763b15 100644 --- a/kftpgrabber/src/widgets/browser/locationnavigator.h +++ b/kftpgrabber/src/widgets/browser/locationnavigator.h @@ -36,8 +36,8 @@ #ifndef KFTPWIDGETS_BROWSERLOCATIONNAVIGATOR_H #define KFTPWIDGETS_BROWSERLOCATIONNAVIGATOR_H -#include <ntqobject.h> -#include <ntqvaluelist.h> +#include <tqobject.h> +#include <tqvaluelist.h> #include <kurl.h> @@ -54,7 +54,7 @@ class DetailsView; * @author Jernej Kos */ class LocationNavigator : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * An Element instance represents one history element. The class contains diff --git a/kftpgrabber/src/widgets/browser/propsplugin.cpp b/kftpgrabber/src/widgets/browser/propsplugin.cpp index cb22ede..06a70c7 100644 --- a/kftpgrabber/src/widgets/browser/propsplugin.cpp +++ b/kftpgrabber/src/widgets/browser/propsplugin.cpp @@ -36,10 +36,10 @@ #include "browser/propsplugin.h" #include "kftpsession.h" -#include <ntqlayout.h> -#include <ntqlabel.h> -#include <ntqstyle.h> -#include <ntqgroupbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqstyle.h> +#include <tqgroupbox.h> #include <tdelocale.h> #include <kiconloader.h> @@ -296,7 +296,7 @@ PermissionsPropsPlugin::PermissionsPropsPlugin(KPropertiesDialog *_props, KFileI for (int row = 0; row < 3; ++row) { for (int col = 0; col < 4; ++col) { TQCheckBox *cb = new TQCheckBox(gb); - connect(cb, SIGNAL(clicked()), this, SLOT(setDirty())); + connect(cb, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDirty())); m_permsCheck[row][col] = cb; cb->setChecked(permissions & fperm[row][col]); @@ -309,7 +309,7 @@ PermissionsPropsPlugin::PermissionsPropsPlugin(KPropertiesDialog *_props, KFileI if (isDir) { m_cbRecursive = new TQCheckBox(i18n("Apply changes to all subfolders and their contents"), frame); - connect(m_cbRecursive, SIGNAL(clicked()), this, SLOT(changed())); + connect(m_cbRecursive, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); box->addWidget(m_cbRecursive); } } diff --git a/kftpgrabber/src/widgets/browser/propsplugin.h b/kftpgrabber/src/widgets/browser/propsplugin.h index 736ec48..866aa82 100644 --- a/kftpgrabber/src/widgets/browser/propsplugin.h +++ b/kftpgrabber/src/widgets/browser/propsplugin.h @@ -38,7 +38,7 @@ #include "engine/directorylisting.h" -#include <ntqcheckbox.h> +#include <tqcheckbox.h> #include <kpropertiesdialog.h> namespace KFTPSession { @@ -61,7 +61,7 @@ namespace Browser { */ class PropsPlugin : public KPropsDlgPlugin { -Q_OBJECT +TQ_OBJECT public: PropsPlugin(KPropertiesDialog *props, KFileItemList items); @@ -76,7 +76,7 @@ public: */ class PermissionsPropsPlugin : public KPropsDlgPlugin { -Q_OBJECT +TQ_OBJECT public: PermissionsPropsPlugin(KPropertiesDialog *props, KFileItemList items, KFTPSession::Session *session); diff --git a/kftpgrabber/src/widgets/browser/treeview.cpp b/kftpgrabber/src/widgets/browser/treeview.cpp index f101dc7..1b94bee 100644 --- a/kftpgrabber/src/widgets/browser/treeview.cpp +++ b/kftpgrabber/src/widgets/browser/treeview.cpp @@ -40,8 +40,8 @@ #include "misc.h" -#include <ntqheader.h> -#include <ntqtimer.h> +#include <tqheader.h> +#include <tqtimer.h> #include <tdeio/job.h> #include <kurl.h> @@ -114,8 +114,8 @@ TreeView::TreeView(TQWidget *parent) m_noItemOpen = false; // Connect signals - connect(this, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*))); - connect(this, SIGNAL(doubleClicked(TQListViewItem*)), this, SLOT(slotDoubleClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(slotDoubleClicked(TQListViewItem*))); // Drag and drop m_dropItem = 0L; diff --git a/kftpgrabber/src/widgets/browser/treeview.h b/kftpgrabber/src/widgets/browser/treeview.h index d325fe6..093e1d0 100644 --- a/kftpgrabber/src/widgets/browser/treeview.h +++ b/kftpgrabber/src/widgets/browser/treeview.h @@ -40,8 +40,8 @@ #include <tdelocale.h> #include <kurl.h> -#include <ntqpixmap.h> -#include <ntqdict.h> +#include <tqpixmap.h> +#include <tqdict.h> namespace KFTPWidgets { @@ -57,7 +57,7 @@ class TreeViewItem; */ class TreeView : public TDEListView { -Q_OBJECT +TQ_OBJECT friend class ListView; friend class TreeViewItem; public: diff --git a/kftpgrabber/src/widgets/browser/view.cpp b/kftpgrabber/src/widgets/browser/view.cpp index f4b1393..4058bd6 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" @@ -58,9 +58,9 @@ #include <tdeio/job.h> -#include <ntqdir.h> -#include <ntqlabel.h> -#include <ntqlayout.h> +#include <tqdir.h> +#include <tqlabel.h> +#include <tqlayout.h> using namespace KFTPGrabberBase; using namespace KFTPEngine; @@ -93,14 +93,14 @@ View::View(TQWidget *parent, const char *name, KFTPEngine::Thread *client, KFTPS setTreeVisible(KFTPCore::Config::showTree()); // Let us be up to date with bookmark changes - connect(KFTPBookmarks::Manager::self(), SIGNAL(update()), this, SLOT(updateBookmarks())); + connect(KFTPBookmarks::Manager::self(), TQ_SIGNAL(update()), this, TQ_SLOT(updateBookmarks())); // Some other stuff - connect(m_ftpClient->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotEngineEvent(KFTPEngine::Event*))); - connect(m_connTimer, SIGNAL(timeout()), this, SLOT(slotDurationUpdate())); + connect(m_ftpClient->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), this, TQ_SLOT(slotEngineEvent(KFTPEngine::Event*))); + connect(m_connTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDurationUpdate())); // Config updates to hide/show the tree - connect(KFTPCore::Config::self(), SIGNAL(configChanged()), this, SLOT(slotConfigUpdate())); + connect(KFTPCore::Config::self(), TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotConfigUpdate())); } View::~View() @@ -137,7 +137,7 @@ void View::init() m_searchToolBar->insertWidget(1, 35, filterLabel); // Create the erase button - m_toolBarSecond->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, SIGNAL(clicked()), this, SLOT(slotHistoryEraseClicked()), true); + m_toolBarSecond->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHistoryEraseClicked()), true); // Create the labels TQLabel *pathLabel = new TQLabel(i18n("Path: "), m_toolBarSecond); @@ -152,7 +152,7 @@ void View::init() m_historyCombo->setDuplicatesEnabled(false); m_historyCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(m_historyCombo, SIGNAL(activated(const TQString&)), this, SLOT(slotHistoryActivated(const TQString&))); + connect(m_historyCombo, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotHistoryActivated(const TQString&))); // Do some more stuff m_toolBarSecond->setItemAutoSized(1, true); @@ -178,7 +178,7 @@ void View::init() m_sslIcon->setIconSet(SmallIconSet("decrypted")); m_sslIcon->setEnabled(false); - connect(m_sslIcon, SIGNAL(clicked()), this, SLOT(slotDisplayCertInfo())); + connect(m_sslIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDisplayCertInfo())); m_statusMsg = new TQLabel(this); m_statusMsg->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); @@ -199,7 +199,7 @@ void View::init() m_detailsView = new DetailsView(m_splitter, this, m_session); m_splitter->moveToLast(m_detailsView); - connect(m_detailsView->locationNavigator(), SIGNAL(historyChanged()), this, SLOT(slotHistoryChanged())); + connect(m_detailsView->locationNavigator(), TQ_SIGNAL(historyChanged()), this, TQ_SLOT(slotHistoryChanged())); // Create the tree view m_tree = new TreeView(m_splitter); diff --git a/kftpgrabber/src/widgets/browser/view.h b/kftpgrabber/src/widgets/browser/view.h index 198a383..ea949c5 100644 --- a/kftpgrabber/src/widgets/browser/view.h +++ b/kftpgrabber/src/widgets/browser/view.h @@ -38,12 +38,12 @@ #include "browser/locationnavigator.h" -#include <ntqwidget.h> -#include <ntqlabel.h> -#include <ntqpushbutton.h> -#include <ntqtimer.h> -#include <ntqdatetime.h> -#include <ntqsplitter.h> +#include <tqwidget.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqdatetime.h> +#include <tqsplitter.h> #include <kurl.h> #include <tdefileitem.h> @@ -78,7 +78,7 @@ class FilterWidget; */ class View : public TQWidget { -Q_OBJECT +TQ_OBJECT friend class Actions; friend class DetailsView; friend class ListView; diff --git a/kftpgrabber/src/widgets/configdialog.cpp b/kftpgrabber/src/widgets/configdialog.cpp index bd3170e..9954eb3 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> @@ -48,9 +48,9 @@ #include <kcharsets.h> #include <kcombobox.h> -#include <ntqframe.h> -#include <ntqlayout.h> -#include <ntqcheckbox.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqcheckbox.h> // Config layouts #include "ui/config_general.h" @@ -93,12 +93,12 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) static_cast<KURLRequester*>(child("kcfg_defLocalDir"))->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly); // Setup signals - connect(child("kcfg_globalMail"), SIGNAL(toggled(bool)), this, SLOT(slotGeneralEmailChanged(bool))); - connect(child("kcfg_portForceIp"), SIGNAL(toggled(bool)), this, SLOT(slotTransfersForceIpChanged(bool))); - connect(child("kcfg_activeForcePort"), SIGNAL(toggled(bool)), this, SLOT(slotTransfersForcePortChanged(bool))); - connect(child("kcfg_diskCheckSpace"), SIGNAL(toggled(bool)), this, SLOT(slotTransfersDiskChanged(bool))); - connect(child("kcfg_failedAutoRetry"), SIGNAL(toggled(bool)), this, SLOT(slotTransfersFailedRetryChanged(bool))); - connect(child("kcfg_saveToFile"), SIGNAL(toggled(bool)), this, SLOT(slotLogOutputFileChanged(bool))); + connect(child("kcfg_globalMail"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGeneralEmailChanged(bool))); + connect(child("kcfg_portForceIp"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTransfersForceIpChanged(bool))); + connect(child("kcfg_activeForcePort"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTransfersForcePortChanged(bool))); + connect(child("kcfg_diskCheckSpace"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTransfersDiskChanged(bool))); + connect(child("kcfg_failedAutoRetry"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTransfersFailedRetryChanged(bool))); + connect(child("kcfg_saveToFile"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotLogOutputFileChanged(bool))); // Refresh states slotGeneralEmailChanged(static_cast<TQCheckBox*>(child("kcfg_globalMail"))->isChecked()); @@ -109,8 +109,8 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) slotTransfersForcePortChanged(static_cast<TQCheckBox*>(child("kcfg_activeForcePort"))->isChecked()); // Let the config be up-to-date - connect(this, SIGNAL(settingsChanged()), KFTPCore::Config::self(), SLOT(emitChange())); - connect(this, SIGNAL(okClicked()), this, SLOT(slotSettingsChanged())); + connect(this, TQ_SIGNAL(settingsChanged()), KFTPCore::Config::self(), TQ_SLOT(emitChange())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSettingsChanged())); } void ConfigDialog::prepareDialog() diff --git a/kftpgrabber/src/widgets/configdialog.h b/kftpgrabber/src/widgets/configdialog.h index 0214d5c..ed5f14e 100644 --- a/kftpgrabber/src/widgets/configdialog.h +++ b/kftpgrabber/src/widgets/configdialog.h @@ -46,7 +46,7 @@ class ConfigFilter; */ class ConfigDialog : public TDEConfigDialog { -Q_OBJECT +TQ_OBJECT public: ConfigDialog(TQWidget *parent, const char *name = 0); diff --git a/kftpgrabber/src/widgets/configfilter.cpp b/kftpgrabber/src/widgets/configfilter.cpp index 48f068a..ca5a2fb 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> @@ -50,9 +50,9 @@ #include <kcolorbutton.h> #include <kdialogbase.h> -#include <ntqcheckbox.h> -#include <ntqlayout.h> -#include <ntqtabwidget.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqtabwidget.h> using namespace KFTPGrabberBase; @@ -75,8 +75,8 @@ ConfigFilter::ConfigFilter(TQWidget *parent, const char *name) loadSettings(); // Connect the slots - connect(m_editorLayout->addExtButton, SIGNAL(clicked()), this, SLOT(slotAddAscii())); - connect(m_editorLayout->removeExtButton, SIGNAL(clicked()), this, SLOT(slotRemoveAscii())); + connect(m_editorLayout->addExtButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddAscii())); + connect(m_editorLayout->removeExtButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveAscii())); } void ConfigFilter::loadSettings() diff --git a/kftpgrabber/src/widgets/configfilter.h b/kftpgrabber/src/widgets/configfilter.h index d83baf2..6130b4a 100644 --- a/kftpgrabber/src/widgets/configfilter.h +++ b/kftpgrabber/src/widgets/configfilter.h @@ -37,11 +37,11 @@ #ifndef KFTPWIDGETSCONFIGFILTER_H #define KFTPWIDGETSCONFIGFILTER_H -#include <ntqwidget.h> +#include <tqwidget.h> #include <kdialogbase.h> #include <knuminput.h> -#include <ntqradiobutton.h> -#include <ntqvaluelist.h> +#include <tqradiobutton.h> +#include <tqvaluelist.h> // Layouts #include "ui/config_filters.h" @@ -57,7 +57,7 @@ class FilterEditor; */ class ConfigFilter : public TQWidget { -Q_OBJECT +TQ_OBJECT public: ConfigFilter(TQWidget *parent = 0, const char *name = 0); diff --git a/kftpgrabber/src/widgets/failedtransfers.cpp b/kftpgrabber/src/widgets/failedtransfers.cpp index dfe11d1..494658d 100644 --- a/kftpgrabber/src/widgets/failedtransfers.cpp +++ b/kftpgrabber/src/widgets/failedtransfers.cpp @@ -44,8 +44,8 @@ #include <tdeio/job.h> #include <tdemessagebox.h> -#include <ntqlayout.h> -#include <ntqheader.h> +#include <tqlayout.h> +#include <tqheader.h> using namespace KFTPGrabberBase; @@ -99,10 +99,10 @@ FailedTransfers::FailedTransfers(TQWidget *parent, const char *name) layout->addWidget(m_list); - connect(KFTPQueue::Manager::self(), SIGNAL(failedTransferNew(KFTPQueue::FailedTransfer*)), this, SLOT(slotFailedTransferNew(KFTPQueue::FailedTransfer*))); - connect(KFTPQueue::Manager::self(), SIGNAL(failedTransferRemoved(long)), this, SLOT(slotFailedTransferRemoved(long))); + connect(KFTPQueue::Manager::self(), TQ_SIGNAL(failedTransferNew(KFTPQueue::FailedTransfer*)), this, TQ_SLOT(slotFailedTransferNew(KFTPQueue::FailedTransfer*))); + connect(KFTPQueue::Manager::self(), TQ_SIGNAL(failedTransferRemoved(long)), this, TQ_SLOT(slotFailedTransferRemoved(long))); - connect(m_list, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(m_list, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&))); // Initialize the actions initActions(); @@ -114,11 +114,11 @@ FailedTransfers::~FailedTransfers() void FailedTransfers::initActions() { - m_restartAction = new TDEAction(i18n("&Restart Transfer"), "launch", TDEShortcut(), this, SLOT(slotRestart()), actionCollection(), "launch"); - m_addToQueueAction = new TDEAction(i18n("&Add To Queue"), "queue", TDEShortcut(), this, SLOT(slotAddToQueue()), actionCollection(), "addtoqueue"); - m_addAllToQueueAction = new TDEAction(i18n("Add All To Queue"), TDEShortcut(), this, SLOT(slotAddAllToQueue()), actionCollection(), "addalltoqueue"); - m_removeAction = new TDEAction(i18n("R&emove"), "edit-delete", TDEShortcut(), this, SLOT(slotRemove()), actionCollection(), "remove"); - m_removeAllAction = new TDEAction(i18n("Remove All"), TDEShortcut(), this, SLOT(slotRemoveAll()), actionCollection(), "removeall"); + m_restartAction = new TDEAction(i18n("&Restart Transfer"), "launch", TDEShortcut(), this, TQ_SLOT(slotRestart()), actionCollection(), "launch"); + m_addToQueueAction = new TDEAction(i18n("&Add To Queue"), "queue", TDEShortcut(), this, TQ_SLOT(slotAddToQueue()), actionCollection(), "addtoqueue"); + m_addAllToQueueAction = new TDEAction(i18n("Add All To Queue"), TDEShortcut(), this, TQ_SLOT(slotAddAllToQueue()), actionCollection(), "addalltoqueue"); + m_removeAction = new TDEAction(i18n("R&emove"), "edit-delete", TDEShortcut(), this, TQ_SLOT(slotRemove()), actionCollection(), "remove"); + m_removeAllAction = new TDEAction(i18n("Remove All"), TDEShortcut(), this, TQ_SLOT(slotRemoveAll()), actionCollection(), "removeall"); } void FailedTransfers::updateActions() diff --git a/kftpgrabber/src/widgets/failedtransfers.h b/kftpgrabber/src/widgets/failedtransfers.h index c216ebb..0abfa51 100644 --- a/kftpgrabber/src/widgets/failedtransfers.h +++ b/kftpgrabber/src/widgets/failedtransfers.h @@ -39,8 +39,8 @@ #include <tdelistview.h> #include <tdeaction.h> -#include <ntqwidget.h> -#include <ntqguardedptr.h> +#include <tqwidget.h> +#include <tqguardedptr.h> #include "listviewitem.h" @@ -76,7 +76,7 @@ private: */ class FailedTransfers : public TQWidget { -Q_OBJECT +TQ_OBJECT public: FailedTransfers(TQWidget *parent = 0, const char *name = 0); ~FailedTransfers(); diff --git a/kftpgrabber/src/widgets/filtereditor.cpp b/kftpgrabber/src/widgets/filtereditor.cpp index 6e63594..2dd5987 100644 --- a/kftpgrabber/src/widgets/filtereditor.cpp +++ b/kftpgrabber/src/widgets/filtereditor.cpp @@ -37,11 +37,11 @@ #include "listview.h" #include "misc/filterwidgethandler.h" -#include <ntqlayout.h> -#include <ntqhbox.h> -#include <ntqtooltip.h> -#include <ntqheader.h> -#include <ntqbuttongroup.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqtooltip.h> +#include <tqheader.h> +#include <tqbuttongroup.h> #include <kiconloader.h> #include <tdelocale.h> @@ -76,16 +76,16 @@ FilterEditor::FilterEditor(TQWidget *parent) rightLayout->addStretch(1); // Connect some signals - connect(m_enabledCheck, SIGNAL(clicked()), this, SLOT(slotEnabledChanged())); + connect(m_enabledCheck, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEnabledChanged())); - connect(m_listView, SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), this, SLOT(slotRuleChanged(KFTPCore::Filter::Rule*))); - connect(m_listView, SIGNAL(ruleRemoved()), this, SLOT(slotRuleRemoved())); + connect(m_listView, TQ_SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), this, TQ_SLOT(slotRuleChanged(KFTPCore::Filter::Rule*))); + connect(m_listView, TQ_SIGNAL(ruleRemoved()), this, TQ_SLOT(slotRuleRemoved())); - connect(m_listView, SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), m_conditionsList, SLOT(loadRule(KFTPCore::Filter::Rule*))); - connect(m_listView, SIGNAL(ruleRemoved()), m_conditionsList, SLOT(reset())); + connect(m_listView, TQ_SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), m_conditionsList, TQ_SLOT(loadRule(KFTPCore::Filter::Rule*))); + connect(m_listView, TQ_SIGNAL(ruleRemoved()), m_conditionsList, TQ_SLOT(reset())); - connect(m_listView, SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), m_actionsList, SLOT(loadRule(KFTPCore::Filter::Rule*))); - connect(m_listView, SIGNAL(ruleRemoved()), m_actionsList, SLOT(reset())); + connect(m_listView, TQ_SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), m_actionsList, TQ_SLOT(loadRule(KFTPCore::Filter::Rule*))); + connect(m_listView, TQ_SIGNAL(ruleRemoved()), m_actionsList, TQ_SLOT(reset())); } void FilterEditor::slotRuleChanged(KFTPCore::Filter::Rule *rule) @@ -177,15 +177,15 @@ FilterListView::FilterListView(TQWidget *parent) TQToolTip::add(m_buttonDelete, i18n("Delete")); // Connect the signals - connect(m_buttonNew, SIGNAL(clicked()), this, SLOT(slotNewRule())); - connect(m_buttonDelete, SIGNAL(clicked()), this, SLOT(slotDeleteRule())); - connect(m_buttonRename, SIGNAL(clicked()), this, SLOT(slotRenameRule())); - connect(m_buttonCopy, SIGNAL(clicked()), this, SLOT(slotCopyRule())); + connect(m_buttonNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewRule())); + connect(m_buttonDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteRule())); + connect(m_buttonRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRenameRule())); + connect(m_buttonCopy, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyRule())); - connect(m_buttonUp, SIGNAL(clicked()), this, SLOT(slotUp())); - connect(m_buttonDown, SIGNAL(clicked()), this, SLOT(slotDown())); + connect(m_buttonUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUp())); + connect(m_buttonDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDown())); - connect(m_listView, SIGNAL(selectionChanged(TQListViewItem*)), this, SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); m_buttonUp->setEnabled(false); m_buttonDown->setEnabled(false); @@ -346,7 +346,7 @@ FilterConditionsList::FilterConditionsList(TQWidget *parent) bg->insert(m_buttonAny, (int) ConditionChain::Any); // Connect some signals - connect(bg, SIGNAL(clicked(int)), this, SLOT(slotMatchTypeChanged(int))); + connect(bg, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotMatchTypeChanged(int))); m_lister = new FilterConditionWidgetLister(this); } @@ -454,7 +454,7 @@ FilterConditionWidget::FilterConditionWidget(TQWidget *parent) WidgetHandlerManager::self()->createConditionWidgets(m_typeStack, m_valueStack, this); // Connect signals - connect(m_fieldCombo, SIGNAL(activated(int)), this, SLOT(slotFieldChanged(int))); + connect(m_fieldCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFieldChanged(int))); setFocusProxy(m_fieldCombo); } @@ -591,8 +591,8 @@ FilterActionWidget::FilterActionWidget(TQWidget *parent) WidgetHandlerManager::self()->createActionWidgets(m_valueStack, this); // Connect signals - connect(m_actionCombo, SIGNAL(activated(int)), this, SLOT(slotActionChanged(int))); - connect(m_actionCombo, SIGNAL(activated(int)), m_valueStack, SLOT(raiseWidget(int))); + connect(m_actionCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActionChanged(int))); + connect(m_actionCombo, TQ_SIGNAL(activated(int)), m_valueStack, TQ_SLOT(raiseWidget(int))); setFocusProxy(m_actionCombo); } diff --git a/kftpgrabber/src/widgets/filtereditor.h b/kftpgrabber/src/widgets/filtereditor.h index 869b900..0e1dfa4 100644 --- a/kftpgrabber/src/widgets/filtereditor.h +++ b/kftpgrabber/src/widgets/filtereditor.h @@ -39,14 +39,14 @@ #include "widgetlister.h" #include "misc/filter.h" -#include <ntqwidget.h> -#include <ntqpushbutton.h> -#include <ntqgroupbox.h> -#include <ntqlistview.h> -#include <ntqradiobutton.h> -#include <ntqcombobox.h> -#include <ntqwidgetstack.h> -#include <ntqcheckbox.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqlistview.h> +#include <tqradiobutton.h> +#include <tqcombobox.h> +#include <tqwidgetstack.h> +#include <tqcheckbox.h> #include <kpushbutton.h> @@ -60,7 +60,7 @@ class ListView; * @author Jernej Kos */ class FilterConditionWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. @@ -100,7 +100,7 @@ private: * @author Jernej Kos */ class FilterConditionWidgetLister : public WidgetLister { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. @@ -131,7 +131,7 @@ private: * @author Jernej Kos */ class FilterConditionsList : public TQGroupBox { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. @@ -167,7 +167,7 @@ private: * @author Jernej Kos */ class FilterActionWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. @@ -205,7 +205,7 @@ private: * @author Jernej Kos */ class FilterActionWidgetLister : public WidgetLister { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. @@ -236,7 +236,7 @@ private: * @author Jernej Kos */ class FilterActionsList : public TQGroupBox { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. @@ -267,7 +267,7 @@ private: * @author Jernej Kos */ class FilterListView : public TQGroupBox { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. @@ -345,7 +345,7 @@ private: * @author Jernej Kos */ class FilterEditor : public TQWidget { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. diff --git a/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.cpp b/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.cpp index 409912f..271544c 100644 --- a/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.cpp +++ b/kftpgrabber/src/widgets/kftpfilteraddpatternlayout.cpp @@ -10,15 +10,15 @@ #include "kftpfilteraddpatternlayout.h" -#include <ntqvariant.h> -#include <ntqpushbutton.h> -#include <ntqgroupbox.h> -#include <ntqlabel.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqgroupbox.h> +#include <tqlabel.h> #include <klineedit.h> #include <kcolorbutton.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> /* * Constructs a KFTPFilterAddPatternLayout as a child of 'parent', with the diff --git a/kftpgrabber/src/widgets/kftpfiltereditorlayout.cpp b/kftpgrabber/src/widgets/kftpfiltereditorlayout.cpp index 44ba1f2..72f576f 100644 --- a/kftpgrabber/src/widgets/kftpfiltereditorlayout.cpp +++ b/kftpgrabber/src/widgets/kftpfiltereditorlayout.cpp @@ -10,17 +10,17 @@ #include "kftpfiltereditorlayout.h" -#include <ntqvariant.h> -#include <ntqpushbutton.h> -#include <ntqtabwidget.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqtabwidget.h> #include <kpushbutton.h> -#include <ntqheader.h> +#include <tqheader.h> #include <tdelistview.h> -#include <ntqcheckbox.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqtooltip.h> -#include <ntqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> /* * Constructs a KFTPFilterEditorLayout as a child of 'parent', with the diff --git a/kftpgrabber/src/widgets/kftpselectserverdialog.cpp b/kftpgrabber/src/widgets/kftpselectserverdialog.cpp index effaf46..bfc3c78 100644 --- a/kftpgrabber/src/widgets/kftpselectserverdialog.cpp +++ b/kftpgrabber/src/widgets/kftpselectserverdialog.cpp @@ -53,7 +53,7 @@ KFTPSelectServerDialog::KFTPSelectServerDialog(TQWidget *parent, const char *nam m_tree->setMinimumWidth(270); m_tree->fillBookmarkData(); - connect(m_tree, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotTreeClicked())); + connect(m_tree, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotTreeClicked())); // Set some stuff setMainWidget(m_tree); diff --git a/kftpgrabber/src/widgets/kftpselectserverdialog.h b/kftpgrabber/src/widgets/kftpselectserverdialog.h index 86753c0..0da120b 100644 --- a/kftpgrabber/src/widgets/kftpselectserverdialog.h +++ b/kftpgrabber/src/widgets/kftpselectserverdialog.h @@ -37,8 +37,8 @@ #define KFTPSELECTSERVERDIALOG_H #include <kdialogbase.h> -#include <ntqdom.h> -#include <ntqlistview.h> +#include <tqdom.h> +#include <tqlistview.h> namespace KFTPBookmarks { class Site; @@ -55,7 +55,7 @@ namespace Bookmarks { */ class KFTPSelectServerDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: KFTPSelectServerDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/kftpgrabber/src/widgets/kftpserverlineedit.cpp b/kftpgrabber/src/widgets/kftpserverlineedit.cpp index 1e1467f..30da520 100644 --- a/kftpgrabber/src/widgets/kftpserverlineedit.cpp +++ b/kftpgrabber/src/widgets/kftpserverlineedit.cpp @@ -41,7 +41,7 @@ #include <kpushbutton.h> #include <tdelocale.h> -#include <ntqlayout.h> +#include <tqlayout.h> KFTPServerLineEdit::KFTPServerLineEdit(TQWidget *parent, const char *name, WFlags f) : TQWidget(parent, name, f), m_currentSite(0) @@ -53,7 +53,7 @@ KFTPServerLineEdit::KFTPServerLineEdit(TQWidget *parent, const char *name, WFlag KPushButton *selectButton = new KPushButton(i18n("Select..."), this); selectButton->setFlat(true); - connect(selectButton, SIGNAL(clicked()), this, SLOT(slotSelectButtonClicked())); + connect(selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectButtonClicked())); layout->addWidget(m_lineEdit); layout->addWidget(selectButton); diff --git a/kftpgrabber/src/widgets/kftpserverlineedit.h b/kftpgrabber/src/widgets/kftpserverlineedit.h index e7fcd12..8875cb3 100644 --- a/kftpgrabber/src/widgets/kftpserverlineedit.h +++ b/kftpgrabber/src/widgets/kftpserverlineedit.h @@ -36,8 +36,8 @@ #ifndef KFTPSERVERLINEEDIT_H #define KFTPSERVERLINEEDIT_H -#include <ntqwidget.h> -#include <ntqdom.h> +#include <tqwidget.h> +#include <tqdom.h> #include <klineedit.h> @@ -50,7 +50,7 @@ namespace KFTPBookmarks { */ class KFTPServerLineEdit : public TQWidget { -Q_OBJECT +TQ_OBJECT public: KFTPServerLineEdit(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); ~KFTPServerLineEdit(); diff --git a/kftpgrabber/src/widgets/kftptabwidget.h b/kftpgrabber/src/widgets/kftptabwidget.h index 77f60e6..9aef9c0 100644 --- a/kftpgrabber/src/widgets/kftptabwidget.h +++ b/kftpgrabber/src/widgets/kftptabwidget.h @@ -44,7 +44,7 @@ class KFTPTabWidget : public KTabWidget { private: - Q_OBJECT + TQ_OBJECT public: KFTPTabWidget( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kftpgrabber/src/widgets/kftpzeroconflistview.cpp b/kftpgrabber/src/widgets/kftpzeroconflistview.cpp index b64da05..a311f51 100644 --- a/kftpgrabber/src/widgets/kftpzeroconflistview.cpp +++ b/kftpgrabber/src/widgets/kftpzeroconflistview.cpp @@ -39,9 +39,7 @@ #include <tdeversion.h> -#if KDE_IS_VERSION(3,4,0) #include "kftpzeroconf.h" -#endif #include <tdelocale.h> #include <kiconloader.h> @@ -57,17 +55,14 @@ KFTPZeroConfListView::KFTPZeroConfListView(TQWidget *parent, const char *name) setEmptyListText(i18n("No sites published.")); setItemsRenameable(false); -#if KDE_IS_VERSION(3,4,0) - connect(KFTPAPI::getInstance()->zeroConfInterface(), SIGNAL(servicesUpdated()), this, SLOT(slotSitesChanged())); - connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotSiteExecuted(TQListViewItem*))); + connect(KFTPAPI::getInstance()->zeroConfInterface(), TQ_SIGNAL(servicesUpdated()), this, TQ_SLOT(slotSitesChanged())); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotSiteExecuted(TQListViewItem*))); slotSitesChanged(); -#endif } void KFTPZeroConfListView::slotSitesChanged() { -#if KDE_IS_VERSION(3,4,0) // Update the site list TQValueList<DNSSD::RemoteService::Ptr> list = KFTPAPI::getInstance()->zeroConfInterface()->getServiceList(); @@ -84,15 +79,12 @@ void KFTPZeroConfListView::slotSitesChanged() site->setPixmap(0, SmallIcon("lan")); } } -#endif } void KFTPZeroConfListView::slotSiteExecuted(TQListViewItem *item) { -#if KDE_IS_VERSION(3,4,0) // Connect to the site KFTPAPI::getInstance()->mainWindow()->slotQuickConnect(item->text(0), item->text(1), item->text(2).toInt()); -#endif } #include "kftpzeroconflistview.moc" diff --git a/kftpgrabber/src/widgets/kftpzeroconflistview.h b/kftpgrabber/src/widgets/kftpzeroconflistview.h index 1c2cc18..627c1f6 100644 --- a/kftpgrabber/src/widgets/kftpzeroconflistview.h +++ b/kftpgrabber/src/widgets/kftpzeroconflistview.h @@ -45,7 +45,7 @@ */ class KFTPZeroConfListView : public KFTPWidgets::ListView { -Q_OBJECT +TQ_OBJECT public: KFTPZeroConfListView(TQWidget *parent = 0, const char *name = 0); private slots: diff --git a/kftpgrabber/src/widgets/listview.cpp b/kftpgrabber/src/widgets/listview.cpp index fc17ad3..3de6cc2 100644 --- a/kftpgrabber/src/widgets/listview.cpp +++ b/kftpgrabber/src/widgets/listview.cpp @@ -35,8 +35,8 @@ #include "listview.h" -#include <ntqpainter.h> -#include <ntqstringlist.h> +#include <tqpainter.h> +#include <tqstringlist.h> namespace KFTPWidgets { diff --git a/kftpgrabber/src/widgets/listview.h b/kftpgrabber/src/widgets/listview.h index 487e9e1..6fd7f24 100644 --- a/kftpgrabber/src/widgets/listview.h +++ b/kftpgrabber/src/widgets/listview.h @@ -45,7 +45,7 @@ namespace KFTPWidgets { */ class ListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: ListView(TQWidget *parent = 0, const char *name = 0); ~ListView(); diff --git a/kftpgrabber/src/widgets/listviewitem.cpp b/kftpgrabber/src/widgets/listviewitem.cpp index d249d46..0c0437e 100644 --- a/kftpgrabber/src/widgets/listviewitem.cpp +++ b/kftpgrabber/src/widgets/listviewitem.cpp @@ -35,10 +35,10 @@ #include "listviewitem.h" -#include <ntqheader.h> -#include <ntqpixmap.h> -#include <ntqpainter.h> -#include <ntqsimplerichtext.h> +#include <tqheader.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqsimplerichtext.h> namespace KFTPWidgets { diff --git a/kftpgrabber/src/widgets/listviewitem.h b/kftpgrabber/src/widgets/listviewitem.h index 0feb435..ed8ce68 100644 --- a/kftpgrabber/src/widgets/listviewitem.h +++ b/kftpgrabber/src/widgets/listviewitem.h @@ -38,8 +38,8 @@ #include <tdelistview.h> -#include <ntqmap.h> -#include <ntqcolor.h> +#include <tqmap.h> +#include <tqcolor.h> namespace KFTPWidgets { diff --git a/kftpgrabber/src/widgets/logview.cpp b/kftpgrabber/src/widgets/logview.cpp index 1d1c57f..6f4dfdf 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> @@ -42,8 +42,8 @@ #include <tdefiledialog.h> #include <tdemessagebox.h> -#include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> namespace KFTPWidgets { @@ -58,8 +58,8 @@ LogView::LogView(TQWidget *parent, const char *name) unsetPalette(); // Init actions - m_saveToFileAction = KStdAction::saveAs(this, SLOT(slotSaveToFile()), KFTPAPI::getInstance()->mainWindow()->actionCollection(), "log_safeAs"); - m_clearLogAction = KStdAction::clear(this, SLOT(slotClearLog()), KFTPAPI::getInstance()->mainWindow()->actionCollection(), "log_clear"); + m_saveToFileAction = KStdAction::saveAs(this, TQ_SLOT(slotSaveToFile()), KFTPAPI::getInstance()->mainWindow()->actionCollection(), "log_safeAs"); + m_clearLogAction = KStdAction::clear(this, TQ_SLOT(slotClearLog()), KFTPAPI::getInstance()->mainWindow()->actionCollection(), "log_clear"); append(i18n("<b>KFTPGrabber</b> logger initialized.<br>")); } diff --git a/kftpgrabber/src/widgets/logview.h b/kftpgrabber/src/widgets/logview.h index 80e5f43..f37d149 100644 --- a/kftpgrabber/src/widgets/logview.h +++ b/kftpgrabber/src/widgets/logview.h @@ -39,7 +39,7 @@ #include <ktextedit.h> #include <tdeaction.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> namespace KFTPWidgets { @@ -50,7 +50,7 @@ namespace KFTPWidgets { */ class LogView : public KTextEdit { -Q_OBJECT +TQ_OBJECT public: LogView(TQWidget *parent = 0, const char *name = 0); ~LogView(); diff --git a/kftpgrabber/src/widgets/multitabbar.cpp b/kftpgrabber/src/widgets/multitabbar.cpp index 86530a4..fb49231 100644 --- a/kftpgrabber/src/widgets/multitabbar.cpp +++ b/kftpgrabber/src/widgets/multitabbar.cpp @@ -42,15 +42,15 @@ #include <math.h> -#include <ntqapplication.h> -#include <ntqbutton.h> -#include <ntqpopupmenu.h> -#include <ntqlayout.h> -#include <ntqpainter.h> -#include <ntqtooltip.h> -#include <ntqfontmetrics.h> -#include <ntqstyle.h> -#include <ntqtimer.h> +#include <tqapplication.h> +#include <tqbutton.h> +#include <tqpopupmenu.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqtooltip.h> +#include <tqfontmetrics.h> +#include <tqstyle.h> +#include <tqtimer.h> #include <kiconloader.h> #include <kdebug.h> @@ -439,8 +439,8 @@ MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const TQPixmap& pi setFixedWidth(24); m_id = id; - connect(this, SIGNAL(clicked()), this, SLOT(slotClicked())); - connect(m_animTimer, SIGNAL(timeout()), this, SLOT(slotAnimTimer())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); + connect(m_animTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimTimer())); } MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const TQString& text, TQPopupMenu *popup, @@ -462,8 +462,8 @@ MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const TQString& te setFixedWidth(24); m_id = id; - connect(this, SIGNAL(clicked()), this, SLOT(slotClicked())); - connect(m_animTimer, SIGNAL(timeout()), this, SLOT(slotAnimTimer())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); + connect(m_animTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimTimer())); } MultiTabBarButton::~MultiTabBarButton() @@ -556,7 +556,7 @@ TQSize MultiTabBarButton::sizeHint() const int w = 0, h = 0; // calculate contents size... -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET if ( iconSet() && !iconSet() ->isNull() ) { int iw = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; int ih = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal ).height(); diff --git a/kftpgrabber/src/widgets/multitabbar.h b/kftpgrabber/src/widgets/multitabbar.h index 9cca7fb..de6298b 100644 --- a/kftpgrabber/src/widgets/multitabbar.h +++ b/kftpgrabber/src/widgets/multitabbar.h @@ -38,13 +38,13 @@ #ifndef KFTPWIDGETSMULTITABBAR_H #define KFTPWIDGETSMULTITABBAR_H -#include <ntqscrollview.h> -#include <ntqvbox.h> -#include <ntqhbox.h> -#include <ntqlayout.h> -#include <ntqstring.h> -#include <ntqptrlist.h> -#include <ntqpushbutton.h> +#include <tqscrollview.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqlayout.h> +#include <tqstring.h> +#include <tqptrlist.h> +#include <tqpushbutton.h> class TQPixmap; class TQPainter; @@ -67,7 +67,7 @@ class MultiTabBarInternal; */ class MultiTabBar: public TQWidget { -Q_OBJECT +TQ_OBJECT friend class MultiTabBarButton; public: enum MultiTabBarMode { Horizontal, Vertical }; @@ -172,7 +172,7 @@ private: */ class MultiTabBarButton: public TQPushButton { -Q_OBJECT +TQ_OBJECT public: MultiTabBarButton(MultiTabBarInternal *tb, const TQPixmap& pic, const TQString&, TQPopupMenu *popup, int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style); @@ -236,7 +236,7 @@ protected slots: */ class MultiTabBarTab: public MultiTabBarButton { -Q_OBJECT +TQ_OBJECT friend class MultiTabBarInternal; public: MultiTabBarTab(MultiTabBarInternal *tb, const TQPixmap &pic, const TQString&, int id, TQWidget *parent, diff --git a/kftpgrabber/src/widgets/multitabbar_p.h b/kftpgrabber/src/widgets/multitabbar_p.h index 39d7d96..d4c9bc5 100644 --- a/kftpgrabber/src/widgets/multitabbar_p.h +++ b/kftpgrabber/src/widgets/multitabbar_p.h @@ -37,7 +37,7 @@ #ifndef KFTPWIDGETSMULTITABBAR_P_H #define KFTPWIDGETSMULTITABBAR_P_H -#include <ntqscrollview.h> +#include <tqscrollview.h> #include "multitabbar.h" @@ -45,7 +45,7 @@ namespace KFTPWidgets { class MultiTabBarInternal : public TQScrollView { -Q_OBJECT +TQ_OBJECT friend class MultiTabBar; public: MultiTabBarInternal(TQWidget *parent,MultiTabBar::MultiTabBarMode bm); diff --git a/kftpgrabber/src/widgets/overlaywidget.cpp b/kftpgrabber/src/widgets/overlaywidget.cpp index 778a5a9..8e45b0d 100644 --- a/kftpgrabber/src/widgets/overlaywidget.cpp +++ b/kftpgrabber/src/widgets/overlaywidget.cpp @@ -36,7 +36,7 @@ */ #include "overlaywidget.h" -#include <ntqpoint.h> +#include <tqpoint.h> namespace KFTPWidgets { diff --git a/kftpgrabber/src/widgets/overlaywidget.h b/kftpgrabber/src/widgets/overlaywidget.h index c03b2e4..80171d0 100644 --- a/kftpgrabber/src/widgets/overlaywidget.h +++ b/kftpgrabber/src/widgets/overlaywidget.h @@ -37,7 +37,7 @@ #ifndef KFTPWIDGETSOVERLAYWIDGET_H #define KFTPWIDGETSOVERLAYWIDGET_H -#include <ntqhbox.h> +#include <tqhbox.h> namespace KFTPWidgets { diff --git a/kftpgrabber/src/widgets/popupmessage.cpp b/kftpgrabber/src/widgets/popupmessage.cpp index 3f1a6f3..36c91be 100644 --- a/kftpgrabber/src/widgets/popupmessage.cpp +++ b/kftpgrabber/src/widgets/popupmessage.cpp @@ -41,13 +41,13 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -#include <ntqfont.h> -#include <ntqframe.h> -#include <ntqlabel.h> -#include <ntqmessagebox.h> -#include <ntqpainter.h> -#include <ntqtimer.h> -#include <ntqtooltip.h> +#include <tqfont.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqmessagebox.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqtooltip.h> namespace KFTPWidgets { @@ -98,7 +98,7 @@ PopupMessage::PopupMessage(TQWidget *parent, TQWidget *anchor, int timeout) hbox->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred)); hbox->add(new KPushButton(KStdGuiItem::close(), this, "closeButton")); - connect(child("closeButton"), SIGNAL(clicked()), SLOT(close())); + connect(child("closeButton"), TQ_SIGNAL(clicked()), TQ_SLOT(close())); } void PopupMessage::addWidget(TQWidget *widget) diff --git a/kftpgrabber/src/widgets/popupmessage.h b/kftpgrabber/src/widgets/popupmessage.h index a22b6b8..6af2172 100644 --- a/kftpgrabber/src/widgets/popupmessage.h +++ b/kftpgrabber/src/widgets/popupmessage.h @@ -40,9 +40,9 @@ #include "overlaywidget.h" -#include <ntqbitmap.h> -#include <ntqlayout.h> -#include <ntqpixmap.h> +#include <tqbitmap.h> +#include <tqlayout.h> +#include <tqpixmap.h> namespace KFTPWidgets { @@ -50,7 +50,7 @@ namespace KFTPWidgets { * Widget that animates itself into a position relative to an anchor widget. */ class PopupMessage : public OverlayWidget { -Q_OBJECT +TQ_OBJECT public: /** * Possible animation effects. 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/Makefile.am b/kftpgrabber/src/widgets/queueview/Makefile.am deleted file mode 100644 index e34c5bd..0000000 --- a/kftpgrabber/src/widgets/queueview/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = -I$(srcdir)/../.. \ - -I$(srcdir)/../../engine \ - -I$(srcdir)/../../misc \ - -I$(srcdir)/../../ui -I../../ui\ - -I$(srcdir)/.. \ - -I$(srcdir)/../browser \ - -I$(top_builddir) \ - -I$(top_builddir)/kftpgrabber/src \ - $(all_includes) - -METASOURCES = AUTO -noinst_LIBRARIES = libqueueviewwidget.a -libqueueviewwidget_a_SOURCES = queueeditor.cpp queueview.cpp threadview.cpp - -noinst_HEADERS = queueeditor.h queueview.h threadview.h diff --git a/kftpgrabber/src/widgets/queueview/queueeditor.cpp b/kftpgrabber/src/widgets/queueview/queueeditor.cpp index 38748e9..f3f2c4f 100644 --- a/kftpgrabber/src/widgets/queueview/queueeditor.cpp +++ b/kftpgrabber/src/widgets/queueview/queueeditor.cpp @@ -43,10 +43,10 @@ #include <kcombobox.h> #include <tdelocale.h> -#include <ntqspinbox.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqtabwidget.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtabwidget.h> #define REMOTE_PROTOCOL m_transfer->getSourceUrl().isLocalFile() ? m_transfer->getDestUrl().protocol() : m_transfer->getSourceUrl().protocol() @@ -59,21 +59,21 @@ QueueEditor::QueueEditor(TQWidget *parent, const char *name) m_layout = new KFTPQueueEditorLayout(this); setMainWidget(m_layout); - connect(m_layout->srcPath, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); - connect(m_layout->dstPath, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); + connect(m_layout->srcPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); + connect(m_layout->dstPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); - connect(m_layout->srcHost, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); - connect(m_layout->srcUser, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); - connect(m_layout->srcPass, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); + connect(m_layout->srcHost, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); + connect(m_layout->srcUser, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); + connect(m_layout->srcPass, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); - connect(m_layout->dstHost, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); - connect(m_layout->dstUser, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); - connect(m_layout->dstPass, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged())); + connect(m_layout->dstHost, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); + connect(m_layout->dstUser, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); + connect(m_layout->dstPass, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); - connect(m_layout->srcName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotSourceSiteChanged(KFTPBookmarks::Site*))); - connect(m_layout->dstName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotDestSiteChanged(KFTPBookmarks::Site*))); + connect(m_layout->srcName, TQ_SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, TQ_SLOT(slotSourceSiteChanged(KFTPBookmarks::Site*))); + connect(m_layout->dstName, TQ_SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, TQ_SLOT(slotDestSiteChanged(KFTPBookmarks::Site*))); - connect(m_layout->transferType, SIGNAL(activated(int)), this, SLOT(slotTransferModeChanged(int))); + connect(m_layout->transferType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTransferModeChanged(int))); setMaximumHeight(250); setInitialSize(TQSize(500, 250)); diff --git a/kftpgrabber/src/widgets/queueview/queueeditor.h b/kftpgrabber/src/widgets/queueview/queueeditor.h index 9daf317..c004d1e 100644 --- a/kftpgrabber/src/widgets/queueview/queueeditor.h +++ b/kftpgrabber/src/widgets/queueview/queueeditor.h @@ -40,7 +40,7 @@ #include "kftpbookmarks.h" #include <kdialogbase.h> -#include <ntqdom.h> +#include <tqdom.h> class KFTPQueueEditorLayout; @@ -51,7 +51,7 @@ namespace KFTPWidgets { */ class QueueEditor : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: QueueEditor(TQWidget *parent = 0, const char *name = 0); diff --git a/kftpgrabber/src/widgets/queueview/queueview.cpp b/kftpgrabber/src/widgets/queueview/queueview.cpp index daec26e..c0615c8 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> @@ -55,8 +55,8 @@ #include <tdelistviewsearchline.h> #include <kdebug.h> -#include <ntqspinbox.h> -#include <ntqtooltip.h> +#include <tqspinbox.h> +#include <tqtooltip.h> using namespace KFTPGrabberBase; using namespace KFTPCore; @@ -411,7 +411,7 @@ QueueView::QueueView(TQWidget *parent, const char *name) m_searchToolBar->setFullSize(true); // Create the erase button - m_searchToolBar->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, SIGNAL(clicked()), this, SLOT(slotSearchEraseClicked()), true); + m_searchToolBar->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchEraseClicked()), true); // Create the labels TQLabel *searchLabel = new TQLabel(i18n("Filter: "), m_searchToolBar); @@ -453,16 +453,16 @@ QueueView::QueueView(TQWidget *parent, const char *name) layout->addWidget(m_queue); // The signals - connect(m_queue, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, - SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(m_queue, SIGNAL(selectionChanged()), this, SLOT(updateActions())); + connect(m_queue, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, + TQ_SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(m_queue, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateActions())); // Let us be up-to-date - connect(KFTPQueue::Manager::self(), SIGNAL(transferRemoved(long)), this, SLOT(slotObjectRemoved(long))); - connect(KFTPQueue::Manager::self(), SIGNAL(siteRemoved(long)), this, SLOT(slotObjectRemoved(long))); - connect(KFTPQueue::Manager::self(), SIGNAL(newTransfer(KFTPQueue::Transfer*)), this, SLOT(slotTransferAdded(KFTPQueue::Transfer*))); - connect(KFTPQueue::Manager::self(), SIGNAL(newSite(KFTPQueue::Site*)), this, SLOT(slotSiteAdded(KFTPQueue::Site*))); - connect(KFTPQueue::Manager::self(), SIGNAL(queueUpdate()), this, SLOT(updateActions())); + connect(KFTPQueue::Manager::self(), TQ_SIGNAL(transferRemoved(long)), this, TQ_SLOT(slotObjectRemoved(long))); + connect(KFTPQueue::Manager::self(), TQ_SIGNAL(siteRemoved(long)), this, TQ_SLOT(slotObjectRemoved(long))); + connect(KFTPQueue::Manager::self(), TQ_SIGNAL(newTransfer(KFTPQueue::Transfer*)), this, TQ_SLOT(slotTransferAdded(KFTPQueue::Transfer*))); + connect(KFTPQueue::Manager::self(), TQ_SIGNAL(newSite(KFTPQueue::Site*)), this, TQ_SLOT(slotSiteAdded(KFTPQueue::Site*))); + connect(KFTPQueue::Manager::self(), TQ_SIGNAL(queueUpdate()), this, TQ_SLOT(updateActions())); // Load the listview layout loadLayout(); @@ -509,7 +509,7 @@ void QueueView::initToolBar() m_toolBar->insertWidget(1, 35, new TQLabel(i18n("Down: "), m_toolBar)); m_toolBar->insertWidget(2, 35, downloadSpeed); downloadSpeed->setValue(Config::downloadSpeedLimit()); - connect(downloadSpeed, SIGNAL(valueChanged(int)), this, SLOT(slotDownloadLimitChanged(int))); + connect(downloadSpeed, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDownloadLimitChanged(int))); m_toolBar->insertSeparator(); @@ -518,7 +518,7 @@ void QueueView::initToolBar() m_toolBar->insertWidget(3, 35, new TQLabel(i18n("Up: "), m_toolBar)); m_toolBar->insertWidget(4, 35, uploadSpeed); uploadSpeed->setValue(Config::uploadSpeedLimit()); - connect(uploadSpeed, SIGNAL(valueChanged(int)), this, SLOT(slotUploadLimitChanged(int))); + connect(uploadSpeed, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotUploadLimitChanged(int))); // Create thread count control widget m_toolBar->insertSeparator(); @@ -528,7 +528,7 @@ void QueueView::initToolBar() m_toolBar->insertWidget(5, 35, new TQLabel(i18n("Threads: "), m_toolBar)); m_toolBar->insertWidget(6, 35, threadCount); threadCount->setValue(Config::threadCount()); - connect(threadCount, SIGNAL(valueChanged(int)), this, SLOT(slotThreadCountChanged(int))); + connect(threadCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotThreadCountChanged(int))); } void QueueView::slotDownloadLimitChanged(int value) @@ -554,25 +554,25 @@ void QueueView::initActions() m_actionCollection = new TDEActionCollection(this, this); // Create all the actions - m_launchAction = new TDEAction(i18n("&Start Transfer"), "launch", TDEShortcut(), this, SLOT(slotLaunch()), m_actionCollection, "launch"); - m_abortAction = new TDEAction(i18n("&Abort Transfer"), TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort"); - m_removeAction = new TDEAction(i18n("&Remove"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotRemove()), m_actionCollection, "remove"); - m_removeAllAction = new TDEAction(i18n("Remove &All"), TDEShortcut(), this, SLOT(slotRemoveAll()), m_actionCollection, "removeAll"); - m_moveUpAction = new TDEAction(i18n("Move &Up"), "go-up", TDEShortcut(), this, SLOT(slotMoveUp()), m_actionCollection, "moveUp"); - m_moveDownAction = new TDEAction(i18n("Move &Down"), "go-down", TDEShortcut("del"), this, SLOT(slotMoveDown()), m_actionCollection, "moveDown"); - m_moveTopAction = new TDEAction(i18n("Move To &Top"), "go-top", TDEShortcut(), this, SLOT(slotMoveTop()), m_actionCollection, "moveTop"); - m_moveBottomAction = new TDEAction(i18n("Move To &Bottom"), "go-bottom", TDEShortcut(), this, SLOT(slotMoveBottom()), m_actionCollection, "moveBottom"); - m_editAction = new TDEAction(i18n("&Change Transfer Info"), TDEShortcut(), this, SLOT(slotEdit()), m_actionCollection, "changeTransfer"); + m_launchAction = new TDEAction(i18n("&Start Transfer"), "launch", TDEShortcut(), this, TQ_SLOT(slotLaunch()), m_actionCollection, "launch"); + m_abortAction = new TDEAction(i18n("&Abort Transfer"), TDEShortcut(), this, TQ_SLOT(slotAbort()), m_actionCollection, "abort"); + m_removeAction = new TDEAction(i18n("&Remove"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, TQ_SLOT(slotRemove()), m_actionCollection, "remove"); + m_removeAllAction = new TDEAction(i18n("Remove &All"), TDEShortcut(), this, TQ_SLOT(slotRemoveAll()), m_actionCollection, "removeAll"); + m_moveUpAction = new TDEAction(i18n("Move &Up"), "go-up", TDEShortcut(), this, TQ_SLOT(slotMoveUp()), m_actionCollection, "moveUp"); + m_moveDownAction = new TDEAction(i18n("Move &Down"), "go-down", TDEShortcut("del"), this, TQ_SLOT(slotMoveDown()), m_actionCollection, "moveDown"); + m_moveTopAction = new TDEAction(i18n("Move To &Top"), "go-top", TDEShortcut(), this, TQ_SLOT(slotMoveTop()), m_actionCollection, "moveTop"); + m_moveBottomAction = new TDEAction(i18n("Move To &Bottom"), "go-bottom", TDEShortcut(), this, TQ_SLOT(slotMoveBottom()), m_actionCollection, "moveBottom"); + m_editAction = new TDEAction(i18n("&Change Transfer Info"), TDEShortcut(), this, TQ_SLOT(slotEdit()), m_actionCollection, "changeTransfer"); // Create the toolbar actions - m_loadAction = new TDEAction(i18n("&Load Queue From File"), "document-open", TDEShortcut(), this, SLOT(slotLoad()), m_actionCollection, "load"); - m_saveAction = new TDEAction(i18n("&Save Queue to File"), "document-save-as", TDEShortcut(), this, SLOT(slotSave()), m_actionCollection, "save"); - m_startAction = new TDEAction(i18n("S&tart"), "media-playback-start", TDEShortcut(), this, SLOT(slotStart()), m_actionCollection, "start"); - m_pauseAction = new TDEAction(i18n("&Pause"), "media-playback-pause", TDEShortcut(), this, SLOT(slotPause()), m_actionCollection, "pause"); - m_stopAction = new TDEAction(i18n("St&op"), "media-playback-stop", TDEShortcut(), this, SLOT(slotStop()), m_actionCollection, "stop"); - m_addAction = new TDEAction(i18n("&Add Transfer..."), "document-new", TDEShortcut(), this, SLOT(slotAdd()), m_actionCollection, "add"); - m_searchAction = new TDEAction(i18n("&Search && Replace..."), "edit-find", TDEShortcut(), this, SLOT(slotSearch()), m_actionCollection, "search"); - m_filterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotFilter()), m_actionCollection, "filter"); + m_loadAction = new TDEAction(i18n("&Load Queue From File"), "document-open", TDEShortcut(), this, TQ_SLOT(slotLoad()), m_actionCollection, "load"); + m_saveAction = new TDEAction(i18n("&Save Queue to File"), "document-save-as", TDEShortcut(), this, TQ_SLOT(slotSave()), m_actionCollection, "save"); + m_startAction = new TDEAction(i18n("S&tart"), "media-playback-start", TDEShortcut(), this, TQ_SLOT(slotStart()), m_actionCollection, "start"); + m_pauseAction = new TDEAction(i18n("&Pause"), "media-playback-pause", TDEShortcut(), this, TQ_SLOT(slotPause()), m_actionCollection, "pause"); + m_stopAction = new TDEAction(i18n("St&op"), "media-playback-stop", TDEShortcut(), this, TQ_SLOT(slotStop()), m_actionCollection, "stop"); + m_addAction = new TDEAction(i18n("&Add Transfer..."), "document-new", TDEShortcut(), this, TQ_SLOT(slotAdd()), m_actionCollection, "add"); + m_searchAction = new TDEAction(i18n("&Search && Replace..."), "edit-find", TDEShortcut(), this, TQ_SLOT(slotSearch()), m_actionCollection, "search"); + m_filterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, TQ_SLOT(slotFilter()), m_actionCollection, "filter"); m_saveAction->setEnabled( false ); m_startAction->setEnabled(false); @@ -629,7 +629,7 @@ void QueueView::slotSiteAdded(KFTPQueue::Site *site) { // The site should be inserted top-level m_queuedItems.insert(site->getId(), new QueueViewItem(this, site, m_queue)); - connect(site, SIGNAL(objectUpdated()), this, SLOT(slotObjectUpdated())); + connect(site, TQ_SIGNAL(objectUpdated()), this, TQ_SLOT(slotObjectUpdated())); } void QueueView::slotTransferAdded(KFTPQueue::Transfer *transfer) @@ -639,7 +639,7 @@ void QueueView::slotTransferAdded(KFTPQueue::Transfer *transfer) if (parent) { m_queuedItems.insert(transfer->getId(), new QueueViewItem(this, transfer, parent)); - connect(transfer, SIGNAL(objectUpdated()), this, SLOT(slotObjectUpdated())); + connect(transfer, TQ_SIGNAL(objectUpdated()), this, TQ_SLOT(slotObjectUpdated())); } // Update actions diff --git a/kftpgrabber/src/widgets/queueview/queueview.h b/kftpgrabber/src/widgets/queueview/queueview.h index 812e965..426049a 100644 --- a/kftpgrabber/src/widgets/queueview/queueview.h +++ b/kftpgrabber/src/widgets/queueview/queueview.h @@ -37,10 +37,10 @@ #ifndef KFTPQUEUEVIEW_H #define KFTPQUEUEVIEW_H -#include <ntqguardedptr.h> -#include <ntqintdict.h> -#include <ntqlayout.h> -#include <ntqlabel.h> +#include <tqguardedptr.h> +#include <tqintdict.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <tdeaction.h> #include <tdelistview.h> @@ -197,7 +197,7 @@ public: class QueueView : public TQWidget { friend class QueueViewItem; -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. diff --git a/kftpgrabber/src/widgets/queueview/threadview.cpp b/kftpgrabber/src/widgets/queueview/threadview.cpp index 9047dfa..ac60421 100644 --- a/kftpgrabber/src/widgets/queueview/threadview.cpp +++ b/kftpgrabber/src/widgets/queueview/threadview.cpp @@ -38,7 +38,7 @@ #include "listview.h" -#include <ntqlayout.h> +#include <tqlayout.h> #include <tdelocale.h> namespace KFTPWidgets { @@ -59,16 +59,16 @@ ThreadViewItem::ThreadViewItem(KFTPSession::Connection *conn, TQListViewItem *pa m_connection(conn), m_session(0) { - connect(conn, SIGNAL(connectionRemoved()), this, SLOT(slotUpdateItemRequested())); - connect(conn, SIGNAL(connectionLost(KFTPSession::Connection*)), this, SLOT(slotUpdateItemRequested())); - connect(conn, SIGNAL(connectionEstablished()), this, SLOT(slotUpdateItemRequested())); + connect(conn, TQ_SIGNAL(connectionRemoved()), this, TQ_SLOT(slotUpdateItemRequested())); + connect(conn, TQ_SIGNAL(connectionLost(KFTPSession::Connection*)), this, TQ_SLOT(slotUpdateItemRequested())); + connect(conn, TQ_SIGNAL(connectionEstablished()), this, TQ_SLOT(slotUpdateItemRequested())); // Connect the transfer signals if the transfer is already present KFTPQueue::Transfer *transfer = m_connection->getTransfer(); if (transfer) { - connect(transfer, SIGNAL(objectUpdated()), this, SLOT(slotUpdateItemRequested())); + connect(transfer, TQ_SIGNAL(objectUpdated()), this, TQ_SLOT(slotUpdateItemRequested())); } else { - connect(conn, SIGNAL(connectionAcquired()), this, SLOT(slotConnectionAcquired())); + connect(conn, TQ_SIGNAL(connectionAcquired()), this, TQ_SLOT(slotConnectionAcquired())); } refresh(); @@ -79,7 +79,7 @@ void ThreadViewItem::slotConnectionAcquired() if (!m_connection->getTransfer()) return; - connect(m_connection->getTransfer(), SIGNAL(objectUpdated()), this, SLOT(slotUpdateItemRequested())); + connect(m_connection->getTransfer(), TQ_SIGNAL(objectUpdated()), this, TQ_SLOT(slotUpdateItemRequested())); refresh(); } @@ -162,7 +162,7 @@ ThreadView::ThreadView(TQWidget *parent, const char *name) layout->addWidget(m_threads); - connect(KFTPSession::Manager::self(), SIGNAL(update()), this, SLOT(slotUpdateSessions())); + connect(KFTPSession::Manager::self(), TQ_SIGNAL(update()), this, TQ_SLOT(slotUpdateSessions())); } ThreadView::~ThreadView() diff --git a/kftpgrabber/src/widgets/queueview/threadview.h b/kftpgrabber/src/widgets/queueview/threadview.h index 5977086..9e45fc8 100644 --- a/kftpgrabber/src/widgets/queueview/threadview.h +++ b/kftpgrabber/src/widgets/queueview/threadview.h @@ -36,7 +36,7 @@ #ifndef KFTPTHREADVIEW_H #define KFTPTHREADVIEW_H -#include <ntqguardedptr.h> +#include <tqguardedptr.h> #include <tdeaction.h> #include <tdelistview.h> @@ -51,7 +51,7 @@ class ListView; class ThreadViewItem : public TQObject, public TQListViewItem { -Q_OBJECT +TQ_OBJECT public: ThreadViewItem(KFTPSession::Session *session, TQListView *parent); ThreadViewItem(KFTPSession::Connection *conn, TQListViewItem *parent, int id); @@ -75,7 +75,7 @@ private slots: */ class ThreadView : public TQWidget { -Q_OBJECT +TQ_OBJECT public: ThreadView(TQWidget *parent = 0, const char *name = 0); ~ThreadView(); diff --git a/kftpgrabber/src/widgets/quickconnect.cpp b/kftpgrabber/src/widgets/quickconnect.cpp index a71a716..3909b33 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" @@ -55,8 +55,8 @@ /* KSSL includes */ #include <ksslpkcs12.h> -#include <ntqcheckbox.h> -#include <ntqspinbox.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> using namespace KFTPGrabberBase; @@ -79,16 +79,16 @@ QuickConnectDialog::QuickConnectDialog(TQWidget *parent, const char *name) m_layout->protoAdvanced->setIconSet(loadSmallIcon("configure")); // Connect the slots - connect(m_layout->urlBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotUrlChanged(const TQString &))); - connect(m_layout->hostBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotHostChanged(const TQString&))); - connect(m_layout->protocolBox, SIGNAL(activated(int)), this, SLOT(slotProtocolChanged(int))); - connect(m_layout->protoAdvanced, SIGNAL(clicked()), this, SLOT(slotProtoAdvancedClicked())); - connect(m_layout->usernameBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotUserChanged())); - connect(m_layout->passwordBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotPassChanged())); - connect(m_layout->portBox, SIGNAL(valueChanged(int)), this, SLOT(slotPortChanged(int))); - connect(m_layout->anonLogin, SIGNAL(clicked()), this, SLOT(slotAnonClicked())); - connect(m_layout->recentConnections, SIGNAL(activated(int)), this, SLOT(slotRecentConnectionActivated(int))); - connect(m_layout->clearRecent, SIGNAL(clicked()), this, SLOT(slotClearRecentClicked())); + connect(m_layout->urlBox, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUrlChanged(const TQString &))); + connect(m_layout->hostBox, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotHostChanged(const TQString&))); + connect(m_layout->protocolBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotProtocolChanged(int))); + connect(m_layout->protoAdvanced, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotProtoAdvancedClicked())); + connect(m_layout->usernameBox, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUserChanged())); + connect(m_layout->passwordBox, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(m_layout->portBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotPortChanged(int))); + connect(m_layout->anonLogin, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAnonClicked())); + connect(m_layout->recentConnections, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotRecentConnectionActivated(int))); + connect(m_layout->clearRecent, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClearRecentClicked())); // Init url m_url.setProtocol("ftp"); @@ -367,7 +367,7 @@ void QuickConnectDialog::setupClient(KFTPEngine::Thread *client) // Should we use a X509 certificate ? if (m_protocolAdvancedDialog->isCertChecked() && m_layout->protocolBox->currentItem() == SP_FTP) { // Ask the user for the decryption password - TQCString certPass; + TQString certPass; KPasswordDialog::getPassword(certPass, i18n("Please provide your X509 certificate decryption password.")); static_cast<KFTPEngine::FtpSocket*>(client->socket())->setSslClientCertificate(KSSLPKCS12::loadCertFile(m_protocolAdvancedDialog->getCertPath(), certPass)); diff --git a/kftpgrabber/src/widgets/quickconnect.h b/kftpgrabber/src/widgets/quickconnect.h index 86eef44..677e728 100644 --- a/kftpgrabber/src/widgets/quickconnect.h +++ b/kftpgrabber/src/widgets/quickconnect.h @@ -39,7 +39,7 @@ #include "kftpquickconnectlayout.h" -#include <ntqmap.h> +#include <tqmap.h> #include <kdialogbase.h> #include <kurl.h> @@ -59,7 +59,7 @@ namespace Bookmarks { */ class QuickConnectDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: QuickConnectDialog(TQWidget *parent = 0, const char *name = 0); ~QuickConnectDialog(); diff --git a/kftpgrabber/src/widgets/searchdialog.cpp b/kftpgrabber/src/widgets/searchdialog.cpp index 9fc380d..c10e6b6 100644 --- a/kftpgrabber/src/widgets/searchdialog.cpp +++ b/kftpgrabber/src/widgets/searchdialog.cpp @@ -39,10 +39,10 @@ #include "kftpbookmarks.h" #include "kftpqueue.h" -#include <ntqcheckbox.h> -#include <ntqgroupbox.h> -#include <ntqspinbox.h> -#include <ntqregexp.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqspinbox.h> +#include <tqregexp.h> #include <tdelocale.h> #include <klineedit.h> @@ -60,8 +60,8 @@ SearchDialog::SearchDialog(TQWidget *parent, const char *name) setMainWidget(m_layout); setInitialSize(TQSize(500,400)); - connect(m_layout->searchServer, SIGNAL(clicked()), this, SLOT(slotSearchServerClicked())); - connect(m_layout->searchServerName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotSiteChanged(KFTPBookmarks::Site*))); + connect(m_layout->searchServer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchServerClicked())); + connect(m_layout->searchServerName, TQ_SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, TQ_SLOT(slotSiteChanged(KFTPBookmarks::Site*))); } TQString SearchDialog::replaceCap(TQStringList cap, const TQString &text) diff --git a/kftpgrabber/src/widgets/searchdialog.h b/kftpgrabber/src/widgets/searchdialog.h index d42a390..48c14e9 100644 --- a/kftpgrabber/src/widgets/searchdialog.h +++ b/kftpgrabber/src/widgets/searchdialog.h @@ -36,7 +36,7 @@ #ifndef KFTPWIDGETSSEARCHDIALOG_H #define KFTPWIDGETSSEARCHDIALOG_H -#include <ntqdom.h> +#include <tqdom.h> #include <kdialogbase.h> namespace KFTPQueue { @@ -59,7 +59,7 @@ namespace KFTPWidgets { */ class SearchDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. diff --git a/kftpgrabber/src/widgets/sidebar.cpp b/kftpgrabber/src/widgets/sidebar.cpp index 0e26987..fc75d76 100644 --- a/kftpgrabber/src/widgets/sidebar.cpp +++ b/kftpgrabber/src/widgets/sidebar.cpp @@ -43,10 +43,10 @@ #include <kiconloader.h> #include <tdelocale.h> -#include <ntqcursor.h> -#include <ntqpainter.h> -#include <ntqsignalmapper.h> -#include <ntqstyle.h> +#include <tqcursor.h> +#include <tqpainter.h> +#include <tqsignalmapper.h> +#include <tqstyle.h> namespace KFTPWidgets { @@ -127,7 +127,7 @@ Sidebar::Sidebar(TQWidget *parent, Position position) m_content->setSpacing(1); } - connect(m_mapper, SIGNAL(mapped(int)), SLOT(showHideSidebar(int))); + connect(m_mapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(showHideSidebar(int))); } void Sidebar::setVisible(bool visible) @@ -321,7 +321,7 @@ void Sidebar::addSidebar(TQWidget *widget, const TQString &title, const TQString tab->setFocusPolicy(TQWidget::NoFocus); // We use a SignalMapper to show/hide the corresponding browser when tabs are clicked - connect(tab, SIGNAL(clicked()), m_mapper, SLOT(map())); + connect(tab, TQ_SIGNAL(clicked()), m_mapper, TQ_SLOT(map())); m_mapper->setMapping(tab, id); m_sidebars.push_back(widget); diff --git a/kftpgrabber/src/widgets/sidebar.h b/kftpgrabber/src/widgets/sidebar.h index 60f95ee..0960266 100644 --- a/kftpgrabber/src/widgets/sidebar.h +++ b/kftpgrabber/src/widgets/sidebar.h @@ -37,8 +37,8 @@ #ifndef KFTPWIDGETSSIDEBAR_H #define KFTPWIDGETSSIDEBAR_H -#include <ntqwidget.h> -#include <ntqvaluevector.h> +#include <tqwidget.h> +#include <tqvaluevector.h> class KURL; class TQSignalMapper; @@ -64,7 +64,7 @@ class MultiTabBarTab; */ class Sidebar : public TQWidget { -Q_OBJECT +TQ_OBJECT friend class Splitter; public: enum Position { diff --git a/kftpgrabber/src/widgets/systemtray.cpp b/kftpgrabber/src/widgets/systemtray.cpp index 7cd851d..8a0ebaa 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; @@ -70,13 +70,13 @@ SystemTray::SystemTray(MainWindow *parent) slotUpdateBookmarks(); // Let our bookmarks be up to date - connect(KFTPBookmarks::Manager::self(), SIGNAL(update()), this, SLOT(slotUpdateBookmarks())); + connect(KFTPBookmarks::Manager::self(), TQ_SIGNAL(update()), this, TQ_SLOT(slotUpdateBookmarks())); m_actions->m_fileConnectAction->plug(contextMenu(), 1); m_bookmarkMenu->plug(contextMenu(), 1); // Ensure that we actually quit - connect(this, SIGNAL(quitSelected()), this, SLOT(slotQuitSelected())); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuitSelected())); } SystemTray::~SystemTray() @@ -110,7 +110,7 @@ void SystemTray::showBalloon(const TQString &text) KWin::setOnAllDesktops(m_balloon->winId() , true); // Hide the balloon after 5 sec - TQTimer::singleShot(5000, this, SLOT(slotHideBalloon())); + TQTimer::singleShot(5000, this, TQ_SLOT(slotHideBalloon())); } void SystemTray::slotHideBalloon() diff --git a/kftpgrabber/src/widgets/systemtray.h b/kftpgrabber/src/widgets/systemtray.h index 1a5ec44..79b8a82 100644 --- a/kftpgrabber/src/widgets/systemtray.h +++ b/kftpgrabber/src/widgets/systemtray.h @@ -39,7 +39,7 @@ #include <ksystemtray.h> #include <tdeaction.h> -#include <ntqmenudata.h> +#include <tqmenudata.h> class MainWindow; class MainActions; @@ -55,7 +55,7 @@ class Balloon; */ class SystemTray : public KSystemTray { -Q_OBJECT +TQ_OBJECT public: /** * Get the global system tray instance. diff --git a/kftpgrabber/src/widgets/trafficgraph.cpp b/kftpgrabber/src/widgets/trafficgraph.cpp index 6770234..12495ad 100644 --- a/kftpgrabber/src/widgets/trafficgraph.cpp +++ b/kftpgrabber/src/widgets/trafficgraph.cpp @@ -37,8 +37,8 @@ #include <math.h> #include <string.h> -#include <ntqpainter.h> -#include <ntqpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include <tdelocale.h> diff --git a/kftpgrabber/src/widgets/trafficgraph.h b/kftpgrabber/src/widgets/trafficgraph.h index 2e45981..3905666 100644 --- a/kftpgrabber/src/widgets/trafficgraph.h +++ b/kftpgrabber/src/widgets/trafficgraph.h @@ -36,11 +36,11 @@ #ifndef KFTPTRAFFICGRAPH_H #define KFTPTRAFFICGRAPH_H -#include <ntqpoint.h> -#include <ntqdialog.h> -#include <ntqptrlist.h> -#include <ntqstring.h> -#include <ntqvaluelist.h> +#include <tqpoint.h> +#include <tqdialog.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #define GRAPH_POLYGON 0 #define GRAPH_ORIGINAL 1 @@ -54,7 +54,7 @@ namespace KFTPWidgets { */ class TrafficGraph : public TQWidget { -Q_OBJECT +TQ_OBJECT public: TrafficGraph(TQWidget *parent = 0, const char *name = 0); ~TrafficGraph(); diff --git a/kftpgrabber/src/widgets/verifier.cpp b/kftpgrabber/src/widgets/verifier.cpp index bdbee22..78e61ac 100644 --- a/kftpgrabber/src/widgets/verifier.cpp +++ b/kftpgrabber/src/widgets/verifier.cpp @@ -44,8 +44,8 @@ #include <kprogress.h> #include <kurl.h> -#include <ntqheader.h> -#include <ntqlabel.h> +#include <tqheader.h> +#include <tqlabel.h> // UI layouts #include "ui/checksum_verifier.h" @@ -81,10 +81,10 @@ void Verifier::setFile(const TQString &filename) m_verifier = new KFTPCore::ChecksumVerifier(filename); m_layout->currentFile->setText(KURL(filename).fileName()); - connect(m_verifier, SIGNAL(fileList(TQValueList<TQPair<TQString, TQString> >)), this, SLOT(slotHaveFileList(TQValueList<TQPair<TQString, TQString> >))); - connect(m_verifier, SIGNAL(fileDone(const TQString&, KFTPCore::ChecksumVerifier::Result)), this, SLOT(slotFileDone(const TQString&, KFTPCore::ChecksumVerifier::Result))); - connect(m_verifier, SIGNAL(progress(int)), this, SLOT(slotProgress(int))); - connect(m_verifier, SIGNAL(error()), this, SLOT(slotError())); + connect(m_verifier, TQ_SIGNAL(fileList(TQValueList<TQPair<TQString, TQString> >)), this, TQ_SLOT(slotHaveFileList(TQValueList<TQPair<TQString, TQString> >))); + connect(m_verifier, TQ_SIGNAL(fileDone(const TQString&, KFTPCore::ChecksumVerifier::Result)), this, TQ_SLOT(slotFileDone(const TQString&, KFTPCore::ChecksumVerifier::Result))); + connect(m_verifier, TQ_SIGNAL(progress(int)), this, TQ_SLOT(slotProgress(int))); + connect(m_verifier, TQ_SIGNAL(error()), this, TQ_SLOT(slotError())); // Start the verification m_verifier->verify(); diff --git a/kftpgrabber/src/widgets/verifier.h b/kftpgrabber/src/widgets/verifier.h index 53cdf53..7bbb4a2 100644 --- a/kftpgrabber/src/widgets/verifier.h +++ b/kftpgrabber/src/widgets/verifier.h @@ -41,8 +41,8 @@ #include <kdialogbase.h> -#include <ntqvaluelist.h> -#include <ntqpair.h> +#include <tqvaluelist.h> +#include <tqpair.h> class VerifierLayout; @@ -53,7 +53,7 @@ namespace KFTPWidgets { */ class Verifier : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: Verifier(TQWidget *parent = 0, const char *name = 0); ~Verifier(); diff --git a/kftpgrabber/src/widgets/widgetlister.cpp b/kftpgrabber/src/widgets/widgetlister.cpp index 933101e..1ba7a15 100644 --- a/kftpgrabber/src/widgets/widgetlister.cpp +++ b/kftpgrabber/src/widgets/widgetlister.cpp @@ -40,9 +40,9 @@ #include <kpushbutton.h> #include <kdialog.h> -#include <ntqpushbutton.h> -#include <ntqlayout.h> -#include <ntqhbox.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqhbox.h> namespace KFTPWidgets { @@ -73,9 +73,9 @@ WidgetLister::WidgetLister(TQWidget *parent, int minWidgets, int maxWidgets) m_buttonBox->setStretchFactor(m_buttonClear, 0); // Connect signals - connect(m_buttonMore, SIGNAL(clicked()), this, SLOT(slotMore())); - connect(m_buttonFewer, SIGNAL(clicked()), this, SLOT(slotFewer())); - connect(m_buttonClear, SIGNAL(clicked()), this, SLOT(slotClear())); + connect(m_buttonMore, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMore())); + connect(m_buttonFewer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFewer())); + connect(m_buttonClear, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClear())); enableControls(); } @@ -170,3 +170,5 @@ void WidgetLister::enableControls() } } + +#include "widgetlister.moc" diff --git a/kftpgrabber/src/widgets/widgetlister.h b/kftpgrabber/src/widgets/widgetlister.h index 40192eb..78c0f26 100644 --- a/kftpgrabber/src/widgets/widgetlister.h +++ b/kftpgrabber/src/widgets/widgetlister.h @@ -36,8 +36,8 @@ #ifndef KFTPWIDGETSWIDGETLISTER_H #define KFTPWIDGETSWIDGETLISTER_H -#include <ntqwidget.h> -#include <ntqptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> class TQPushButton; class TQVBoxLayout; @@ -54,7 +54,7 @@ namespace KFTPWidgets { */ class WidgetLister : public TQWidget { -Q_OBJECT +TQ_OBJECT public: /** * Class constructor. |