From 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:58:08 -0600 Subject: Remove additional unneeded tq method conversions --- filesharing/advanced/kcm_sambaconf/dictmanager.cpp | 2 +- filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp | 8 ++++---- filesharing/advanced/kcm_sambaconf/hiddenfileview.h | 2 +- filesharing/advanced/kcm_sambaconf/kcminterface.ui | 6 +++--- filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui | 2 +- filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp | 12 ++++++------ .../advanced/kcm_sambaconf/linuxpermissionchecker.cpp | 8 ++++---- filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp | 8 ++++---- filesharing/advanced/kcm_sambaconf/sambafile.cpp | 10 +++++----- filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) (limited to 'filesharing/advanced/kcm_sambaconf') diff --git a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp index 6048e871..04eb0be7 100644 --- a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp +++ b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp @@ -58,7 +58,7 @@ DictManager::~DictManager() { void DictManager::handleUnsupportedWidget(const TQString & s, TQWidget* w) { w->setEnabled(false); - TQToolTip::add(w,i18n("The option %1 is not supported by your Samba version").tqarg(s)); + TQToolTip::add(w,i18n("The option %1 is not supported by your Samba version").arg(s)); } void DictManager::add(const TQString & key, TQLineEdit* lineEdit) { diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 31a642ff..09252315 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -91,7 +91,7 @@ KFileItem* HiddenListViewItem::getFileItem() } -void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; @@ -101,7 +101,7 @@ void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int col if (isOn(COL_HIDDEN)) _cg.setColor(TQColorGroup::Text,gray); - QMultiCheckListItem::paintCell(p, _cg, column, width, tqalignment); + QMultiCheckListItem::paintCell(p, _cg, column, width, alignment); } @@ -404,7 +404,7 @@ void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQ // TODO remove and use instead int result = KMessageBox::questionYesNo(_dlg,i18n( "Some files you have selected are matched by the wildcarded string '%1'; " - "do you want to uncheck all files matching '%1'?").tqarg(rx->pattern()).tqarg(rx->pattern()).tqarg(rx->pattern()), + "do you want to uncheck all files matching '%1'?").arg(rx->pattern()).arg(rx->pattern()).arg(rx->pattern()), i18n("Wildcarded String"),i18n("Uncheck Matches"),i18n("Keep Selected")); TQPtrList lst = getMatchingItems( *rx ); @@ -519,7 +519,7 @@ void HiddenFileView::updateView() item->setOn(COL_VETO_OPLOCK,matchVetoOplock(item->text(0))); } - _dlg->hiddenListView->tqrepaint(); + _dlg->hiddenListView->repaint(); } diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h index 27bd7c7b..58e0e056 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h @@ -47,7 +47,7 @@ public: HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock ); ~HiddenListViewItem(); - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); KFileItem* getFileItem(); protected: diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index 8b386a4d..df9a6bd3 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -370,7 +370,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. RichText - + WordBreak|AlignTop @@ -584,7 +584,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. For detailed help about every option please look at: - + AlignVCenter @@ -4607,7 +4607,7 @@ Only change something if you know what you are doing. Oplock break &wait time: - + AlignVCenter diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 200f9eaa..069059bc 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -25,7 +25,7 @@ KcmPrinterDlg - + 0 0 diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 26b3a194..332f063c 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -1102,7 +1102,7 @@ void KcmSambaConf::joinADomainBtnClicked() { dlg->usernameEdit->text(), dlg->passwordEdit->text())) { - KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").tqarg(dlg->domainEdit->text())); + KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").arg(dlg->domainEdit->text())); } } delete dlg; @@ -1172,7 +1172,7 @@ void KcmSambaConf::addSambaUserBtnClicked() TQCString password; int passResult = KPasswordDialog::getNewPassword(password, - i18n("Please enter a password for the user %1").tqarg(user.name)); + i18n("Please enter a password for the user %1").arg(user.name)); if (passResult != KPasswordDialog::Accepted) { list.remove(item); continue; @@ -1180,7 +1180,7 @@ void KcmSambaConf::addSambaUserBtnClicked() if (!passwd.addUser(user,password)) { - KMessageBox::sorry(0,i18n("Adding the user %1 to the Samba user database failed.").tqarg(user.name)); + KMessageBox::sorry(0,i18n("Adding the user %1 to the Samba user database failed.").arg(user.name)); break; } @@ -1211,7 +1211,7 @@ void KcmSambaConf::removeSambaUserBtnClicked() SambaUser user( item->text(0), item->text(1).toInt() ); if (!passwd.removeUser(user)) { - KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").tqarg(user.name)); + KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").arg(user.name)); continue; } @@ -1235,13 +1235,13 @@ void KcmSambaConf::sambaUserPasswordBtnClicked() TQCString password; int passResult = KPasswordDialog::getNewPassword(password, - i18n("Please enter a password for the user %1").tqarg(user.name)); + i18n("Please enter a password for the user %1").arg(user.name)); if (passResult != KPasswordDialog::Accepted) return; if (!passwd.changePassword(user,password)) { - KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").tqarg(user.name)); + KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").arg(user.name)); } else { static_cast(item)->setOn(COL_NOPASSWORD,false); } diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp index 5bac2fdf..83ea5180 100644 --- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp +++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp @@ -115,7 +115,7 @@ bool LinuxPermissionChecker::checkPublicPermissions() { 0L,i18n( "You have specified public read access for this directory, but " "the guest account %1 does not have the necessary read permissions;
" - "do you want to continue anyway?").tqarg(guestAccount) + "do you want to continue anyway?").arg(guestAccount) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_guestAccountHasNoReadPermissionsWarning")) @@ -129,7 +129,7 @@ bool LinuxPermissionChecker::checkPublicPermissions() { 0L,i18n( "You have specified public write access for this directory, but " "the guest account %1 does not have the necessary write permissions;
" - "do you want to continue anyway?").tqarg(guestAccount) + "do you want to continue anyway?").arg(guestAccount) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_guestAccountHasNoWritePermissionsWarning")) @@ -166,7 +166,7 @@ bool LinuxPermissionChecker::checkUserWritePermissions(const TQString & user, bo 0L,i18n( "You have specified write access to the user %1 for this directory, but " "the user does not have the necessary write permissions;
" - "do you want to continue anyway?").tqarg(user) + "do you want to continue anyway?").arg(user) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_userHasNoWritePermissionsWarning")) @@ -189,7 +189,7 @@ bool LinuxPermissionChecker::checkUserReadPermissions(const TQString & user, boo 0L,i18n( "You have specified read access to the user %1 for this directory, but " "the user does not have the necessary read permissions;
" - "do you want to continue anyway?").tqarg(user) + "do you want to continue anyway?").arg(user) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_userHasNoReadPermissionsWarning")) diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp index 1600aa7c..187289b6 100644 --- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp +++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp @@ -53,7 +53,7 @@ void QMultiCheckListItem::setOn(int column, bool b) { checkStates.setBit(column,b); checkBoxColumns.setBit(column); kdDebug(5009) << "setOn : " << column << endl; - tqrepaint(); + repaint(); } bool QMultiCheckListItem::isOn(int column) { @@ -74,7 +74,7 @@ void QMultiCheckListItem::toggle(int column) { checkStates.toggleBit(column); emit stateChanged(column,checkStates.testBit(column)); - tqrepaint(); + repaint(); } void QMultiCheckListItem::setDisabled(int column, bool b) { @@ -83,8 +83,8 @@ void QMultiCheckListItem::setDisabled(int column, bool b) { } disableStates.setBit(column,b); -// KMessageBox::information(0L,TQString("setDisabled"),TQString("disable %1 ").tqarg(column)); - tqrepaint(); +// KMessageBox::information(0L,TQString("setDisabled"),TQString("disable %1 ").arg(column)); + repaint(); } void QMultiCheckListItem::paintCell(TQPainter *p,const TQColorGroup & cg, int col, int width, int align) diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 0b1d1524..4703716b 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -174,14 +174,14 @@ bool SambaFile::slotApply() kdDebug(5009) << "SambaFile::slotApply: is local file!" << endl; TQString suCommand=TQString("cp %1 %2; rm %3") - .tqarg(_tempFile->name()) - .tqarg(path) - .tqarg(_tempFile->name()); + .arg(_tempFile->name()) + .arg(path) + .arg(_tempFile->name()); proc << "tdesu" << "-d" << suCommand; if (! proc.start(KProcess::Block)) { kdDebug(5009) << "SambaFile::slotApply: saving to " << path << " failed!" << endl; - //KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").tqarg(path)); + //KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").arg(path)); delete _tempFile; _tempFile = 0; return false; @@ -506,7 +506,7 @@ bool SambaFile::openFile() { TQFile f(localPath); if (!f.open(IO_ReadOnly)) { - //throw SambaFileLoadException(TQString("Could not open file %1 for reading.").tqarg(path)); + //throw SambaFileLoadException(TQString("Could not open file %1 for reading.").arg(path)); return false; } diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 3805429b..46a8bc8b 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -72,7 +72,7 @@ void SmbConfConfigWidget::btnPressed() { if (smbConf.isEmpty()) return; if ( ! TQFileInfo(smbConf).isReadable() ) { - KMessageBox::sorry(this,i18n("The file %1 could not be read.").tqarg(smbConf),i18n("Could Not Read File")); + KMessageBox::sorry(this,i18n("The file %1 could not be read.").arg(smbConf),i18n("Could Not Read File")); return; } -- cgit v1.2.1