Replace various '#define' strings - part 6

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

2 files changed, 27 insertions, 27 deletions

diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index 51d04b6..95227a9 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -193,42 +193,42 @@ void TopLevel::slotSelectionChanged()
 void TopLevel::setupActions()
 {
     // setup File menu
-    KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection());
-    KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection());
-    recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)),
+    KStdAction::openNew(this, TQT_SLOT(file_new()), actionCollection());
+    KStdAction::open(this, TQT_SLOT(file_open()), actionCollection());
+    recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)),
                                           actionCollection());
-    KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(file_save()), actionCollection());
-    KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(file_save_as()), actionCollection());
-    KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection());
-    KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
-    KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection());
-    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+    KStdAction::save(this, TQT_SLOT(file_save()), actionCollection());
+    KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection());
+    KStdAction::close(this, TQT_SLOT(file_close()), actionCollection());
+    KStdAction::print(this, TQT_SLOT(print()), actionCollection());
+    KStdAction::mail(this, TQT_SLOT(mail()), actionCollection());
+    KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
 
     // setup edit menu
-    undoAction = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection());
-    redoAction = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection());
-    cutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), actionCollection());
-    copyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection());
-    KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection());
-    KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(select_all()), actionCollection());
-    KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection());
-    KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(search_again()), actionCollection());
-    KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(replace()), actionCollection());
-
-    (void)new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()),
+    undoAction = KStdAction::undo(this, TQT_SLOT(undo()), actionCollection());
+    redoAction = KStdAction::redo(this, TQT_SLOT(redo()), actionCollection());
+    cutAction = KStdAction::cut(this, TQT_SLOT(cut()), actionCollection());
+    copyAction = KStdAction::copy(this, TQT_SLOT(copy()), actionCollection());
+    KStdAction::pasteText(this, TQT_SLOT(paste()), actionCollection());
+    KStdAction::selectAll(this, TQT_SLOT(select_all()), actionCollection());
+    KStdAction::find(this, TQT_SLOT(search()), actionCollection());
+    KStdAction::findNext(this, TQT_SLOT(search_again()), actionCollection());
+    KStdAction::replace(this, TQT_SLOT(replace()), actionCollection());
+
+    (void)new TDEAction(i18n("&Insert File..."), 0, this, TQT_SLOT(file_insert()),
                       actionCollection(), "insert_file");
-    (void)new TDEAction(i18n("In&sert Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertDate()),
+    (void)new TDEAction(i18n("In&sert Date"), 0, this, TQT_SLOT(insertDate()),
                       actionCollection(), "insert_date");
-    (void)new TDEAction(i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(clean_space()),
+    (void)new TDEAction(i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(clean_space()),
                       actionCollection(), "clean_spaces");
 
     // setup Tools menu
-    KStdAction::spelling(TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection());
+    KStdAction::spelling(this, TQT_SLOT(spellcheck()), actionCollection());
 
     // setup Go menu
-    KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), actionCollection());
+    KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), actionCollection());
 
-    KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
+    KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection());
 }
 
 void TopLevel::setupStatusBar()
@@ -388,7 +388,7 @@ void TopLevel::spellcheck()
   statusBar()->changeItem(i18n("Spellcheck:  Started."), ID_GENERAL);
 
   initSpellConfig();
-  tdespell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this),
+  tdespell = new KSpell(this, i18n("Spellcheck"), this,
 	TQT_SLOT( spell_started(KSpell *)), tdespellconfigOptions);
 
   connect (tdespell, TQT_SIGNAL ( death()),
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index 6df31be..7c8b22b 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -62,7 +62,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
 
   TDEAction* mEncoding = new TDEAction(
       i18n("Select Encoding..."), 0,
-      TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding");
+      this, TQT_SLOT( slotShowEncCombo() ), this, "encoding");
 
   mEncoding->setIcon( TQString::fromLatin1("charset") );