Remove additional unneeded tq method conversions

15 files changed, 42 insertions, 42 deletions

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 <em>%1</em> is not supported by your Samba version").tqarg(s));
+  TQToolTip::add(w,i18n("The option <em>%1</em> 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 <b></b> and use <qt> instead
                     int result = KMessageBox::questionYesNo(_dlg,i18n(
                     "<b></b>Some files you have selected are matched by the wildcarded string <b>'%1'</b>; "
-                    "do you want to uncheck all files matching <b>'%1'</b>?").tqarg(rx->pattern()).tqarg(rx->pattern()).tqarg(rx->pattern()),
+                    "do you want to uncheck all files matching <b>'%1'</b>?").arg(rx->pattern()).arg(rx->pattern()).arg(rx->pattern()),
                     i18n("Wildcarded String"),i18n("Uncheck Matches"),i18n("Keep Selected"));
             
                     TQPtrList<HiddenListViewItem> 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.
                                 <property name="textFormat">
                                     <enum>RichText</enum>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignTop</set>
                                 </property>
                                 <property name="indent">
@@ -584,7 +584,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
                                 <property name="text">
                                     <string>For detailed help about every option please look at:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter</set>
                                 </property>
                             </widget>
@@ -4607,7 +4607,7 @@ Only change something if you know what you are doing.</string>
                                             <property name="text">
                                                 <string>Oplock break &amp;wait time:</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter</set>
                                             </property>
                                             <property name="buddy" stdset="0">
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 @@
     <property name='name'>
       <cstring>KcmPrinterDlg</cstring>
     </property>
-    <property name='tqgeometry'>
+    <property name='geometry'>
       <rect>
         <x>0</x>
         <y>0</y>
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("<qt>Please enter a password for the user <b>%1</b></qt>").tqarg(user.name));
+                        i18n("<qt>Please enter a password for the user <b>%1</b></qt>").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("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").tqarg(user.name));
+      KMessageBox::sorry(0,i18n("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").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<QMultiCheckListItem*>(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(
            "<qt>You have specified <b>public read access</b> for this directory, but "
            "the guest account <b>%1</b> does not have the necessary read permissions;<br>" 
-           "do you want to continue anyway?</qt>").tqarg(guestAccount)
+           "do you want to continue anyway?</qt>").arg(guestAccount)
            ,i18n("Warning")
            ,KStdGuiItem::cont()
            ,"KSambaPlugin_guestAccountHasNoReadPermissionsWarning"))
@@ -129,7 +129,7 @@ bool LinuxPermissionChecker::checkPublicPermissions() {
          0L,i18n(
            "<qt>You have specified <b>public write access</b> for this directory, but "
            "the guest account <b>%1</b> does not have the necessary write permissions;<br>" 
-           "do you want to continue anyway?</qt>").tqarg(guestAccount)
+           "do you want to continue anyway?</qt>").arg(guestAccount)
            ,i18n("Warning")
            ,KStdGuiItem::cont()
            ,"KSambaPlugin_guestAccountHasNoWritePermissionsWarning"))
@@ -166,7 +166,7 @@ bool LinuxPermissionChecker::checkUserWritePermissions(const TQString & user, bo
         0L,i18n(
           "<qt>You have specified <b>write access</b> to the user <b>%1</b> for this directory, but "
           "the user does not have the necessary write permissions;<br>" 
-          "do you want to continue anyway?</qt>").tqarg(user)
+          "do you want to continue anyway?</qt>").arg(user)
           ,i18n("Warning")
           ,KStdGuiItem::cont()
           ,"KSambaPlugin_userHasNoWritePermissionsWarning"))
@@ -189,7 +189,7 @@ bool LinuxPermissionChecker::checkUserReadPermissions(const TQString & user, boo
          0L,i18n(
            "<qt>You have specified <b>read access</b> to the user <b>%1</b> for this directory, but "
            "the user does not have the necessary read permissions;<br>" 
-           "do you want to continue anyway?</qt>").tqarg(user)
+           "do you want to continue anyway?</qt>").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("<qt>Could not open file <em>%1</em> for reading.</qt>").tqarg(path));
+    //throw SambaFileLoadException(TQString("<qt>Could not open file <em>%1</em> for reading.</qt>").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("<qt>The file <i>%1</i> could not be read.</qt>").tqarg(smbConf),i18n("Could Not Read File"));
+    KMessageBox::sorry(this,i18n("<qt>The file <i>%1</i> could not be read.</qt>").arg(smbConf),i18n("Could Not Read File"));
     return;
   }
 
diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui
index 1851fad6..4fa41052 100644
--- a/filesharing/advanced/nfs/hostprops.ui
+++ b/filesharing/advanced/nfs/hostprops.ui
@@ -302,7 +302,7 @@ Early NFS client implementations did not send credentials with lock requests, an
             <property name="title">
                 <string>User Mapping</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignAuto</set>
             </property>
             <vbox>
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/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp
index 9eb674c8..9a1c787b 100644
--- a/filesharing/advanced/nfs/nfsfile.cpp
+++ b/filesharing/advanced/nfs/nfsfile.cpp
@@ -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..c6bc1e20 100644
--- a/filesharing/advanced/nfs/nfshostdlg.cpp
+++ b/filesharing/advanced/nfs/nfshostdlg.cpp
@@ -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"<<command;
@@ -527,7 +527,7 @@ bool PropertiesPage::updateSambaShare() {
       SambaShare* otherShare = m_sambaFile->getShare(sambaNameEdit->text());
       if (otherShare && otherShare != m_sambaShare) {
         // There is another Share with the same name
-        KMessageBox::sorry(this, i18n("<qt>There is already a share with the name <strong>%1</strong>.<br> Please choose another name.</qt>").tqarg(sambaNameEdit->text()));
+        KMessageBox::sorry(this, i18n("<qt>There is already a share with the name <strong>%1</strong>.<br> Please choose another name.</qt>").arg(sambaNameEdit->text()));
         sambaNameEdit->selectAll();
         sambaNameEdit->setFocus();
         return false;