diff options
Diffstat (limited to 'kdecore/kconfigbackend.cpp')
| -rw-r--r-- | kdecore/kconfigbackend.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp index 234124820..192ef9b20 100644 --- a/kdecore/kconfigbackend.cpp +++ b/kdecore/kconfigbackend.cpp @@ -114,8 +114,8 @@ static TQCString printableToString(const char *str, int l) static TQCString stringToPrintable(const TQCString& str){ TQCString result(str.length()*2); // Maximum 2x as long as source string - register char *r = result.data(); - register char *s = str.data(); + register char *r = const_cast<TQCString&>(result).data(); + register char *s = const_cast<TQCString&>(str).data(); if (!s) return TQCString(""); @@ -198,8 +198,8 @@ static TQCString encodeGroup(const TQCString &str) { int l = str.length(); TQCString result(l*2+1); - register char *r = result.data(); - register char *s = str.data(); + register char *r = const_cast<TQCString&>(result).data(); + register char *s = const_cast<TQCString&>(str).data(); while(l) { if ((*s == '[') || (*s == ']')) @@ -256,7 +256,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName, if (useKDEGlobals) mGlobalFileName = KGlobal::dirs()->saveLocation("config") + - TQString::fromLatin1("kdeglobals"); + TQString::tqfromLatin1("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::fromLatin1("kdeglobals")); + findAllResources("config", TQString::tqfromLatin1("kdeglobals")); #ifdef Q_WS_WIN TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" ); #else - TQString etc_kderc = TQString::fromLatin1("/etc/kderc"); + TQString etc_kderc = TQString::tqfromLatin1("/etc/kderc"); #endif if (checkAccess(etc_kderc, R_OK)) kdercs += etc_kderc; kdercs += KGlobal::dirs()-> - findAllResources("config", TQString::fromLatin1("system.kdeglobals")); + findAllResources("config", TQString::tqfromLatin1("system.kdeglobals")); TQStringList::ConstIterator it; @@ -999,7 +999,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal, const KEntry ¤tEntry = *aIt; if(aIt.key().bDefault) { - aTempMap.replace(aIt.key(), currentEntry); + aTempMap.tqreplace(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.find(aIt.key()); + KEntryMapIterator aIt2 = aTempMap.tqfind(aIt.key()); if (aIt2 != aTempMap.end() && (*aIt2).bImmutable) continue; // Bail out if the on-disk entry is immutable |