Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 418e8f7a6f6d79b2cbc9d83b29ef53d01582f826)

1 files changed, 22 insertions, 22 deletions

diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index 862d83ab..d6ac7302 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -314,46 +314,46 @@ bool TopLevel::queryClose()
 void TopLevel::setupActions()
 {
   // file menu...
-  actSave = KStdAction::save(TQT_TQOBJECT(queryView), TQT_SLOT(saveQuery()), actionCollection());
+  actSave = KStdAction::save(queryView, TQT_SLOT(saveQuery()), actionCollection());
   actSave->setText(i18n("&Save As..."));
   actSave->setEnabled(false);
-  actPrint = KStdAction::print(TQT_TQOBJECT(queryView), TQT_SLOT(printQuery()), actionCollection());
+  actPrint = KStdAction::print(queryView, TQT_SLOT(printQuery()), actionCollection());
   actPrint->setEnabled(false);
-  actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , TQT_TQOBJECT(this),
+  actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , this,
                   TQT_SLOT(doDefine()), actionCollection(), "start_query");
-  actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , TQT_TQOBJECT(this),
+  actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , this,
                  TQT_SLOT(stopClients()), actionCollection(), "stop_query");
   actStopQuery->setEnabled(false);
-  KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection());
+  KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection());
 
   // edit menu...
-  actCopy = KStdAction::copy(TQT_TQOBJECT(queryView), TQT_SLOT(copySelection()), actionCollection());
+  actCopy = KStdAction::copy(queryView, TQT_SLOT(copySelection()), actionCollection());
   actCopy->setEnabled(false);
-  KStdAction::selectAll(TQT_TQOBJECT(queryView), TQT_SLOT(selectAll()), actionCollection());
-  new TDEAction(i18n("&Define Clipboard Content"), "define_clip", 0 , TQT_TQOBJECT(this),
+  KStdAction::selectAll(queryView, TQT_SLOT(selectAll()), actionCollection());
+  new TDEAction(i18n("&Define Clipboard Content"), "define_clip", 0 , this,
               TQT_SLOT(defineClipboard()), actionCollection(), "define_clipboard");
-  new TDEAction(i18n("&Match Clipboard Content"), 0 , TQT_TQOBJECT(this),
+  new TDEAction(i18n("&Match Clipboard Content"), 0 , this,
               TQT_SLOT(matchClipboard()), actionCollection(), "match_clipboard");
-  KStdAction::find(TQT_TQOBJECT(queryView), TQT_SLOT(showFindDialog()), actionCollection());
+  KStdAction::find(queryView, TQT_SLOT(showFindDialog()), actionCollection());
 
   // history menu...
   actBack = new TDEToolBarPopupAction(i18n("&Back"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back),
-                                    TQT_TQOBJECT(queryView), TQT_SLOT(browseBack()), actionCollection(),"browse_back");
+                                    queryView, TQT_SLOT(browseBack()), actionCollection(),"browse_back");
   actBack->setDelayed(true);
   actBack->setStickyMenu(false);
   actBack->setEnabled(false);
   actForward = new TDEToolBarPopupAction(i18n("&Forward"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward),
-                                       TQT_TQOBJECT(queryView), TQT_SLOT(browseForward()), actionCollection(),"browse_forward");
+                                       queryView, TQT_SLOT(browseForward()), actionCollection(),"browse_forward");
   actForward->setDelayed(true);
   actForward->setStickyMenu(false);
   actForward->setEnabled(false);
-  new TDEAction(i18n("&Clear History"), 0 , TQT_TQOBJECT(this),
+  new TDEAction(i18n("&Clear History"), 0 , this,
               TQT_SLOT(clearQueryHistory()), actionCollection(), "clear_history");
 
   // server menu...
   new TDEAction(i18n("&Get Capabilities"), 0 , interface,
               TQT_SLOT(updateServer()), actionCollection(), "get_capabilities");
-  new TDEAction(i18n("Edit &Database Sets..."), "edit", 0 , TQT_TQOBJECT(this),
+  new TDEAction(i18n("Edit &Database Sets..."), "edit", 0 , this,
               TQT_SLOT(showSetsDialog()), actionCollection(), "edit_sets");
   new TDEAction(i18n("&Summary"), 0 , interface,
               TQT_SLOT(showDatabases()), actionCollection(), "db_summary");
@@ -366,17 +366,17 @@ void TopLevel::setupActions()
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
 
-  actShowMatchList = new TDEToggleAction(i18n("Show &Match List"), 0 , TQT_TQOBJECT(this),
+  actShowMatchList = new TDEToggleAction(i18n("Show &Match List"), 0 , this,
                                  TQT_SLOT(toggleMatchListShow()), actionCollection(), "show_match");
   actShowMatchList->setCheckedState(i18n("Hide &Match List"));
   actShowMatchList->setChecked(global->showMatchList);
   KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
-  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection());
-  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptionsDialog()), actionCollection());
+  KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection());
+  KStdAction::preferences(this, TQT_SLOT(showOptionsDialog()), actionCollection());
 
   // toolbar...
-  new TDEAction(i18n("Clear Input Field"), "query_erase", 0 , TQT_TQOBJECT(this),
+  new TDEAction(i18n("Clear Input Field"), "query_erase", 0 , this,
               TQT_SLOT(clearInput()), actionCollection(), "clear_query");
 
   actQueryLabel = new DictLabelAction(i18n("&Look for:"), actionCollection(), "look_label");
@@ -386,8 +386,8 @@ actionCollection());
   actDbLabel = new DictLabelAction(i18n("&in"), actionCollection(), "in_label");
   actDbCombo = new DictComboAction(i18n("Databases"), actionCollection(), "db_combo",false,false);
   connect(actDbCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(databaseSelected(int)));
-  actDefineBtn = new DictButtonAction(i18n("&Define"), TQT_TQOBJECT(this), TQT_SLOT(doDefine()), actionCollection(), "define_btn");
-  actMatchBtn = new DictButtonAction(i18n("&Match"), TQT_TQOBJECT(this), TQT_SLOT(doMatch()), actionCollection(), "match_btn");
+  actDefineBtn = new DictButtonAction(i18n("&Define"), this, TQT_SLOT(doDefine()), actionCollection(), "define_btn");
+  actMatchBtn = new DictButtonAction(i18n("&Match"), this, TQT_SLOT(doMatch()), actionCollection(), "match_btn");
 
   queryView->setActions(actBack,actForward,actQueryCombo);
 }
@@ -509,7 +509,7 @@ void TopLevel::buildHistMenu()
 
   unsigned int i = 0;
   while ((i<10)&&(i<global->queryHistory.count())) {
-    historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, TQT_TQOBJECT(this), TQT_SLOT(queryHistMenu()),
+    historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, this, TQT_SLOT(queryHistMenu()),
                                           (TQObject*)0, global->queryHistory[i].utf8().data()) );
     i++;
   }
@@ -548,7 +548,7 @@ void TopLevel::stratDbChanged()
   dbActionList.clear();
 
   for (unsigned int i=0;i<global->serverDatabases.count();i++)
-    dbActionList.append( new TDEAction(global->serverDatabases[i], 0, TQT_TQOBJECT(this), TQT_SLOT(dbInfoMenuClicked()),
+    dbActionList.append( new TDEAction(global->serverDatabases[i], 0, this, TQT_SLOT(dbInfoMenuClicked()),
                                      (TQObject*)0, global->serverDatabases[i].utf8().data()) );
 
   plugActionList("db_detail", dbActionList);