Replace various '#define' strings - part 6

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

3 files changed, 17 insertions, 17 deletions

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()));