rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

13 files changed, 50 insertions, 50 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/common.cpp b/filesharing/advanced/kcm_sambaconf/common.cpp
index 48ce7220..4dbbd209 100644
--- a/filesharing/advanced/kcm_sambaconf/common.cpp
+++ b/filesharing/advanced/kcm_sambaconf/common.cpp
@@ -34,7 +34,7 @@
 
 void setComboToString(TQComboBox* combo,const TQString & s)
 {
-  int i = combo->listBox()->index(combo->listBox()->tqfindItem(s,TQt::ExactMatch));
+  int i = combo->listBox()->index(combo->listBox()->findItem(s,TQt::ExactMatch));
   combo->setCurrentItem(i);
 }
 
diff --git a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h
index 32f859e8..d5ebac97 100644
--- a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h
+++ b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h
@@ -14,7 +14,7 @@ void GroupSelectDlg::init(const TQStringList & specifiedGroups)
 
   for (TQStringList::Iterator it = unixGroups.begin(); it != unixGroups.end(); ++it)
   {
-      if ( ! specifiedGroups.tqcontains(*it))
+      if ( ! specifiedGroups.contains(*it))
 	  new TQListViewItem(groupListView, *it, TQString::number(getGroupGID(*it)));
   }
 }
diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index 041aadda..70d2bda6 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -397,8 +397,8 @@ void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQ
             if (rx) {
                 // perhaps it is matched by a wildcard string
                 TQString p = rx->pattern();
-                if ( p.tqfind("*") > -1 ||
-                        p.tqfind("?") > -1 )
+                if ( p.find("*") > -1 ||
+                        p.find("?") > -1 )
                 {
                     // TODO after message freeze: why show three times the wildcard string? Once should be enough.
 		    // TODO remove <b></b> and use <qt> instead
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index 05a30547..ce411c69 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -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()->tqfindItem(share->getValue(value,false,true),TQt::ExactMatch));
+  int i = box->listBox()->index(box->listBox()->findItem(share->getValue(value,false,true),TQt::ExactMatch));
   box->setCurrentItem(i);
 }
 
@@ -1078,7 +1078,7 @@ void KcmSambaConf::loadUserTab()
   {
     TQStringList::Iterator it;
 
-    it=added.tqfind(unixUser->name);
+    it=added.find(unixUser->name);
     if (it == added.end())
         new KListViewItem(_interface->unixUsersListView, unixUser->name, TQString::number(unixUser->uid));
   }
@@ -1311,7 +1311,7 @@ void KcmSambaConf::save() {
 bool KcmSambaConf::getSocketBoolValue( const TQString & str, const TQString & name )
 {
   TQString s = str;
-  int i = s.tqfind(name ,0,false);
+  int i = s.find(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.tqfind(name ,0,false);
+    int i = s.find(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.tqfind(" ");
+        i = s.find(" ");
         if (i < 0)
           i = s.length();
         else
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
index 63795a12..2ba52a57 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
@@ -115,7 +115,7 @@ TQString SambaFile::findShareByPath(const TQString & path) const
   {
     SambaShare* share = it.current();
 
-    TQString *s = share->tqfind("path");
+    TQString *s = share->find("path");
     if (s) {
         KURL curUrl(*s);
         curUrl.adjustPath(-1);
@@ -222,7 +222,7 @@ TQString SambaFile::getUnusedName(const TQString alreadyUsedName) const
 
   int i = 2;
 
-  while (_sambaConfig->tqfind(s))
+  while (_sambaConfig->find(s))
   {
     s = init+TQString::number(i);
     i++;
@@ -235,7 +235,7 @@ TQString SambaFile::getUnusedName(const TQString alreadyUsedName) const
 
 SambaShare* SambaFile::newShare(const TQString & name)
 {
-  if (_sambaConfig->tqfind(name))
+  if (_sambaConfig->find(name))
     return 0L;
 
   SambaShare* share = new SambaShare(name,_sambaConfig);
@@ -293,7 +293,7 @@ void SambaFile::removeShareByPath(const TQString & path) {
 /** No descriptions */
 SambaShare* SambaFile::getShare(const TQString & share) const
 {
-  SambaShare *s = _sambaConfig->tqfind(share);
+  SambaShare *s = _sambaConfig->find(share);
 
   return s;
 }
@@ -353,7 +353,7 @@ int SambaFile::getSambaVersion() {
           
           
   if (testParam.start(KProcess::Block,KProcess::Stdout)) {
-    if (_parmOutput.tqfind("3") > -1)
+    if (_parmOutput.find("3") > -1)
       _sambaVersion = 3;
   } 
 
@@ -434,7 +434,7 @@ void SambaFile::parseParmStdOutput()
 
     // parameter
     // parameter
-    int i = line.tqfind('=');
+    int i = line.find('=');
 
     if (i>-1) {
       TQString name = line.left(i).stripWhiteSpace();
@@ -564,7 +564,7 @@ bool SambaFile::openFile() {
     }
 
     // parameter
-    int i = completeLine.tqfind('=');
+    int i = completeLine.find('=');
 
     if (i>-1)
     {
@@ -604,7 +604,7 @@ bool SambaFile::saveTo(const TQString & path)
 
   for ( TQStringList::Iterator it = shareList.begin(); it != shareList.end(); ++it )
   {
-    SambaShare* share = _sambaConfig->tqfind(*it);
+    SambaShare* share = _sambaConfig->find(*it);
 
     // First add all comments of the share to the file
     TQStringList comments = share->getComments();
@@ -637,7 +637,7 @@ bool SambaFile::saveTo(const TQString & path)
       }
 
       // Add the option
-      s << *optionIt << " = " << *share->tqfind(*optionIt) << endl;
+      s << *optionIt << " = " << *share->find(*optionIt) << endl;
     }
 
 
diff --git a/filesharing/advanced/kcm_sambaconf/sambashare.cpp b/filesharing/advanced/kcm_sambaconf/sambashare.cpp
index 5c9c69ed..c4f02af9 100644
--- a/filesharing/advanced/kcm_sambaconf/sambashare.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambashare.cpp
@@ -58,8 +58,8 @@ bool SambaShare::setName(const TQString & name, bool testWetherExists)
 {
 
   if ( testWetherExists &&
-      _sambaFile->tqfind(name) &&
-      _sambaFile->tqfind(name) != this)
+      _sambaFile->find(name) &&
+      _sambaFile->find(name) != this)
     return false;
 
   _name = name;
@@ -82,7 +82,7 @@ TQString SambaShare::getValue(const TQString & name, bool globalValue, bool defa
 {
   TQString synonym = getSynonym(name);
 
-  TQString* str = tqfind(synonym);
+  TQString* str = find(synonym);
   TQString ret;
 
   if (str) {
@@ -113,7 +113,7 @@ TQString SambaShare::getGlobalValue(const TQString & name, bool defaultValue)
   if (!_sambaFile)
     return getValue(name,false,defaultValue);
 
-  SambaShare* globals = _sambaFile->tqfind("global");
+  SambaShare* globals = _sambaFile->find("global");
 
   TQString s = globals->getValue(name,false,defaultValue);
 
@@ -219,12 +219,12 @@ void SambaShare::setValue(const TQString & name, const TQString & value, bool gl
     
   }
 
-  if (!tqfind(synonym))
+  if (!find(synonym))
   {
     _optionList.append(synonym);
   }
     
-  tqreplace(synonym,new TQString(newValue));
+  replace(synonym,new TQString(newValue));
 }
 
 void SambaShare::setValue(const TQString & name, bool value, bool globalValue, bool defaultValue)
@@ -266,7 +266,7 @@ void SambaShare::setComments(const TQString & name, const TQStringList & comment
 
   TQString synonym = getSynonym(name);
 
-  _commentList.tqreplace(name,new TQStringList(commentList));
+  _commentList.replace(name,new TQStringList(commentList));
 }
 
 /**
@@ -274,7 +274,7 @@ void SambaShare::setComments(const TQString & name, const TQStringList & comment
 **/
 TQStringList SambaShare::getComments(const TQString & name)
 {
-  TQStringList* list = _commentList.tqfind(getSynonym(name));
+  TQStringList* list = _commentList.find(getSynonym(name));
 
   if (list)
     return TQStringList(*list);
@@ -285,7 +285,7 @@ TQStringList SambaShare::getComments(const TQString & name)
 
 bool SambaShare::hasComments(const TQString & name)
 {
-  return 0L != _commentList.tqfind(getSynonym(name));
+  return 0L != _commentList.find(getSynonym(name));
 }
 
 /**
@@ -316,10 +316,10 @@ TQStringList SambaShare::getOptionList()
 **/
 bool SambaShare::isPrinter()
 {
-  TQString* str = tqfind("printable");
+  TQString* str = find("printable");
 
   if (!str)
-      str = tqfind("print ok");
+      str = find("print ok");
 
   return str!=0;
 }
diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
index 406e609f..b964d700 100644
--- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
@@ -99,10 +99,10 @@ SambaUserList SmbPasswdFile::getSambaUserList()
 
       SambaUser* user = new SambaUser(l[0],l[1].toInt());
       user->gid = getUserGID(l[0]);
-      user->isUserAccount = l[4].tqcontains('U');
-      user->hasNoPassword = l[4].tqcontains('N');;
-      user->isDisabled = l[4].tqcontains('D');;
-      user->isWorkstationTrustAccount = l[4].tqcontains('W');;
+      user->isUserAccount = l[4].contains('U');
+      user->hasNoPassword = l[4].contains('N');;
+      user->isDisabled = l[4].contains('D');;
+      user->isWorkstationTrustAccount = l[4].contains('W');;
       list.append(user);
     }
     f.close();
diff --git a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h
index 25c08453..12cc488f 100644
--- a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h
+++ b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h
@@ -62,7 +62,7 @@ SO_RCVLOWATSpin->setValue( getIntValue( s, "SO_RCVLOWAT") );
 bool SocketOptionsDlg::getBoolValue( const TQString & str, const TQString & name )
 {
     TQString s = str;
-    int i = s.tqfind(name ,0,false);
+    int i = s.find(name ,0,false);
 		
     if (i > -1)
     {
@@ -85,7 +85,7 @@ bool SocketOptionsDlg::getBoolValue( const TQString & str, const TQString & name
 int SocketOptionsDlg::getIntValue( const TQString & str, const TQString & name )
 {
     TQString s = str;
-    int i = s.tqfind(name ,0,false);
+    int i = s.find(name ,0,false);
 		
     if (i > -1)
     {
@@ -94,7 +94,7 @@ int SocketOptionsDlg::getIntValue( const TQString & str, const TQString & name )
 	{
 	    s = s.remove(0,1);
 	    
-	    i = s.tqfind(" ");
+	    i = s.find(" ");
 	    if (i < 0)
 	        i = s.length();
 	    else
diff --git a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h
index ef505ea0..6a53e28c 100644
--- a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h
+++ b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h
@@ -15,7 +15,7 @@ void UserSelectDlg::init(const TQStringList & specifiedUsers, SambaShare* share)
 
   for (SambaUser * user = sambaList.first(); user; user = sambaList.next() )
   {
-    if (! specifiedUsers.tqcontains(user->name))
+    if (! specifiedUsers.contains(user->name))
         new TQListViewItem(userListView, user->name, TQString::number(user->uid), TQString::number(user->gid));	
   }
 
diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
index 36393114..366a3f15 100644
--- a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
@@ -240,7 +240,7 @@ void UserTabImpl::setAllowedUser(int i, const TQString & name)
       _specifiedUsers << name2;
     }
 
-    if (name2.tqcontains(' '))
+    if (name2.contains(' '))
         name2 = "\""+name2+"\"";
 
 
diff --git a/filesharing/advanced/nfs/nfsentry.cpp b/filesharing/advanced/nfs/nfsentry.cpp
index 8c71053d..b54a3169 100644
--- a/filesharing/advanced/nfs/nfsentry.cpp
+++ b/filesharing/advanced/nfs/nfsentry.cpp
@@ -27,8 +27,8 @@ NFSHost::NFSHost(const TQString & hostString)
 
   TQString s = hostString;
 
-  int l = s.tqfind('(');
-  int r = s.tqfind(')');
+  int l = s.find('(');
+  int r = s.find(')');
 
   initParams();
 
@@ -90,7 +90,7 @@ void NFSHost::parseParamsString(const TQString & s)
 
   do
   {
-    i = rest.tqfind(",",0);
+    i = rest.find(",",0);
 
     if (i==-1)
       p = rest;
@@ -251,7 +251,7 @@ void NFSHost::setParam(const TQString & s)
      rootSquash = false;
      return; }
 
-  int i = p.tqfind("=",0);
+  int i = p.find("=",0);
 
   // get anongid or anonuid
   if (i>-1)
@@ -306,7 +306,7 @@ TQString NFSEntry::toString() const
 {
   TQString s = _path.stripWhiteSpace();
 
-  if (_path.tqfind(' ') > -1) {
+  if (_path.find(' ') > -1) {
     s = '"'+s+'"';
   }
   
diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp
index 4caea490..ebc33a9c 100644
--- a/filesharing/advanced/nfs/nfsfile.cpp
+++ b/filesharing/advanced/nfs/nfsfile.cpp
@@ -61,7 +61,7 @@ void NFSFile::removeEntry(NFSEntry *entry)
 
 bool NFSFile::hasEntry(NFSEntry *entry)
 {
-  return 0 < _entries.tqcontains(entry);
+  return 0 < _entries.contains(entry);
 }
 
 
@@ -151,7 +151,7 @@ bool NFSFile::load()
     
     // Handle quotation marks
     if ( completeLine[0] == '"' ) {
-      int i = completeLine.tqfind('"',1);
+      int i = completeLine.find('"',1);
       if (i == -1) {
         kdError() << "NFSFile: Parse error: Missing quotation mark: " 
                   << completeLine << endl;   
@@ -161,9 +161,9 @@ bool NFSFile::load()
       hosts = completeLine.mid(i+1);
       
     } else { // no quotation marks
-      int i = completeLine.tqfind(' ');
+      int i = completeLine.find(' ');
       if (i == -1)
-          i = completeLine.tqfind('\t');
+          i = completeLine.find('\t');
       
       if (i == -1) 
         path = completeLine;
diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp
index 304386c4..e4f52356 100644
--- a/filesharing/simple/groupconfigdlg.cpp
+++ b/filesharing/simple/groupconfigdlg.cpp
@@ -110,8 +110,8 @@ TQString prettyString(const KUser &user) {
 TQString fromPrettyString(const TQString & s) {
   // Jan Schaefer (jan)
   //              i   j
-  int i = s.tqfind('(');
-  int j = s.tqfind(')');
+  int i = s.find('(');
+  int j = s.find(')');
   TQString loginName = s.mid(i+1,j-i-1);
   return loginName;
 }
@@ -293,7 +293,7 @@ void GroupConfigDlg::slotChangeGroup() {
     TQString groupName = combo->currentText();             
     if (groupName != m_fileShareGroup.name()) {
       TQString oldGroup = m_fileShareGroup.name();
-      if (allGroups.tqcontains(KUserGroup(groupName)))                           
+      if (allGroups.contains(KUserGroup(groupName)))                           
         setFileShareGroup(KUserGroup(groupName));
       else {
         if (!createFileShareGroup(groupName)) {