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

7 files changed, 16 insertions, 16 deletions

diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp
index 7de4b19c..61996018 100644
--- a/lanbrowsing/kcmlisa/findnic.cpp
+++ b/lanbrowsing/kcmlisa/findnic.cpp
@@ -192,8 +192,8 @@ NICList* findNICs()
 
 void suggestSettingsForAddress(const TQString& addrMask, LisaConfigInfo& lci)
 {
-   TQString ip=addrMask.left(addrMask.tqfind("/"));
-   TQString tqmask=addrMask.mid(addrMask.tqfind("/")+1);
+   TQString ip=addrMask.left(addrMask.find("/"));
+   TQString tqmask=addrMask.mid(addrMask.find("/")+1);
 
    if (tqmask[tqmask.length()-1]==';')
       tqmask=tqmask.left(tqmask.length()-1);
diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp
index ab73259c..82873c00 100644
--- a/lanbrowsing/kcmlisa/setupwizard.cpp
+++ b/lanbrowsing/kcmlisa/setupwizard.cpp
@@ -546,7 +546,7 @@ void SetupWizard::checkIPAddress(const TQString& addr)
    TQString address=addr.simplifyWhiteSpace();
    TQRegExp regex("^\\d+\\.\\d+\\.\\d+\\.\\d+\\s*/\\s*\\d+\\.\\d+\\.\\d+\\.\\d+$");
    setNextEnabled(m_noNicPage, (regex.search(address,0)!=-1));
-//   setNextEnabled(m_noNicPage, (regex.tqfind(address,0)!=-1));
+//   setNextEnabled(m_noNicPage, (regex.find(address,0)!=-1));
 }
 
 void SetupWizard::applyLisaConfigInfo(LisaConfigInfo& lci)
diff --git a/lanbrowsing/lisa/addressvalidator.cpp b/lanbrowsing/lisa/addressvalidator.cpp
index 3ac8ccf0..70207ece 100644
--- a/lanbrowsing/lisa/addressvalidator.cpp
+++ b/lanbrowsing/lisa/addressvalidator.cpp
@@ -74,20 +74,20 @@ void AddressValidator::setValidAddresses(MyString addressSpecs)
       nextPart=addressSpecs.left(pos);
       addressSpecs=addressSpecs.mid(pos+1);
       dcerr<<"setValidAddresses: nextPart: "<<nextPart<<std::endl;
-      if ((nextPart.tqcontains('.')==3) && (nextPart.tqcontains('-')==0))
+      if ((nextPart.contains('.')==3) && (nextPart.contains('-')==0))
       {
          addSpec(EXACTADDR_SPEC,inet_addr(nextPart.data()));
          dcerr<<"setValidAddresses: exact addr: "
 	 <<std::ios::hex<<inet_addr(nextPart.data())<<std::ios::dec<<std::endl;
       }
-      else if ((nextPart.tqcontains('-')==1) && (nextPart.tqcontains('.')==6))
+      else if ((nextPart.contains('-')==1) && (nextPart.contains('.')==6))
       {
          int p2=nextPart.find("-");
          MyString from=nextPart.left(p2);
          MyString to=nextPart.mid(p2+1);
          addSpec(RANGE_SPEC,ntohl(inet_addr(from.data())),ntohl(inet_addr(to.data())));
       }
-      else if ((nextPart.tqcontains('-')==4) && (nextPart.tqcontains('.')==3))
+      else if ((nextPart.contains('-')==4) && (nextPart.contains('.')==3))
       {
          unsigned int i1=0;
          unsigned int i2=0;
diff --git a/lanbrowsing/lisa/mystring.cpp b/lanbrowsing/lisa/mystring.cpp
index 901c5db3..a66bafac 100644
--- a/lanbrowsing/lisa/mystring.cpp
+++ b/lanbrowsing/lisa/mystring.cpp
@@ -38,7 +38,7 @@ MyString stripWhiteSpace(MyString str)
 }
 
 //mainly taken from qcstring
-int MyString::tqcontains(char c)
+int MyString::contains(char c)
 {
    int count = 0;
    char const *d = c_str();
diff --git a/lanbrowsing/lisa/mystring.h b/lanbrowsing/lisa/mystring.h
index 9e636e03..135e36c7 100644
--- a/lanbrowsing/lisa/mystring.h
+++ b/lanbrowsing/lisa/mystring.h
@@ -26,7 +26,7 @@ class MyString: public std::string
          else return (*this);
       };
 
-      int tqcontains(char c);
+      int contains(char c);
       //char & operator[] (unsigned int i)    {return ((string)(*this))[i];}
       //operator const char* () const     {return c_str();}
       const char* data() const     {return c_str();}
diff --git a/lanbrowsing/lisa/netmanager.cpp b/lanbrowsing/lisa/netmanager.cpp
index 43742564..46002ed1 100644
--- a/lanbrowsing/lisa/netmanager.cpp
+++ b/lanbrowsing/lisa/netmanager.cpp
@@ -365,10 +365,10 @@ MyString NetManager::getConfigFileName()
       int length=strlen(buf);
       if (buf[length-1]=='\n') buf[length-1]='\0';
       MyString kdeDirs(buf);
-      while (kdeDirs.tqcontains(':'))
+      while (kdeDirs.contains(':'))
       {
-         MyString nextDir=kdeDirs.left(kdeDirs.tqfind(':'));
-         kdeDirs=kdeDirs.mid(kdeDirs.tqfind(':')+1);
+         MyString nextDir=kdeDirs.left(kdeDirs.find(':'));
+         kdeDirs=kdeDirs.mid(kdeDirs.find(':')+1);
          nextDir=nextDir+tmpBase;
          mdcerr<<"trying to open "<<nextDir<<std::endl;
          if (fileReadable(nextDir))
diff --git a/lanbrowsing/lisa/netscanner.cpp b/lanbrowsing/lisa/netscanner.cpp
index fd6a86bf..5486c506 100644
--- a/lanbrowsing/lisa/netscanner.cpp
+++ b/lanbrowsing/lisa/netscanner.cpp
@@ -187,7 +187,7 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index)
 //   mdcerr<<"NetScanner::getIPFromArray: -"<<tmp<<"-"<<std::endl;
    while (!tmp.isEmpty())
    {
-      if (tmp.tqcontains('/'))
+      if (tmp.contains('/'))
       {
          //mdcerr<<"net/tqmask combination detected"<<std::endl;
          MyString netStr(tmp.left(tmp.find("/")));
@@ -207,7 +207,7 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index)
             //return string2Struct(ipInt2String(net));
          }
       }
-      else if (tmp.tqcontains('-')==1)
+      else if (tmp.contains('-')==1)
       {
          //mdcerr<<"single range detected"<<std::endl;
          MyString fromIPStr(tmp.left(tmp.find("-")));
@@ -233,7 +233,7 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index)
          }
          
       }
-      else if (tmp.tqcontains('-')==4)
+      else if (tmp.contains('-')==4)
       {
          //mdcerr<<"multiple range detected"<<std::endl;
          int cp(tmp.find('-'));
@@ -291,7 +291,7 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index)
          }
       }
       //single IP address
-      else if (tmp.tqcontains('.')==3)
+      else if (tmp.contains('.')==3)
       {
          //mdcerr<<"single IP address detected"<<std::endl;
          //if (tmpIndex==index) return string2Struct(tmp);
@@ -316,7 +316,7 @@ void NetScanner::resetIPRange()
 
 MyString NetScanner::getNextIPRange()
 {
-   if (tmpIPRange.tqcontains(';')<1) return "";
+   if (tmpIPRange.contains(';')<1) return "";
    int cp(tmpIPRange.find(';'));
    MyString tmp(tmpIPRange.left(cp));
    tmpIPRange=tmpIPRange.mid(cp+1);