Replace various '#define' strings - part 6

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

3 files changed, 25 insertions, 25 deletions

diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 6c8ef1a6..570157d1 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -90,33 +90,33 @@ void ActionManager::initPart(KLinkStatusPart* part)
     new TDEAction(i18n("New Link Check"), "document-new",
                 0,
                 d->part, TQT_SLOT(slotNewLinkCheck()),
-                TQT_TQOBJECT(d->actionCollection), "new_link_check");
+                d->actionCollection, "new_link_check");
 
     new TDEAction(i18n("Open URL..."), "document-open",
                 0,
                 d->part, TQT_SLOT(slotOpenLink()),
-                TQT_TQOBJECT(d->actionCollection), "open_link");
+                d->actionCollection, "open_link");
 
     action = new TDEAction(i18n("Close Tab"), "window-close",
                          0,
                          d->part, TQT_SLOT(slotClose()),
-                         TQT_TQOBJECT(d->actionCollection), "close_tab");
+                         d->actionCollection, "close_tab");
     action->setEnabled(false);
 
     // *************** Settings menu *********************
 
     (void) new TDEAction(i18n("Configure KLinkStatus..."), "configure",
                        0, d->part, TQT_SLOT(slotConfigureKLinkStatus()),
-                       TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus");
+                       d->actionCollection, "configure_klinkstatus");
 
     // *************** Help menu *********************
 
     (void) new TDEAction(i18n("About KLinkStatus"), "klinkstatus",
                        0, d->part, TQT_SLOT(slotAbout()),
-                       TQT_TQOBJECT(d->actionCollection), "about_klinkstatus");
+                       d->actionCollection, "about_klinkstatus");
 
     (void) new TDEAction(i18n("&Report Bug..."), 0, 0, d->part,
-                       TQT_SLOT(slotReportBug()), TQT_TQOBJECT(d->actionCollection), "report_bug");
+                       TQT_SLOT(slotReportBug()), d->actionCollection, "report_bug");
 
     // *************** View menu *********************
 }
@@ -133,8 +133,8 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession)
     // *************** File menu *********************
 
     TDEAction* action = new TDEAction(i18n("E&xport Results as HTML..."), "document-save", 0,
-                                  TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotExportAsHTML()),
-                                  TQT_TQOBJECT(d->actionCollection), "file_export_html");
+                                  d->tabWidgetSession, TQT_SLOT(slotExportAsHTML()),
+                                  d->actionCollection, "file_export_html");
     action->setEnabled(false);
 
     // *************** View menu *********************
@@ -142,39 +142,39 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession)
     //     this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget
     TDEToggleAction* toggle_action = new TDEToggleAction(i18n("&Follow last Link checked"),
                                    "make_tdevelop", "Ctrl+f",
-                                   TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotFollowLastLinkChecked()),
-                                   TQT_TQOBJECT(d->actionCollection), "follow_last_link_checked");
+                                   d->tabWidgetSession, TQT_SLOT(slotFollowLastLinkChecked()),
+                                   d->actionCollection, "follow_last_link_checked");
     toggle_action->setChecked(KLSConfig::followLastLinkChecked());
 
     //     this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget
     toggle_action = new TDEToggleAction(i18n("&Hide Search Panel"), "go-bottom", "Ctrl+h",
-                                      TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotHideSearchPanel()),
-                                      TQT_TQOBJECT(d->actionCollection), "hide_search_bar");
+                                      d->tabWidgetSession, TQT_SLOT(slotHideSearchPanel()),
+                                      d->actionCollection, "hide_search_bar");
     KGuiItem item(i18n("&Show Search Panel"), "go-top", "Show Search Panel");
     toggle_action->setCheckedState(item);
     
     new TDEAction(i18n("&Reset Search Options"), "reload", "F5",
-                TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotResetSearchOptions()),
-                TQT_TQOBJECT(d->actionCollection), "reset_search_bar");
+                d->tabWidgetSession, TQT_SLOT(slotResetSearchOptions()),
+                d->actionCollection, "reset_search_bar");
 
     // *************** Search menu *********************
     
     toggle_action = new TDEToggleAction(i18n("&Start Search"),
                                       "media-playback-start", "Ctrl+s",
-                                      TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStartSearch()),
-                                      TQT_TQOBJECT(d->actionCollection), "start_search");
+                                      d->tabWidgetSession, TQT_SLOT(slotStartSearch()),
+                                      d->actionCollection, "start_search");
     toggle_action->setEnabled(false);
     
     toggle_action = new TDEToggleAction(i18n("&Pause Search"),
                                       "media-playback-pause", "Ctrl+p",
-                                      TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotPauseSearch()),
-                                      TQT_TQOBJECT(d->actionCollection), "pause_search");    
+                                      d->tabWidgetSession, TQT_SLOT(slotPauseSearch()),
+                                      d->actionCollection, "pause_search");    
     toggle_action->setEnabled(false);
     
     action = new TDEAction(i18n("St&op Search"),
                                   "media-playback-stop", "Ctrl+c",
-                                  TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStopSearch()),
-                                  TQT_TQOBJECT(d->actionCollection), "stop_search");
+                                  d->tabWidgetSession, TQT_SLOT(slotStopSearch()),
+                                  d->actionCollection, "stop_search");
     action->setEnabled(false);
 }
 
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index f4154f3c..1e069117 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -54,7 +54,7 @@ KLinkStatus::KLinkStatus()
     {
         // now that the Part is loaded, we cast it to a Part to get
         // our hands on it
-        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),
+        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,
                  "klinkstatus_part", "KParts::ReadOnlyPart" ));
 
         if (m_part)
@@ -113,13 +113,13 @@ void KLinkStatus::setupActions()
     administration.
     The easiest solution is to call close() on the mainwindow instead of 
     TDEApplication::quit()*/
-    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+    KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
 
     //m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
     //m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
 
-    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
 void KLinkStatus::setupPartActions()
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index a3dc0e25..2ad6867b 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -151,7 +151,7 @@ void SessionWidget::newSearchManager()
 
     search_manager_ = new SearchManager(KLSConfig::maxConnectionsNumber(),
                                         KLSConfig::timeOut(),
-                                        TQT_TQOBJECT(this), "search_manager");
+                                        this, "search_manager");
     Q_ASSERT(search_manager_);
 
     connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)),