summaryrefslogtreecommitdiffstats
path: root/kdecore/kconfig.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdecore/kconfig.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
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
Diffstat (limited to 'kdecore/kconfig.cpp')
-rw-r--r--kdecore/kconfig.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kdecore/kconfig.cpp b/kdecore/kconfig.cpp
index 3dfb018b9..2531034ee 100644
--- a/kdecore/kconfig.cpp
+++ b/kdecore/kconfig.cpp
@@ -144,7 +144,7 @@ TQMap<TQString, TQString> KConfig::entryMap(const TQString &pGroup) const
KEntryKey groupKey( pGroup_utf, 0 );
TQMap<TQString, TQString> tmpMap;
- KEntryMapConstIterator aIt = aEntryMap.tqfind(groupKey);
+ KEntryMapConstIterator aIt = aEntryMap.find(groupKey);
if (aIt == aEntryMap.end())
return tmpMap;
++aIt; // advance past special group entry marker
@@ -183,7 +183,7 @@ KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const
KEntryKey aKey(pGroup_utf, 0);
KEntryMap tmpEntryMap;
- aIt = aEntryMap.tqfind(aKey);
+ aIt = aEntryMap.find(aKey);
if (aIt == aEntryMap.end()) {
// the special group key is not in the map,
// so it must be an invalid group. Return
@@ -215,7 +215,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro
if (bGroupImmutable && !_key.bDefault)
return;
- // now either add or tqreplace the data
+ // now either add or replace the data
KEntry &entry = aEntryMap[_key];
bool immutable = entry.bImmutable;
if (immutable && !_key.bDefault)
@@ -237,7 +237,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro
KEntry KConfig::lookupData(const KEntryKey &_key) const
{
- KEntryMapConstIterator aIt = aEntryMap.tqfind(_key);
+ KEntryMapConstIterator aIt = aEntryMap.find(_key);
if (aIt != aEntryMap.end())
{
const KEntry &entry = *aIt;
@@ -255,7 +255,7 @@ bool KConfig::internalHasGroup(const TQCString &group) const
{
KEntryKey groupKey( group, 0);
- KEntryMapConstIterator aIt = aEntryMap.tqfind(groupKey);
+ KEntryMapConstIterator aIt = aEntryMap.find(groupKey);
KEntryMapConstIterator aEnd = aEntryMap.end();
if (aIt == aEnd)
@@ -290,7 +290,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
setGroup("$Version");
TQString cfg_id = updateFile+":"+id;
TQStringList ids = readListEntry("update_info");
- if (!ids.tqcontains(cfg_id))
+ if (!ids.contains(cfg_id))
{
TQStringList args;
args << "--check" << updateFile;