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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 89 insertions, 89 deletions

diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index 803bad7f5..f59de0db0 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -171,7 +171,7 @@ static TQString sanitizeCustomHTTPHeader(const TQString& _header)
     TQString header = (*it).lower();
     // Do not allow Request line to be specified and ignore
     // the other HTTP headers.
-    if (header.tqfind(':') == -1 ||
+    if (header.find(':') == -1 ||
         header.startsWith("host") ||
         header.startsWith("via"))
       continue;
@@ -320,7 +320,7 @@ void HTTPProtocol::resetSessionSettings()
         TQString protocol = referrerURL.protocol();
         if (protocol.startsWith("webdav"))
         {
-           protocol.tqreplace(0, 6, "http");
+           protocol.replace(0, 6, "http");
            referrerURL.setProtocol(protocol);
         }
 
@@ -431,7 +431,7 @@ void HTTPProtocol::setHost( const TQString& host, int port,
     m_davHostOk = m_davHostUnsupported = false;
 
   // is it an IPv6 address?
-  if (host.tqfind(':') == -1)
+  if (host.find(':') == -1)
     {
       m_request.hostname = host;
       m_request.encoded_hostname = KIDNA::toAscii(host);
@@ -439,7 +439,7 @@ void HTTPProtocol::setHost( const TQString& host, int port,
   else
     {
       m_request.hostname = host;
-      int pos = host.tqfind('%');
+      int pos = host.find('%');
       if (pos == -1)
 	m_request.encoded_hostname = '[' + host + ']';
       else
@@ -607,7 +607,7 @@ void HTTPProtocol::stat(const KURL& url)
 
   if ( m_protocol != "webdav" && m_protocol != "webdavs" )
   {
-    TQString statSide = metaData(TQString::tqfromLatin1("statSide"));
+    TQString statSide = metaData(TQString::fromLatin1("statSide"));
     if ( statSide != "source" )
     {
       // When uploading we assume the file doesn't exit
@@ -686,7 +686,7 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )
     // We are only after certain features...
     TQCString request;
     request = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"
-    "<D:proptqfind xmlns:D=\"DAV:\">";
+    "<D:propfind xmlns:D=\"DAV:\">";
 
     // insert additional XML request from the davRequestResponse metadata
     if ( hasMetaData( "davRequestResponse" ) )
@@ -708,7 +708,7 @@ void HTTPProtocol::davStatList( const KURL& url, bool stat )
       "<D:resourcetype/>"
       "</D:prop>";
     }
-    request += "</D:proptqfind>";
+    request += "</D:propfind>";
 
     davSetRequest( request );
   }
@@ -828,8 +828,8 @@ void HTTPProtocol::davGeneric( const KURL& url, KIO::HTTP_METHOD method )
 
 int HTTPProtocol::codeFromResponse( const TQString& response )
 {
-  int firstSpace = response.tqfind( ' ' );
-  int secondSpace = response.tqfind( ' ', firstSpace + 1 );
+  int firstSpace = response.find( ' ' );
+  int secondSpace = response.find( ' ', firstSpace + 1 );
   return response.mid( firstSpace + 1, secondSpace - firstSpace - 1 ).toInt();
 }
 
@@ -1267,12 +1267,12 @@ void HTTPProtocol::put( const KURL &url, int, bool overwrite, bool)
 
     TQCString request;
     request = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"
-    "<D:proptqfind xmlns:D=\"DAV:\"><D:prop>"
+    "<D:propfind xmlns:D=\"DAV:\"><D:prop>"
       "<D:creationdate/>"
       "<D:getcontentlength/>"
       "<D:displayname/>"
       "<D:resourcetype/>"
-      "</D:prop></D:proptqfind>";
+      "</D:prop></D:propfind>";
 
     davSetRequest( request );
 
@@ -1797,15 +1797,15 @@ void HTTPProtocol::httpError()
 
 bool HTTPProtocol::isOffline(const KURL &url)
 {
-  const int NetWorktqStatusUnknown = 1;
-  const int NetWorktqStatusOnline = 8;
+  const int NetWorkStatusUnknown = 1;
+  const int NetWorkStatusOnline = 8;
   TQCString replyType;
   TQByteArray params;
   TQByteArray reply;
 
   TQDataStream stream(params, IO_WriteOnly);
 
-  if ( url.host() == TQString::tqfromLatin1("localhost") || url.host() == TQString::tqfromLatin1("127.0.0.1") || url.host() == TQString::tqfromLatin1("::") ) {
+  if ( url.host() == TQString::fromLatin1("localhost") || url.host() == TQString::fromLatin1("127.0.0.1") || url.host() == TQString::fromLatin1("::") ) {
       return false;
   }
   if ( dcopClient()->call( "kded", "networkstatus", "status()",
@@ -1815,7 +1815,7 @@ bool HTTPProtocol::isOffline(const KURL &url)
      TQDataStream stream2( reply, IO_ReadOnly );
      stream2 >> result;
      kdDebug(7113) << "(" << m_pid << ") networkstatus status = " << result << endl;
-     return (result != NetWorktqStatusUnknown) && (result != NetWorktqStatusOnline);
+     return (result != NetWorkStatusUnknown) && (result != NetWorkStatusOnline);
   }
   kdDebug(7113) << "(" << m_pid << ") networkstatus <unreachable>" << endl;
   return false; // On error, assume we are online
@@ -1824,7 +1824,7 @@ bool HTTPProtocol::isOffline(const KURL &url)
 void HTTPProtocol::multiGet(const TQByteArray &data)
 {
   TQDataStream stream(data, IO_ReadOnly);
-  TQ_UINT32 n;
+  Q_UINT32 n;
   stream >> n;
 
   kdDebug(7113) << "(" << m_pid << ") HTTPProtcool::multiGet n = " << n << endl;
@@ -2485,7 +2485,7 @@ bool HTTPProtocol::httpOpen()
     {
       m_request.cookieMode = HTTPRequest::CookiesAuto;
       if (m_request.bUseCookiejar)
-        cookieStr = tqfindCookies( m_request.url.url());
+        cookieStr = findCookies( m_request.url.url());
     }
 
     if (!cookieStr.isEmpty())
@@ -2786,7 +2786,7 @@ try_again:
       // by assuming that they will be sending html.
       kdDebug(7113) << "(" << m_pid << ") HTTPPreadHeader: HEAD -> returned "
                     << "mimetype: " << DEFAULT_MIME_TYPE << endl;
-      mimeType(TQString::tqfromLatin1(DEFAULT_MIME_TYPE));
+      mimeType(TQString::fromLatin1(DEFAULT_MIME_TYPE));
       return true;
     }
 
@@ -2847,7 +2847,7 @@ try_again:
 
     // Store the the headers so they can be passed to the
     // calling application later
-    m_responseHeader << TQString::tqfromLatin1(buf);
+    m_responseHeader << TQString::fromLatin1(buf);
 
     if ((strncasecmp(buf, "HTTP/", 5) == 0) ||
         (strncasecmp(buf, "ICY ", 4) == 0)) // Shoutcast support
@@ -3030,7 +3030,7 @@ try_again:
     // Keep Alive
     else if (strncasecmp(buf, "Keep-Alive:", 11) == 0) {
       TQStringList options = TQStringList::split(',',
-                                     TQString::tqfromLatin1(trimLead(buf+11)));
+                                     TQString::fromLatin1(trimLead(buf+11)));
       for(TQStringList::ConstIterator it = options.begin();
           it != options.end();
           it++)
@@ -3046,7 +3046,7 @@ try_again:
     // Cache control
     else if (strncasecmp(buf, "Cache-Control:", 14) == 0) {
       TQStringList cacheControls = TQStringList::split(',',
-                                     TQString::tqfromLatin1(trimLead(buf+14)));
+                                     TQString::fromLatin1(trimLead(buf+14)));
       for(TQStringList::ConstIterator it = cacheControls.begin();
           it != cacheControls.end();
           it++)
@@ -3081,7 +3081,7 @@ try_again:
 
     else if (strncasecmp(buf, "Content-location:", 17) == 0) {
       setMetaData ("content-location",
-                   TQString::tqfromLatin1(trimLead(buf+17)).stripWhiteSpace());
+                   TQString::fromLatin1(trimLead(buf+17)).stripWhiteSpace());
     }
 
     // what type of data do we have?
@@ -3093,7 +3093,7 @@ try_again:
       while ( *pos && *pos != ';' )  pos++;
 
       // Assign the mime-type.
-      m_strMimeType = TQString::tqfromLatin1(start, pos-start).stripWhiteSpace().lower();
+      m_strMimeType = TQString::fromLatin1(start, pos-start).stripWhiteSpace().lower();
       kdDebug(7113) << "(" << m_pid << ") Content-type: " << m_strMimeType << endl;
 
       // If we still have text, then it means we have a mime-type with a
@@ -3108,8 +3108,8 @@ try_again:
 
         if (*pos)
         {
-          mediaAttribute = TQString::tqfromLatin1(start, pos-start).stripWhiteSpace().lower();
-          mediaValue = TQString::tqfromLatin1(pos+1, end-pos-1).stripWhiteSpace();
+          mediaAttribute = TQString::fromLatin1(start, pos-start).stripWhiteSpace().lower();
+          mediaValue = TQString::fromLatin1(pos+1, end-pos-1).stripWhiteSpace();
 	  pos = end;
           if (mediaValue.length() &&
               (mediaValue[0] == '"') &&
@@ -3153,7 +3153,7 @@ try_again:
 
     // Cache management
     else if (strncasecmp(buf, "Last-Modified:", 14) == 0) {
-      m_request.lastModified = (TQString::tqfromLatin1(trimLead(buf+14))).stripWhiteSpace();
+      m_request.lastModified = (TQString::fromLatin1(trimLead(buf+14))).stripWhiteSpace();
     }
 
     // whoops.. we received a warning
@@ -3177,7 +3177,7 @@ try_again:
     // The deprecated Refresh Response
     else if (strncasecmp(buf,"Refresh:", 8) == 0) {
       mayCache = false;  // Do not cache page as it defeats purpose of Refresh tag!
-      setMetaData( "http-refresh", TQString::tqfromLatin1(trimLead(buf+8)).stripWhiteSpace() );
+      setMetaData( "http-refresh", TQString::fromLatin1(trimLead(buf+8)).stripWhiteSpace() );
     }
 
     // In fact we should do redirection only if we got redirection code
@@ -3254,7 +3254,7 @@ try_again:
               dispositionBuf--;
 
             if ( dispositionBuf > bufStart )
-              dispositionFilename = TQString::tqfromLatin1( bufStart, dispositionBuf-bufStart );
+              dispositionFilename = TQString::fromLatin1( bufStart, dispositionBuf-bufStart );
 
             break;
           }
@@ -3267,7 +3267,7 @@ try_again:
             dispositionBuf++;
 
           if ( dispositionBuf > bufStart )
-            dispositionType = TQString::tqfromLatin1( bufStart, dispositionBuf-bufStart ).stripWhiteSpace();
+            dispositionType = TQString::fromLatin1( bufStart, dispositionBuf-bufStart ).stripWhiteSpace();
 
           while ( *dispositionBuf == ';' || *dispositionBuf == ' ' )
             dispositionBuf++;
@@ -3278,7 +3278,7 @@ try_again:
       // path, thus we extract the filename only.
       if ( !dispositionFilename.isEmpty() )
       {
-        int pos = dispositionFilename.tqfindRev( '/' );
+        int pos = dispositionFilename.findRev( '/' );
 
         if( pos > -1 )
           dispositionFilename = dispositionFilename.mid(pos+1);
@@ -3288,7 +3288,7 @@ try_again:
       }
     }
     else if(strncasecmp(buf, "Content-Language:", 17) == 0) {
-      TQString language = TQString::tqfromLatin1(trimLead(buf+17)).stripWhiteSpace();
+      TQString language = TQString::fromLatin1(trimLead(buf+17)).stripWhiteSpace();
       if (!language.isEmpty())
         setMetaData("content-language", language);
     }
@@ -3302,14 +3302,14 @@ try_again:
     else if (strncasecmp(buf, "Link:", 5) == 0) {
       // We only support Link: <url>; rel="type"   so far
       TQStringList link = TQStringList::split(";", TQString(buf)
-                                                 .tqreplace(TQRegExp("^Link:[ ]*"),
+                                                 .replace(TQRegExp("^Link:[ ]*"),
                                                           ""));
       if (link.count() == 2) {
         TQString rel = link[1].stripWhiteSpace();
         if (rel.startsWith("rel=\"")) {
           rel = rel.mid(5, rel.length() - 6);
           if (rel.lower() == "pageservices") {
-            TQString url = link[0].tqreplace(TQRegExp("[<>]"),"").stripWhiteSpace();
+            TQString url = link[0].replace(TQRegExp("[<>]"),"").stripWhiteSpace();
             setMetaData("PageServices", url);
           }
         }
@@ -3327,14 +3327,14 @@ try_again:
 
          if (policy.count() == 2) {
             if (policy[0].lower() == "policyref") {
-               policyrefs << policy[1].tqreplace(TQRegExp("[\"\']"), "")
+               policyrefs << policy[1].replace(TQRegExp("[\"\']"), "")
                                       .stripWhiteSpace();
             } else if (policy[0].lower() == "cp") {
                // We convert to cp\ncp\ncp\n[...]\ncp to be consistent with
                // other metadata sent in strings.  This could be a bit more
                // efficient but I'm going for correctness right now.
                TQStringList cps = TQStringList::split(" ",
-                                        policy[1].tqreplace(TQRegExp("[\"\']"), "")
+                                        policy[1].replace(TQRegExp("[\"\']"), "")
                                                  .simplifyWhiteSpace());
 
                for (TQStringList::Iterator j = cps.begin(); j != cps.end(); ++j)
@@ -3381,17 +3381,17 @@ try_again:
 
       // md5 signature
       else if (strncasecmp(buf, "Content-MD5:", 12) == 0) {
-        m_sContentMD5 = TQString::tqfromLatin1(trimLead(buf + 12));
+        m_sContentMD5 = TQString::fromLatin1(trimLead(buf + 12));
       }
 
       // *** Responses to the HTTP OPTIONS method follow
       // WebDAV capabilities
       else if (strncasecmp(buf, "DAV:", 4) == 0) {
         if (m_davCapabilities.isEmpty()) {
-          m_davCapabilities << TQString::tqfromLatin1(trimLead(buf + 4));
+          m_davCapabilities << TQString::fromLatin1(trimLead(buf + 4));
         }
         else {
-          m_davCapabilities << TQString::tqfromLatin1(trimLead(buf + 4));
+          m_davCapabilities << TQString::fromLatin1(trimLead(buf + 4));
         }
       }
       // *** Responses to the HTTP OPTIONS method finished
@@ -3667,14 +3667,14 @@ try_again:
      if (m_strMimeType == "application/x-tar")
      {
         m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-        m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+        m_strMimeType = TQString::fromLatin1("application/x-tgz");
      }
      else if (m_strMimeType == "application/postscript")
      {
         // LEONB: Adding another exception for psgz files.
         // Could we use the mimelnk files instead of hardcoding all this?
         m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-        m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+        m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
      }
      else if ( m_request.allowCompressedPage &&
                m_strMimeType != "application/x-tgz" &&
@@ -3683,7 +3683,7 @@ try_again:
                m_request.url.path().right(6) == ".ps.gz" )
      {
         m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-        m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+        m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
      }
      else if ( (m_request.allowCompressedPage &&
                 m_strMimeType == "text/html")
@@ -3700,7 +3700,7 @@ try_again:
      else
      {
         m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-        m_strMimeType = TQString::tqfromLatin1("application/x-gzip");
+        m_strMimeType = TQString::fromLatin1("application/x-gzip");
      }
   }
 
@@ -3713,34 +3713,34 @@ try_again:
   if (m_qContentEncodings.last() == "bzip2")
   {
      m_qContentEncodings.remove(m_qContentEncodings.fromLast());
-     m_strMimeType = TQString::tqfromLatin1("application/x-bzip2");
+     m_strMimeType = TQString::fromLatin1("application/x-bzip2");
   }
 
   // Convert some common mimetypes to standard KDE mimetypes
   if (m_strMimeType == "application/x-targz")
-     m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+     m_strMimeType = TQString::fromLatin1("application/x-tgz");
   else if (m_strMimeType == "application/zip")
-     m_strMimeType = TQString::tqfromLatin1("application/x-zip");
+     m_strMimeType = TQString::fromLatin1("application/x-zip");
   else if (m_strMimeType == "image/x-png")
-     m_strMimeType = TQString::tqfromLatin1("image/png");
+     m_strMimeType = TQString::fromLatin1("image/png");
   else if (m_strMimeType == "image/bmp")
-     m_strMimeType = TQString::tqfromLatin1("image/x-bmp");
+     m_strMimeType = TQString::fromLatin1("image/x-bmp");
   else if (m_strMimeType == "audio/mpeg" || m_strMimeType == "audio/x-mpeg" || m_strMimeType == "audio/mp3")
-     m_strMimeType = TQString::tqfromLatin1("audio/x-mp3");
+     m_strMimeType = TQString::fromLatin1("audio/x-mp3");
   else if (m_strMimeType == "audio/microsoft-wave")
-     m_strMimeType = TQString::tqfromLatin1("audio/x-wav");
+     m_strMimeType = TQString::fromLatin1("audio/x-wav");
   else if (m_strMimeType == "audio/midi")
-     m_strMimeType = TQString::tqfromLatin1("audio/x-midi");
+     m_strMimeType = TQString::fromLatin1("audio/x-midi");
   else if (m_strMimeType == "image/x-xpixmap")
-     m_strMimeType = TQString::tqfromLatin1("image/x-xpm");
+     m_strMimeType = TQString::fromLatin1("image/x-xpm");
   else if (m_strMimeType == "application/rtf")
-     m_strMimeType = TQString::tqfromLatin1("text/rtf");
+     m_strMimeType = TQString::fromLatin1("text/rtf");
 
   // Crypto ones....
   else if (m_strMimeType == "application/pkix-cert" ||
            m_strMimeType == "application/binary-certificate")
   {
-     m_strMimeType = TQString::tqfromLatin1("application/x-x509-ca-cert");
+     m_strMimeType = TQString::fromLatin1("application/x-x509-ca-cert");
   }
 
   // Prefer application/x-tgz or x-gzpostscript over application/x-gzip.
@@ -3748,9 +3748,9 @@ try_again:
   {
      if ((m_request.url.path().right(7) == ".tar.gz") ||
          (m_request.url.path().right(4) == ".tar"))
-        m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+        m_strMimeType = TQString::fromLatin1("application/x-tgz");
      if ((m_request.url.path().right(6) == ".ps.gz"))
-        m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+        m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
   }
 
   // Some webservers say "text/plain" when they mean "application/x-bzip2"
@@ -3758,15 +3758,15 @@ try_again:
   {
      TQString ext = m_request.url.path().right(4).upper();
      if (ext == ".BZ2")
-        m_strMimeType = TQString::tqfromLatin1("application/x-bzip2");
+        m_strMimeType = TQString::fromLatin1("application/x-bzip2");
      else if (ext == ".PEM")
-        m_strMimeType = TQString::tqfromLatin1("application/x-x509-ca-cert");
+        m_strMimeType = TQString::fromLatin1("application/x-x509-ca-cert");
      else if (ext == ".SWF")
-        m_strMimeType = TQString::tqfromLatin1("application/x-shockwave-flash");
+        m_strMimeType = TQString::fromLatin1("application/x-shockwave-flash");
      else if (ext == ".PLS")
-        m_strMimeType = TQString::tqfromLatin1("audio/x-scpls");
+        m_strMimeType = TQString::fromLatin1("audio/x-scpls");
      else if (ext == ".WMV")
-        m_strMimeType = TQString::tqfromLatin1("video/x-ms-wmv");
+        m_strMimeType = TQString::fromLatin1("video/x-ms-wmv");
   }
 
 #if 0
@@ -3871,11 +3871,11 @@ void HTTPProtocol::addEncoding(TQString encoding, TQStringList &encs)
     //if ( m_cmd != CMD_COPY )
       m_iSize = NO_SIZE;
   } else if ((encoding == "x-gzip") || (encoding == "gzip")) {
-    encs.append(TQString::tqfromLatin1("gzip"));
+    encs.append(TQString::fromLatin1("gzip"));
   } else if ((encoding == "x-bzip2") || (encoding == "bzip2")) {
-    encs.append(TQString::tqfromLatin1("bzip2")); // Not yet supported!
+    encs.append(TQString::fromLatin1("bzip2")); // Not yet supported!
   } else if ((encoding == "x-deflate") || (encoding == "deflate")) {
-    encs.append(TQString::tqfromLatin1("deflate"));
+    encs.append(TQString::fromLatin1("deflate"));
   } else {
     kdDebug(7113) << "(" << m_pid << ") Unknown encoding encountered.  "
                     << "Please write code. Encoding = \"" << encoding
@@ -4018,7 +4018,7 @@ void HTTPProtocol::slave_status()
   if ( m_iSock != -1 && !isConnectionValid() )
      httpCloseConnection();
 
-  slavetqStatus( m_state.hostname, (m_iSock != -1) );
+  slaveStatus( m_state.hostname, (m_iSock != -1) );
 }
 
 void HTTPProtocol::mimetype( const KURL& url )
@@ -4259,7 +4259,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d)
                       << endl;
 
         KMimeMagicResult *result;
-        result = KMimeMagic::self()->tqfindBufferFileType( m_mimeTypeBuffer,
+        result = KMimeMagic::self()->findBufferFileType( m_mimeTypeBuffer,
                                                          m_request.url.fileName() );
         if( result )
         {
@@ -4270,7 +4270,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d)
 
         if ( m_strMimeType.isEmpty() )
         {
-          m_strMimeType = TQString::tqfromLatin1( DEFAULT_MIME_TYPE );
+          m_strMimeType = TQString::fromLatin1( DEFAULT_MIME_TYPE );
           kdDebug(7113) << "(" << m_pid << ") Using default mimetype: "
                         <<  m_strMimeType << endl;
         }
@@ -4344,7 +4344,7 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
   // Update the application with total size except when
   // it is compressed, or when the data is to be handled
   // internally (webDAV).  If compressed we have to wait
-  // until we uncompress to tqfind out the actual data size
+  // until we uncompress to find out the actual data size
   if ( !dataInternal ) {
     if ( (m_iSize > 0) && (m_iSize != NO_SIZE)) {
        totalSize(m_iSize);
@@ -4609,7 +4609,7 @@ void HTTPProtocol::addCookies( const TQString &url, const TQCString &cookieHeade
    }
 }
 
-TQString HTTPProtocol::tqfindCookies( const TQString &url)
+TQString HTTPProtocol::findCookies( const TQString &url)
 {
   TQCString replyType;
   TQByteArray params;
@@ -4621,7 +4621,7 @@ TQString HTTPProtocol::tqfindCookies( const TQString &url)
   TQDataStream stream(params, IO_WriteOnly);
   stream << url << windowId;
 
-  if ( !dcopClient()->call( "kded", "kcookiejar", "tqfindCookies(TQString,long int)",
+  if ( !dcopClient()->call( "kded", "kcookiejar", "findCookies(TQString,long int)",
                             params, replyType, reply ) )
   {
      kdWarning(7113) << "(" << m_pid << ") Can't communicate with kded_kcookiejar!" << endl;
@@ -4634,7 +4634,7 @@ TQString HTTPProtocol::tqfindCookies( const TQString &url)
   }
   else
   {
-     kdError(7113) << "(" << m_pid << ") DCOP function tqfindCookies(...) returns "
+     kdError(7113) << "(" << m_pid << ") DCOP function findCookies(...) returns "
                           << replyType << ", expected TQString" << endl;
   }
   return result;
@@ -4680,12 +4680,12 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
 
    TQString CEF = m_request.path;
 
-   int p = CEF.tqfind('/');
+   int p = CEF.find('/');
 
    while(p != -1)
    {
       CEF[p] = separator;
-      p = CEF.tqfind('/', p);
+      p = CEF.find('/', p);
    }
 
    TQString host = m_request.hostname.lower();
@@ -4739,7 +4739,7 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
       ok = false;
 
    time_t date;
-   time_t tqcurrentDate = time(0);
+   time_t currentDate = time(0);
 
    // URL
    if (ok && (!fgets(buffer, 400, fs)))
@@ -4762,10 +4762,10 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
    {
       date = (time_t) strtoul(buffer, 0, 10);
       m_request.creationDate = date;
-      if (m_maxCacheAge && (difftime(tqcurrentDate, date) > m_maxCacheAge))
+      if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge))
       {
          m_request.bMustRevalidate = true;
-         m_request.expireDate = tqcurrentDate;
+         m_request.expireDate = currentDate;
       }
    }
 
@@ -4779,14 +4779,14 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
       {
          date = (time_t) strtoul(buffer, 0, 10);
          // After the expire date we need to revalidate.
-         if (!date || difftime(tqcurrentDate, date) >= 0)
+         if (!date || difftime(currentDate, date) >= 0)
             m_request.bMustRevalidate = true;
          m_request.expireDate = date;
       }
       else if (m_request.cache == CC_Refresh)
       {
          m_request.bMustRevalidate = true;
-         m_request.expireDate = tqcurrentDate;
+         m_request.expireDate = currentDate;
       }
    }
 
@@ -4875,7 +4875,7 @@ void HTTPProtocol::updateExpireDate(time_t expireDate, bool updateCreationDate)
 void HTTPProtocol::createCacheEntry( const TQString &mimetype, time_t expireDate)
 {
    TQString dir = m_request.cef;
-   int p = dir.tqfindRev('/');
+   int p = dir.findRev('/');
    if (p == -1) return; // Error.
    dir.truncate(p);
 
@@ -5114,7 +5114,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy )
     {
       //for sites like lib.homelinux.org
       TQTextCodec* oldCodec=TQTextCodec::codecForCStrings();
-      if (KGlobal::locale()->language().tqcontains("ru"))
+      if (KGlobal::locale()->language().contains("ru"))
         TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("CP1251"));
 
       p += 6;
@@ -5135,12 +5135,12 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy )
   if( isForProxy )
   {
     ProxyAuthentication = f;
-    m_strProxyAuthorization = TQString::tqfromLatin1( strAuth );
+    m_strProxyAuthorization = TQString::fromLatin1( strAuth );
   }
   else
   {
     Authentication = f;
-    m_strAuthorization = TQString::tqfromLatin1( strAuth );
+    m_strAuthorization = TQString::fromLatin1( strAuth );
   }
 }
 
@@ -5233,13 +5233,13 @@ bool HTTPProtocol::getAuthorization()
     {
       bool isStaleNonce = false;
       TQString auth = ( m_responseCode == 401 ) ? m_strAuthorization : m_strProxyAuthorization;
-      int pos = auth.tqfind("stale", 0, false);
+      int pos = auth.find("stale", 0, false);
       if ( pos != -1 )
       {
         pos += 5;
         int len = auth.length();
         while( pos < len && (auth[pos] == ' ' || auth[pos] == '=') ) pos++;
-        if ( pos < len && auth.tqfind("true", pos, false) != -1 )
+        if ( pos < len && auth.find("true", pos, false) != -1 )
         {
           isStaleNonce = true;
           kdDebug(7113) << "(" << m_pid << ") Stale nonce value. "
@@ -5311,7 +5311,7 @@ bool HTTPProtocol::getAuthorization()
   }
   else
   {
-    // At this point we know more details, so use it to tqfind
+    // At this point we know more details, so use it to find
     // out if we have a cached version and avoid a re-prompt!
     // We also do not use verify path unlike the pre-emptive
     // requests because we already know the realm value...
@@ -5358,13 +5358,13 @@ bool HTTPProtocol::getAuthorization()
       else
         auth = m_strProxyAuthorization;
 
-      int pos = auth.tqfind("stale", 0, false);
+      int pos = auth.find("stale", 0, false);
       if ( pos != -1 )
       {
         pos += 5;
         int len = auth.length();
         while( pos < len && (auth[pos] == ' ' || auth[pos] == '=') ) pos++;
-        if ( pos < len && auth.tqfind("true", pos, false) != -1 )
+        if ( pos < len && auth.find("true", pos, false) != -1 )
         {
           info.digestInfo = (m_responseCode == 401) ? m_strAuthorization : m_strProxyAuthorization;
           kdDebug(7113) << "(" << m_pid << ") Just a stale nonce value! "
@@ -5612,7 +5612,7 @@ TQString HTTPProtocol::createNTLMAuth( bool isForProxy )
     strauth = m_strAuthorization.latin1();
     len = m_strAuthorization.length();
   }
-  if ( user.tqcontains('\\') ) {
+  if ( user.contains('\\') ) {
     domain = user.section( '\\', 0, 0);
     user = user.section( '\\', 1 );
   }
@@ -5880,7 +5880,7 @@ TQString HTTPProtocol::createDigestAuth ( bool isForProxy )
       TQCString uri = TQCString(p,i+1);
       do
       {
-        pos = uri.tqfind( ' ', idx );
+        pos = uri.find( ' ', idx );
         if ( pos != -1 )
         {
           KURL u (m_request.url, uri.mid(idx, pos-idx));
@@ -6032,7 +6032,7 @@ TQString HTTPProtocol::proxyAuthenticationHeader()
     info.password = m_proxyURL.pass();
     info.verifyPath = true;
 
-    // If the proxy URL already tqcontains username
+    // If the proxy URL already contains username
     // and password simply attempt to retrieve it
     // without prompting the user...
     if ( !info.username.isNull() && !info.password.isNull() )