summaryrefslogtreecommitdiffstats
path: root/kuser
diff options
context:
space:
mode:
Diffstat (limited to 'kuser')
-rw-r--r--kuser/addUser.cpp2
-rw-r--r--kuser/editDefaults.cpp10
-rw-r--r--kuser/editGroup.cpp24
-rw-r--r--kuser/generalsettings.ui4
-rw-r--r--kuser/kgroupfiles.cpp2
-rw-r--r--kuser/kgroupldap.cpp16
-rw-r--r--kuser/kuser.cpp4
-rw-r--r--kuser/kuserfiles.cpp2
-rw-r--r--kuser/kuserldap.cpp16
-rw-r--r--kuser/ldapsamba.ui4
-rw-r--r--kuser/main.cpp4
-rw-r--r--kuser/mainView.cpp10
-rw-r--r--kuser/mainWidget.cpp76
-rw-r--r--kuser/misc.cpp2
-rw-r--r--kuser/passwordpolicy.ui4
-rw-r--r--kuser/propdlg.cpp72
-rw-r--r--kuser/selectconn.cpp16
-rw-r--r--kuser/tdeglobal.cpp2
18 files changed, 135 insertions, 135 deletions
diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 06f716a..ed154d5 100644
--- a/kuser/addUser.cpp
+++ b/kuser/addUser.cpp
@@ -49,7 +49,7 @@ addUser::addUser( KU::KUser *AUser, bool useprivategroup,
createhome = new TQCheckBox(i18n("Create home folder"), group);
createhome->setChecked(true);
copyskel = new TQCheckBox(i18n("Copy skeleton"), group);
- connect(createhome, TQT_SIGNAL(toggled(bool)), copyskel, TQT_SLOT(setEnabled(bool)));
+ connect(createhome, TQ_SIGNAL(toggled(bool)), copyskel, TQ_SLOT(setEnabled(bool)));
frontlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
if ( useprivategroup ) pbprigr->setEnabled( false );
diff --git a/kuser/editDefaults.cpp b/kuser/editDefaults.cpp
index b030c2b..37e2a63 100644
--- a/kuser/editDefaults.cpp
+++ b/kuser/editDefaults.cpp
@@ -76,7 +76,7 @@ editDefaults::editDefaults( TDEConfigSkeleton *config, TQWidget *parent, const c
page3->addTab( page3b, i18n("Settings") );
page3c = new LdapSamba( this );
- connect( page3c->domQuery, TQT_SIGNAL(clicked()), TQT_SLOT(slotQueryClicked()) );
+ connect( page3c->domQuery, TQ_SIGNAL(clicked()), TQ_SLOT(slotQueryClicked()) );
page3->addTab( page3c, i18n("Samba") );
addPage( page3, i18n("LDAP"), "", i18n("LDAP Source Settings") );
}
@@ -107,10 +107,10 @@ void editDefaults::slotQueryClicked()
mLdif.startParsing();
TDEIO::Job *job = TDEIO::get( _url, true, false );
// job->addMetaData("no-auth-prompt","true");
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( loadResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQ_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( loadResult( TDEIO::Job* ) ) );
mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true );
mProg->progressBar()->setValue( 0 );
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index c9ca5a3..c5de11e 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,9 +78,9 @@ 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)) );
+ connect( lerid, TQ_SIGNAL(activated(int)), TQ_SLOT(ridSelected(int)) );
lb->setBuddy( lerid );
layout->addWidget( lb, 1, 0 );
layout->addMultiCellWidget( lerid, 1, 1, 1, 2 );
@@ -150,11 +150,11 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
cbsamba = new TQCheckBox( i18n("Disable Samba group information"), page );
layout->addMultiCellWidget( cbsamba, 7, 7, 0, 2 );
- connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledesc, TQT_SLOT(setDisabled(bool)) );
- connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledispname, TQT_SLOT(setDisabled(bool)) );
- connect( cbsamba, TQT_SIGNAL(toggled(bool)), letype, TQT_SLOT(setDisabled(bool)) );
- connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledomsid, TQT_SLOT(setDisabled(bool)) );
- if ( mAdd ) connect( cbsamba, TQT_SIGNAL(toggled(bool)), lerid, TQT_SLOT(setDisabled(bool)) );
+ connect( cbsamba, TQ_SIGNAL(toggled(bool)), ledesc, TQ_SLOT(setDisabled(bool)) );
+ connect( cbsamba, TQ_SIGNAL(toggled(bool)), ledispname, TQ_SLOT(setDisabled(bool)) );
+ connect( cbsamba, TQ_SIGNAL(toggled(bool)), letype, TQ_SLOT(setDisabled(bool)) );
+ connect( cbsamba, TQ_SIGNAL(toggled(bool)), ledomsid, TQ_SLOT(setDisabled(bool)) );
+ if ( mAdd ) connect( cbsamba, TQ_SIGNAL(toggled(bool)), lerid, TQ_SLOT(setDisabled(bool)) );
if ( !mAdd ) cbsamba->setChecked( !( kg->getCaps() & KU::KGroup::Cap_Samba ) );
}
@@ -176,8 +176,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
layout->addWidget( m_list_notin, 8, 2 );
// TQString whatstr = i18n("Select the users that should be in this kg->");
// TQWhatsThis::add(m_list, whatstr);
-// connect(this,TQT_SIGNAL(okClicked(void)),
- //this,TQT_SLOT(okClicked()));
+// connect(this,TQ_SIGNAL(okClicked(void)),
+ //this,TQ_SLOT(okClicked()));
for (unsigned int i = 0; i<kug->getUsers().count(); i++) {
@@ -192,8 +192,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
}
}
- connect(btadd, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()));
- connect(btdel, TQT_SIGNAL(clicked()), TQT_SLOT(delClicked()));
+ connect(btadd, TQ_SIGNAL(clicked()), TQ_SLOT(addClicked()));
+ connect(btdel, TQ_SIGNAL(clicked()), TQ_SLOT(delClicked()));
if ( ro ) {
btadd->setEnabled( false );
diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui
index f6e4be4..bcf56e5 100644
--- a/kuser/generalsettings.ui
+++ b/kuser/generalsettings.ui
@@ -233,9 +233,9 @@
<tabstop>kcfg_copySkel</tabstop>
<tabstop>kcfg_userPrivateGroup</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>kcfg_createHomeDir_toggled( bool )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index b827a89..7466d91 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -35,7 +35,7 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include "kglobal_.h"
diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp
index c969e19..977cb06 100644
--- a/kuser/kgroupldap.cpp
+++ b/kuser/kgroupldap.cpp
@@ -170,10 +170,10 @@ bool KGroupLDAP::reload()
ldif = "";
TDEIO::Job *job = TDEIO::get( mUrl, true, false );
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( result( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( result( TDEIO::Job* ) ) );
mProg->exec();
if ( mCancel ) job->kill();
@@ -193,10 +193,10 @@ bool KGroupLDAP::dbcommit()
mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true );
TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false );
- connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
- this, TQT_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( result( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+ this, TQ_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( result( TDEIO::Job* ) ) );
mProg->exec();
return( mOk );
}
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index ffe24f1..687cf44 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -37,9 +37,9 @@
#include "kglobal_.h"
#include "kuser.h"
#include "misc.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index 4cf59c8..2d9bef5 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -40,7 +40,7 @@
#include "kglobal_.h"
#include "kuserfiles.h"
#include "misc.h"
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <kdebug.h>
#include "editDefaults.h"
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index a136b61..5ad7836 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -248,10 +248,10 @@ bool KUserLDAP::reload()
ldif = "";
TDEIO::Job *job = TDEIO::get( mUrl, true, false );
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( result( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( result( TDEIO::Job* ) ) );
// job->addMetaData( "SERVER_CTRL0", "1.2.840.113556.1.4.473 true: uidNumber");
mProg->exec();
if ( mCancel ) job->kill();
@@ -610,10 +610,10 @@ bool KUserLDAP::dbcommit()
mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true );
TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false );
- connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
- this, TQT_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( result( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+ this, TQ_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( result( TDEIO::Job* ) ) );
mProg->exec();
return( mOk );
}
diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui
index ed4e248..aea4ecf 100644
--- a/kuser/ldapsamba.ui
+++ b/kuser/ldapsamba.ui
@@ -355,9 +355,9 @@
<tabstop>kcfg_samdomsid</tabstop>
<tabstop>domQuery</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>kcfg_ldapsam_toggled( bool )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/kuser/main.cpp b/kuser/main.cpp
index af623ce..06e3ad6 100644
--- a/kuser/main.cpp
+++ b/kuser/main.cpp
@@ -52,9 +52,9 @@ int main(int argc, char **argv)
TDEApplication a;
- kapp->sharedConfig()->setGroup( "general" );
+ tdeApp->sharedConfig()->setGroup( "general" );
kug = new KUserGlobals();
- kug->initCfg( kapp->sharedConfig()->readEntry( "connection", "default" ) );
+ kug->initCfg( tdeApp->sharedConfig()->readEntry( "connection", "default" ) );
mw = new mainWidget("kuser");
a.setMainWidget(mw);
diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp
index eae6ef8..9533b54 100644
--- a/kuser/mainView.cpp
+++ b/kuser/mainView.cpp
@@ -52,13 +52,13 @@ void mainView::init() {
lbgroups = new KGroupView( this, "lbgroups" );
addTab( lbgroups, i18n("Groups"));
- connect(lbusers, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(userSelected()));
- connect(lbusers, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(userSelected()));
+ connect(lbusers, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(userSelected()));
+ connect(lbusers, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(userSelected()));
- connect(lbgroups, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(groupSelected()));
- connect(lbgroups, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(groupSelected()));
+ connect(lbgroups, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(groupSelected()));
+ connect(lbgroups, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(groupSelected()));
- connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(slotTabChanged()));
+ connect(this, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(slotTabChanged()));
}
mainView::~mainView()
diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp
index a306a6d..9e6fa54 100644
--- a/kuser/mainWidget.cpp
+++ b/kuser/mainWidget.cpp
@@ -68,46 +68,46 @@ bool mainWidget::queryClose()
void mainWidget::setupActions()
{
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+ KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(properties()), actionCollection());
#define BarIconC(x) BarIcon(TQString::fromLatin1(x))
- (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, TQT_TQOBJECT(md),
- TQT_SLOT(useradd()), actionCollection(), "add_user");
+ (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, md,
+ TQ_SLOT(useradd()), actionCollection(), "add_user");
- (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_user")), 0, TQT_TQOBJECT(md),
- TQT_SLOT(useredit()), actionCollection(), "edit_user");
+ (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_user")), 0, md,
+ TQ_SLOT(useredit()), actionCollection(), "edit_user");
- (void) new TDEAction(i18n("&Delete..."), TQIconSet(BarIconC("delete_user")), 0, TQT_TQOBJECT(md),
- TQT_SLOT(userdel()), actionCollection(), "delete_user");
+ (void) new TDEAction(i18n("&Delete..."), TQIconSet(BarIconC("delete_user")), 0, md,
+ TQ_SLOT(userdel()), actionCollection(), "delete_user");
(void) new TDEAction(i18n("&Set Password..."),
- 0, TQT_TQOBJECT(md), TQT_SLOT(setpwd()), actionCollection(), "set_password_user");
+ 0, md, TQ_SLOT(setpwd()), actionCollection(), "set_password_user");
- (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_group")), 0, TQT_TQOBJECT(md),
- TQT_SLOT(grpadd()), actionCollection(), "add_group");
+ (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_group")), 0, md,
+ TQ_SLOT(grpadd()), actionCollection(), "add_group");
- (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_group")), 0, TQT_TQOBJECT(md),
- TQT_SLOT(grpedit()), actionCollection(), "edit_group");
+ (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_group")), 0, md,
+ TQ_SLOT(grpedit()), actionCollection(), "edit_group");
- (void) new TDEAction(i18n("&Delete"), TQIconSet(BarIconC("delete_group")), 0, TQT_TQOBJECT(md),
- TQT_SLOT(grpdel()), actionCollection(), "delete_group");
+ (void) new TDEAction(i18n("&Delete"), TQIconSet(BarIconC("delete_group")), 0, md,
+ TQ_SLOT(grpdel()), actionCollection(), "delete_group");
- (void) new TDEAction(i18n("&Reload"), TQIconSet(BarIconC("reload")), 0, TQT_TQOBJECT(this),
- TQT_SLOT(reload()), actionCollection(), "reload");
+ (void) new TDEAction(i18n("&Reload"), TQIconSet(BarIconC("reload")), 0, this,
+ TQ_SLOT(reload()), actionCollection(), "reload");
#undef BarIconC
(void) new TDEAction(i18n("&Select Connection..."),
- 0, TQT_TQOBJECT(this),
- TQT_SLOT(selectconn()), actionCollection(), "select_conn");
+ 0, this,
+ TQ_SLOT(selectconn()), actionCollection(), "select_conn");
mShowSys = new TDEToggleAction(i18n("Show System Users/Groups"),
- 0, 0, TQT_TQOBJECT(this),
- TQT_SLOT(showSys()), actionCollection(), "show_sys");
+ 0, 0, this,
+ TQ_SLOT(showSys()), actionCollection(), "show_sys");
mShowSys->setCheckedState(i18n("Hide System Users/Groups"));
mShowSys->setChecked( kug->kcfg()->showsys() );
}
@@ -123,7 +123,7 @@ void mainWidget::showSys()
void mainWidget::properties()
{
editDefaults *eddlg = new editDefaults( kug->kcfg(), this );
- connect(eddlg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplySettings()));
+ connect(eddlg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplySettings()));
eddlg->show();
}
@@ -147,14 +147,14 @@ void mainWidget::init()
actionCollection()->action("delete_user")->setEnabled( rw );
actionCollection()->action("set_password_user")->setEnabled( rw );
if ( rw ) {
- connect( md, TQT_SIGNAL(userSelected(bool)),
- actionCollection()->action("edit_user"), TQT_SLOT(setEnabled(bool)) );
- connect( md, TQT_SIGNAL(userSelected(bool)),
- actionCollection()->action("delete_user"), TQT_SLOT(setEnabled(bool)) );
- connect( md, TQT_SIGNAL(userSelected(bool)),
- actionCollection()->action("set_password_user"), TQT_SLOT(setEnabled(bool)) );
+ connect( md, TQ_SIGNAL(userSelected(bool)),
+ actionCollection()->action("edit_user"), TQ_SLOT(setEnabled(bool)) );
+ connect( md, TQ_SIGNAL(userSelected(bool)),
+ actionCollection()->action("delete_user"), TQ_SLOT(setEnabled(bool)) );
+ connect( md, TQ_SIGNAL(userSelected(bool)),
+ actionCollection()->action("set_password_user"), TQ_SLOT(setEnabled(bool)) );
} else {
- disconnect( md, TQT_SIGNAL(userSelected(bool)), 0, 0 );
+ disconnect( md, TQ_SIGNAL(userSelected(bool)), 0, 0 );
}
rw = ! ( kug->getGroups().getCaps() & KU::KGroups::Cap_ReadOnly );
@@ -163,16 +163,16 @@ void mainWidget::init()
actionCollection()->action("edit_group")->setEnabled( rw );
actionCollection()->action("delete_group")->setEnabled( rw );
if ( rw ) {
- connect( md, TQT_SIGNAL(groupSelected(bool)),
- actionCollection()->action("edit_group"), TQT_SLOT(setEnabled(bool)) );
- connect( md, TQT_SIGNAL(groupSelected(bool)),
- actionCollection()->action("delete_group"), TQT_SLOT(setEnabled(bool)) );
+ connect( md, TQ_SIGNAL(groupSelected(bool)),
+ actionCollection()->action("edit_group"), TQ_SLOT(setEnabled(bool)) );
+ connect( md, TQ_SIGNAL(groupSelected(bool)),
+ actionCollection()->action("delete_group"), TQ_SLOT(setEnabled(bool)) );
} else {
- disconnect( md, TQT_SIGNAL(groupSelected(bool)), 0, 0 );
+ disconnect( md, TQ_SIGNAL(groupSelected(bool)), 0, 0 );
}
md->reloadUsers();
md->reloadGroups();
- TQTimer::singleShot( 0, TQT_TQOBJECT(md), TQT_SLOT(slotTabChanged()) );
+ TQTimer::singleShot( 0, md, TQ_SLOT(slotTabChanged()) );
}
void mainWidget::slotApplySettings()
@@ -193,8 +193,8 @@ void mainWidget::slotApplyConnection()
void mainWidget::selectconn()
{
sc = new SelectConn( kug->kcfg()->connection(), this, "selectconn" );
- connect( sc, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotApplyConnection()) );
- connect( sc, TQT_SIGNAL(okClicked()), TQT_SLOT(slotApplyConnection()) );
+ connect( sc, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotApplyConnection()) );
+ connect( sc, TQ_SIGNAL(okClicked()), TQ_SLOT(slotApplyConnection()) );
sc->show();
}
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index 84ffa81..febd3b6 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -139,7 +139,7 @@ TQCString genSalt( int len )
salt[0] = set[getpid() % strlen(set)];
for( int i = 1; i < len; i++ ) {
- salt[i] = set[kapp->random() % strlen(set)];
+ salt[i] = set[tdeApp->random() % strlen(set)];
}
return salt;
}
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index fb4b246..2730bbd 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -232,9 +232,9 @@
<tabstop>kcfg_sinact</tabstop>
<tabstop>kcfg_sneverexpire</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>kcfg_sneverexpire_toggled( bool )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kdatetimewidget.h</include>
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index 3e82282..7693d6d 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -86,7 +86,7 @@ KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *layout, int r
}
layout->addWidget( days, row, 2 );
- connect(days, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
+ connect(days, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
layout->addWidget( nc, row, 3 );
@@ -117,33 +117,33 @@ 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()));
+ connect(leid, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
if ( !ro ) {
pbsetpwd = new TQPushButton(i18n("Set &Password..."), frame);
layout->addWidget(pbsetpwd, 0, 2);
- connect(pbsetpwd, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpwd()));
+ connect(pbsetpwd, TQ_SIGNAL(clicked()), this, TQ_SLOT(setpwd()));
}
lefname = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Full Name");
addRow(frame, layout, row++, lefname, i18n("Full &name:"), whatstr);
- connect(lefname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(lefname, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
lefname->setFocus();
if ( kug->getUsers().getCaps() & KU::KUsers::Cap_InetOrg ) {
lesurname = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Surname");
addRow(frame, layout, row++, lesurname, i18n("Surname:"), whatstr);
- connect(lesurname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(lesurname, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
lemail = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Email");
addRow(frame, layout, row++, lemail, i18n("Email address:"), whatstr);
- connect(lemail, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(lemail, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
}
leshell = new KComboBox(true, frame);
@@ -153,13 +153,13 @@ void propdlg::initDlg()
TQStringList shells = readShells();
shells.sort();
leshell->insertStringList(shells);
- connect(leshell, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(changed()));
- connect(leshell, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leshell, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(changed()));
+ connect(leshell, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Login Shell");
addRow(frame, layout, row++, leshell, i18n("&Login shell:"), whatstr);
lehome = new KLineEdit(frame);
- connect(lehome, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(lehome, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Home Directory");
addRow(frame, layout, row++, lehome, i18n("&Home folder:"), whatstr);
@@ -167,48 +167,48 @@ void propdlg::initDlg()
// differently than Linux.
if ( kug->getUsers().getCaps() & KU::KUsers::Cap_BSD ) {
leoffice = new KLineEdit(frame);
- connect(leoffice, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leoffice, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Office");
addRow(frame, layout, row++, leoffice, i18n("&Office:"), whatstr);
leophone = new KLineEdit(frame);
- connect(leophone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leophone, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Office Phone");
addRow(frame, layout, row++, leophone, i18n("Offi&ce Phone:"), whatstr);
lehphone = new KLineEdit(frame);
- connect(lehphone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(lehphone, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Home Phone");
addRow(frame, layout, row++, lehphone, i18n("Ho&me Phone:"), whatstr);
leclass = new KLineEdit(frame);
- connect(leclass, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leclass, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Login class");
addRow(frame, layout, row++, leclass, i18n("Login class:"), whatstr, true);
} else {
leoffice1 = new KLineEdit(frame);
- connect(leoffice1, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leoffice1, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Office1");
addRow(frame, layout, row++, leoffice1, i18n("&Office #1:"), whatstr);
leoffice2 = new KLineEdit(frame);
- connect(leoffice2, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leoffice2, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Office2");
addRow(frame, layout, row++, leoffice2, i18n("O&ffice #2:"), whatstr);
leaddress = new KLineEdit(frame);
- connect(leaddress, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leaddress, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Address");
addRow(frame, layout, row++, leaddress, i18n("&Address:"), whatstr);
}
cbdisabled = new TQCheckBox(frame);
- connect(cbdisabled, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
+ connect(cbdisabled, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
addRow(frame, layout, row++, cbdisabled, i18n("Account &disabled"), whatstr);
if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Disable_POSIX ) {
cbposix = new TQCheckBox(frame);
- connect(cbposix, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
- connect(cbposix, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(cbposixChanged()));
+ connect(cbposix, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
+ connect(cbposix, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(cbposixChanged()));
addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
} else {
cbposix = 0;
@@ -257,9 +257,9 @@ void propdlg::initDlg()
cbexpire = new TQCheckBox( i18n("Never"), frame );
layout->addWidget( cbexpire, row++, 3 );
- connect( lesexpire, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(changed()) );
- connect( cbexpire, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
- connect( cbexpire, TQT_SIGNAL(toggled(bool)), lesexpire, TQT_SLOT(setDisabled(bool)) );
+ connect( lesexpire, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(changed()) );
+ connect( cbexpire, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) );
+ connect( cbexpire, TQ_SIGNAL(toggled(bool)), lesexpire, TQ_SLOT(setDisabled(bool)) );
}
// Tab 3: Samba
@@ -270,48 +270,48 @@ 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()));
+ connect(lerid, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
leliscript = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
addRow(frame, layout, row++, leliscript, i18n("Login script:"), whatstr);
- connect(leliscript, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leliscript, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
leprofile = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
addRow(frame, layout, row++, leprofile, i18n("Profile path:"), whatstr);
- connect(leprofile, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leprofile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
lehomedrive = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
addRow(frame, layout, row++, lehomedrive, i18n("Home drive:"), whatstr);
- connect(lehomedrive, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(lehomedrive, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
lehomepath = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
addRow(frame, layout, row++, lehomepath, i18n("Home path:"), whatstr);
- connect(lehomepath, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(lehomepath, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
leworkstations = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
addRow(frame, layout, row++, leworkstations, i18n("User workstations:"), whatstr);
- connect(leworkstations, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(leworkstations, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
ledomain = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
addRow(frame, layout, row++, ledomain, i18n("Domain name:"), whatstr);
- connect(ledomain, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(ledomain, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
ledomsid = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
addRow(frame, layout, row++, ledomsid, i18n("Domain SID:"), whatstr);
- connect(ledomsid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
+ connect(ledomsid, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed()));
cbsamba = new TQCheckBox(frame);
- connect(cbsamba, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
- connect(cbsamba, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(cbsambaChanged()));
+ connect(cbsamba, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()));
+ connect(cbsamba, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(cbsambaChanged()));
addRow(frame, layout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
}
@@ -332,9 +332,9 @@ void propdlg::initDlg()
if ( !ro ) {
pbprigr = new TQPushButton( i18n("Set as Primary"), frame );
layout->addWidget( pbprigr, 1, 1 );
- connect( pbprigr, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpgroup()) );
+ connect( pbprigr, TQ_SIGNAL(clicked()), this, TQ_SLOT(setpgroup()) );
}
- connect( lstgrp, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(gchanged()) );
+ connect( lstgrp, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(gchanged()) );
}
}
diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp
index 30066f0..67a38cb 100644
--- a/kuser/selectconn.cpp
+++ b/kuser/selectconn.cpp
@@ -50,7 +50,7 @@ SelectConn::SelectConn(const TQString &selected, TQWidget* parent, const char *
mSelected = selected;
kdDebug() << "selected item: " << mSelected << endl;
- conns = kapp->sharedConfig()->groupList();
+ conns = tdeApp->sharedConfig()->groupList();
TQStringList::iterator it = conns.begin();
int i = 0, sel = 0;
while ( it != conns.end() ) {
@@ -80,15 +80,15 @@ void SelectConn::slotUser3()
newconn = KInputDialog::getText( TQString(),
i18n("Please type the name of the new connection:") );
if ( newconn.isEmpty() ) return;
- if ( kapp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) {
+ if ( tdeApp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) {
KMessageBox::sorry( 0, i18n("A connection with this name already exists.") );
return;
}
- KUserPrefsBase kcfg( kapp->sharedConfig(), newconn );
+ KUserPrefsBase kcfg( tdeApp->sharedConfig(), newconn );
editDefaults eddlg( &kcfg, this );
- connect(&eddlg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotNewApplySettings()));
+ connect(&eddlg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotNewApplySettings()));
eddlg.exec();
if ( newconn.isEmpty() )
@@ -107,11 +107,11 @@ void SelectConn::slotNewApplySettings()
void SelectConn::slotUser2()
{
kdDebug() << "slotUser2: " << connSelected() << endl;
- KUserPrefsBase kcfg( kapp->sharedConfig(), connSelected() );
+ KUserPrefsBase kcfg( tdeApp->sharedConfig(), connSelected() );
kcfg.readConfig();
editDefaults eddlg( &kcfg, this );
- connect( &eddlg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplySettings()) );
+ connect( &eddlg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplySettings()) );
eddlg.exec();
}
@@ -122,8 +122,8 @@ void SelectConn::slotUser1()
if ( KMessageBox::warningContinueCancel( 0, i18n("Do you really want to delete the connection '%1'?").
arg( conn ),i18n("Delete Connection"),KStdGuiItem::del() ) == KMessageBox::Cancel ) return;
- kapp->sharedConfig()->deleteGroup( "connection-" + conn, true );
- kapp->sharedConfig()->sync();
+ tdeApp->sharedConfig()->deleteGroup( "connection-" + conn, true );
+ tdeApp->sharedConfig()->sync();
mCombo->removeItem( mCombo->currentItem() );
if ( mCombo->count() == 0 ) {
mCombo->insertItem( "default" );
diff --git a/kuser/tdeglobal.cpp b/kuser/tdeglobal.cpp
index 287f475..479125c 100644
--- a/kuser/tdeglobal.cpp
+++ b/kuser/tdeglobal.cpp
@@ -42,7 +42,7 @@ void KUserGlobals::initCfg( const TQString &connection )
cfg->writeConfig();
delete cfg;
}
- cfg = new KUserPrefsBase( kapp->sharedConfig(), connection );
+ cfg = new KUserPrefsBase( tdeApp->sharedConfig(), connection );
cfg->readConfig();
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-23 01:57:01 +0000