summaryrefslogtreecommitdiffstats
path: root/kuser
diff options
context:
space:
mode:
Diffstat (limited to 'kuser')
-rw-r--r--kuser/kgroup.cpp2
-rw-r--r--kuser/kgroupfiles.cpp12
-rw-r--r--kuser/kgroupldap.cpp28
-rw-r--r--kuser/kuserfiles.cpp12
-rw-r--r--kuser/kuserldap.cpp146
-rw-r--r--kuser/mainView.cpp6
-rw-r--r--kuser/misc.cpp2
-rw-r--r--kuser/propdlg.cpp24
-rw-r--r--kuser/selectconn.cpp2
-rw-r--r--kuser/sid.cpp2
10 files changed, 118 insertions, 118 deletions
diff --git a/kuser/kgroup.cpp b/kuser/kgroup.cpp
index 1ea6462..dbbff91 100644
--- a/kuser/kgroup.cpp
+++ b/kuser/kgroup.cpp
@@ -140,7 +140,7 @@ void KU::KGroup::setDesc(const TQString &data)
bool KU::KGroup::lookup_user(const TQString &name)
{
- return (u.tqfind(name) != u.end());
+ return (u.find(name) != u.end());
}
bool KU::KGroup::addUser(const TQString &name)
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index 1dacda2..4534ac5 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -271,12 +271,12 @@ bool KGroupFiles::save()
if ( gr == 0 ) break;
};
- if ( mDel.tqcontainsRef( gr ) ) {
+ if ( mDel.containsRef( gr ) ) {
++it;
gr = (*it);
continue;
}
- if ( mMod.tqcontains( gr ) ) gr = &( mMod[ gr ] );
+ if ( mMod.contains( gr ) ) gr = &( mMod[ gr ] );
#ifdef HAVE_SHADOW
if ( addok && !mCfg->gshadowsrc().isEmpty() )
@@ -284,8 +284,8 @@ bool KGroupFiles::save()
#endif
tmpGe = gr->getName();
- tmpGe.tqreplace( ',', "_" );
- tmpGe.tqreplace( ':', "_" );
+ tmpGe.replace( ',', "_" );
+ tmpGe.replace( ':', "_" );
gr->setName( tmpGe );
tmp_gid = gr->getGID();
@@ -298,8 +298,8 @@ bool KGroupFiles::save()
tmpGe += ',';
tmpSe += ',';
}
- gr->user( j ).tqreplace( ',', "_" );
- gr->user( j ).tqreplace( ':', "_" );
+ gr->user( j ).replace( ',', "_" );
+ gr->user( j ).replace( ':', "_" );
tmpGe += gr->user( j) ;
tmpSe += gr->user( j );
}
diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp
index d99475d..2f66b27 100644
--- a/kuser/kgroupldap.cpp
+++ b/kuser/kgroupldap.cpp
@@ -281,39 +281,39 @@ void KGroupLDAP::modData( KU::KGroup *group )
ldif += "dn: " + newrdn.utf8() + "," + mUrl.dn().utf8() + "\n" +
"changetype: modify\n" +
- "tqreplace: objectclass\n" +
+ "replace: objectclass\n" +
"objectclass: posixgroup\n";
if ( ( getCaps() & Cap_Samba ) && ( group->getCaps() & KU::KGroup::Cap_Samba ) ) {
ldif += "objectclass: sambagroupmapping\n";
}
ldif +=
- "-\ntqreplace: cn\n" +
+ "-\nreplace: cn\n" +
KABC::LDIF::assembleLine( "cn", group->getName() ) +
- "\n-\ntqreplace: gidnumber\n" +
+ "\n-\nreplace: gidnumber\n" +
KABC::LDIF::assembleLine( "gidnumber", TQString::number(group->getGID()) ) +
- "\n-\ntqreplace: userpassword\n" +
+ "\n-\nreplace: userpassword\n" +
KABC::LDIF::assembleLine( "userpassword", group->getPwd() ) +
- "\n-\ntqreplace: memberuid\n";
+ "\n-\nreplace: memberuid\n";
for ( uint i=0; i < group->count(); i++ ) {
ldif += KABC::LDIF::assembleLine( "memberuid", group->user(i)) + "\n";
}
if ( getCaps() & Cap_Samba ) {
if ( group->getCaps() & KU::KGroup::Cap_Samba ) {
ldif +=
- "-\ntqreplace: sambasid\n" +
+ "-\nreplace: sambasid\n" +
KABC::LDIF::assembleLine( "sambasid", group->getSID().getSID() ) +
- "\n-\ntqreplace: displayname\n" +
+ "\n-\nreplace: displayname\n" +
KABC::LDIF::assembleLine( "displayname", group->getDisplayName() ) +
- "\n-\ntqreplace: description\n" +
+ "\n-\nreplace: description\n" +
KABC::LDIF::assembleLine( "description", group->getDesc() ) +
- "\n-\ntqreplace: sambagrouptype\n" +
+ "\n-\nreplace: sambagrouptype\n" +
KABC::LDIF::assembleLine( "sambagrouptype", TQString::number( group->getType() ) ) + "\n";
} else {
- ldif += "-\ntqreplace: sambasid\n";
- ldif += "-\ntqreplace: displayname\n";
- ldif += "-\ntqreplace: description\n";
- ldif += "-\ntqreplace: sambagrouptype\n";
- ldif += "-\ntqreplace: sambasidlist\n";
+ ldif += "-\nreplace: sambasid\n";
+ ldif += "-\nreplace: displayname\n";
+ ldif += "-\nreplace: description\n";
+ ldif += "-\nreplace: sambagrouptype\n";
+ ldif += "-\nreplace: sambasidlist\n";
}
}
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index f76c2ac..868f100 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -286,8 +286,8 @@ bool KUserFiles::loadsdw()
// Save password file
#define escstr(a,b) tmp2 = user->a(); \
- tmp2.tqreplace(':',"_"); \
- tmp2.tqreplace(',',"_"); \
+ tmp2.replace(':',"_"); \
+ tmp2.replace(',',"_"); \
user->b( tmp2 );
@@ -364,12 +364,12 @@ bool KUserFiles::savepwd()
addok = true;
if ( user == 0 ) break;
};
- if ( mDel.tqcontainsRef( user ) ) {
+ if ( mDel.containsRef( user ) ) {
++it;
user = (*it);
continue;
}
- if ( mMod.tqcontains( user ) ) user = &( mMod[ user ] );
+ if ( mMod.contains( user ) ) user = &( mMod[ user ] );
tmp_uid = user->getUID();
if ( caps & Cap_Shadow )
@@ -542,12 +542,12 @@ bool KUserFiles::savesdw()
if ( up == 0 ) break;
};
- if ( mDel.tqcontainsRef( up ) ) {
+ if ( mDel.containsRef( up ) ) {
++it;
up = (*it);
continue;
}
- if ( mMod.tqcontains( up ) ) up = &( mMod[ up ] );
+ if ( mMod.contains( up ) ) up = &( mMod[ up ] );
strncpy( s.sp_namp, up->getName().local8Bit(), 200 );
if ( up->getDisabled() )
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index d1d99b0..5d4979a 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -176,7 +176,7 @@ void KUserLDAP::data( KIO::Job *, const TQByteArray& data )
else if ( name == "shadowflag" )
mUser->setFlag( val.toLong() );
else if ( name == "sambaacctflags" ) {
- if ( !val.tqcontains( 'D' ) ) mUser->setDisabled( false );
+ if ( !val.contains( 'D' ) ) mUser->setDisabled( false );
} else if ( name == "sambasid" )
mUser->setSID( val );
else if ( name == "sambaprimarygroupsid" )
@@ -399,7 +399,7 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
ldif += "dn: " + getRDN( user ).utf8() + "," + mUrl.dn().utf8() + "\n";
if ( mod ) {
ldif += "changetype: modify\n";
- ldif += "tqreplace: objectClass\n";
+ ldif += "replace: objectClass\n";
}
if ( caps & Cap_InetOrg )
@@ -416,7 +416,7 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
if ( ( caps & Cap_Samba ) && ( user->getCaps() & KU::KUser::Cap_Samba ) ) {
ldif += "objectClass: sambaSamAccount\n";
}
- if ( mod && mObjectClasses.tqcontains( mUser ) ) {
+ if ( mod && mObjectClasses.contains( mUser ) ) {
TQStringList ocs = mObjectClasses[ mUser ];
kdDebug() << user->getName() << " has additional objectclasses: " << ocs.join(",") << endl;
TQValueListIterator<TQString> it;
@@ -427,61 +427,61 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
}
}
- if ( mod ) ldif += "-\ntqreplace: cn\n";
+ if ( mod ) ldif += "-\nreplace: cn\n";
ldif += KABC::LDIF::assembleLine( "cn", cn )+"\n";
if ( caps & Cap_InetOrg ) {
- if ( mod ) ldif += "-\ntqreplace: uid\n";
+ if ( mod ) ldif += "-\nreplace: uid\n";
ldif += KABC::LDIF::assembleLine( "uid", user->getName() ) + "\n";
} else {
- if ( mod ) ldif += "-\ntqreplace: userid\n";
+ if ( mod ) ldif += "-\nreplace: userid\n";
ldif += KABC::LDIF::assembleLine( "userid", user->getName() ) + "\n";
}
if ( mod ) ldif += "-\n";
if ( ( user->getCaps() & KU::KUser::Cap_POSIX ) || ( caps & Cap_InetOrg ) ) {
- if ( mod ) ldif += "tqreplace: userpassword\n";
+ if ( mod ) ldif += "replace: userpassword\n";
ldif += KABC::LDIF::assembleLine( "userpassword", pwd )+"\n";
if ( mod ) ldif += "-\n";
}
if ( user->getCaps() & KU::KUser::Cap_POSIX ) {
- if ( mod ) ldif += "tqreplace: uidnumber\n";
+ if ( mod ) ldif += "replace: uidnumber\n";
ldif += KABC::LDIF::assembleLine( "uidnumber",
TQString::number( user->getUID() ) )+"\n";
- if ( mod ) ldif += "-\ntqreplace: gidnumber\n";
+ if ( mod ) ldif += "-\nreplace: gidnumber\n";
ldif += KABC::LDIF::assembleLine( "gidnumber",
TQString::number( user->getGID() ) )+"\n";
- if ( mod ) ldif += "-\ntqreplace: gecos\n";
+ if ( mod ) ldif += "-\nreplace: gecos\n";
ldif += KABC::LDIF::assembleLine( "gecos", !mCfg->ldapgecos() ? TQCString() :
TQCString( gecos.latin1() ) )+"\n";
- if ( mod ) ldif += "-\ntqreplace: homedirectory\n";
+ if ( mod ) ldif += "-\nreplace: homedirectory\n";
ldif += KABC::LDIF::assembleLine( "homedirectory",
user->getHomeDir() )+"\n";
- if ( mod ) ldif += "-\ntqreplace: loginshell\n";
+ if ( mod ) ldif += "-\nreplace: loginshell\n";
ldif += KABC::LDIF::assembleLine( "loginshell",
user->getShell() )+"\n";
if ( mod ) ldif += "-\n";
} else {
if ( mod ) {
- ldif += "tqreplace: uidnumber\n";
- ldif += "-\ntqreplace: gidnumber\n";
- ldif += "-\ntqreplace: homedirectory\n";
- ldif += "-\ntqreplace: loginshell\n";
- ldif += "-\ntqreplace: gecos\n";
+ ldif += "replace: uidnumber\n";
+ ldif += "-\nreplace: gidnumber\n";
+ ldif += "-\nreplace: homedirectory\n";
+ ldif += "-\nreplace: loginshell\n";
+ ldif += "-\nreplace: gecos\n";
ldif += "-\n";
}
}
if ( caps & Cap_InetOrg ) {
- if ( mod ) ldif += "tqreplace: sn\n";
+ if ( mod ) ldif += "replace: sn\n";
ldif += KABC::LDIF::assembleLine( "sn", user->getSurname() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: mail\n";
+ if ( mod ) ldif += "-\nreplace: mail\n";
ldif += KABC::LDIF::assembleLine( "mail", user->getEmail() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: displayName\n";
+ if ( mod ) ldif += "-\nreplace: displayName\n";
ldif += KABC::LDIF::assembleLine( "displayname", user->getFullName() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: postaladdress\n";
+ if ( mod ) ldif += "-\nreplace: postaladdress\n";
ldif += KABC::LDIF::assembleLine( "postaladdress", user->getAddress() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: telephoneNumber\n";
+ if ( mod ) ldif += "-\nreplace: telephoneNumber\n";
ldif += KABC::LDIF::assembleLine( "telephoneNumber", user->getOffice1() ) + "\n";
ldif += KABC::LDIF::assembleLine( "telephoneNumber", user->getOffice2() ) + "\n";
if ( mod ) ldif += "-\n";
@@ -489,63 +489,63 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
if ( caps & Cap_Samba ) {
if ( user->getCaps() & KU::KUser::Cap_Samba ) {
- if ( mod ) ldif += "tqreplace: sambadomainname\n";
+ if ( mod ) ldif += "replace: sambadomainname\n";
ldif += KABC::LDIF::assembleLine( "sambadomainname", user->getDomain() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambauserworkstations\n";
+ if ( mod ) ldif += "-\nreplace: sambauserworkstations\n";
ldif += KABC::LDIF::assembleLine( "sambauserworkstations", user->getWorkstations() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambahomepath\n";
+ if ( mod ) ldif += "-\nreplace: sambahomepath\n";
ldif += KABC::LDIF::assembleLine( "sambahomepath", user->getHomePath() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambahomedrive\n";
+ if ( mod ) ldif += "-\nreplace: sambahomedrive\n";
ldif += KABC::LDIF::assembleLine( "sambahomedrive", user->getHomeDrive() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambalogonscript\n";
+ if ( mod ) ldif += "-\nreplace: sambalogonscript\n";
ldif += KABC::LDIF::assembleLine( "sambalogonscript", user->getLoginScript() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambaprofilepath\n";
+ if ( mod ) ldif += "-\nreplace: sambaprofilepath\n";
ldif += KABC::LDIF::assembleLine( "sambaprofilepath", user->getProfilePath() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambalmpassword\n";
+ if ( mod ) ldif += "-\nreplace: sambalmpassword\n";
ldif += KABC::LDIF::assembleLine( "sambalmpassword", user->getLMPwd() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambantpassword\n";
+ if ( mod ) ldif += "-\nreplace: sambantpassword\n";
ldif += KABC::LDIF::assembleLine( "sambantpassword", user->getNTPwd() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambasid\n";
+ if ( mod ) ldif += "-\nreplace: sambasid\n";
ldif += KABC::LDIF::assembleLine( "sambasid", user->getSID().getSID() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambaacctflags\n";
+ if ( mod ) ldif += "-\nreplace: sambaacctflags\n";
ldif += KABC::LDIF::assembleLine( "sambaacctflags", samflags ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambaprimarygroupsid\n";
+ if ( mod ) ldif += "-\nreplace: sambaprimarygroupsid\n";
ldif += KABC::LDIF::assembleLine( "sambaprimarygroupsid",
user->getPGSID().getSID() ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambapwdlastset\n";
+ if ( mod ) ldif += "-\nreplace: sambapwdlastset\n";
ldif += KABC::LDIF::assembleLine( "sambapwdlastset",
TQString::number( user->getLastChange() ) ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: sambakickofftime\n";
+ if ( mod ) ldif += "-\nreplace: sambakickofftime\n";
if ( user->getExpire() != -1 ) ldif +=
KABC::LDIF::assembleLine( "sambakickofftime",
TQString::number( user->getExpire() ) ) + "\n";
if ( mod ) ldif += "-\n";
} else {
if ( mod ) {
- ldif += "tqreplace: sambahomepath\n";
- ldif += "-\ntqreplace: sambahomedrive\n";
- ldif += "-\ntqreplace: sambalogonscript\n";
- ldif += "-\ntqreplace: sambaprofilepath\n";
- ldif += "-\ntqreplace: sambalmpassword\n";
- ldif += "-\ntqreplace: sambantpassword\n";
- ldif += "-\ntqreplace: sambasid\n";
- ldif += "-\ntqreplace: sambaacctflags\n";
- ldif += "-\ntqreplace: sambaprimarygroupsid\n";
- ldif += "-\ntqreplace: sambapwdlastset\n";
- ldif += "-\ntqreplace: sambakickofftime\n";
- ldif += "-\ntqreplace: sambalogontime\n";
- ldif += "-\ntqreplace: sambalogofftime\n";
- ldif += "-\ntqreplace: sambapwdcanchange\n";
- ldif += "-\ntqreplace: sambapwdmustchange\n";
- ldif += "-\ntqreplace: sambauserworkstations\n";
- ldif += "-\ntqreplace: sambadomainname\n";
- ldif += "-\ntqreplace: sambamungeddial\n";
- ldif += "-\ntqreplace: sambabadpasswordcount\n";
- ldif += "-\ntqreplace: sambabadpasswordtime\n";
- ldif += "-\ntqreplace: sambadomainname\n";
+ ldif += "replace: sambahomepath\n";
+ ldif += "-\nreplace: sambahomedrive\n";
+ ldif += "-\nreplace: sambalogonscript\n";
+ ldif += "-\nreplace: sambaprofilepath\n";
+ ldif += "-\nreplace: sambalmpassword\n";
+ ldif += "-\nreplace: sambantpassword\n";
+ ldif += "-\nreplace: sambasid\n";
+ ldif += "-\nreplace: sambaacctflags\n";
+ ldif += "-\nreplace: sambaprimarygroupsid\n";
+ ldif += "-\nreplace: sambapwdlastset\n";
+ ldif += "-\nreplace: sambakickofftime\n";
+ ldif += "-\nreplace: sambalogontime\n";
+ ldif += "-\nreplace: sambalogofftime\n";
+ ldif += "-\nreplace: sambapwdcanchange\n";
+ ldif += "-\nreplace: sambapwdmustchange\n";
+ ldif += "-\nreplace: sambauserworkstations\n";
+ ldif += "-\nreplace: sambadomainname\n";
+ ldif += "-\nreplace: sambamungeddial\n";
+ ldif += "-\nreplace: sambabadpasswordcount\n";
+ ldif += "-\nreplace: sambabadpasswordtime\n";
+ ldif += "-\nreplace: sambadomainname\n";
if ( schemaversion > 0 ) {
- ldif += "-\ntqreplace: sambapasswordhistory\n";
- ldif += "-\ntqreplace: sambalogonhours\n";
+ ldif += "-\nreplace: sambapasswordhistory\n";
+ ldif += "-\nreplace: sambalogonhours\n";
}
ldif += "-\n";
}
@@ -554,37 +554,37 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
if ( caps & Cap_Shadow ) {
if ( user->getCaps() & KU::KUser::Cap_POSIX ) {
- if ( mod ) ldif += "tqreplace: shadowlastchange\n"; //sambapwdlastset
+ if ( mod ) ldif += "replace: shadowlastchange\n"; //sambapwdlastset
ldif += KABC::LDIF::assembleLine( "shadowlastchange",
TQString::number( timeToDays( user->getLastChange() ) ) ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: shadowmin\n"; //sambaPwdCanChange
+ if ( mod ) ldif += "-\nreplace: shadowmin\n"; //sambaPwdCanChange
ldif += KABC::LDIF::assembleLine( "shadowmin",
TQString::number( user->getMin() ) ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: shadowmax\n"; //sambaPwdMustChange
+ if ( mod ) ldif += "-\nreplace: shadowmax\n"; //sambaPwdMustChange
ldif += KABC::LDIF::assembleLine( "shadowmax",
TQString::number( user->getMax() ) ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: shadowwarning\n";
+ if ( mod ) ldif += "-\nreplace: shadowwarning\n";
ldif += KABC::LDIF::assembleLine( "shadowwarning",
TQString::number( user->getWarn() ) ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: shadowinactive\n";
+ if ( mod ) ldif += "-\nreplace: shadowinactive\n";
ldif += KABC::LDIF::assembleLine( "shadowinactive",
TQString::number( user->getInactive() ) ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: shadowexpire\n"; //sambaKickoffTime
+ if ( mod ) ldif += "-\nreplace: shadowexpire\n"; //sambaKickoffTime
ldif += KABC::LDIF::assembleLine( "shadowexpire",
TQString::number( timeToDays( user->getExpire() ) ) ) + "\n";
- if ( mod ) ldif += "-\ntqreplace: shadowflag\n";
+ if ( mod ) ldif += "-\nreplace: shadowflag\n";
ldif += KABC::LDIF::assembleLine( "shadowflag",
TQString::number( user->getFlag() ) ) + "\n";
if ( mod ) ldif += "-\n";
} else {
if ( mod ) {
- ldif += "tqreplace: shadowlastchange\n";
- ldif += "-\ntqreplace: shadowmin\n";
- ldif += "-\ntqreplace: shadowmax\n";
- ldif += "-\ntqreplace: shadowwarning\n";
- ldif += "-\ntqreplace: shadowinactive\n";
- ldif += "-\ntqreplace: shadowexpire\n";
- ldif += "-\ntqreplace: shadowflag\n";
+ ldif += "replace: shadowlastchange\n";
+ ldif += "-\nreplace: shadowmin\n";
+ ldif += "-\nreplace: shadowmax\n";
+ ldif += "-\nreplace: shadowwarning\n";
+ ldif += "-\nreplace: shadowinactive\n";
+ ldif += "-\nreplace: shadowexpire\n";
+ ldif += "-\nreplace: shadowflag\n";
ldif += "-\n";
}
}
@@ -630,7 +630,7 @@ void KUserLDAP::putData( KIO::Job *, TQByteArray& data )
if ( mDelUser ) {
kdDebug() << "delete ok for: " << mDelUser->getName() << endl;
mDelSucc.append( mDelUser );
- if ( mObjectClasses.tqcontains( mDelUser ) ) {
+ if ( mObjectClasses.contains( mDelUser ) ) {
kdDebug() << "deleting additonal objectclasses!" << endl;
mObjectClasses.remove( mDelUser );
}
diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp
index 82b5cb3..344ee3a 100644
--- a/kuser/mainView.cpp
+++ b/kuser/mainView.cpp
@@ -217,15 +217,15 @@ void mainView::useradd()
sid.setDOM( kug->getUsers().getDOMSID() );
sid.setRID( rid );
tk->setSID( sid );
- tk->setProfilePath( kug->kcfg()->samprofilepath().tqreplace( "%U",name ) );
- tk->setHomePath( kug->kcfg()->samhomepath().tqreplace( "%U", name ) );
+ tk->setProfilePath( kug->kcfg()->samprofilepath().replace( "%U",name ) );
+ tk->setHomePath( kug->kcfg()->samhomepath().replace( "%U", name ) );
tk->setHomeDrive( kug->kcfg()->samhomedrive() );
tk->setLoginScript( kug->kcfg()->samloginscript() );
tk->setDomain( kug->kcfg()->samdomain() );
}
tk->setShell( kug->kcfg()->shell() );
- tk->setHomeDir( kug->kcfg()->homepath().tqreplace( "%U", name ) );
+ tk->setHomeDir( kug->kcfg()->homepath().replace( "%U", name ) );
if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Shadow || samba ) {
tk->setLastChange( now() );
}
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index 5f550be..2e1ebab 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -120,7 +120,7 @@ TQStringList readShells()
void addShell(const TQString &shell)
{
TQStringList shells = readShells();
- if (shells.tqcontains(shell))
+ if (shells.contains(shell))
return;
FILE *f = fopen(SHELL_FILE,"a");
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index 775b837..b273d8d 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -408,7 +408,7 @@ void propdlg::setLE( KLineEdit *le, const TQString &val, bool first )
if ( val.isEmpty() && le->text().isEmpty() ) return;
if ( le->text() != val ) {
le->setText( "" );
- if ( !ro && mNoChanges.tqcontains( le ) ) {
+ if ( !ro && mNoChanges.contains( le ) ) {
mNoChanges[ le ]->show();
mNoChanges[ le ]->setChecked( true );
}
@@ -437,7 +437,7 @@ void propdlg::setSB( KIntSpinBox *sb, int val, bool first )
}
if ( sb->value() != val ) {
sb->setValue( 0 );
- if ( !ro && mNoChanges.tqcontains( sb ) ) {
+ if ( !ro && mNoChanges.contains( sb ) ) {
mNoChanges[ sb ]->show();
mNoChanges[ sb ]->setChecked( true );
}
@@ -485,7 +485,7 @@ void propdlg::selectuser()
setLE( lefname, user->getFullName(), first );
TQString home;
home = user->getHomeDir();
- if ( !one ) home.tqreplace( user->getName(), "%U" );
+ if ( !one ) home.replace( user->getName(), "%U" );
setLE( lehome, home, first );
TQString shell = user->getShell();
@@ -523,11 +523,11 @@ void propdlg::selectuser()
setLE( leliscript, user->getLoginScript(), first );
TQString profile;
profile = user->getProfilePath();
- if ( !one ) profile.tqreplace( user->getName(), "%U" );
+ if ( !one ) profile.replace( user->getName(), "%U" );
setLE( leprofile, profile, first );
setLE( lehomedrive, user->getHomeDrive(), first );
home = user->getHomePath();
- if ( !one ) home.tqreplace( user->getName(), "%U" );
+ if ( !one ) home.replace( user->getName(), "%U" );
setLE( lehomepath, home, first );
setLE( leworkstations, user->getWorkstations(), first );
setLE( ledomain, user->getDomain(), first );
@@ -676,7 +676,7 @@ void propdlg::setpgroup()
void propdlg::changed()
{
TQWidget *widget = (TQWidget*) sender();
- if ( mNoChanges.tqcontains( widget ) ) mNoChanges[ widget ]->setChecked( false );
+ if ( mNoChanges.contains( widget ) ) mNoChanges[ widget ]->setChecked( false );
ischanged = true;
kdDebug() << "changed" << endl;
}
@@ -689,14 +689,14 @@ void propdlg::gchanged()
TQString propdlg::mergeLE( KLineEdit *le, const TQString &val, bool one )
{
TQCheckBox *cb = 0;
- if ( mNoChanges.tqcontains( le ) ) cb = mNoChanges[ le ];
+ if ( mNoChanges.contains( le ) ) cb = mNoChanges[ le ];
return ( one || ( cb && !cb->isChecked() ) ) ? le->text() : val;
}
int propdlg::mergeSB( KIntSpinBox *sb, int val, bool one )
{
TQCheckBox *cb = 0;
- if ( mNoChanges.tqcontains( sb ) ) cb = mNoChanges[ sb ];
+ if ( mNoChanges.contains( sb ) ) cb = mNoChanges[ sb ];
return ( one || ( cb && !cb->isChecked() ) ) ? sb->value() : val;
}
@@ -745,11 +745,11 @@ void propdlg::mergeUser( KU::KUser *user, KU::KUser *newuser )
newuser->setLoginScript( samba ?
mergeLE( leliscript, user->getLoginScript(), one ) : TQString() );
newuser->setProfilePath( samba ?
- mergeLE( leprofile, user->getProfilePath(), one ).tqreplace( "%U", newuser->getName() ) : TQString() );
+ mergeLE( leprofile, user->getProfilePath(), one ).replace( "%U", newuser->getName() ) : TQString() );
newuser->setHomeDrive( samba ?
mergeLE( lehomedrive, user->getHomeDrive(), one ) : TQString() );
newuser->setHomePath( samba ?
- mergeLE( lehomepath, user->getHomePath(), one ).tqreplace( "%U", newuser->getName() ) : TQString() );
+ mergeLE( lehomepath, user->getHomePath(), one ).replace( "%U", newuser->getName() ) : TQString() );
newuser->setWorkstations( samba ?
mergeLE( leworkstations, user->getWorkstations(), one ) : TQString() );
newuser->setDomain( samba ?
@@ -768,7 +768,7 @@ void propdlg::mergeUser( KU::KUser *user, KU::KUser *newuser )
}
newuser->setHomeDir( posix ?
- mergeLE( lehome, user->getHomeDir(), one ).tqreplace( "%U", newuser->getName() ) :
+ mergeLE( lehome, user->getHomeDir(), one ).replace( "%U", newuser->getName() ) :
TQString() );
if ( posix ) {
if ( leshell->currentItem() == 0 && ismoreshells ) {
@@ -870,7 +870,7 @@ bool propdlg::checkShell(const TQString &shell)
if (shell.isEmpty())
return true;
TQStringList shells = readShells();
- return shells.tqcontains(shell);
+ return shells.contains(shell);
}
bool propdlg::check()
diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp
index d661fb1..20c7ec3 100644
--- a/kuser/selectconn.cpp
+++ b/kuser/selectconn.cpp
@@ -80,7 +80,7 @@ void SelectConn::slotUser3()
newconn = KInputDialog::getText( TQString(),
i18n("Please type the name of the new connection:") );
if ( newconn.isEmpty() ) return;
- if ( kapp->sharedConfig()->groupList().tqcontains( "connection-" + newconn ) ) {
+ if ( kapp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) {
KMessageBox::sorry( 0, i18n("A connection with this name already exists.") );
return;
}
diff --git a/kuser/sid.cpp b/kuser/sid.cpp
index 5608129..8f3e254 100644
--- a/kuser/sid.cpp
+++ b/kuser/sid.cpp
@@ -83,7 +83,7 @@ void SID::setSID( const TQString &sid )
TQString rid;
mSid = sid;
- pos = sid.tqfindRev( '-' );
+ pos = sid.findRev( '-' );
mDom = sid.left( pos );
rid = sid.right( sid.length() - pos - 1 );
mRid = rid.toUInt();