Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

5 files changed, 16 insertions, 16 deletions

diff --git a/kioslave/fish/COPYING b/kioslave/fish/COPYING
index 42fdfb04d..2d08eab44 100644
--- a/kioslave/fish/COPYING
+++ b/kioslave/fish/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions:
     stating that you changed the files and the date of any change.
 
     b) You must cause any work that you distribute or publish, that in
-    whole or in part tqcontains or is derived from the Program or any
+    whole or in part contains or is derived from the Program or any
     part thereof, to be licensed as a whole at no charge to all third
     parties under the terms of this License.
 
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kioslave/fish/INSTALL b/kioslave/fish/INSTALL
index d53db4b2e..02a4a0740 100644
--- a/kioslave/fish/INSTALL
+++ b/kioslave/fish/INSTALL
@@ -17,7 +17,7 @@ reconfiguring, and a file `config.log' containing compiler output
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If at some point `config.cache'
-tqcontains results you don't want to keep, you may remove or edit it.
+contains results you don't want to keep, you may remove or edit it.
 
    The file `configure.in' is used to create `configure' by a program
 called `autoconf'.  You only need `configure.in' if you want to change
diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp
index ee22929c3..77533964c 100644
--- a/kioslave/fish/fish.cpp
+++ b/kioslave/fish/fish.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 /*
-  This code tqcontains fragments and ideas from the ftp kioslave
+  This code contains fragments and ideas from the ftp kioslave
   done by David Faure <faure@kde.org>.
 
   Structure is a bit complicated, since I made the mistake to use
@@ -88,7 +88,7 @@
 #define connected() do{myDebug( << "_______ emitting connected()" << endl); connected();}while(0)
 #define dataReq() do{myDebug( << "_______ emitting dataReq()" << endl); dataReq();}while(0)
 #define needSubURLData() do{myDebug( << "_______ emitting needSubURLData()" << endl); needSubURLData();}while(0)
-#define slavetqStatus(x,y) do{myDebug( << "_______ emitting slavetqStatus(" << x << ", " << y << ")" << endl); slavetqStatus(x,y);}while(0)
+#define slaveStatus(x,y) do{myDebug( << "_______ emitting slaveStatus(" << x << ", " << y << ")" << endl); slaveStatus(x,y);}while(0)
 #define statEntry(x) do{myDebug( << "_______ emitting statEntry("<<x.size()<<")" << endl); statEntry(x);}while(0)
 #define listEntries(x) do{myDebug( << "_______ emitting listEntries(...)" << endl); listEntries(x);}while(0)
 #define canResume(x) do{myDebug( << "_______ emitting canResume("<<(int)x<<")" << endl); canResume(x);}while(0)
@@ -738,11 +738,11 @@ bool fishProtocol::sendCommand(fish_command_type cmd, ...) {
         TQString arg(va_arg(list, const char *));
         int pos = -2;
         while ((pos = rx.search(arg,pos+2)) >= 0) {
-            arg.tqreplace(pos,0,TQString("\\"));
+            arg.replace(pos,0,TQString("\\"));
         }
         //myDebug( << "arg " << i << ": " << arg << endl);
         realCmd.append(" ").append(arg);
-        realAlt.tqreplace(TQRegExp("%"+TQString::number(i+1)),arg);
+        realAlt.replace(TQRegExp("%"+TQString::number(i+1)),arg);
     }
     TQString s("#");
     s.append(realCmd).append("\n ").append(realAlt).append(" 2>&1;echo '### 000'\n");
@@ -774,7 +774,7 @@ int fishProtocol::handleResponse(const TQString &str){
 
 int fishProtocol::makeTimeFromLs(const TQString &monthStr, const TQString &dayStr, const TQString &timeyearStr)
 {
-    TQDateTime dt(TQDate::tqcurrentDate(Qt::UTC));
+    TQDateTime dt(TQDate::currentDate(Qt::UTC));
     int year = dt.date().year();
     int month = dt.date().month();
     int currentMonth = month;
@@ -820,7 +820,7 @@ void fishProtocol::manageConnection(const TQString &l) {
         case FISH_VER:
             if (line.startsWith("VER 0.0.3")) {
                 line.append(" ");
-                hasAppend = line.tqcontains(" append ");
+                hasAppend = line.contains(" append ");
             } else {
                 error(ERR_UNSUPPORTED_PROTOCOL,line);
                 shutdownConnection();
@@ -1258,7 +1258,7 @@ int fishProtocol::received(const char *buffer, KIO::fileoffset_t buflen)
                 if ( !mime || mime->name() == KMimeType::defaultMimeType()
                      || !accurate )
                 {
-                    KMimeType::Ptr p_mimeType = KMimeType::tqfindByContent(mimeBuffer);
+                    KMimeType::Ptr p_mimeType = KMimeType::findByContent(mimeBuffer);
                     if ( p_mimeType && p_mimeType->name() != KMimeType::defaultMimeType() )
                         mime = p_mimeType;
                 }
@@ -1436,7 +1436,7 @@ void fishProtocol::run() {
                 if (rc > 0) {
                     int noff = received(buf,rc+offset);
                     if (noff > 0) memmove(buf,buf+offset+rc-noff,noff);
-                    //myDebug( << "left " << noff << " bytes: " << TQString::tqfromLatin1(buf,offset) << endl);
+                    //myDebug( << "left " << noff << " bytes: " << TQString::fromLatin1(buf,offset) << endl);
                     offset = noff;
                 } else {
                     if (errno == EINTR)
@@ -1655,7 +1655,7 @@ void fishProtocol::special( const TQByteArray &data ){
 void fishProtocol::slave_status() {
     myDebug( << "@@@@@@@@@ slave_status" << endl);
     if (childPid > 0)
-        slavetqStatus(connectionHost,isLoggedIn);
+        slaveStatus(connectionHost,isLoggedIn);
     else
-        slavetqStatus(TQString::null,false);
+        slaveStatus(TQString::null,false);
 }
diff --git a/kioslave/fish/fish.protocol b/kioslave/fish/fish.protocol
index ca16c6702..c14599d50 100644
--- a/kioslave/fish/fish.protocol
+++ b/kioslave/fish/fish.protocol
@@ -18,7 +18,7 @@ Description[bn]=ফিশ (FISH) প্রোটোকল-এর জন্য �
 Description[br]=Ur c'hioslave evit ar c'homenad FISH
 Description[bs]=kioslave za FISH protokol
 Description[ca]=Un kioslave pel protocol FISH
-Description[cs]=Potqmocný protokol pro FISH
+Description[cs]=Pomocný protokol pro FISH
 Description[csb]=Plugins protokòłu FISH
 Description[da]=En kioslave for FISH-protokollen
 Description[de]=Ein-/Ausgabemodul für das FISH-Protokoll
diff --git a/kioslave/fish/nxfish.protocol b/kioslave/fish/nxfish.protocol
index 16645b05f..f050282af 100644
--- a/kioslave/fish/nxfish.protocol
+++ b/kioslave/fish/nxfish.protocol
@@ -17,7 +17,7 @@ Description[be]=Kioslave для пратакола NXFISH
 Description[br]=Ur c'hioslave evit ar c'homenad NXFISH
 Description[bs]=kioslave za NXFISH protokol
 Description[ca]=Un kioslave pel protocol NXFISH
-Description[cs]=Potqmocný protokol pro NXFISH
+Description[cs]=Pomocný protokol pro NXFISH
 Description[csb]=Plugins protokòłu NXFISH
 Description[da]=En kioslave for NXFISH-protokollen
 Description[de]=Ein-/Ausgabemodul für das NXFISH-Protokoll