Replace various '#define' strings - part 6

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

13 files changed, 93 insertions, 93 deletions

diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp
index 6db4cb3..e5e854b 100644
--- a/kcron/ktapp.cpp
+++ b/kcron/ktapp.cpp
@@ -120,24 +120,24 @@ TQString KTApp::caption()
 void KTApp::setupActions()
 {
   //File Menu
-  KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
-  KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
+  KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
+  KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
+  KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
   
   //Edit menu
-  KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
-  KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
-  KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
-  (void)new TDEAction(i18n("&New..."), TDEStdAccel::openNew(), TQT_TQOBJECT(this),TQT_SLOT(slotEditNew()),actionCollection(),"edit_new");
+  KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection());
+  KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
+  KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
+  (void)new TDEAction(i18n("&New..."), TDEStdAccel::openNew(), this,TQT_SLOT(slotEditNew()),actionCollection(),"edit_new");
   //I don't like this TDEStdAccel::open() for modifying, but I'm just porting this to xmlui
-  (void)new TDEAction(i18n("M&odify..."), TDEStdAccel::open(), TQT_TQOBJECT(this),TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify");
-  (void)new TDEAction(i18n("&Delete"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete");
-  (void)new TDEAction(i18n("&Enabled"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable");
-  (void)new TDEAction(i18n("&Run Now"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run");
+  (void)new TDEAction(i18n("M&odify..."), TDEStdAccel::open(), this,TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify");
+  (void)new TDEAction(i18n("&Delete"), 0, this,TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete");
+  (void)new TDEAction(i18n("&Enabled"), 0, this,TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable");
+  (void)new TDEAction(i18n("&Run Now"), 0, this,TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run");
   
   //Settings menu
-  (void)new TDEAction(i18n("Show &Toolbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar");
-  (void)new TDEAction(i18n("Show &Statusbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar");
+  (void)new TDEAction(i18n("Show &Toolbar"), 0, this,TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar");
+  (void)new TDEAction(i18n("Show &Statusbar"), 0, this,TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar");
     
 }
 
diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index b0e3cce..b41b8b5 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -398,9 +398,9 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption)
  
   // key acceleration
   key_accel = new TDEAccel(this);
-  key_accel->insert(TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT(slotOK()));
-  key_accel->insert(TDEStdAccel::Close, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()));
-  key_accel->insert(TDEStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()));
+  key_accel->insert(TDEStdAccel::Open, this, TQT_SLOT(slotOK()));
+  key_accel->insert(TDEStdAccel::Close, this, TQT_SLOT(slotCancel()));
+  key_accel->insert(TDEStdAccel::Quit, this, TQT_SLOT(slotCancel()));
   key_accel->readSettings();
 
   setFixedSize( minimumSize() );
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index 381bcf7..834567e 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -305,7 +305,7 @@ void BackupDlg::slotProcessExited( TDEProcess* )
     TapeDrive::instance()->close();
     TapeDrive::instance()->open();
 
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     delete _proc;
 
     _tape->addChild( _archive );
@@ -381,7 +381,7 @@ void BackupDlg::slotOK()
 
 void BackupDlg::slotAbort()
 {
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     if ( _proc ) {
         _proc->kill();
         delete _proc;
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index 4c9ff2f..2cfedcf 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -221,13 +221,13 @@ void IndexDlg::slotOK()
 
 void IndexDlg::slotAbort()
 {
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     _aborted = TRUE;
 }
 
 void IndexDlg::timerEvent( TQTimerEvent* )
 {
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
 
     // Rewind tape.
     _log->append( i18n( "Rewinding tape." ) );
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index e89a83f..8e5e2a1 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -157,15 +157,15 @@ KDatMainWindow::KDatMainWindow()
 
     _toolbar = new TDEToolBar( this );
 
-    _toolbar->insertButton( *ImageCache::instance()->getTapeUnmounted(), 0, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileMountTape() ), TRUE, i18n( "Mount/unmount tape" ) );
+    _toolbar->insertButton( *ImageCache::instance()->getTapeUnmounted(), 0, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileMountTape() ), TRUE, i18n( "Mount/unmount tape" ) );
 
     _toolbar->insertSeparator();
 
-    _toolbar->insertButton( *ImageCache::instance()->getBackup() , 1, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileBackup() ) , TRUE, i18n( "Backup" ) );
+    _toolbar->insertButton( *ImageCache::instance()->getBackup() , 1, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileBackup() ) , TRUE, i18n( "Backup" ) );
     _toolbar->setButtonIconSet( 1, BarIconSet("kdat_backup"));
-    _toolbar->insertButton( *ImageCache::instance()->getRestore(), 2, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileRestore() ), TRUE, i18n( "Restore" ) );
+    _toolbar->insertButton( *ImageCache::instance()->getRestore(), 2, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileRestore() ), TRUE, i18n( "Restore" ) );
     _toolbar->setButtonIconSet( 2, BarIconSet("kdat_restore"));
-    _toolbar->insertButton( *ImageCache::instance()->getVerify() , 3, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileVerify() ) , TRUE, i18n( "Verify" ) );
+    _toolbar->insertButton( *ImageCache::instance()->getVerify() , 3, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileVerify() ) , TRUE, i18n( "Verify" ) );
     _toolbar->setButtonIconSet( 3, BarIconSet("kdat_verify"));
     addToolBar( _toolbar );
 
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index c43fa00..0580144 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -233,7 +233,7 @@ void VerifyDlg::show()
 
 void VerifyDlg::slotProcessExited( TDEProcess* )
 {
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     delete _proc;
 
     // Set this, or we get caught in a loop.
@@ -307,7 +307,7 @@ void VerifyDlg::slotAbort()
 
 void VerifyDlg::timerEvent( TQTimerEvent* )
 {
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
 
     int oldElapsed = 0;
 
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index a92f5bc..9d0b7f2 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -685,7 +685,7 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){
   dialog->setModal(true);
   dialog->show();
 
-  procDeviceState = new TQProcess(TQT_TQOBJECT(this));
+  procDeviceState = new TQProcess(this);
   TQString cmd;
   procDeviceState->addArgument( locate("data",BACKEND_PATH) );
 
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index b5d51a5..dc30f45 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -93,52 +93,52 @@ KPKG::KPKG(TDEConfig *_config)
 void KPKG::setupMenu()
 {
 
-  pack_open = KStdAction::open(TQT_TQOBJECT(kpackage), TQT_SLOT(fileOpen()),
+  pack_open = KStdAction::open(kpackage, TQT_SLOT(fileOpen()),
 			       actionCollection());
 
-  recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)),
+  recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)),
 				  actionCollection());
   recent->loadEntries( config );
 
   pack_find = new TDEAction( i18n("Find &Package..."), "edit-find",
-			   TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(kpackage),
+			   TDEStdAccel::shortcut(TDEStdAccel::Find), kpackage,
 			   TQT_SLOT(find()), actionCollection(), "pack_find");
 
   pack_findf = new TDEAction( i18n("Find &File..."), "filefind",
-			    0, TQT_TQOBJECT(kpackage),
+			    0, kpackage,
 			    TQT_SLOT(findf()), actionCollection(), "pack_findf");
 
   kpack_reload = new TDEAction( i18n("&Reload"), "reload",
-			      TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(kpackage),
+			      TDEStdAccel::shortcut(TDEStdAccel::Reload), kpackage,
 			      TQT_SLOT(reload()), actionCollection(), "kpack_reload");
 
-  (void) KStdAction::quit(TQT_TQOBJECT(kpackage), TQT_SLOT(fileQuit()),
+  (void) KStdAction::quit(kpackage, TQT_SLOT(fileQuit()),
 			  actionCollection());
 
-  pack_prev = KStdAction::back(TQT_TQOBJECT(kpackage->management->treeList), TQT_SLOT(previous()),
+  pack_prev = KStdAction::back(kpackage->management->treeList, TQT_SLOT(previous()),
 			       actionCollection(),"pack_prev");
 
-  pack_next = KStdAction::forward(TQT_TQOBJECT(kpackage->management->treeList), TQT_SLOT(next()),
+  pack_next = KStdAction::forward(kpackage->management->treeList, TQT_SLOT(next()),
 				  actionCollection(),"pack_next");
 
   (void) (new TDEAction( i18n("&Expand Tree"), "ftout",
-		       0, TQT_TQOBJECT(kpackage),
+		       0, kpackage,
 		       TQT_SLOT(expandTree()), actionCollection(), "kpack_expand"));
 
   (void) (new TDEAction( i18n("&Collapse Tree"), "ftin",
-		       0, TQT_TQOBJECT(kpackage),
+		       0, kpackage,
 		       TQT_SLOT(collapseTree()), actionCollection(), "kpack_collapse"));
 
   (void) (new TDEAction( i18n("Clear &Marked"), TQString(),
-		       0, TQT_TQOBJECT(kpackage),
+		       0, kpackage,
 		       TQT_SLOT(clearMarked()), actionCollection(), "kpack_clear"));
 
   (void) (new TDEAction( i18n("Mark &All"), TQString(),
-		       0, TQT_TQOBJECT(kpackage),
+		       0, kpackage,
 		       TQT_SLOT(markAll()), actionCollection(), "kpack_markall"));
 
   pack_install = new TDEAction( i18n("&Install"), TQString(),
-			      0, TQT_TQOBJECT(kpackage->management),
+			      0, kpackage->management,
 			      TQT_SLOT(installSingleClicked()), actionCollection(), "install_single");
 
   pack_install->setEnabled(false);
@@ -146,7 +146,7 @@ void KPKG::setupMenu()
 
 
   pack_uninstall = new TDEAction( i18n("&Uninstall"), TQString(),
-				0, TQT_TQOBJECT(kpackage->management),
+				0, kpackage->management,
 				TQT_SLOT(uninstallSingleClicked()), actionCollection(), "uninstall_single");
 
   pack_uninstall->setEnabled(false);
@@ -154,32 +154,32 @@ void KPKG::setupMenu()
 
 
   (void) (new TDEAction( i18n("&Install Marked"), TQString(),
-		       0, TQT_TQOBJECT(kpackage->management),
+		       0, kpackage->management,
 		       TQT_SLOT(installMultClicked()), actionCollection(), "install_marked"));
 
   (void) (new TDEAction( i18n("&Uninstall Marked"), TQString(),
-		       0, TQT_TQOBJECT(kpackage->management),
+		       0, kpackage->management,
 		       TQT_SLOT(uninstallMultClicked()), actionCollection(), "uninstall_marked"));
 
   setStandardToolBarMenuEnabled(true);
 
-  KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()),
+  KStdAction::configureToolbars( this, TQT_SLOT(configureToolBars()),
 				 actionCollection());
 
-  KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT(saveSettings()), actionCollection());
+  KStdAction::saveOptions( this, TQT_SLOT(saveSettings()), actionCollection());
 
   KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
 
   (void) (new TDEAction( i18n("Configure &KPackage..."), "configure",
-		       0, TQT_TQOBJECT(this),
+		       0, this,
 		       TQT_SLOT(setOptions()), actionCollection(), "kpack_options"));
 
   (void) (new TDEAction( i18n("Clear Package &Folder Cache"), TQString(),
-		       0, TQT_TQOBJECT(this),
+		       0, this,
 		       TQT_SLOT(clearDCache()), actionCollection(), "clear_dcache"));
 
   (void) (new TDEAction( i18n("Clear &Package Cache"), TQString(),
-		       0, TQT_TQOBJECT(this),
+		       0, this,
 		       TQT_SLOT(clearPCache()), actionCollection(), "clear_pcache"));
 
   int i;
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);
 
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index c9ca5a3..7bab765 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -60,7 +60,7 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   // ensure it fits at least 20 characters
   legid->setText( "XXXXXXXXXXXXXXXXXXX" );
   legid->setText( TQString::number(kg->getGID()) );
-  legid->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
+  legid->setValidator( new TQIntValidator(this) );
   legid->setEnabled( mAdd );
   legid->setReadOnly( ro );
   lb->setBuddy( legid );
@@ -78,7 +78,7 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     }
 
     lerid->setCurrentText( TQString::number( sid.getRID() ) );
-    lerid->setValidator (new TQIntValidator(TQT_TQOBJECT(this)) );
+    lerid->setValidator (new TQIntValidator(this) );
     lerid->setEnabled( mAdd );
     connect( lerid, TQT_SIGNAL(activated(int)), TQT_SLOT(ridSelected(int)) );
     lb->setBuddy( lerid );
diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp
index a306a6d..c11c0ca 100644
--- a/kuser/mainWidget.cpp
+++ b/kuser/mainWidget.cpp
@@ -68,45 +68,45 @@ bool mainWidget::queryClose()
 
 void mainWidget::setupActions()
 {
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
   KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
 
-  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection());
+  KStdAction::preferences(this, TQT_SLOT(properties()), actionCollection());
 
 #define BarIconC(x)	BarIcon(TQString::fromLatin1(x))
 
-  (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, TQT_TQOBJECT(md),
+  (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, md,
     TQT_SLOT(useradd()), actionCollection(), "add_user");
 
-  (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_user")), 0, TQT_TQOBJECT(md),
+  (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_user")), 0, md,
     TQT_SLOT(useredit()), actionCollection(), "edit_user");
 
-  (void) new TDEAction(i18n("&Delete..."), TQIconSet(BarIconC("delete_user")), 0, TQT_TQOBJECT(md),
+  (void) new TDEAction(i18n("&Delete..."), TQIconSet(BarIconC("delete_user")), 0, md,
     TQT_SLOT(userdel()), actionCollection(), "delete_user");
 
   (void) new TDEAction(i18n("&Set Password..."),
-    0, TQT_TQOBJECT(md), TQT_SLOT(setpwd()), actionCollection(), "set_password_user");
+    0, md, TQT_SLOT(setpwd()), actionCollection(), "set_password_user");
 
-  (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_group")), 0, TQT_TQOBJECT(md),
+  (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_group")), 0, md,
     TQT_SLOT(grpadd()), actionCollection(), "add_group");
 
-  (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_group")), 0, TQT_TQOBJECT(md),
+  (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_group")), 0, md,
     TQT_SLOT(grpedit()), actionCollection(), "edit_group");
 
-  (void) new TDEAction(i18n("&Delete"), TQIconSet(BarIconC("delete_group")), 0, TQT_TQOBJECT(md),
+  (void) new TDEAction(i18n("&Delete"), TQIconSet(BarIconC("delete_group")), 0, md,
     TQT_SLOT(grpdel()), actionCollection(), "delete_group");
 
-  (void) new TDEAction(i18n("&Reload"), TQIconSet(BarIconC("reload")), 0, TQT_TQOBJECT(this),
+  (void) new TDEAction(i18n("&Reload"), TQIconSet(BarIconC("reload")), 0, this,
     TQT_SLOT(reload()), actionCollection(), "reload");
 
 #undef BarIconC
 	
   (void) new TDEAction(i18n("&Select Connection..."),
-    0, TQT_TQOBJECT(this),
+    0, this,
     TQT_SLOT(selectconn()), actionCollection(), "select_conn");
 
   mShowSys = new TDEToggleAction(i18n("Show System Users/Groups"),
-    0, 0, TQT_TQOBJECT(this),
+    0, 0, this,
     TQT_SLOT(showSys()), actionCollection(), "show_sys");
   mShowSys->setCheckedState(i18n("Hide System Users/Groups"));
   mShowSys->setChecked( kug->kcfg()->showsys() );
@@ -172,7 +172,7 @@ void mainWidget::init()
   }
   md->reloadUsers();
   md->reloadGroups();
-  TQTimer::singleShot( 0, TQT_TQOBJECT(md), TQT_SLOT(slotTabChanged()) );
+  TQTimer::singleShot( 0, md, TQT_SLOT(slotTabChanged()) );
 }
 
 void mainWidget::slotApplySettings()
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index 3e82282..4ffe281 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -117,7 +117,7 @@ void propdlg::initDlg()
 
     leid = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: User Id");
-    leid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame)));
+    leid->setValidator(new TQIntValidator(frame));
     addRow(frame, layout, row++, leid, i18n("&User ID:"), whatstr);
     connect(leid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
@@ -270,7 +270,7 @@ void propdlg::initDlg()
 
     lerid = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Rid");
-    lerid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame)));
+    lerid->setValidator(new TQIntValidator(frame));
     addRow(frame, layout, row++, lerid, i18n("RID:"), whatstr);
     connect(lerid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));