diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
| commit | 5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch) | |
| tree | 9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdecore/klocale.cpp | |
| parent | c17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff) | |
| download | tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/klocale.cpp')
| -rw-r--r-- | tdecore/klocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp index 4c60bed43..f7a3cf77a 100644 --- a/tdecore/klocale.cpp +++ b/tdecore/klocale.cpp @@ -37,7 +37,7 @@ #include "kstandarddirs.h" #include "ksimpleconfig.h" #include "kinstance.h" -#include "kconfig.h" +#include "tdeconfig.h" #include "kdebug.h" #include "kcalendarsystem.h" #include "kcalendarsystemfactory.h" @@ -672,7 +672,7 @@ void KLocale::updateCatalogues( ) } // now iterate over all languages and all wanted catalog names and append or create them in the right order - // the sequence must be e.g. nds/appname nds/tdelibs nds/kio de/appname de/tdelibs de/kio etc. + // the sequence must be e.g. nds/appname nds/tdelibs nds/tdeio de/appname de/tdelibs de/tdeio etc. // and not nds/appname de/appname nds/tdelibs de/tdelibs etc. Otherwise we would be in trouble with a language // sequende nds,en_US, de. In this case en_US must hide everything below in the language list. for ( TQStringList::ConstIterator itLangs = d->languageList.begin(); |