rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

3 files changed, 25 insertions, 25 deletions

diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index 0c9a5d3fd..fd31f7800 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -74,16 +74,16 @@ void ImportsView::updateList()
       if (e!=0)
       {
          s=buf;
-         if ((s.tqcontains(" nfs ")) || (s.tqcontains(" smbfs ")))
+         if ((s.contains(" nfs ")) || (s.contains(" smbfs ")))
          {
-            strSource=s.left(s.tqfind(" on /"));
-            strMount=s.mid(s.tqfind(" on /")+4,s.length());
-            if ((s.tqcontains(" nfs ")) || (s.tqcontains("/remote on ")))
+            strSource=s.left(s.find(" on /"));
+            strMount=s.mid(s.find(" on /")+4,s.length());
+            if ((s.contains(" nfs ")) || (s.contains("/remote on ")))
                strType="NFS";
-            else if (s.tqcontains(" smbfs "))
+            else if (s.contains(" smbfs "))
                strType="SMB";
-            int pos(strMount.tqfind(" type "));
-            if (pos==-1) pos=strMount.tqfind(" read/");
+            int pos(strMount.find(" type "));
+            if (pos==-1) pos=strMount.find(" read/");
             strMount=strMount.left(pos);
             new TQListViewItem(&list,strType,strSource,strMount);
          };
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 0070e4723..ee9a8ab20 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -150,8 +150,8 @@ void StatisticsView::calculate()
       {
          if (connCount)
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
             {
                if (expandedInfoCb->isChecked()) item2=item->text(2);
                else item2=serviceLe->text();
@@ -163,8 +163,8 @@ void StatisticsView::calculate()
          }
          else
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
             {
                if (expandedInfoCb->isChecked()) item2=item->text(2);
                else item2=serviceLe->text();
@@ -201,14 +201,14 @@ void StatisticsView::calculate()
       {
          if (connCount)
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
                count++;
          }
          else
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
                count++;
          };
          item=item->nextSibling();
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index b36d5325b..c94bc5129 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -31,8 +31,8 @@
 #include "ksmbstatus.moc"
 
 
-#define Before(ttf,in) in.left(in.tqfind(ttf))
-#define After(ttf,in)  (in.tqcontains(ttf)?TQString(in.mid(in.tqfind(ttf)+TQString(ttf).length())):TQString(""))
+#define Before(ttf,in) in.left(in.find(ttf))
+#define After(ttf,in)  (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString(""))
 
 NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
    : TQWidget(parent, name)
@@ -77,7 +77,7 @@ NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
 void NetMon::processNFSLine(char *bufline, int)
 {
    TQCString line(bufline);
-   if (line.tqcontains(":/"))
+   if (line.contains(":/"))
       new TQListViewItem(list,"NFS",After(":",line),Before(":/",line));
 }
 
@@ -87,14 +87,14 @@ void NetMon::processSambaLine(char *bufline, int)
    rownumber++;
    if (rownumber == 2)
       version->setText(bufline); // second line = samba version
-   if ((readingpart==header) && line.tqcontains("Service"))
+   if ((readingpart==header) && line.contains("Service"))
    {
-      iUser=line.tqfind("uid");
-      iGroup=line.tqfind("gid");
-      iPid=line.tqfind("pid");
-      iMachine=line.tqfind("machine");
+      iUser=line.find("uid");
+      iGroup=line.find("gid");
+      iPid=line.find("pid");
+      iMachine=line.find("machine");
    }
-   else if ((readingpart==header) && (line.tqcontains("---")))
+   else if ((readingpart==header) && (line.contains("---")))
    {
       readingpart=connexions;
    }
@@ -111,7 +111,7 @@ void NetMon::processSambaLine(char *bufline, int)
    }
    else if (readingpart==connexions)
       readingpart=locked_files;
-   else if ((readingpart==locked_files) && (line.tqfind("No ")==0))
+   else if ((readingpart==locked_files) && (line.find("No ")==0))
       readingpart=finished;
    else if (readingpart==locked_files)
    {