Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 28 insertions, 28 deletions

diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 2dfa585..04e439c 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -113,8 +113,8 @@ KSVTopLevel::KSVTopLevel()
 
     mOpenWith (0L), mOpenDefault (0L),
 
-    mUndoList (new ActionList (TQT_TQOBJECT(this), "UndoList")),
-	mRedoList (new ActionList (TQT_TQOBJECT(this), "RedoList")),
+    mUndoList (new ActionList (this, "UndoList")),
+	mRedoList (new ActionList (this, "RedoList")),
 	mStartDlg (new ServiceDlg (i18n("Start Service"),
 							   i18n("&Choose which service to start:"),
 							   this)),
@@ -211,18 +211,18 @@ void KSVTopLevel::initActions ()
   TDEActionCollection* coll = actionCollection();
 
   // setup File menu
-  mFileRevert = KStdAction::revert (TQT_TQOBJECT(this), TQT_SLOT (slotClearChanges()), coll);
+  mFileRevert = KStdAction::revert (this, TQT_SLOT (slotClearChanges()), coll);
   mFileRevert->setText (i18n("Re&vert Configuration"));
 
-  mFileLoad = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (load()), coll);
+  mFileLoad = KStdAction::open (this, TQT_SLOT (load()), coll);
   mFileLoad->setText (i18n ("&Open..."));
 
-  mFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotAcceptChanges()), coll);
+  mFileSave = KStdAction::save(this, TQT_SLOT(slotAcceptChanges()), coll);
   mFileSave->setText (i18n("&Save Configuration"));
 
-  mFileSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (saveAs ()), coll);
+  mFileSaveAs = KStdAction::saveAs (this, TQT_SLOT (saveAs ()), coll);
 
-  mFileSaveLog = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT(slotSaveLog()), coll, "ksysv_save_log");
+  mFileSaveLog = KStdAction::save (this, TQT_SLOT(slotSaveLog()), coll, "ksysv_save_log");
   mFileSaveLog->setText (i18n("Save &Log..."));
   mFileSaveLog->setShortcut (Key_L+CTRL);
   mFileSaveLog->setEnabled (false);
@@ -230,29 +230,29 @@ void KSVTopLevel::initActions ()
   // disabled due to complexity
   //  mFilePrint = KStdAction::print (this, TQT_SLOT (print()), coll);
 
-  mFilePrintLog = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printLog()), coll, "ksysv_print_log");
+  mFilePrintLog = KStdAction::print(this, TQT_SLOT(printLog()), coll, "ksysv_print_log");
   mFilePrintLog->setText( i18n("&Print Log..."));
   mFilePrintLog->setEnabled (false);
 
-  mFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), coll);
+  mFileQuit = KStdAction::quit(this, TQT_SLOT(close()), coll);
 
   // setup Edit menu
-  mEditUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), coll);
+  mEditUndo = KStdAction::undo(this, TQT_SLOT(editUndo()), coll);
   mEditUndo->setEnabled (false);
-  mEditRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), coll);
+  mEditRedo = KStdAction::redo(this, TQT_SLOT(editRedo()), coll);
   mEditUndo->setEnabled (false);
-  mEditCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(editCut()), coll);
-  mEditCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), coll);
-  mEditPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(editPaste()), coll);
-  mPasteAppend = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (pasteAppend()),
+  mEditCut = KStdAction::cut(this, TQT_SLOT(editCut()), coll);
+  mEditCopy = KStdAction::copy(this, TQT_SLOT(editCopy()), coll);
+  mEditPaste = KStdAction::paste(this, TQT_SLOT(editPaste()), coll);
+  mPasteAppend = KStdAction::paste (this, TQT_SLOT (pasteAppend()),
 									coll, "ksysv_paste_append");
 
   mEditProperties = new TDEAction (i18n("P&roperties"), 0,
-                                 TQT_TQOBJECT(this), TQT_SLOT(properties()),
+                                 this, TQT_SLOT(properties()),
                                  coll, "ksysv_properties");
 
   mOpenDefault = new TDEAction (i18n ("&Open"), 0,
-                              TQT_TQOBJECT(this), TQT_SLOT (editService()),
+                              this, TQT_SLOT (editService()),
                               coll, "ksysv_open_service");
 
   mOpenWith = new TDEActionMenu (i18n ("Open &With"), coll, "ksysv_open_with");
@@ -260,30 +260,30 @@ void KSVTopLevel::initActions ()
   // setup Settings menu
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
-  KStdAction::keyBindings (TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), coll);
-  KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), coll);
-  KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveOptions()), coll);
-  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), coll);
+  KStdAction::keyBindings (this, TQT_SLOT(configureKeys()), coll);
+  KStdAction::configureToolbars (this, TQT_SLOT(configureToolbars()), coll);
+  KStdAction::saveOptions(this, TQT_SLOT(saveOptions()), coll);
+  KStdAction::preferences(this, TQT_SLOT(slotShowConfig()), coll);
   mOptionsToggleLog = new TDEToggleAction (i18n("Show &Log"), "toggle_log", 0,
-										 TQT_TQOBJECT(this), TQT_SLOT (toggleLog()),
+										 this, TQT_SLOT (toggleLog()),
 										 coll, "ksysv_toggle_log");
   mOptionsToggleLog->setCheckedState(i18n("Hide &Log"));
 
   // setup Tools menu
   mToolsStartService = new TDEToggleAction (i18n("&Start Service..."), "ksysv_start", 0,
-                                          TQT_TQOBJECT(mStartDlg), TQT_SLOT (toggle()),
+                                          mStartDlg, TQT_SLOT (toggle()),
                                           coll, "ksysv_start_service");
 
   mToolsStopService = new TDEToggleAction (i18n("&Stop Service..."), "ksysv_stop", 0,
-                                         TQT_TQOBJECT(mStopDlg), TQT_SLOT (toggle()),
+                                         mStopDlg, TQT_SLOT (toggle()),
                                          coll, "ksysv_stop_service");
 
   mToolsRestartService = new TDEToggleAction (i18n("&Restart Service..."), 0,
-                                            TQT_TQOBJECT(mRestartDlg), TQT_SLOT (toggle()),
+                                            mRestartDlg, TQT_SLOT (toggle()),
                                             coll, "ksysv_restart_service");
 
   mToolsEditService = new TDEToggleAction (i18n("&Edit Service..."), 0,
-                                         TQT_TQOBJECT(mEditDlg), TQT_SLOT (toggle()),
+                                         mEditDlg, TQT_SLOT (toggle()),
                                          coll, "ksysv_edit_service");
 
   createGUI(xmlFile());
diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp
index e5798ae..5ca8e36 100644
--- a/ksysv/ksvdraglist.cpp
+++ b/ksysv/ksvdraglist.cpp
@@ -373,8 +373,8 @@ KSVDragList::~KSVDragList()
 void KSVDragList::initItem (TQString file, TQString path, TQString name, TQ_INT8 nr)
 {
   KSVItem* tmp = new KSVItem(this, file, path, name, nr);
-  tmp->setRunlevel(TQT_TQOBJECT(this)->name());
-  tmp->setOriginalRunlevel(TQT_TQOBJECT(this)->name());
+  tmp->setRunlevel(this->name());
+  tmp->setOriginalRunlevel(this->name());
 
   tmp->setIcon (mIcon);