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, 13 insertions, 13 deletions

diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp
index 072eb97b5..234124820 100644
--- a/kdecore/kconfigbackend.cpp
+++ b/kdecore/kconfigbackend.cpp
@@ -215,8 +215,8 @@ static TQCString encodeKey(const char* key)
 {
     TQCString newKey(key);
 
-    newKey.tqreplace('[', "%5b");
-    newKey.tqreplace(']', "%5d");
+    newKey.replace('[', "%5b");
+    newKey.replace(']', "%5d");
 
     return newKey;
 }
@@ -225,8 +225,8 @@ static TQCString decodeKey(const char* key)
 {
     TQCString newKey(key);
 
-    newKey.tqreplace("%5b", "[");
-    newKey.tqreplace("%5d", "]");
+    newKey.replace("%5b", "[");
+    newKey.replace("%5d", "]");
 
     return newKey;
 }
@@ -256,7 +256,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
 
    if (useKDEGlobals)
       mGlobalFileName = KGlobal::dirs()->saveLocation("config") +
-	      TQString::tqfromLatin1("kdeglobals");
+	      TQString::fromLatin1("kdeglobals");
    else
       mGlobalFileName = TQString::null;
 
@@ -347,19 +347,19 @@ bool KConfigINIBackEnd::parseConfigFiles()
   // Parse the general config files
   if (useKDEGlobals) {
     TQStringList kdercs = KGlobal::dirs()->
-      findAllResources("config", TQString::tqfromLatin1("kdeglobals"));
+      findAllResources("config", TQString::fromLatin1("kdeglobals"));
 
 #ifdef Q_WS_WIN
     TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" );
 #else
-    TQString etc_kderc = TQString::tqfromLatin1("/etc/kderc");
+    TQString etc_kderc = TQString::fromLatin1("/etc/kderc");
 #endif
 
     if (checkAccess(etc_kderc, R_OK))
       kdercs += etc_kderc;
 
     kdercs += KGlobal::dirs()->
-      findAllResources("config", TQString::tqfromLatin1("system.kdeglobals"));
+      findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
 
     TQStringList::ConstIterator it;
 
@@ -605,13 +605,13 @@ qWarning("SIGBUS while reading %s", rFile.name().latin1());
       const char *endOfKey = 0, *locale = 0, *elocale = 0;
       for (; (s < eof) && (*s != '\n'); s++)
       {
-         if (*s == '=') //tqfind the equal sign
+         if (*s == '=') //find the equal sign
          {
 	    if (!endOfKey)
         	endOfKey = s;
             goto haveeq;
 	 }
-	 if (*s == '[') //tqfind the locale or options.
+	 if (*s == '[') //find the locale or options.
 	 {
             const char *option;
             const char *eoption;
@@ -792,7 +792,7 @@ void KConfigINIBackEnd::sync(bool bMerge)
 
   bool bEntriesLeft = true;
 
-  // tqfind out the file to write to (most specific writable file)
+  // find out the file to write to (most specific writable file)
   // try local app-specific file first
 
   if (!mfileName.isEmpty()) {
@@ -999,7 +999,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
     const KEntry &currentEntry = *aIt;
     if(aIt.key().bDefault)
     {
-       aTempMap.tqreplace(aIt.key(), currentEntry);
+       aTempMap.replace(aIt.key(), currentEntry);
        continue;
     }
 
@@ -1017,7 +1017,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal,
 
     // put this entry from the config object into the
     // temporary map, possibly replacing an existing entry
-    KEntryMapIterator aIt2 = aTempMap.tqfind(aIt.key());
+    KEntryMapIterator aIt2 = aTempMap.find(aIt.key());
     if (aIt2 != aTempMap.end() && (*aIt2).bImmutable)
        continue; // Bail out if the on-disk entry is immutable