summaryrefslogtreecommitdiffstats
path: root/kuser/kuserfiles.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kuser/kuserfiles.cpp')
-rw-r--r--kuser/kuserfiles.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index 868f100..5ccfe58 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -115,7 +115,7 @@ bool KUserFiles::loadpwd()
mCfg->setPasswdsrc( PASSWORD_FILE );
mCfg->setGroupsrc( GROUP_FILE );
passwd_filename = mCfg->passwdsrc();
- KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").tqarg(mCfg->passwdsrc().tqarg(mCfg->groupsrc())) );
+ KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").arg(mCfg->passwdsrc().arg(mCfg->groupsrc())) );
}
if(!passwd_filename.isEmpty()) {
@@ -128,7 +128,7 @@ bool KUserFiles::loadpwd()
for(int i = 0; i < MAXFILES; i++) {
rc = stat(TQFile::encodeName(filename), &st);
if(rc != 0) {
- KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").tqarg(filename).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").arg(filename).arg(TQString::fromLocal8Bit(strerror(errno))) );
if( (processing_file & P_PASSWD) != 0 ) {
passwd_errno = errno;
if(!nispasswd_filename.isEmpty()) {
@@ -155,7 +155,7 @@ bool KUserFiles::loadpwd()
#ifdef HAVE_FGETPWENT
FILE *fpwd = fopen(TQFile::encodeName(filename), "r");
if(fpwd == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) );
return FALSE;
}
@@ -179,7 +179,7 @@ bool KUserFiles::loadpwd()
tmpKU->setHomeDir(TQString::fromLocal8Bit(p->pw_dir));
tmpKU->setShell(TQString::fromLocal8Bit(p->pw_shell));
#if defined(__FreeBSD__) || defined(__bsdi__)
- tmpKU->setClass(TQString::tqfromLatin1(p->pw_class));
+ tmpKU->setClass(TQString::fromLatin1(p->pw_class));
tmpKU->setLastChange(p->pw_change);
tmpKU->setExpire(p->pw_expire);
#endif
@@ -238,7 +238,7 @@ bool KUserFiles::loadsdw()
FILE *f;
kdDebug() << "open shadow file: " << shadow_file << endl;
if ((f = fopen( TQFile::encodeName(shadow_file), "r")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(shadow_file) );
+ KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(shadow_file) );
caps &= ~Cap_Shadow;
return TRUE;
}
@@ -250,7 +250,7 @@ bool KUserFiles::loadsdw()
kdDebug() << "shadow entry: " << spw->sp_namp << endl;
if ((up = lookup(TQString::fromLocal8Bit(spw->sp_namp))) == NULL) {
- KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").tqarg(TQString::fromLocal8Bit(spw->sp_namp)) );
+ KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").arg(TQString::fromLocal8Bit(spw->sp_namp)) );
continue;
}
@@ -314,9 +314,9 @@ bool KUserFiles::savepwd()
passwd_filename = mCfg->passwdsrc();
nispasswd_filename = mCfg->nispasswdsrc();
TQString new_passwd_filename =
- passwd_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+ passwd_filename + TQString::fromLatin1(KU_CREATE_EXT);
TQString new_nispasswd_filename =
- nispasswd_filename+TQString::tqfromLatin1(KU_CREATE_EXT);
+ nispasswd_filename+TQString::fromLatin1(KU_CREATE_EXT);
if( nispasswd_filename != passwd_filename ) {
minuid = mCfg->nisminuid();
@@ -343,13 +343,13 @@ bool KUserFiles::savepwd()
if(!passwd_filename.isEmpty()) {
if ((passwd_fd =
fopen(TQFile::encodeName(new_passwd_filename),"w")) == NULL)
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(passwd_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(passwd_filename) );
}
if(!nispasswd_filename.isEmpty() && (nispasswd_filename != passwd_filename)){
if ((nispasswd_fd =
fopen(TQFile::encodeName(new_nispasswd_filename),"w")) == NULL)
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(nispasswd_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(nispasswd_filename) );
}
TQPtrListIterator<KU::KUser> it( mUsers );
@@ -512,7 +512,7 @@ bool KUserFiles::savesdw()
struct spwd s;
KU::KUser *up;
TQString shadow_file = mCfg->shadowsrc();
- TQString new_shadow_file = shadow_file+TQString::tqfromLatin1(KU_CREATE_EXT);
+ TQString new_shadow_file = shadow_file+TQString::fromLatin1(KU_CREATE_EXT);
if ( shadow_file.isEmpty() )
return TRUE;
@@ -523,7 +523,7 @@ bool KUserFiles::savesdw()
}
if ((f = fopen(TQFile::encodeName(new_shadow_file), "w")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_shadow_file) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_shadow_file) );
return FALSE;
}
@@ -588,7 +588,7 @@ void KUserFiles::createPassword( KU::KUser *user, const TQString &password )
{
if ( caps & Cap_Shadow ) {
user->setSPwd( encryptPass( password, mCfg->md5shadow() ) );
- user->setPwd( TQString::tqfromLatin1("x") );
+ user->setPwd( TQString::fromLatin1("x") );
} else
user->setPwd( encryptPass( password, false ) );
}