diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-18 19:01:11 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-18 19:01:11 -0500 |
| commit | 2b31f11f979f3ffc3dd060072b85559a832bfab5 (patch) | |
| tree | 081358a0df37f88e89a3e2fa4e137810681ab480 /tdecore/tdeconfigbackend.cpp | |
| parent | 30b0af1f01cdbfcc51a56943e8c091bc8991f83a (diff) | |
| parent | 1c68d332fd7e08a190daedbaa6ace857b575b7c4 (diff) | |
| download | tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.tar.gz tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/tdeconfigbackend.cpp')
| -rw-r--r-- | tdecore/tdeconfigbackend.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp index 6d5197ff7..06939551a 100644 --- a/tdecore/tdeconfigbackend.cpp +++ b/tdecore/tdeconfigbackend.cpp @@ -350,24 +350,24 @@ bool TDEConfigINIBackEnd::parseConfigFiles() // Parse the general config files if (useKDEGlobals) { - TQStringList kdercs = TDEGlobal::dirs()-> + TQStringList tdercs = TDEGlobal::dirs()-> findAllResources("config", TQString::fromLatin1("kdeglobals")); #ifdef Q_WS_WIN - TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" ); + TQString etc_tderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\tderc" ); #else - TQString etc_kderc = TQString::fromLatin1("/etc/kderc"); + TQString etc_tderc = TQString::fromLatin1("/etc/tderc"); #endif - if (checkAccess(etc_kderc, R_OK)) - kdercs += etc_kderc; + if (checkAccess(etc_tderc, R_OK)) + tdercs += etc_tderc; - kdercs += TDEGlobal::dirs()-> + tdercs += TDEGlobal::dirs()-> findAllResources("config", TQString::fromLatin1("system.kdeglobals")); TQStringList::ConstIterator it; - for (it = kdercs.fromLast(); it != kdercs.end(); --it) { + for (it = tdercs.fromLast(); it != tdercs.end(); --it) { TQFile aConfigFile( *it ); if (!aConfigFile.open( IO_ReadOnly )) |