summaryrefslogtreecommitdiffstats
path: root/kuser
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:52:44 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:52:44 -0600
commit6b7a8ff33a6383be4a9dea3c4225d142aab79b78 (patch)
tree5350a439bb05233ff6ee4a4368cdd59de686c685 /kuser
parentb836ed566cdce05ae8408705487cd10a423f3a90 (diff)
downloadtdeadmin-6b7a8ff33a6383be4a9dea3c4225d142aab79b78.tar.gz
tdeadmin-6b7a8ff33a6383be4a9dea3c4225d142aab79b78.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kuser')
-rw-r--r--kuser/addUser.cpp18
-rw-r--r--kuser/delUser.cpp6
-rw-r--r--kuser/editGroup.cpp6
-rw-r--r--kuser/kgroupfiles.cpp10
-rw-r--r--kuser/kuser.cpp58
-rw-r--r--kuser/kuserfiles.cpp16
-rw-r--r--kuser/kuserldap.cpp8
-rw-r--r--kuser/kuservw.cpp4
-rw-r--r--kuser/kuservw.h2
-rw-r--r--kuser/mainView.cpp12
-rw-r--r--kuser/misc.cpp8
-rw-r--r--kuser/passwordpolicy.ui8
-rw-r--r--kuser/propdlg.cpp12
13 files changed, 84 insertions, 84 deletions
diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 828e225..8021f9e 100644
--- a/kuser/addUser.cpp
+++ b/kuser/addUser.cpp
@@ -65,14 +65,14 @@ void addUser::slotOk()
if ( ( user->getCaps() & KU::KUser::Cap_POSIX ) &&
kug->getUsers().lookup( user->getUID() ) ) {
- KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").tqarg( user->getUID() ) );
+ KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").arg( user->getUID() ) );
return;
}
if ( ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) &&
( user->getCaps() & KU::KUser::Cap_Samba ) ) {
if ( kug->getUsers().lookup_sam( user->getSID().getRID() ) ) {
- KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").tqarg( user->getSID().getRID() ) );
+ KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").arg( user->getSID().getRID() ) );
return;
}
}
@@ -115,15 +115,15 @@ bool addUser::checkHome()
if ( KMessageBox::
warningContinueCancel ( 0,
i18n("Folder %1 already exists!\n%2 may become owner and permissions may change.\nDo you really want to use %3?").
- tqarg(h_dir).tqarg(user->getName()).tqarg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel )
+ arg(h_dir).arg(user->getName()).arg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel )
return false;
else
return true;
} else
- KMessageBox::error( 0, i18n("%1 is not a folder.").tqarg(h_dir) );
+ KMessageBox::error( 0, i18n("%1 is not a folder.").arg(h_dir) );
} else
- KMessageBox::error( 0, i18n("stat() failed on %1.").tqarg(h_dir) );
+ KMessageBox::error( 0, i18n("stat() failed on %1.").arg(h_dir) );
return false;
}
@@ -145,13 +145,13 @@ bool addUser::checkMailBox()
if (r == 0)
if (S_ISREG(s.st_mode))
KMessageBox::error( 0, i18n("Mailbox %1 already exists (uid=%2).")
- .tqarg(mailboxpath)
- .tqarg(s.st_uid) );
+ .arg(mailboxpath)
+ .arg(s.st_uid) );
else
KMessageBox::error( 0, i18n("%1 exists but is not a regular file.")
- .tqarg(mailboxpath) );
+ .arg(mailboxpath) );
else
- KMessageBox::error( 0, i18n("stat() failed on %1.").tqarg(mailboxpath) );
+ KMessageBox::error( 0, i18n("stat() failed on %1.").arg(mailboxpath) );
return false;
}
diff --git a/kuser/delUser.cpp b/kuser/delUser.cpp
index 775ff6c..b1ee7e0 100644
--- a/kuser/delUser.cpp
+++ b/kuser/delUser.cpp
@@ -30,11 +30,11 @@ delUser::delUser(KU::KUser *AUser, TQWidget *parent, const char *name)
{
TQVBox *page = makeVBoxMainWidget();
new TQLabel( i18n("<p>Deleting user <b>%1</b>"
- "<p>Also perform the following actions:").tqarg(AUser->getName()),
+ "<p>Also perform the following actions:").arg(AUser->getName()),
page);
- m_deleteHomeDir = new TQCheckBox(i18n("Delete &home folder: %1").tqarg(AUser->getHomeDir()), page);
+ m_deleteHomeDir = new TQCheckBox(i18n("Delete &home folder: %1").arg(AUser->getHomeDir()), page);
TQString mailboxpath = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + AUser->getName();
- m_deleteMailBox = new TQCheckBox(i18n("Delete &mailbox: %1").tqarg(mailboxpath), page);
+ m_deleteMailBox = new TQCheckBox(i18n("Delete &mailbox: %1").arg(mailboxpath), page);
setButtonGuiItem(KDialogBase::Ok, KStdGuiItem::del());
}
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index 0cea581..afb0da3 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -274,19 +274,19 @@ void editGroup::slotOk()
kug->getGroups().lookup( legrpname->text() ) ) {
KMessageBox::sorry( 0,
- i18n("Group with name %1 already exists.").tqarg(legrpname->text()) );
+ i18n("Group with name %1 already exists.").arg(legrpname->text()) );
return;
}
if ( mAdd ) {
if ( mSamba && !cbsamba->isChecked() && kug->getGroups().lookup_sam( sid ) ) {
KMessageBox::sorry( 0,
- i18n("Group with SID %1 already exists.").tqarg( sid.getSID() ) );
+ i18n("Group with SID %1 already exists.").arg( sid.getSID() ) );
return;
}
if (kug->getGroups().lookup(s.toInt())) {
KMessageBox::sorry( 0,
- i18n("Group with gid %1 already exists.").tqarg(s.toInt()) );
+ i18n("Group with gid %1 already exists.").arg(s.toInt()) );
return;
}
}
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index eed0ee5..8734936 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -95,7 +95,7 @@ bool KGroupFiles::reload()
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::fromLatin1(strerror(errno))) );
+ arg(filename).arg(TQString::fromLatin1(strerror(errno))) );
if( (processing_file & GROUP) != 0 ) {
group_errno = errno;
if(!nisgroup_filename.isEmpty()) {
@@ -121,7 +121,7 @@ bool KGroupFiles::reload()
FILE *fgrp = fopen(TQFile::encodeName(filename), "r");
TQString tmp;
if (fgrp == 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;
}
@@ -233,14 +233,14 @@ bool KGroupFiles::save()
if(!group_filename.isEmpty()) {
if((group_fd = fopen(TQFile::encodeName(new_group_filename), "w")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_group_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_group_filename) );
return false;
}
}
if(!gshadow_filename.isEmpty()) {
if((gshadow_fd = fopen(TQFile::encodeName(new_gshadow_filename), "w")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_gshadow_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_gshadow_filename) );
if ( group_fd ) fclose ( group_fd );
return false;
}
@@ -248,7 +248,7 @@ bool KGroupFiles::save()
if(!nisgroup_filename.isEmpty() && (nisgroup_filename != group_filename)) {
if((nisgroup_fd = fopen(TQFile::encodeName(new_nisgroup_filename), "w")) == NULL) {
- KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_nisgroup_filename) );
+ KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_nisgroup_filename) );
if ( group_fd ) fclose ( group_fd );
if ( gshadow_fd ) fclose ( gshadow_fd );
return false;
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index 6369ee7..4ac7c43 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -548,24 +548,24 @@ int KU::KUser::createHome()
{
if(p_dir.isNull() || p_dir.isEmpty()) {
- KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").tqarg(p_name) );
+ KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").arg(p_name) );
return(0);
}
if (mkdir(TQFile::encodeName(p_dir), 0700) != 0) {
if (errno != EEXIST)
{
- KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
return(0);
}
}
if (chown(TQFile::encodeName(p_dir), p_uid, p_gid) != 0) {
- KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
return(1);
}
if (chmod(TQFile::encodeName(p_dir), KU_HOMEDIR_PERM) != 0) {
- KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
return(1);
}
return(1);
@@ -580,33 +580,33 @@ int KU::KUser::tryCreate(const TQString &dir)
if (rc == 0) {
if (S_ISDIR(sb.st_mode)) {
if (KMessageBox::warningContinueCancel( 0,
- i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").tqarg(dir).tqarg(p_name),
+ i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").arg(dir).arg(p_name),
TQString(), KStdGuiItem::cont() ) == KMessageBox::Continue) {
if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) {
- KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
return(0);
} else {
- KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").tqarg(dir).tqarg(p_name) );
+ KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").arg(dir).arg(p_name) );
return(-1);
}
} else {
- KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").tqarg(dir).tqarg(p_name) );
+ KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").arg(dir).arg(p_name) );
return(-1);
}
} else {
if (errno == ENOENT) {
if (mkdir(TQFile::encodeName(dir), 0700) != 0) {
- KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))));
+ KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))));
return(-1);
}
if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) {
- KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
return(0);
} else {
- KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
return(-1);
}
}
@@ -622,8 +622,8 @@ int KU::KUser::createMailBox()
if (errno != EEXIST)
{
KMessageBox::error( 0, i18n("Cannot create %1: %2")
- .tqarg(mailboxpath)
- .tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(mailboxpath)
+ .arg(TQString::fromLocal8Bit(strerror(errno))) );
return -1;
}
}
@@ -632,13 +632,13 @@ int KU::KUser::createMailBox()
if (chown(TQFile::encodeName(mailboxpath), p_uid, KU_MAILBOX_GID) != 0) {
KMessageBox::error( 0, i18n("Cannot change owner on mailbox: %1\nError: %2")
- .tqarg(mailboxpath).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) );
return -1;
}
if (chmod(TQFile::encodeName(mailboxpath), KU_MAILBOX_PERM) != 0) {
KMessageBox::error( 0, i18n("Cannot change permissions on mailbox: %1\nError: %2")
- .tqarg(mailboxpath).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) );
return -1;
}
@@ -683,7 +683,7 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
if (symlink(TQFile::encodeName(link),TQFile::encodeName(d.filePath(name))) != 0) {
KMessageBox::error( 0, i18n("Error creating symlink %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
} else if ( info.isDir() ) {
TQDir dir(filename);
@@ -693,12 +693,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) {
KMessageBox::error( 0, i18n("Cannot change owner of folder %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) {
KMessageBox::error( 0, i18n("Cannot change permissions on folder %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
} else {
@@ -708,12 +708,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) {
KMessageBox::error( 0, i18n("Cannot change owner of file %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) {
KMessageBox::error( 0, i18n("Cannot change permissions on file %1.\nError: %2")
- .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
}
}
@@ -726,12 +726,12 @@ int KU::KUser::copySkel()
mode_t mode;
if (!s.exists()) {
- KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").tqarg(s.absPath()).tqarg(p_name) );
+ KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").arg(s.absPath()).arg(p_name) );
return (-1);
}
if (!d.exists()) {
- KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").tqarg(d.absPath()) );
+ KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").arg(d.absPath()) );
return (-1);
}
@@ -750,14 +750,14 @@ int KU::KUser::removeHome()
if (S_ISDIR(sb.st_mode) && sb.st_uid == p_uid) {
if (!KIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) {
KMessageBox::error( 0, i18n("Cannot remove home folder %1.\nError: %2")
- .tqarg(p_dir).tqarg(KIO::NetAccess::lastErrorString()) );
+ .arg(p_dir).arg(KIO::NetAccess::lastErrorString()) );
}
} else {
- KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").tqarg(p_dir).tqarg(sb.st_uid).tqarg(sb.st_gid) );
+ KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").arg(p_dir).arg(sb.st_uid).arg(sb.st_gid) );
}
else {
KMessageBox::error( 0, i18n("stat call on file %1 failed.\nError: %2")
- .tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
return 0;
@@ -772,10 +772,10 @@ int KU::KUser::removeCrontabs()
file = TQFile::decodeName(CRONTAB_DIR) + "/" + p_name;
if ( access(TQFile::encodeName(file), F_OK) == 0 ) {
- command = TQString::fromLatin1("crontab -u %1 -r").tqarg(KProcess::quote(p_name));
+ command = TQString::fromLatin1("crontab -u %1 -r").arg(KProcess::quote(p_name));
if ( system(TQFile::encodeName(command)) != 0 ) {
KMessageBox::error( 0, i18n("Cannot remove crontab %1.\nError: %2")
- .tqarg(command).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(command).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
}
@@ -789,7 +789,7 @@ int KU::KUser::removeMailBox()
file = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + p_name;
if (remove(TQFile::encodeName(file)) != 0) {
KMessageBox::error( 0, i18n("Cannot remove mailbox %1.\nError: %2")
- .tqarg(file).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
+ .arg(file).arg(TQString::fromLocal8Bit(strerror(errno))) );
}
return 0;
@@ -808,7 +808,7 @@ int KU::KUser::removeProcesses()
break;
case -1:
KMessageBox::error( 0,
- i18n("Cannot fork while trying to kill processes for uid %1.").tqarg(p_uid) );
+ i18n("Cannot fork while trying to kill processes for uid %1.").arg(p_uid) );
break;
}
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index cc67a8a..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;
}
@@ -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;
}
@@ -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 );
@@ -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;
}
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index d661e35..74ee465 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -373,10 +373,10 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
if ( cn.isEmpty() ) cn = user->getName();
gecos = TQString::fromLatin1("%1,%2,%3,%4")
- .tqarg(user->getFullName())
- .tqarg(user->getOffice1())
- .tqarg(user->getOffice2())
- .tqarg(user->getAddress());
+ .arg(user->getFullName())
+ .arg(user->getOffice1())
+ .arg(user->getOffice2())
+ .arg(user->getAddress());
samflags = "[U";
samflags += user->getDisabled() ? 'D' : ' ';
diff --git a/kuser/kuservw.cpp b/kuser/kuservw.cpp
index 43bb19b..6059726 100644
--- a/kuser/kuservw.cpp
+++ b/kuser/kuservw.cpp
@@ -45,7 +45,7 @@ int KUserViewItem::compare( TQListViewItem *i, int col, bool ascending ) const
}
void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment )
+ int column, int width, int alignment )
{
TQColorGroup _cg( cg );
TQColor c = _cg.text();
@@ -53,7 +53,7 @@ void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
if ( mUser->getDisabled() )
_cg.setColor( TQColorGroup::Text, KGlobalSettings::visitedLinkColor() );
- KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ KListViewItem::paintCell( p, _cg, column, width, alignment );
_cg.setColor( TQColorGroup::Text, c );
}
diff --git a/kuser/kuservw.h b/kuser/kuservw.h
index fa5827f..f69573d 100644
--- a/kuser/kuservw.h
+++ b/kuser/kuservw.h
@@ -35,7 +35,7 @@ public:
private:
virtual TQString text ( int ) const;
virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment );
+ int column, int width, int alignment );
virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
KU::KUser *mUser;
};
diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp
index 5d168ac..fd9eee6 100644
--- a/kuser/mainView.cpp
+++ b/kuser/mainView.cpp
@@ -165,7 +165,7 @@ void mainView::userdel()
if ( group &&
KMessageBox::questionYesNo( 0, i18n("You are using private groups.\n"
"Do you want to delete the user's private group '%1'?")
- .tqarg(group->getName()), TQString(),
+ .arg(group->getName()), TQString(),
KStdGuiItem::del(), i18n("Do Not Delete")) == KMessageBox::Yes) {
kdDebug() << "del private group" << endl;
kug->getGroups().del( group );
@@ -203,7 +203,7 @@ void mainView::useradd()
if ( !ok ) return;
if ( kug->getUsers().lookup( name ) ) {
- KMessageBox::sorry( 0, i18n("User with name %1 already exists.").tqarg( name ) );
+ KMessageBox::sorry( 0, i18n("User with name %1 already exists.").arg( name ) );
return;
}
@@ -305,7 +305,7 @@ void mainView::setpwd()
if ( count > 1 ) {
if ( KMessageBox::questionYesNo( 0,
i18n("You have selected %1 users. Do you really want to change the password for all the selected users?")
- .tqarg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return;
+ .arg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return;
}
pwddlg d( this );
if ( d.exec() != TQDialog::Accepted ) return;
@@ -444,7 +444,7 @@ void mainView::grpdel()
KU::KUser *user = kug->getUsers().first();
while ( user ) {
if ( user->getGID() == group->getGID() ) {
- KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).tqarg( group->getName() ).tqarg( user->getName() ) );
+ KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).arg( group->getName() ).arg( user->getName() ) );
return;
}
user = kug->getUsers().next();
@@ -457,12 +457,12 @@ void mainView::grpdel()
case 0: return;
case 1:
if (KMessageBox::warningContinueCancel( 0,
- i18n("Do you really want to delete the group '%1'?").tqarg(group->getName()),
+ i18n("Do you really want to delete the group '%1'?").arg(group->getName()),
TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return;
break;
default:
if (KMessageBox::warningContinueCancel( 0,
- i18n("Do you really want to delete the %1 selected groups?").tqarg(selected),
+ i18n("Do you really want to delete the %1 selected groups?").arg(selected),
TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return;
}
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index 659ff73..6b26a72 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -43,7 +43,7 @@ bool backup(const TQString & name)
if (copyFile(TQFile::encodeName(name), TQFile::encodeName(tmp)) == -1)
{
TQString str;
- KMessageBox::error( 0, i18n("Can't create backup file for %1").tqarg(name) );
+ KMessageBox::error( 0, i18n("Can't create backup file for %1").arg(name) );
return false;
}
return true;
@@ -68,17 +68,17 @@ int copyFile(const TQString & from, const TQString & to)
fo.setName(to);
if (!fi.exists()) {
- KMessageBox::error( 0, i18n("File %1 does not exist.").tqarg(from) );
+ KMessageBox::error( 0, i18n("File %1 does not exist.").arg(from) );
return (-1);
}
if (!fi.open(IO_ReadOnly)) {
- KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").tqarg(from) );
+ KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").arg(from) );
return (-1);
}
if (!fo.open(IO_Raw | IO_WriteOnly | IO_Truncate)) {
- KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").tqarg(to) );
+ KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").arg(to) );
return (-1);
}
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index 4893e04..cc662be 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -39,7 +39,7 @@
<property name="text">
<string>Time before password expires to issue an expire warning:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -53,7 +53,7 @@
<property name="text">
<string>Time when password expires after last password change:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -67,7 +67,7 @@
<property name="text">
<string>Time when account will be disabled after expiration of password:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
<property name="text">
<string>Time before password may not be changed after last password change:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index cd431c0..e1fb80e 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -346,7 +346,7 @@ propdlg::propdlg( const TQPtrList<KU::KUser> &users,
{
mUsers = users;
if ( mUsers.getFirst() != mUsers.getLast() )
- setCaption( i18n("User Properties - %1 Selected Users").tqarg( mUsers.count() ) );
+ setCaption( i18n("User Properties - %1 Selected Users").arg( mUsers.count() ) );
initDlg();
loadgroups( false );
selectuser();
@@ -658,14 +658,14 @@ void propdlg::setpgroup()
{
item->setEnabled(true);
item->setOn(prevPrimaryGroupWasOn);
- item->tqrepaint();
+ item->repaint();
}
if ( groupName == primaryGroup )
{
primaryGroupWasOn = item->isOn();
item->setEnabled(false);
item->setOn(true);
- item->tqrepaint();
+ item->repaint();
}
item = (TQCheckListItem *) item->nextSibling();
@@ -941,7 +941,7 @@ void propdlg::slotOk()
{
if (kug->getUsers().lookup(newuid)) {
KMessageBox::sorry( 0,
- i18n("User with UID %1 already exists").tqarg(newuid) );
+ i18n("User with UID %1 already exists").arg(newuid) );
return;
}
}
@@ -951,7 +951,7 @@ void propdlg::slotOk()
if ( oldrid != newrid ) {
if (kug->getUsers().lookup_sam(newrid)) {
KMessageBox::sorry( 0,
- i18n("User with RID %1 already exists").tqarg(newrid) );
+ i18n("User with RID %1 already exists").arg(newrid) );
return;
}
}
@@ -968,7 +968,7 @@ void propdlg::slotOk()
i18n("<p>The shell %1 is not yet listed in the file %2. "
"In order to use this shell you must add it to "
"this file first."
- "<p>Do you want to add it now?").tqarg(newshell).tqarg(TQFile::decodeName(SHELL_FILE)),
+ "<p>Do you want to add it now?").arg(newshell).arg(TQFile::decodeName(SHELL_FILE)),
i18n("Unlisted Shell"),
i18n("&Add Shell"),
i18n("Do &Not Add"));