Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

9 files changed, 101 insertions, 101 deletions

diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 9e4480d0b..395da6a5d 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -78,136 +78,136 @@ void KEBApp::createActions() {
 
     // save and quit should probably not be in the toplevel???
     (void) KStdAction::quit(
-        this, TQT_SLOT( close() ), actionCollection());
-    KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
+        this, TQ_SLOT( close() ), actionCollection());
+    KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
     (void) KStdAction::configureToolbars(
-        this, TQT_SLOT( slotConfigureToolbars() ), actionCollection());
+        this, TQ_SLOT( slotConfigureToolbars() ), actionCollection());
 
     if (m_browser) {
         (void) KStdAction::open(
-            actn, TQT_SLOT( slotLoad() ), actionCollection());
+            actn, TQ_SLOT( slotLoad() ), actionCollection());
         (void) KStdAction::saveAs(
-            actn, TQT_SLOT( slotSaveAs() ), actionCollection());
+            actn, TQ_SLOT( slotSaveAs() ), actionCollection());
     }
 
-    (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection());
-    (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection());
-    (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection());
-    (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection());
+    (void) KStdAction::cut(actn, TQ_SLOT( slotCut() ), actionCollection());
+    (void) KStdAction::copy(actn, TQ_SLOT( slotCopy() ), actionCollection());
+    (void) KStdAction::paste(actn, TQ_SLOT( slotPaste() ), actionCollection());
+    (void) KStdAction::print(actn, TQ_SLOT( slotPrint() ), actionCollection());
 
     // settings menu
     (void) new TDEToggleAction(
         i18n("&Show Netscape Bookmarks in Konqueror"), 0,
-        actn, TQT_SLOT( slotShowNS() ), actionCollection(),
+        actn, TQ_SLOT( slotShowNS() ), actionCollection(),
         "settings_showNS");
 
     // actions
     (void) new TDEAction(
         i18n("&Delete"), "edit-delete", Key_Delete,
-        actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete");
+        actn, TQ_SLOT( slotDelete() ), actionCollection(), "delete");
     (void) new TDEAction(
         i18n("Rename"), "text", Key_F2,
-        actn, TQT_SLOT( slotRename() ), actionCollection(), "rename");
+        actn, TQ_SLOT( slotRename() ), actionCollection(), "rename");
     (void) new TDEAction(
         i18n("C&hange URL"), "text", Key_F3,
-        actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
+        actn, TQ_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
     (void) new TDEAction(
         i18n("C&hange Comment"), "text", Key_F4,
-        actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
+        actn, TQ_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
     (void) new TDEAction(
         i18n("Chan&ge Icon..."), "icons", 0,
-        actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
+        actn, TQ_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
     (void) new TDEAction(
         i18n("Update Favicon"), 0,
-        actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
+        actn, TQ_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
     (void) new TDEAction(
         i18n("Recursive Sort"), 0,
-        actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
+        actn, TQ_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
     (void) new TDEAction(
         i18n("&New Folder..."), "folder-new", CTRL+Key_N,
-        actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
+        actn, TQ_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
     (void) new TDEAction(
         i18n("&New Bookmark"), "www", 0,
-        actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
+        actn, TQ_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
     (void) new TDEAction(
         i18n("&Insert Separator"), CTRL+Key_I,
-        actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(),
+        actn, TQ_SLOT( slotInsertSeparator() ), actionCollection(),
         "insertseparator");
     (void) new TDEAction(
         i18n("&Sort Alphabetically"), 0,
-        actn, TQT_SLOT( slotSort() ), actionCollection(), "sort");
+        actn, TQ_SLOT( slotSort() ), actionCollection(), "sort");
     (void) new TDEAction(
         i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0,
-        actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
+        actn, TQ_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
     (void) new TDEAction(
         i18n("Show in T&oolbar"), "bookmark_toolbar", 0,
-        actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
+        actn, TQ_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
     (void) new TDEAction(
         i18n("Hide in T&oolbar"), "bookmark_toolbar", 0,
-        actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
+        actn, TQ_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
     (void) new TDEAction(
         i18n("&Expand All Folders"), 0,
-        actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
+        actn, TQ_SLOT( slotExpandAll() ), actionCollection(), "expandall");
     (void) new TDEAction(
         i18n("Collapse &All Folders"), 0,
-        actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
+        actn, TQ_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
     (void) new TDEAction(
         i18n("&Open in Konqueror"), "document-open", 0,
-        actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
+        actn, TQ_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
     (void) new TDEAction(
         i18n("Check &Status"), "bookmark", 0,
-        actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
+        actn, TQ_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
 
     (void) new TDEAction(
         i18n("Check Status: &All"), 0,
-        actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
+        actn, TQ_SLOT( slotTestAll() ), actionCollection(), "testall" );
     (void) new TDEAction(
         i18n("Update All &Favicons"), 0,
-        actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
+        actn, TQ_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
         "updateallfavicons" );
     (void) new TDEAction(
         i18n("Cancel &Checks"), 0,
-        actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
+        actn, TQ_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
     (void) new TDEAction(
         i18n("Cancel &Favicon Updates"), 0,
-        actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
+        actn, TQ_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
         "cancelfaviconupdates" );
     (void) new TDEAction(
         i18n("Import &Netscape Bookmarks..."), "netscape", 0,
-        actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importNS");
     (void) new TDEAction(
         i18n("Import &Opera Bookmarks..."), "opera", 0,
-        actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importOpera");
     (void) new TDEAction(
         i18n("Import All &Crash Sessions as Bookmarks..."), 0,
-        actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importCrashes");
     (void) new TDEAction(
         i18n("Import &Galeon Bookmarks..."), 0,
-        actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importGaleon");
     (void) new TDEAction(
         i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0,
-        actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importKDE2");
     (void) new TDEAction(
         i18n("Import &IE Bookmarks..."), 0,
-        actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importIE");
     (void) new TDEAction(
         i18n("Import &Mozilla Bookmarks..."), "mozilla", 0,
-        actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
+        actn, TQ_SLOT( slotImport() ), actionCollection(), "importMoz");
     (void) new TDEAction(
         i18n("Export to &Netscape Bookmarks"), "netscape", 0,
-        actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
+        actn, TQ_SLOT( slotExportNS() ), actionCollection(), "exportNS");
     (void) new TDEAction(
         i18n("Export to &Opera Bookmarks..."), "opera", 0,
-        actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
+        actn, TQ_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
     (void) new TDEAction(
         i18n("Export to &HTML Bookmarks..."), "text-html", 0,
-        actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
+        actn, TQ_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
     (void) new TDEAction(
         i18n("Export to &IE Bookmarks..."), 0,
-        actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
+        actn, TQ_SLOT( slotExportIE() ), actionCollection(), "exportIE");
     (void) new TDEAction(
         i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0,
-        actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
+        actn, TQ_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
 }
 
 void ActionsImpl::slotLoad() {
@@ -444,7 +444,7 @@ void ActionsImpl::slotPrint() {
 
     s_appId = kapp->dcopClient()->appId();
     s_objId = s_part->property("dcopObjectId").toString().latin1();
-    connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint()));
+    connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint()));
 
     s_part->openURL(KURL( tmpf.name() ));
 }
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 8a7e05c3a..45da6db7a 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -231,7 +231,7 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name), m_connected(false) {
 
     timer = new TQTimer(this);
-    connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges()));
+    connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( commitChanges()));
 
     titlecmd = 0;
     urlcmd = 0;
@@ -246,9 +246,9 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
             new TQLabel(m_title_le, i18n("Name:"), this),
             0, 0);
 
-    connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                        TQT_SLOT( slotTextChangedTitle(const TQString &) ));
-    connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() ));
+    connect(m_title_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                        TQ_SLOT( slotTextChangedTitle(const TQString &) ));
+    connect(m_title_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitTitle() ));
 
     m_url_le = new BookmarkLineEdit(this);
     grid->addWidget(m_url_le, 1, 1);
@@ -256,18 +256,18 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name)
             new TQLabel(m_url_le, i18n("Location:"), this),
             1, 0);
 
-    connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                      TQT_SLOT( slotTextChangedURL(const TQString &) ));
-    connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() ));
+    connect(m_url_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                      TQ_SLOT( slotTextChangedURL(const TQString &) ));
+    connect(m_url_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitURL() ));
 
     m_comment_le = new BookmarkLineEdit(this);
     grid->addWidget(m_comment_le, 2, 1);
     grid->addWidget(
             new TQLabel(m_comment_le, i18n("Comment:"), this),
             2, 0);
-    connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ),
-                          TQT_SLOT( slotTextChangedComment(const TQString &) ));
-    connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() ));
+    connect(m_comment_le, TQ_SIGNAL( textChanged(const TQString &) ),
+                          TQ_SLOT( slotTextChangedComment(const TQString &) ));
+    connect(m_comment_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitComment() ));
 
     m_credate_le = new KLineEdit(this);
     grid->addWidget(m_credate_le, 0, 3);
diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp
index 41aa6299d..35374136f 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.cpp
+++ b/konqueror/keditbookmarks/bookmarkiterator.cpp
@@ -27,8 +27,8 @@
 #include <tqtimer.h>
 
 BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) {
-    connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), 
-            TQT_SLOT( slotCancelTest(BookmarkIterator *) ));
+    connect(this, TQ_SIGNAL( deleteSelf(BookmarkIterator *) ), 
+            TQ_SLOT( slotCancelTest(BookmarkIterator *) ));
     delayedEmitNextOne();
 }
 
@@ -37,7 +37,7 @@ BookmarkIterator::~BookmarkIterator() {
 }
 
 void BookmarkIterator::delayedEmitNextOne() {
-    TQTimer::singleShot(1, this, TQT_SLOT( nextOne() ));
+    TQTimer::singleShot(1, this, TQ_SLOT( nextOne() ));
 }
 
 void BookmarkIterator::slotCancelTest(BookmarkIterator *test) {
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index 0d262bc7a..b02f0af16 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -37,8 +37,8 @@
 
 KBookmarkEditorIface::KBookmarkEditorIface()
     : TQObject(), DCOPObject("KBookmarkEditor") {
-    // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ), 
-    //         this,                   TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) ));
+    // connect(KBookmarkNotifier_stub, TQ_SIGNAL( updatedAccessMetadata(TQString,TQString) ), 
+    //         this,                   TQ_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) ));
     connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false);
 }
 
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index 6013187bb..73cbd9ced 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -84,8 +84,8 @@ void FavIconsItr::doAction() {
     curItem()->setTmpStatus(i18n("Updating favicon..."));
     if (!m_updater) {
         m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
-        connect(m_updater, TQT_SIGNAL( done(bool) ),
-                this,      TQT_SLOT( slotDone(bool) ) );
+        connect(m_updater, TQ_SIGNAL( done(bool) ),
+                this,      TQ_SLOT( slotDone(bool) ) );
     }
     if (curBk().url().protocol().startsWith("http")) {
         m_updater->downloadIcon(curBk());
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fd5cf222..f5a8474cc 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -229,8 +229,8 @@ void ListView::selected(KEBListViewItem * item, bool s)
     }
     //FIXME do it once somewhere
     if (!KEBApp::self()->bkInfo()->connected()) {
-        connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ),
-                                          TQT_SLOT( slotBkInfoUpdateListViewItem() ));
+        connect(KEBApp::self()->bkInfo(), TQ_SIGNAL( updateListViewItem() ),
+                                          TQ_SLOT( slotBkInfoUpdateListViewItem() ));
         KEBApp::self()->bkInfo()->setConnected(true);
     }
 
@@ -716,21 +716,21 @@ void KEBListView::init() {
     setDragEnabled(true);
     setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single);
     setAllColumnsShowFocus(true);
-    connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
-            this, TQT_SLOT(slotColumnSizeChanged(int, int, int)));
+    connect(header(), TQ_SIGNAL(sizeChange(int, int, int)),
+            this, TQ_SLOT(slotColumnSizeChanged(int, int, int)));
 }
 
 void KEBListView::makeConnections() {
-    connect(this, TQT_SIGNAL( moved() ),
-            TQT_SLOT( slotMoved() ));
-    connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ),
-            TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) ));
-    connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ),
-            TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) ));
-    connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ),
-            TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) ));
-    connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
-            TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ));
+    connect(this, TQ_SIGNAL( moved() ),
+            TQ_SLOT( slotMoved() ));
+    connect(this, TQ_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ),
+            TQ_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) ));
+    connect(this, TQ_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ),
+            TQ_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) ));
+    connect(this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ),
+            TQ_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) ));
+    connect(this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ),
+            TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ));
 }
 
 void KEBListView::readonlyFlagInit(bool readonly) {
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 767c15a50..707491741 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -88,10 +88,10 @@ void TestLinkItr::doAction() {
     m_job->addMetaData("errorPage", "true");
     m_job->addMetaData( TQString("cookies"), TQString("none") );
 
-    connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)),
-            this, TQT_SLOT( slotJobResult(TDEIO::Job *)));
-    connect(m_job, TQT_SIGNAL( data( TDEIO::Job *,  const TQByteArray &)),
-            this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &)));
+    connect(m_job, TQ_SIGNAL( result( TDEIO::Job *)),
+            this, TQ_SLOT( slotJobResult(TDEIO::Job *)));
+    connect(m_job, TQ_SIGNAL( data( TDEIO::Job *,  const TQByteArray &)),
+            this, TQ_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &)));
 
     curItem()->setTmpStatus(i18n("Checking..."));
     TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index cc8161f4e..d685e8dee 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -58,8 +58,8 @@ CmdHistory* CmdHistory::s_self = 0;
 
 CmdHistory::CmdHistory(TDEActionCollection *collection)
     : m_commandHistory(collection) {
-    connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ),
-            TQT_SLOT( slotCommandExecuted(KCommand *) ));
+    connect(&m_commandHistory, TQ_SIGNAL( commandExecuted(KCommand *) ),
+            TQ_SLOT( slotCommandExecuted(KCommand *) ));
     assert(!s_self);
     s_self = this; // this is hacky
 }
@@ -138,8 +138,8 @@ void CurrentMgr::createManager(const TQString &filename) {
 
     m_mgr = KBookmarkManager::managerForFile(filename, false);
 
-    connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-            TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ));
+    connect(m_mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+            TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ));
 }
 
 void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) {
@@ -219,8 +219,8 @@ KEBApp::KEBApp(
     TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine");
     quicksearch->setStretchableWidget(searchLineEdit);
     lbl->setBuddy(searchLineEdit);
-    connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear()));
-    connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions()));
+    connect(resetQuickSearch, TQ_SIGNAL(activated()), searchLineEdit, TQ_SLOT(clear()));
+    connect(searchLineEdit, TQ_SIGNAL(searchUpdated()), TQ_SLOT(updateActions()));
 
     ListView::createListViews(vsplitter);
     ListView::self()->initListViews();
@@ -245,8 +245,8 @@ KEBApp::KEBApp(
 
     m_dcopIface = new KBookmarkEditorIface();
 
-    connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
-                               TQT_SLOT( slotClipboardDataChanged() ));
+    connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ),
+                               TQ_SLOT( slotClipboardDataChanged() ));
 
     ListView::self()->connectSignals();
 
@@ -337,8 +337,8 @@ void KEBApp::notifyCommandExecuted() {
 void KEBApp::slotConfigureToolbars() {
     saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
     KEditToolbar dlg(actionCollection());
-    connect(&dlg, TQT_SIGNAL( newToolbarConfig() ),
-                  TQT_SLOT( slotNewToolbarConfig() ));
+    connect(&dlg, TQ_SIGNAL( newToolbarConfig() ),
+                  TQ_SLOT( slotNewToolbarConfig() ));
     dlg.exec();
 }
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 9a0280dfa..377026411 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -95,10 +95,10 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
         part->setProperty("javaEnabled", TQVariant(false));
         part->setProperty("autoloadImages", TQVariant(false));
 
-        connect(part, TQT_SIGNAL( canceled(const TQString &) ),
-                this, TQT_SLOT( slotCompleted() ));
-        connect(part, TQT_SIGNAL( completed() ),
-                this, TQT_SLOT( slotCompleted() ));
+        connect(part, TQ_SIGNAL( canceled(const TQString &) ),
+                this, TQ_SLOT( slotCompleted() ));
+        connect(part, TQ_SIGNAL( completed() ),
+                this, TQ_SLOT( slotCompleted() ));
 
         KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part);
         assert(ext);
@@ -106,8 +106,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
         m_browserIface = new FavIconBrowserInterface(this, "browseriface");
         ext->setBrowserInterface(m_browserIface);
 
-        connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ),
-                this, TQT_SLOT( setIconURL(const KURL &) ));
+        connect(ext, TQ_SIGNAL( setIconURL(const KURL &) ),
+                this, TQ_SLOT( setIconURL(const KURL &) ));
 
         m_part = part;
     }
@@ -115,7 +115,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
     if (!m_timer) {
         // Timeout to stop the updating hanging
       m_timer = new TQTimer(this);
-      connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) );
+      connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) );
     }
     m_timer->start(15000,false);
     m_webGrabber = new FavIconWebGrabber(m_part, bk.url());
@@ -149,10 +149,10 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url
 
     TDEIO::Job *job = TDEIO::get(m_url, false, false);
     job->addMetaData( TQString("cookies"), TQString("none") );
-    connect(job, TQT_SIGNAL( result( TDEIO::Job *)),
-            this, TQT_SLOT( slotFinished(TDEIO::Job *) ));
-    connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ),
-            this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ));
+    connect(job, TQ_SIGNAL( result( TDEIO::Job *)),
+            this, TQ_SLOT( slotFinished(TDEIO::Job *) ));
+    connect(job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ),
+            this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ));
 }
 
 void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) {