diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-04-18 18:26:44 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-04-18 18:26:44 -0500 |
| commit | 1c68d332fd7e08a190daedbaa6ace857b575b7c4 (patch) | |
| tree | 5432577d9a26664aae0410a5887b1dbfc2995406 /tdecore/tdeconfigbackend.cpp | |
| parent | d6ee27dacd1a96ef9e5819695c7eb62720e738bc (diff) | |
| download | tdelibs-1c68d332fd7e08a190daedbaa6ace857b575b7c4.tar.gz tdelibs-1c68d332fd7e08a190daedbaa6ace857b575b7c4.zip | |
Rename kderc -> tderc in support of bug report 1447.
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 )) |