summaryrefslogtreecommitdiffstats
path: root/kuser
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:17:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:17:29 -0600
commit38a31bafc0c0c68b4cb7c0606bac55bbef7c8b69 (patch)
tree8abdf61ff3720b7056a0cf1bc3bbbcf334252c31 /kuser
parent6b7a8ff33a6383be4a9dea3c4225d142aab79b78 (diff)
downloadtdeadmin-38a31bafc0c0c68b4cb7c0606bac55bbef7c8b69.tar.gz
tdeadmin-38a31bafc0c0c68b4cb7c0606bac55bbef7c8b69.zip
Rename obsolete tq methods to standard names
Diffstat (limited to 'kuser')
-rw-r--r--kuser/addUser.cpp2
-rw-r--r--kuser/editGroup.cpp38
-rw-r--r--kuser/generalsettings.ui6
-rw-r--r--kuser/ldapsamba.ui6
-rw-r--r--kuser/ldapsettings.ui2
-rw-r--r--kuser/passwordpolicy.ui4
-rw-r--r--kuser/propdlg.cpp112
-rw-r--r--kuser/propdlg.h6
8 files changed, 88 insertions, 88 deletions
diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 8021f9e..24181b9 100644
--- a/kuser/addUser.cpp
+++ b/kuser/addUser.cpp
@@ -50,7 +50,7 @@ addUser::addUser( KU::KUser *AUser, bool useprivategroup,
createhome->setChecked(true);
copyskel = new TQCheckBox(i18n("Copy skeleton"), group);
connect(createhome, TQT_SIGNAL(toggled(bool)), copyskel, TQT_SLOT(setEnabled(bool)));
- fronttqlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
+ frontlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
if ( useprivategroup ) pbprigr->setEnabled( false );
}
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index afb0da3..02fce6f 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -51,7 +51,7 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
rid.rid = 514; rid.name = i18n("Domain Guests"); rid.desc = i18n("Guests"); mRids.append( rid );
TQFrame *page = makeMainWidget();
- TQGridLayout *tqlayout = new TQGridLayout( page, 10, 3, marginHint(), spacingHint() );
+ TQGridLayout *layout = new TQGridLayout( page, 10, 3, marginHint(), spacingHint() );
TQLabel *lb;
lb = new TQLabel( page );
@@ -64,8 +64,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
legid->setEnabled( mAdd );
legid->setReadOnly( ro );
lb->setBuddy( legid );
- tqlayout->addWidget( lb, 0, 0 );
- tqlayout->addMultiCellWidget( legid, 0, 0, 1, 2 );
+ layout->addWidget( lb, 0, 0 );
+ layout->addMultiCellWidget( legid, 0, 0, 1, 2 );
if ( mSamba ) {
lb = new TQLabel( page );
@@ -82,8 +82,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
lerid->setEnabled( mAdd );
connect( lerid, TQT_SIGNAL(activated(int)), TQT_SLOT(ridSelected(int)) );
lb->setBuddy( lerid );
- tqlayout->addWidget( lb, 1, 0 );
- tqlayout->addMultiCellWidget( lerid, 1, 1, 1, 2 );
+ layout->addWidget( lb, 1, 0 );
+ layout->addMultiCellWidget( lerid, 1, 1, 1, 2 );
}
lb = new TQLabel( page );
@@ -96,8 +96,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
legrpname->setReadOnly( ro );
legrpname->setFocus();
lb->setBuddy( legrpname );
- tqlayout->addWidget( lb, 2, 0 );
- tqlayout->addMultiCellWidget( legrpname, 2, 2, 1, 2 );
+ layout->addWidget( lb, 2, 0 );
+ layout->addMultiCellWidget( legrpname, 2, 2, 1, 2 );
if ( mSamba ) {
lb = new TQLabel( page );
@@ -106,8 +106,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
ledesc->setText( kg->getDesc() );
ledesc->setReadOnly( ro );
lb->setBuddy( ledesc );
- tqlayout->addWidget( lb, 3, 0 );
- tqlayout->addMultiCellWidget( ledesc, 3, 3, 1, 2 );
+ layout->addWidget( lb, 3, 0 );
+ layout->addMultiCellWidget( ledesc, 3, 3, 1, 2 );
lb = new TQLabel( page );
lb->setText(i18n("Display name:"));
@@ -115,8 +115,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
ledispname->setText( kg->getDisplayName() );
ledispname->setReadOnly( ro );
lb->setBuddy( ledispname );
- tqlayout->addWidget( lb, 4, 0 );
- tqlayout->addMultiCellWidget( ledispname, 4, 4, 1, 2 );
+ layout->addWidget( lb, 4, 0 );
+ layout->addMultiCellWidget( ledispname, 4, 4, 1, 2 );
lb = new TQLabel( page );
lb->setText(i18n("Type:"));
@@ -136,8 +136,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
break;
}
lb->setBuddy( letype );
- tqlayout->addWidget( lb, 5, 0 );
- tqlayout->addMultiCellWidget( letype, 5, 5, 1, 2 );
+ layout->addWidget( lb, 5, 0 );
+ layout->addMultiCellWidget( letype, 5, 5, 1, 2 );
lb = new TQLabel( page );
lb->setText(i18n("Domain SID:"));
@@ -145,11 +145,11 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
ledomsid->setText( sid.getDOM() );
ledomsid->setReadOnly( ro );
lb->setBuddy( ledomsid );
- tqlayout->addWidget( lb, 6, 0 );
- tqlayout->addMultiCellWidget( ledomsid, 6, 6, 1, 2 );
+ layout->addWidget( lb, 6, 0 );
+ layout->addMultiCellWidget( ledomsid, 6, 6, 1, 2 );
cbsamba = new TQCheckBox( i18n("Disable Samba group information"), page );
- tqlayout->addMultiCellWidget( cbsamba, 7, 7, 0, 2 );
+ 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)) );
@@ -162,18 +162,18 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
m_list_in->setFullWidth(true); // Single column, full widget width.
m_list_in->addColumn(i18n("Users in Group"));
m_list_in->setSelectionMode( TQListView::Extended );
- tqlayout->addWidget( m_list_in, 8, 0 );
+ layout->addWidget( m_list_in, 8, 0 );
TQVBox *vbox = new TQVBox(page);
TQPushButton *btadd = new TQPushButton(i18n("Add <-"), vbox);
TQPushButton *btdel = new TQPushButton(i18n("Remove ->"), vbox);
- tqlayout->addWidget( vbox, 8, 1 );
+ layout->addWidget( vbox, 8, 1 );
m_list_notin = new KListView(page);
m_list_notin->setFullWidth(true); // Single column, full widget width.
m_list_notin->addColumn(i18n("Users NOT in Group"));
m_list_notin->setSelectionMode(TQListView::Extended);
- tqlayout->addWidget( m_list_notin, 8, 2 );
+ 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)),
diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui
index 8c6eb91..2efcab5 100644
--- a/kuser/generalsettings.ui
+++ b/kuser/generalsettings.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@@ -155,7 +155,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui
index 578894a..7dff3a1 100644
--- a/kuser/ldapsamba.ui
+++ b/kuser/ldapsamba.ui
@@ -40,7 +40,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@@ -152,7 +152,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -220,7 +220,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kuser/ldapsettings.ui b/kuser/ldapsettings.ui
index fa24b2a..6466874 100644
--- a/kuser/ldapsettings.ui
+++ b/kuser/ldapsettings.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index cc662be..e14a809 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -26,7 +26,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -157,7 +157,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index e1fb80e..1a375c5 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -38,38 +38,38 @@
#include "kglobal_.h"
#include "misc.h"
-void propdlg::addRow(TQWidget *parent, TQGridLayout *tqlayout, int row,
+void propdlg::addRow(TQWidget *parent, TQGridLayout *layout, int row,
TQWidget *widget, const TQString &label, const TQString &what,
bool two_column, bool nochange)
{
TQLabel *lab = new TQLabel(widget, label, parent);
lab->setMinimumSize(lab->sizeHint());
widget->setMinimumSize(widget->sizeHint());
- tqlayout->addWidget(lab, row, 0);
+ layout->addWidget(lab, row, 0);
if (!what.isEmpty())
{
TQWhatsThis::add(lab, what);
TQWhatsThis::add(widget, what);
}
if (two_column)
- tqlayout->addMultiCellWidget(widget, row, row, 1, 2);
+ layout->addMultiCellWidget(widget, row, row, 1, 2);
else
- tqlayout->addWidget(widget, row, 1);
+ layout->addWidget(widget, row, 1);
if ( !nochange || ro ) return;
TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
- tqlayout->addWidget( nc, row, 3 );
+ layout->addWidget( nc, row, 3 );
nc->hide();
mNoChanges[ widget ] = nc;
}
-KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *tqlayout, int row,
+KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *layout, int row,
const TQString &title, bool never)
{
KIntSpinBox *days;
TQLabel *label = new TQLabel( title, parent );
- tqlayout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
+ layout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
days = new KIntSpinBox( parent );
label->setBuddy( days );
@@ -84,12 +84,12 @@ KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *tqlayout, int
{
days->setMinValue( 0 );
}
- tqlayout->addWidget( days, row, 2 );
+ layout->addWidget( days, row, 2 );
connect(days, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
- tqlayout->addWidget( nc, row, 3 );
+ layout->addWidget( nc, row, 3 );
nc->hide();
mNoChanges[ days ] = nc;
@@ -105,44 +105,44 @@ void propdlg::initDlg()
// Tab 1: User Info
{
TQFrame *frame = addPage(i18n("User Info"));
- TQGridLayout *tqlayout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
+ TQGridLayout *layout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
int row = 0;
frontpage = frame;
- fronttqlayout = tqlayout;
+ frontlayout = layout;
lbuser = new TQLabel(frame);
// whatstr = i18n("WHAT IS THIS: User login");
- addRow(frame, tqlayout, row++, lbuser, i18n("User login:"), whatstr, false, false);
+ addRow(frame, layout, row++, lbuser, i18n("User login:"), whatstr, false, false);
leid = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: User Id");
leid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame)));
- addRow(frame, tqlayout, row++, leid, i18n("&User ID:"), whatstr);
+ addRow(frame, layout, row++, leid, i18n("&User ID:"), whatstr);
connect(leid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
if ( !ro ) {
pbsetpwd = new TQPushButton(i18n("Set &Password..."), frame);
- tqlayout->addWidget(pbsetpwd, 0, 2);
+ layout->addWidget(pbsetpwd, 0, 2);
connect(pbsetpwd, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpwd()));
}
lefname = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Full Name");
- addRow(frame, tqlayout, row++, lefname, i18n("Full &name:"), whatstr);
+ addRow(frame, layout, row++, lefname, i18n("Full &name:"), whatstr);
connect(lefname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
lefname->setFocus();
if ( kug->getUsers().getCaps() & KU::KUsers::Cap_InetOrg ) {
lesurname = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Surname");
- addRow(frame, tqlayout, row++, lesurname, i18n("Surname:"), whatstr);
+ addRow(frame, layout, row++, lesurname, i18n("Surname:"), whatstr);
connect(lesurname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
lemail = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Email");
- addRow(frame, tqlayout, row++, lemail, i18n("Email address:"), whatstr);
+ addRow(frame, layout, row++, lemail, i18n("Email address:"), whatstr);
connect(lemail, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
}
@@ -156,12 +156,12 @@ void propdlg::initDlg()
connect(leshell, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(changed()));
connect(leshell, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Login Shell");
- addRow(frame, tqlayout, row++, leshell, i18n("&Login shell:"), whatstr);
+ addRow(frame, layout, row++, leshell, i18n("&Login shell:"), whatstr);
lehome = new KLineEdit(frame);
connect(lehome, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Home Directory");
- addRow(frame, tqlayout, row++, lehome, i18n("&Home folder:"), whatstr);
+ addRow(frame, layout, row++, lehome, i18n("&Home folder:"), whatstr);
// FreeBSD appears to use the comma separated fields in the GECOS entry
// differently than Linux.
@@ -169,47 +169,47 @@ void propdlg::initDlg()
leoffice = new KLineEdit(frame);
connect(leoffice, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Office");
- addRow(frame, tqlayout, row++, leoffice, i18n("&Office:"), whatstr);
+ addRow(frame, layout, row++, leoffice, i18n("&Office:"), whatstr);
leophone = new KLineEdit(frame);
connect(leophone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Office Phone");
- addRow(frame, tqlayout, row++, leophone, i18n("Offi&ce Phone:"), whatstr);
+ 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()));
// whatstr = i18n("WHAT IS THIS: Home Phone");
- addRow(frame, tqlayout, row++, lehphone, i18n("Ho&me Phone:"), whatstr);
+ 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()));
// whatstr = i18n("WHAT IS THIS: Login class");
- addRow(frame, tqlayout, row++, leclass, i18n("Login class:"), whatstr, true);
+ 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()));
// whatstr = i18n("WHAT IS THIS: Office1");
- addRow(frame, tqlayout, row++, leoffice1, i18n("&Office #1:"), whatstr);
+ addRow(frame, layout, row++, leoffice1, i18n("&Office #1:"), whatstr);
leoffice2 = new KLineEdit(frame);
connect(leoffice2, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
// whatstr = i18n("WHAT IS THIS: Office2");
- addRow(frame, tqlayout, row++, leoffice2, i18n("O&ffice #2:"), whatstr);
+ 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()));
// whatstr = i18n("WHAT IS THIS: Address");
- addRow(frame, tqlayout, row++, leaddress, i18n("&Address:"), whatstr);
+ addRow(frame, layout, row++, leaddress, i18n("&Address:"), whatstr);
}
cbdisabled = new TQCheckBox(frame);
connect(cbdisabled, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
- addRow(frame, tqlayout, row++, cbdisabled, i18n("Account &disabled"), whatstr);
+ 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()));
- addRow(frame, tqlayout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
+ addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
} else {
cbposix = 0;
}
@@ -222,40 +222,40 @@ void propdlg::initDlg()
// Tab 2 : Password Management
TQFrame *frame = addPage(i18n("Password Management"));
- TQGridLayout *tqlayout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
+ TQGridLayout *layout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
int row = 0;
TQDateTime time;
leslstchg = new TQLabel(frame);
- addRow(frame, tqlayout, row++, leslstchg, i18n("Last password change:"), TQString(), true);
+ addRow(frame, layout, row++, leslstchg, i18n("Last password change:"), TQString(), true);
- tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+ layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
row++;
if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Shadow ) {
- tqlayout->addWidget( new TQLabel( i18n("POSIX parameters:"), frame ), row++, 0 );
- lesmin = addDaysGroup(frame, tqlayout, row++, i18n("Time before password may &not be changed after last password change:"), false);
- lesmax = addDaysGroup(frame, tqlayout, row++, i18n("Time when password &expires after last password change:") );
- leswarn = addDaysGroup(frame, tqlayout, row++, i18n("Time before password expires to &issue an expire warning:"));
- lesinact = addDaysGroup(frame, tqlayout, row++, i18n("Time when account will be &disabled after expiration of password:"));
- tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+ layout->addWidget( new TQLabel( i18n("POSIX parameters:"), frame ), row++, 0 );
+ lesmin = addDaysGroup(frame, layout, row++, i18n("Time before password may &not be changed after last password change:"), false);
+ lesmax = addDaysGroup(frame, layout, row++, i18n("Time when password &expires after last password change:") );
+ leswarn = addDaysGroup(frame, layout, row++, i18n("Time before password expires to &issue an expire warning:"));
+ lesinact = addDaysGroup(frame, layout, row++, i18n("Time when account will be &disabled after expiration of password:"));
+ layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
row++;
}
/*
if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) {
- tqlayout->addWidget( new TQLabel( "SAMBA parameters:", frame ), row++, 0 );
- tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+ layout->addWidget( new TQLabel( "SAMBA parameters:", frame ), row++, 0 );
+ layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
row++;
}
*/
TQLabel *label = new TQLabel( i18n("&Account will expire on:"), frame );
- tqlayout->addWidget( label, row, 0 );
+ layout->addWidget( label, row, 0 );
lesexpire = new KDateTimeWidget( frame );
label->setBuddy( lesexpire );
- tqlayout->addMultiCellWidget( lesexpire, row, row, 1, 2);
+ layout->addMultiCellWidget( lesexpire, row, row, 1, 2);
cbexpire = new TQCheckBox( i18n("Never"), frame );
- tqlayout->addWidget( cbexpire, row++, 3 );
+ 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()) );
@@ -265,60 +265,60 @@ void propdlg::initDlg()
// Tab 3: Samba
if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) {
TQFrame *frame = addPage(i18n("Samba"));
- TQGridLayout *tqlayout = new TQGridLayout(frame, 10, 4, marginHint(), spacingHint());
+ TQGridLayout *layout = new TQGridLayout(frame, 10, 4, marginHint(), spacingHint());
int row = 0;
lerid = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Rid");
lerid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame)));
- addRow(frame, tqlayout, row++, lerid, i18n("RID:"), whatstr);
+ addRow(frame, layout, row++, lerid, i18n("RID:"), whatstr);
connect(lerid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
leliscript = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
- addRow(frame, tqlayout, row++, leliscript, i18n("Login script:"), whatstr);
+ addRow(frame, layout, row++, leliscript, i18n("Login script:"), whatstr);
connect(leliscript, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
leprofile = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
- addRow(frame, tqlayout, row++, leprofile, i18n("Profile path:"), whatstr);
+ addRow(frame, layout, row++, leprofile, i18n("Profile path:"), whatstr);
connect(leprofile, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
lehomedrive = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
- addRow(frame, tqlayout, row++, lehomedrive, i18n("Home drive:"), whatstr);
+ addRow(frame, layout, row++, lehomedrive, i18n("Home drive:"), whatstr);
connect(lehomedrive, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
lehomepath = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
- addRow(frame, tqlayout, row++, lehomepath, i18n("Home path:"), whatstr);
+ addRow(frame, layout, row++, lehomepath, i18n("Home path:"), whatstr);
connect(lehomepath, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
leworkstations = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
- addRow(frame, tqlayout, row++, leworkstations, i18n("User workstations:"), whatstr);
+ addRow(frame, layout, row++, leworkstations, i18n("User workstations:"), whatstr);
connect(leworkstations, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
ledomain = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
- addRow(frame, tqlayout, row++, ledomain, i18n("Domain name:"), whatstr);
+ addRow(frame, layout, row++, ledomain, i18n("Domain name:"), whatstr);
connect(ledomain, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
ledomsid = new KLineEdit(frame);
// whatstr = i18n("WHAT IS THIS: Login script");
- addRow(frame, tqlayout, row++, ledomsid, i18n("Domain SID:"), whatstr);
+ addRow(frame, layout, row++, ledomsid, i18n("Domain SID:"), whatstr);
connect(ledomsid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_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()));
- addRow(frame, tqlayout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
+ addRow(frame, layout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
}
// Tab 4: Groups
{
TQFrame *frame = addPage(i18n("Groups"));
- TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, marginHint(), spacingHint());
+ TQGridLayout *layout = new TQGridLayout(frame, 2, 2, marginHint(), spacingHint());
lstgrp = new KListView(frame);
lstgrp->setFullWidth(true); // Single column, full widget width.
@@ -326,12 +326,12 @@ void propdlg::initDlg()
if ( ro ) lstgrp->setSelectionMode( TQListView::NoSelection );
// TQString whatstr = i18n("Select the groups that this user belongs to.");
TQWhatsThis::add(lstgrp, whatstr);
- tqlayout->addMultiCellWidget(lstgrp, 0, 0, 0, 1);
+ layout->addMultiCellWidget(lstgrp, 0, 0, 0, 1);
leprigr = new TQLabel( i18n("Primary group: "), frame );
- tqlayout->addWidget( leprigr, 1, 0 );
+ layout->addWidget( leprigr, 1, 0 );
if ( !ro ) {
pbprigr = new TQPushButton( i18n("Set as Primary"), frame );
- tqlayout->addWidget( pbprigr, 1, 1 );
+ layout->addWidget( pbprigr, 1, 1 );
connect( pbprigr, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpgroup()) );
}
connect( lstgrp, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(gchanged()) );
diff --git a/kuser/propdlg.h b/kuser/propdlg.h
index d4fa163..4dca3ba 100644
--- a/kuser/propdlg.h
+++ b/kuser/propdlg.h
@@ -70,7 +70,7 @@ protected:
bool check();
void loadgroups( bool fixedprivgroup );
bool checkShell(const TQString &shell);
- void addRow( TQWidget *parent, TQGridLayout *tqlayout, int row,
+ void addRow( TQWidget *parent, TQGridLayout *layout, int row,
TQWidget *widget, const TQString &label, const TQString &what,
bool two_column=true, bool nochange=true );
void setLE( KLineEdit *le, const TQString &val, bool first );
@@ -79,11 +79,11 @@ protected:
TQString mergeLE( KLineEdit *le, const TQString &val, bool one );
int mergeSB( KIntSpinBox *sb, int val, bool one );
- KIntSpinBox *addDaysGroup( TQWidget *parent, TQGridLayout *tqlayout, int row,
+ KIntSpinBox *addDaysGroup( TQWidget *parent, TQGridLayout *layout, int row,
const TQString &title, bool never=true );
TQFrame *frontpage;
- TQGridLayout *fronttqlayout;
+ TQGridLayout *frontlayout;
int frontrow;
TQPtrList<KU::KUser> mUsers;