Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c4a6487c827add9382001ff1892b8fb3bfa94682)

2 files changed, 44 insertions, 44 deletions

diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index aedf4a74d..9e4480d0b 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(
-        TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
+        this, TQT_SLOT( close() ), actionCollection());
     KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
     (void) KStdAction::configureToolbars(
-        TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection());
+        this, TQT_SLOT( slotConfigureToolbars() ), actionCollection());
 
     if (m_browser) {
         (void) KStdAction::open(
-            TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection());
+            actn, TQT_SLOT( slotLoad() ), actionCollection());
         (void) KStdAction::saveAs(
-            TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection());
+            actn, TQT_SLOT( slotSaveAs() ), actionCollection());
     }
 
-    (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection());
-    (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection());
-    (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection());
-    (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), 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());
 
     // settings menu
     (void) new TDEToggleAction(
         i18n("&Show Netscape Bookmarks in Konqueror"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(),
+        actn, TQT_SLOT( slotShowNS() ), actionCollection(),
         "settings_showNS");
 
     // actions
     (void) new TDEAction(
         i18n("&Delete"), "edit-delete", Key_Delete,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete");
+        actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete");
     (void) new TDEAction(
         i18n("Rename"), "text", Key_F2,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename");
+        actn, TQT_SLOT( slotRename() ), actionCollection(), "rename");
     (void) new TDEAction(
         i18n("C&hange URL"), "text", Key_F3,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
+        actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
     (void) new TDEAction(
         i18n("C&hange Comment"), "text", Key_F4,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
+        actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
     (void) new TDEAction(
         i18n("Chan&ge Icon..."), "icons", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
+        actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
     (void) new TDEAction(
         i18n("Update Favicon"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
+        actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
     (void) new TDEAction(
         i18n("Recursive Sort"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
+        actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
     (void) new TDEAction(
         i18n("&New Folder..."), "folder-new", CTRL+Key_N,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
+        actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
     (void) new TDEAction(
         i18n("&New Bookmark"), "www", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
+        actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
     (void) new TDEAction(
         i18n("&Insert Separator"), CTRL+Key_I,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(),
+        actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(),
         "insertseparator");
     (void) new TDEAction(
         i18n("&Sort Alphabetically"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort");
+        actn, TQT_SLOT( slotSort() ), actionCollection(), "sort");
     (void) new TDEAction(
         i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
+        actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
     (void) new TDEAction(
         i18n("Show in T&oolbar"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
+        actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
     (void) new TDEAction(
         i18n("Hide in T&oolbar"), "bookmark_toolbar", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
+        actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
     (void) new TDEAction(
         i18n("&Expand All Folders"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
+        actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
     (void) new TDEAction(
         i18n("Collapse &All Folders"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
+        actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
     (void) new TDEAction(
         i18n("&Open in Konqueror"), "document-open", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
+        actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
     (void) new TDEAction(
         i18n("Check &Status"), "bookmark", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
+        actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
 
     (void) new TDEAction(
         i18n("Check Status: &All"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
+        actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
     (void) new TDEAction(
         i18n("Update All &Favicons"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
+        actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
         "updateallfavicons" );
     (void) new TDEAction(
         i18n("Cancel &Checks"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
+        actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
     (void) new TDEAction(
         i18n("Cancel &Favicon Updates"), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
+        actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
         "cancelfaviconupdates" );
     (void) new TDEAction(
         i18n("Import &Netscape Bookmarks..."), "netscape", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS");
+        actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS");
     (void) new TDEAction(
         i18n("Import &Opera Bookmarks..."), "opera", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
+        actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
     (void) new TDEAction(
         i18n("Import All &Crash Sessions as Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
+        actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
     (void) new TDEAction(
         i18n("Import &Galeon Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
+        actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
     (void) new TDEAction(
         i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
+        actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
     (void) new TDEAction(
         i18n("Import &IE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE");
+        actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE");
     (void) new TDEAction(
         i18n("Import &Mozilla Bookmarks..."), "mozilla", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
+        actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
     (void) new TDEAction(
         i18n("Export to &Netscape Bookmarks"), "netscape", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
+        actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
     (void) new TDEAction(
         i18n("Export to &Opera Bookmarks..."), "opera", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
+        actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
     (void) new TDEAction(
         i18n("Export to &HTML Bookmarks..."), "text-html", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
+        actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
     (void) new TDEAction(
         i18n("Export to &IE Bookmarks..."), 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
+        actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
     (void) new TDEAction(
         i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0,
-        TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
+        actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
 }
 
 void ActionsImpl::slotLoad() {
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index a1ea018b1..6013187bb 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -83,7 +83,7 @@ void FavIconsItr::doAction() {
     // kdDebug() << "FavIconsItr::doAction()" << endl;
     curItem()->setTmpStatus(i18n("Updating favicon..."));
     if (!m_updater) {
-        m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater");
+        m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
         connect(m_updater, TQT_SIGNAL( done(bool) ),
                 this,      TQT_SLOT( slotDone(bool) ) );
     }