TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 19 insertions, 19 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index 78f3c7fb..05a30547 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -75,8 +75,8 @@
 #define COL_NOPASSWORD 3
 
 
-ShareListViewItem::ShareListViewItem(TQListView * parent, SambaShare* share)
-  : TQListViewItem(parent)
+ShareListViewItem::ShareListViewItem(TQListView * tqparent, SambaShare* share)
+  : TQListViewItem(tqparent)
 {
   setShare(share);
 }
@@ -174,8 +174,8 @@ TQPixmap ShareListViewItem::createPropertyPixmap()
   return TQPixmap(pix);
 }
 
-KcmSambaConf::KcmSambaConf(TQWidget *parent, const char *name)
-  : KCModule(parent,name)
+KcmSambaConf::KcmSambaConf(TQWidget *tqparent, const char *name)
+  : KCModule(tqparent,name)
 {
   _dictMngr = 0L;
   _sambaFile = 0L;
@@ -919,7 +919,7 @@ void KcmSambaConf::loadCharset(SambaShare* )
   _dictMngr->add("character set", _interface->characterSetEdit);
   _dictMngr->add("valid chars", _interface->validCharsEdit);
   
-  _dictMngr->add("unicode",_interface->unicodeChk);
+  _dictMngr->add("tqunicode",_interface->tqunicodeChk);
 }
 
 void KcmSambaConf::loadWinbind(SambaShare* )
@@ -1010,7 +1010,7 @@ void KcmSambaConf::loadCommands(SambaShare*)
 
 void KcmSambaConf::setComboIndexToValue(TQComboBox* box, const TQString & value, SambaShare* share) 
 {
-  int i = box->listBox()->index(box->listBox()->findItem(share->getValue(value,false,true),Qt::ExactMatch));
+  int i = box->listBox()->index(box->listBox()->tqfindItem(share->getValue(value,false,true),TQt::ExactMatch));
   box->setCurrentItem(i);
 }
 
@@ -1078,7 +1078,7 @@ void KcmSambaConf::loadUserTab()
   {
     TQStringList::Iterator it;
 
-    it=added.find(unixUser->name);
+    it=added.tqfind(unixUser->name);
     if (it == added.end())
         new KListViewItem(_interface->unixUsersListView, unixUser->name, TQString::number(unixUser->uid));
   }
@@ -1102,7 +1102,7 @@ void KcmSambaConf::joinADomainBtnClicked() {
                             dlg->usernameEdit->text(),
                             dlg->passwordEdit->text()))
     {
-      KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").arg(dlg->domainEdit->text()));
+      KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").tqarg(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>").arg(user.name));
+                        i18n("<qt>Please enter a password for the user <b>%1</b></qt>").tqarg(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>").arg(user.name));
+      KMessageBox::sorry(0,i18n("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").tqarg(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.").arg(user.name));
+      KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").tqarg(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").arg(user.name));
+                        i18n("Please enter a password for the user %1").tqarg(user.name));
     if (passResult != KPasswordDialog::Accepted)
        return;
     
     if (!passwd.changePassword(user,password))
     {
-      KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").arg(user.name));
+      KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").tqarg(user.name));
     } else {
       static_cast<QMultiCheckListItem*>(item)->setOn(COL_NOPASSWORD,false);
     }
@@ -1267,7 +1267,7 @@ void KcmSambaConf::save() {
   // Base settings
 
   _smbconf = _interface->configUrlRq->url();
-  KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),false);
+  KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),false);
   config.writeEntry("SMBCONF",_smbconf);
   config.sync();
 
@@ -1311,7 +1311,7 @@ void KcmSambaConf::save() {
 bool KcmSambaConf::getSocketBoolValue( const TQString & str, const TQString & name )
 {
   TQString s = str;
-  int i = s.find(name ,0,false);
+  int i = s.tqfind(name ,0,false);
 
   if (i > -1)
   {
@@ -1335,7 +1335,7 @@ bool KcmSambaConf::getSocketBoolValue( const TQString & str, const TQString & na
 int KcmSambaConf::getSocketIntValue( const TQString & str, const TQString & name )
 {
     TQString s = str;
-    int i = s.find(name ,0,false);
+    int i = s.tqfind(name ,0,false);
 
     if (i > -1)
     {
@@ -1344,7 +1344,7 @@ int KcmSambaConf::getSocketIntValue( const TQString & str, const TQString & name
       {
         s = s.remove(0,1);
 
-        i = s.find(" ");
+        i = s.tqfind(" ");
         if (i < 0)
           i = s.length();
         else
@@ -1432,10 +1432,10 @@ TQString KcmSambaConf::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *parent, const char *name)
+  KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *tqparent, const char *name)
   {
     KGlobal::locale()->insertCatalogue("kfileshare");
-    return new KcmSambaConf(parent, name);
+    return new KcmSambaConf(tqparent, name);
   }
 }