From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 03:45:53 +0000
Subject: 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
---
 kio/kio/kprotocolmanager.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kio/kio/kprotocolmanager.cpp')

diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
index 3b4206ddd..8fb8b3227 100644
--- a/kio/kio/kprotocolmanager.cpp
+++ b/kio/kio/kprotocolmanager.cpp
@@ -277,7 +277,7 @@ TQString KProtocolManager::proxyForURL( const KURL &url )
           break;
   }
 
-  return (proxy.isEmpty() ? TQString::tqfromLatin1("DIRECT") : proxy);
+  return (proxy.isEmpty() ? TQString::fromLatin1("DIRECT") : proxy);
 }
 
 void KProtocolManager::badProxy( const TQString &proxy )
@@ -305,7 +305,7 @@ static bool revmatch(const char *host, const char *nplist)
     {
       hptr = shptr;
 
-      // Try to tqfind another domain or host in the list
+      // Try to find another domain or host in the list
       while(--nptr>=nplist && *nptr!=',' && *nptr!=' ') ;
 
       // Strip out multiple spaces and commas
@@ -453,31 +453,31 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers )
   struct utsname nam;
   if( uname(&nam) >= 0 )
   {
-    if( modifiers.tqcontains('o') )
+    if( modifiers.contains('o') )
     {
       supp += TQString("; %1").arg(nam.sysname);
-      if ( modifiers.tqcontains('v') )
+      if ( modifiers.contains('v') )
         supp += TQString(" %1").arg(nam.release);
     }
-    if( modifiers.tqcontains('p') )
+    if( modifiers.contains('p') )
     {
       // TODO: determine this value instead of hardcoding it...
-      supp += TQString::tqfromLatin1("; X11");
+      supp += TQString::fromLatin1("; X11");
     }
-    if( modifiers.tqcontains('m') )
+    if( modifiers.contains('m') )
     {
       supp += TQString("; %1").arg(nam.machine);
     }
-    if( modifiers.tqcontains('l') )
+    if( modifiers.contains('l') )
     {
       TQStringList languageList = KGlobal::locale()->languageList();
-      TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") );
+      TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
       if( it != languageList.end() )
       {
-        if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 )
+        if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
           languageList.remove( it );
         else
-          (*it) = TQString::tqfromLatin1("en");
+          (*it) = TQString::fromLatin1("en");
       }
       if( languageList.count() )
         supp += TQString("; %1").arg(languageList.join(", "));
-- 
cgit v1.2.3