From 808e453c56036211f57482ed847d54aca01bba68 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:40 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- filesharing/advanced/kcm_sambaconf/dictmanager.cpp | 2 +- .../advanced/kcm_sambaconf/expertuserdlg.ui | 4 +- filesharing/advanced/kcm_sambaconf/filemodedlg.ui | 6 +- .../advanced/kcm_sambaconf/groupselectdlg.ui | 4 +- .../advanced/kcm_sambaconf/hiddenfileview.cpp | 8 +- .../advanced/kcm_sambaconf/hiddenfileview.h | 2 +- .../advanced/kcm_sambaconf/joindomaindlg.ui | 4 +- filesharing/advanced/kcm_sambaconf/kcminterface.ui | 142 ++++++++++----------- .../advanced/kcm_sambaconf/kcmprinterdlg.ui | 18 +-- .../advanced/kcm_sambaconf/kcmsambaconf.cpp | 18 +-- .../advanced/kcm_sambaconf/konqinterface.ui | 4 +- .../kcm_sambaconf/linuxpermissionchecker.cpp | 8 +- .../advanced/kcm_sambaconf/printerdlgimpl.cpp | 6 +- .../advanced/kcm_sambaconf/qmultichecklistitem.cpp | 8 +- filesharing/advanced/kcm_sambaconf/sambafile.cpp | 12 +- filesharing/advanced/kcm_sambaconf/share.ui | 72 +++++------ .../advanced/kcm_sambaconf/sharedlgimpl.cpp | 2 +- .../advanced/kcm_sambaconf/smbconfconfigwidget.cpp | 12 +- .../advanced/kcm_sambaconf/smbpasswdfile.cpp | 4 +- .../advanced/kcm_sambaconf/socketoptionsdlg.ui | 2 +- .../advanced/kcm_sambaconf/userselectdlg.ui | 4 +- filesharing/advanced/kcm_sambaconf/usertab.ui | 2 +- filesharing/advanced/nfs/hostprops.ui | 14 +- filesharing/advanced/nfs/nfsdialog.cpp | 6 +- filesharing/advanced/nfs/nfsdialoggui.ui | 2 +- filesharing/advanced/nfs/nfsentry.cpp | 4 +- filesharing/advanced/nfs/nfsentry.h | 2 +- filesharing/advanced/nfs/nfsfile.cpp | 6 +- filesharing/advanced/nfs/nfshostdlg.cpp | 10 +- .../advanced/propsdlgplugin/propertiespage.cpp | 10 +- .../advanced/propsdlgplugin/propertiespagegui.ui | 22 ++-- .../propsdlgplugin/propsdlgshareplugin.cpp | 2 +- 32 files changed, 211 insertions(+), 211 deletions(-) (limited to 'filesharing/advanced') 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/expertuserdlg.ui b/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui index 690688c2..59b27886 100644 --- a/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui @@ -129,7 +129,7 @@ Expanding - + 20 20 @@ -179,7 +179,7 @@ Expanding - + 20 40 diff --git a/filesharing/advanced/kcm_sambaconf/filemodedlg.ui b/filesharing/advanced/kcm_sambaconf/filemodedlg.ui index 0f8867c8..96e207df 100644 --- a/filesharing/advanced/kcm_sambaconf/filemodedlg.ui +++ b/filesharing/advanced/kcm_sambaconf/filemodedlg.ui @@ -67,7 +67,7 @@ Expanding - + 20 43 @@ -84,7 +84,7 @@ Expanding - + 70 20 @@ -359,7 +359,7 @@ Expanding - + 20 20 diff --git a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui index 51f5e10b..08595eb5 100644 --- a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui @@ -52,7 +52,7 @@ Expanding - + 285 20 @@ -113,7 +113,7 @@ Expanding - + 20 20 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/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui index 2ab91cf5..51a0ff36 100644 --- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui +++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui @@ -46,7 +46,7 @@ Expanding - + 20 20 @@ -190,7 +190,7 @@ Expanding - + 20 40 diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index 39a21fb3..f206907b 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -91,7 +91,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout38 + layout38 @@ -259,7 +259,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout33 + layout33 @@ -370,7 +370,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. RichText - + WordBreak|AlignTop @@ -461,7 +461,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout39 + layout39 @@ -521,7 +521,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 40 20 @@ -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 @@ -614,7 +614,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 30 0 @@ -633,7 +633,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 40 @@ -752,7 +752,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 0 @@ -900,7 +900,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 0 @@ -954,7 +954,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout56 + layout56 @@ -1044,7 +1044,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout55 + layout55 @@ -1066,7 +1066,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 30 @@ -1102,7 +1102,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 30 @@ -1135,7 +1135,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 30 @@ -1202,7 +1202,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. - tqlayout55 + layout55 @@ -1243,7 +1243,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 240 20 @@ -1413,7 +1413,7 @@ Only change something if you know what you are doing. Expanding - + 20 40 @@ -1673,7 +1673,7 @@ Only change something if you know what you are doing. Expanding - + 180 20 @@ -1717,7 +1717,7 @@ Only change something if you know what you are doing. Expanding - + 117 20 @@ -1789,7 +1789,7 @@ Only change something if you know what you are doing. Expanding - + 20 40 @@ -2065,7 +2065,7 @@ Only change something if you know what you are doing. Expanding - + 20 20 @@ -2242,7 +2242,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -2295,7 +2295,7 @@ Only change something if you know what you are doing. Expanding - + 20 170 @@ -2458,7 +2458,7 @@ Only change something if you know what you are doing. Expanding - + 16 20 @@ -2592,7 +2592,7 @@ Only change something if you know what you are doing. Expanding - + 120 20 @@ -2611,7 +2611,7 @@ Only change something if you know what you are doing. Expanding - + 20 20 @@ -2730,7 +2730,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -2768,7 +2768,7 @@ Only change something if you know what you are doing. 0 - + 76 0 @@ -2834,7 +2834,7 @@ Only change something if you know what you are doing. statusChk - tqStatus + Status true @@ -2906,7 +2906,7 @@ Only change something if you know what you are doing. Expanding - + 20 60 @@ -3034,7 +3034,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -3053,7 +3053,7 @@ Only change something if you know what you are doing. Expanding - + 20 50 @@ -3144,7 +3144,7 @@ Only change something if you know what you are doing. Expanding - + 16 20 @@ -3493,7 +3493,7 @@ Only change something if you know what you are doing. Expanding - + 20 16 @@ -3694,7 +3694,7 @@ Only change something if you know what you are doing. Expanding - + 20 40 @@ -3730,7 +3730,7 @@ Only change something if you know what you are doing. Expanding - + 20 100 @@ -3811,7 +3811,7 @@ Only change something if you know what you are doing. Preferred - + 323 20 @@ -4060,7 +4060,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -4202,7 +4202,7 @@ Only change something if you know what you are doing. Expanding - + 20 120 @@ -4347,7 +4347,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -4393,7 +4393,7 @@ Only change something if you know what you are doing. Expanding - + 20 280 @@ -4570,7 +4570,7 @@ Only change something if you know what you are doing. Expanding - + 30 20 @@ -4607,7 +4607,7 @@ Only change something if you know what you are doing. Oplock break &wait time: - + AlignVCenter @@ -4640,7 +4640,7 @@ Only change something if you know what you are doing. Expanding - + 50 20 @@ -4659,7 +4659,7 @@ Only change something if you know what you are doing. Expanding - + 20 120 @@ -4776,7 +4776,7 @@ Only change something if you know what you are doing. - tqunicodeChk + unicodeChk U&nicode @@ -4917,7 +4917,7 @@ Only change something if you know what you are doing. Expanding - + 20 80 @@ -5036,7 +5036,7 @@ Only change something if you know what you are doing. Expanding - + 20 20 @@ -5481,7 +5481,7 @@ Only change something if you know what you are doing. Expanding - + 80 0 @@ -5500,7 +5500,7 @@ Only change something if you know what you are doing. Expanding - + 0 70 @@ -5729,7 +5729,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 140 0 @@ -5913,7 +5913,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 0 30 @@ -5949,7 +5949,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 50 @@ -6035,7 +6035,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 330 20 @@ -6193,7 +6193,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 40 20 @@ -6405,7 +6405,7 @@ This is only available if the SSL libraries have been compiled on your system an 0 - + 150 0 @@ -6468,7 +6468,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 340 20 @@ -6553,7 +6553,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 300 @@ -6728,7 +6728,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 370 20 @@ -6824,7 +6824,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 100 @@ -6860,7 +6860,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 280 @@ -6946,7 +6946,7 @@ This is only available if the SSL libraries have been compiled on your system an 0 - + 150 0 @@ -6993,7 +6993,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 0 30 @@ -7134,7 +7134,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 130 @@ -7339,7 +7339,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 330 20 @@ -7452,7 +7452,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 230 @@ -7643,7 +7643,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 40 20 @@ -7764,7 +7764,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 40 @@ -7838,7 +7838,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 320 @@ -8243,7 +8243,7 @@ This is only available if the SSL libraries have been compiled on your system an logonDriveEdit logonPathUrlRq logonHomeUrlRq - tqunicodeChk + unicodeChk displayCharsetEdit unixCharsetEdit dosCharsetEdit diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 4a622f1a..069059bc 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -25,7 +25,7 @@ KcmPrinterDlg - + 0 0 @@ -319,7 +319,7 @@ Expanding - + 20 20 @@ -349,7 +349,7 @@ Expanding - + 20 50 @@ -535,7 +535,7 @@ Expanding - + 200 20 @@ -633,7 +633,7 @@ Expanding - + 20 20 @@ -683,7 +683,7 @@ Expanding - + 263 20 @@ -831,7 +831,7 @@ Expanding - + 20 20 @@ -944,7 +944,7 @@ Expanding - + 20 20 @@ -1079,7 +1079,7 @@ Expanding - + 20 20 diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 7914aef2..64d09e0c 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -919,7 +919,7 @@ void KcmSambaConf::loadCharset(SambaShare* ) _dictMngr->add("character set", _interface->characterSetEdit); _dictMngr->add("valid chars", _interface->validCharsEdit); - _dictMngr->add("tqunicode",_interface->tqunicodeChk); + _dictMngr->add("unicode",_interface->unicodeChk); } void KcmSambaConf::loadWinbind(SambaShare* ) @@ -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); } @@ -1267,7 +1267,7 @@ void KcmSambaConf::save() { // Base settings _smbconf = _interface->configUrlRq->url(); - KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),false); + KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),false); config.writeEntry("SMBCONF",_smbconf); config.sync(); diff --git a/filesharing/advanced/kcm_sambaconf/konqinterface.ui b/filesharing/advanced/kcm_sambaconf/konqinterface.ui index dfccf5c2..6cba8d8b 100644 --- a/filesharing/advanced/kcm_sambaconf/konqinterface.ui +++ b/filesharing/advanced/kcm_sambaconf/konqinterface.ui @@ -420,7 +420,7 @@ Expanding - + 20 0 @@ -447,7 +447,7 @@ Expanding - + 0 20 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/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index 0ba2082b..6182c5b0 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -227,14 +227,14 @@ void PrinterDlgImpl::printersChkToggled(bool b) pix.setMask(mask); printerPixLbl->setPixmap(pix); - pixFrame->tqlayout()->setMargin( 2 ); + pixFrame->layout()->setMargin( 2 ); } else { shareNameEdit->setEnabled(true); shareNameEdit->setText( _share->getName() ); printerPixLbl->setPixmap(DesktopIcon("printer1")); - pixFrame->tqlayout()->setMargin( 11 ); + pixFrame->layout()->setMargin( 11 ); } } 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 50df27c0..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; @@ -394,7 +394,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload) void SambaFile::testParmStdOutReceived(KProcess *, char *buffer, int buflen) { - _parmOutput+=TQString::tqfromLatin1(buffer,buflen); + _parmOutput+=TQString::fromLatin1(buffer,buflen); } void SambaFile::parseParmStdOutput() @@ -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/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index 65fff9c5..ba600d17 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -304,7 +304,7 @@ Expanding - + 20 90 @@ -362,7 +362,7 @@ Expanding - + 50 20 @@ -540,7 +540,7 @@ Expanding - + 20 20 @@ -735,7 +735,7 @@ - tqlayout18 + layout18 @@ -799,7 +799,7 @@ - tqlayout52 + layout52 @@ -1050,7 +1050,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1072,7 +1072,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1086,7 +1086,7 @@ Only change something if you know what you are doing. forceCreateModeEdit - + 40 0 @@ -1100,7 +1100,7 @@ Only change something if you know what you are doing. forceSecurityModeEdit - + 40 0 @@ -1114,7 +1114,7 @@ Only change something if you know what you are doing. forceDirectoryModeEdit - + 40 0 @@ -1128,7 +1128,7 @@ Only change something if you know what you are doing. forceDirectorySecurityModeEdit - + 40 0 @@ -1150,7 +1150,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1172,7 +1172,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1194,7 +1194,7 @@ Only change something if you know what you are doing. Expanding - + 20 16 @@ -1272,7 +1272,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1294,7 +1294,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1316,7 +1316,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1330,7 +1330,7 @@ Only change something if you know what you are doing. securityMaskEdit - + 40 0 @@ -1344,7 +1344,7 @@ Only change something if you know what you are doing. directoryMaskEdit - + 40 0 @@ -1358,7 +1358,7 @@ Only change something if you know what you are doing. directorySecurityMaskEdit - + 40 0 @@ -1386,7 +1386,7 @@ Only change something if you know what you are doing. createMaskEdit - + 40 0 @@ -1408,7 +1408,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1490,7 +1490,7 @@ Only change something if you know what you are doing. forceUnknownAclUserEdit - + 40 0 @@ -1676,7 +1676,7 @@ Only change something if you know what you are doing. Expanding - + 20 120 @@ -1759,7 +1759,7 @@ Only change something if you know what you are doing. Expanding - + 143 16 @@ -1933,7 +1933,7 @@ Only change something if you know what you are doing. Expanding - + 20 30 @@ -2024,7 +2024,7 @@ Only change something if you know what you are doing. manglingCharEdit - + 40 32767 @@ -2041,7 +2041,7 @@ Only change something if you know what you are doing. Expanding - + 20 0 @@ -2322,7 +2322,7 @@ Only change something if you know what you are doing. Expanding - + 20 20 @@ -2392,7 +2392,7 @@ Only change something if you know what you are doing. Expanding - + 299 20 @@ -2453,7 +2453,7 @@ Only change something if you know what you are doing. - tqlayout9 + layout9 @@ -2508,7 +2508,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -2564,7 +2564,7 @@ Only change something if you know what you are doing. Expanding - + 20 260 @@ -2648,7 +2648,7 @@ Only change something if you know what you are doing. Expanding - + 16 284 @@ -2745,7 +2745,7 @@ Only change something if you know what you are doing. Expanding - + 20 50 @@ -2916,7 +2916,7 @@ Only change something if you know what you are doing. Expanding - + 20 0 diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 55a1983c..ce2d15ad 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 3805429b..c9616a14 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -27,7 +27,7 @@ ******************************************************************************/ #include -#include +#include #include #include @@ -43,7 +43,7 @@ SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent) : TQWidget(parent,"configWidget") { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this,5); + TQVBoxLayout *layout = new TQVBoxLayout(this,5); TQLabel *lbl = new TQLabel(i18n("

The SAMBA configuration file 'smb.conf'" \ " could not be found;

" \ @@ -59,9 +59,9 @@ SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent) hbox->addStretch(); hbox->addWidget(btn); - tqlayout->addWidget(lbl); - tqlayout->addLayout(hbox); - tqlayout->addStretch(); + layout->addWidget(lbl); + layout->addLayout(hbox); + layout->addStretch(); } void SmbConfConfigWidget::btnPressed() { @@ -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; } diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp index b964d700..f6a2282b 100644 --- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include @@ -175,7 +175,7 @@ bool SmbPasswdFile::changePassword(const SambaUser & user, const TQString & newP void SmbPasswdFile::smbpasswdStdOutReceived(KProcess *, char *buffer, int buflen) { - _smbpasswdOutput+=TQString::tqfromLatin1(buffer,buflen); + _smbpasswdOutput+=TQString::fromLatin1(buffer,buflen); } diff --git a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui index b04f8b7b..e2d4be95 100644 --- a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui @@ -238,7 +238,7 @@ Expanding - + 20 20 diff --git a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui index 1526832a..17d02c12 100644 --- a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui @@ -183,7 +183,7 @@ Expanding - + 20 50 @@ -225,7 +225,7 @@ Expanding - + 285 20 diff --git a/filesharing/advanced/kcm_sambaconf/usertab.ui b/filesharing/advanced/kcm_sambaconf/usertab.ui index af5b87bf..57d8b591 100644 --- a/filesharing/advanced/kcm_sambaconf/usertab.ui +++ b/filesharing/advanced/kcm_sambaconf/usertab.ui @@ -159,7 +159,7 @@ Expanding - + 20 100 diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui index b7fd9f79..d3775c32 100644 --- a/filesharing/advanced/nfs/hostprops.ui +++ b/filesharing/advanced/nfs/hostprops.ui @@ -34,7 +34,7 @@ 0 - + 180 0 @@ -302,7 +302,7 @@ Early NFS client implementations did not send credentials with lock requests, an User Mapping - + AlignAuto @@ -348,7 +348,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap - tqlayout15 + layout15 @@ -380,7 +380,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap 0 - + 50 0 @@ -394,7 +394,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap - tqlayout16 + layout16 @@ -426,7 +426,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap 0 - + 50 0 @@ -450,7 +450,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap Expanding - + 20 16 diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp index ecc93a7d..0dbd5b7a 100644 --- a/filesharing/advanced/nfs/nfsdialog.cpp +++ b/filesharing/advanced/nfs/nfsdialog.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -62,8 +62,8 @@ void NFSDialog::initGUI() { TQWidget* page = plainPage(); m_gui = new NFSDialogGUI(page); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); - tqlayout->addWidget( m_gui ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); + layout->addWidget( m_gui ); KAccel* accel = new KAccel( m_gui->listView ); accel->insert( "Delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveHost())); diff --git a/filesharing/advanced/nfs/nfsdialoggui.ui b/filesharing/advanced/nfs/nfsdialoggui.ui index a9295773..ca77e192 100644 --- a/filesharing/advanced/nfs/nfsdialoggui.ui +++ b/filesharing/advanced/nfs/nfsdialoggui.ui @@ -89,7 +89,7 @@ The first column shows the name or address of the host, the second column shows Expanding - + 20 40 diff --git a/filesharing/advanced/nfs/nfsentry.cpp b/filesharing/advanced/nfs/nfsentry.cpp index b54a3169..397e19b4 100644 --- a/filesharing/advanced/nfs/nfsentry.cpp +++ b/filesharing/advanced/nfs/nfsentry.cpp @@ -125,10 +125,10 @@ TQString NFSHost::paramString() const if (!hide) s+="nohide,"; if (anongid!=65534) - s+=TQString("anongid=%1,").tqarg(anongid); + s+=TQString("anongid=%1,").arg(anongid); if (anonuid!=65534) - s+=TQString("anonuid=%1,").tqarg(anonuid); + s+=TQString("anonuid=%1,").arg(anonuid); // get rid of the last ',' s.truncate(s.length()-1); diff --git a/filesharing/advanced/nfs/nfsentry.h b/filesharing/advanced/nfs/nfsentry.h index 98d1e56a..43071504 100644 --- a/filesharing/advanced/nfs/nfsentry.h +++ b/filesharing/advanced/nfs/nfsentry.h @@ -74,7 +74,7 @@ typedef TQPtrListIterator NFSLineIterator; class NFSEmptyLine : public NFSLine { public: - virtual TQString toString() const { return TQString::tqfromLatin1("\n"); } + virtual TQString toString() const { return TQString::fromLatin1("\n"); } virtual ~NFSEmptyLine() {}; }; diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp index 9eb674c8..0c5f52eb 100644 --- a/filesharing/advanced/nfs/nfsfile.cpp +++ b/filesharing/advanced/nfs/nfsfile.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -241,8 +241,8 @@ bool NFSFile::save() KProcIO proc; TQString command = TQString("cp %1 %2") - .tqarg(KProcess::quote( tempFile.name() )) - .tqarg(KProcess::quote( _url.path() )); + .arg(KProcess::quote( tempFile.name() )) + .arg(KProcess::quote( _url.path() )); if (restartNFSServer) command +=";exportfs -ra"; diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp index c4c1002d..09307e92 100644 --- a/filesharing/advanced/nfs/nfshostdlg.cpp +++ b/filesharing/advanced/nfs/nfshostdlg.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -41,8 +41,8 @@ NFSHostDlg::NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry) m_gui = new HostProps(page); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, 6 ); - tqlayout->addWidget( m_gui ); + TQVBoxLayout *layout = new TQVBoxLayout( page, 0, 6 ); + layout->addWidget( m_gui ); connect( m_gui, TQT_SIGNAL(modified()), this, TQT_SLOT(setModified())); @@ -156,14 +156,14 @@ bool NFSHostDlg::saveName(NFSHost* host) { TQString name = m_gui->nameEdit->text().stripWhiteSpace(); if (name.isEmpty()) { KMessageBox::sorry(this, - i18n("Please enter a hostname or an IP address.").tqarg(name), + i18n("Please enter a hostname or an IP address.").arg(name), i18n("No Hostname/IP-Address")); m_gui->nameEdit->setFocus(); return false; } else { NFSHost* host2 = m_nfsEntry->getHostByName(name); if (host2 && host2 != host) { - KMessageBox::sorry(this,i18n("The host '%1' already exists.").tqarg(name), + KMessageBox::sorry(this,i18n("The host '%1' already exists.").arg(name), i18n("Host Already Exists")); m_gui->nameEdit->setFocus(); return false; diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index b52fd8fc..5ff1af7b 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -211,15 +211,15 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool if (nfsNeedsKDEsu) { nfsFile->saveTo(nfsTempFile.name()); command += TQString("cp %1 %2;exportfs -ra;") - .tqarg(KProcess::quote( nfsTempFile.name() )) - .tqarg(KProcess::quote( nfsFileName )); + .arg(KProcess::quote( nfsTempFile.name() )) + .arg(KProcess::quote( nfsFileName )); } if (sambaNeedsKDEsu) { sambaFile->saveTo(sambaTempFile.name()); command += TQString("cp %1 %2;") - .tqarg(KProcess::quote( sambaTempFile.name() )) - .tqarg(KProcess::quote( sambaFileName )); + .arg(KProcess::quote( sambaTempFile.name() )) + .arg(KProcess::quote( sambaFileName )); } proc<<"tdesu" << "-d" << "-c"<getShare(sambaNameEdit->text()); if (otherShare && otherShare != m_sambaShare) { // There is another Share with the same name - KMessageBox::sorry(this, i18n("There is already a share with the name %1.
Please choose another name.").tqarg(sambaNameEdit->text())); + KMessageBox::sorry(this, i18n("There is already a share with the name %1.
Please choose another name.").arg(sambaNameEdit->text())); sambaNameEdit->selectAll(); sambaNameEdit->setFocus(); return false; diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui index 3ba4aca5..a41de020 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui +++ b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui @@ -21,7 +21,7 @@ - tqlayout6 + layout6 @@ -108,7 +108,7 @@ - tqlayout6 + layout6 @@ -146,7 +146,7 @@ Expanding - + 40 20 @@ -157,7 +157,7 @@ - tqlayout4 + layout4 @@ -181,7 +181,7 @@ Expanding - + 156 20 @@ -216,7 +216,7 @@ - tqlayout3 + layout3 @@ -239,7 +239,7 @@ - tqlayout5 + layout5 @@ -277,7 +277,7 @@ Expanding - + 40 20 @@ -288,7 +288,7 @@ - tqlayout3 + layout3 @@ -312,7 +312,7 @@ Expanding - + 40 20 @@ -335,7 +335,7 @@ Expanding - + 20 1 diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp index 2af403f5..f9baf270 100644 --- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp +++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp @@ -18,7 +18,7 @@ */ #include #include -#include +#include #include #include -- cgit v1.2.1