Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: remove redudant support for kde4rc and system.kdeglobals configs

Browse source
This commit is contained in:
Ivailo Monev 2015-04-28 16:21:11 +00:00
parent 46abe997dd
commit d417f74d40
4 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
kdecore/config/kconfig.cpp
View file

@ -62,33 +62,6 @@ KConfigPrivate::KConfigPrivate(const KComponentData &componentData_, KConfig::Op
{
sGlobalFileName = componentData.dirs()->saveLocation("config", QString(), false) + QLatin1String("kdeglobals");
static int use_etc_kderc = -1;
if (use_etc_kderc < 0)
use_etc_kderc = getenv("KDE_SKIP_KDERC") != 0 ? 0 : 1; // for unit tests
if (use_etc_kderc) {
etc_kderc =
QLatin1String("/etc/kde4rc");
if (!KStandardDirs::checkAccess(etc_kderc, R_OK)) {
etc_kderc.clear();
}
}
// if (!mappingsRegistered) {
// KEntryMap tmp;
// if (!etc_kderc.isEmpty()) {
// KSharedPtr<KConfigBackend> backend = KConfigBackend::create(componentData, etc_kderc, QLatin1String("INI"));
// backend->parseConfig( "en_US", tmp, KConfigBackend::ParseDefaults);
// }
// const QString kde4rc(QDir::home().filePath(".kde4rc"));
// if (KStandardDirs::checkAccess(kde4rc, R_OK)) {
// KSharedPtr<KConfigBackend> backend = KConfigBackend::create(componentData, kde4rc, QLatin1String("INI"));
// backend->parseConfig( "en_US", tmp, KConfigBackend::ParseOptions());
// }
// KConfigBackend::registerMappings(tmp);
// mappingsRegistered = true;
// }
setLocale(KGlobal::hasLocale() ? KGlobal::locale()->language() : KLocale::defaultLanguage());
}
@ -598,10 +571,6 @@ QStringList KConfigPrivate::getGlobalFiles() const
QStringList globalFiles;
foreach (const QString& dir1, dirs->findAllResources("config", QLatin1String("kdeglobals")))
globalFiles.push_front(dir1);
foreach (const QString& dir2, dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
globalFiles.push_front(dir2);
if (!etc_kderc.isEmpty())
globalFiles.push_front(etc_kderc);
return globalFiles;
}

2
kdecore/util/qtest_kde.h
View file

@ -73,7 +73,6 @@ int main(int argc, char *argv[]) \
setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test") ), 1); \
setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test/xdg/local") ), 1); \
setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test/xdg/config") ), 1); \
setenv("KDE_SKIP_KDERC", "1", 1); \
unsetenv("KDE_COLOR_DEBUG"); \
QFile::remove(QDir::homePath() + QString::fromLatin1("/.kde-unit-test/share/config/qttestrc")); \
KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("KDE Test Program"), QByteArray("version") ); \
@ -124,7 +123,6 @@ int main(int argc, char *argv[]) \
setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test" )), 1); \
setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test/xdg/local") ), 1); \
setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test/xdg/config") ), 1); \
setenv("KDE_SKIP_KDERC", "1", 1); \
unsetenv("KDE_COLOR_DEBUG"); \
QFile::remove(QDir::homePath() + QString::fromLatin1("/.kde-unit-test/share/config/qttestrc")); \
KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("KDE Test Program"), QByteArray("version") ); \

1
kdeui/tests/kmanagerselectiontest.cpp
View file

@ -149,7 +149,6 @@ int main(int argc, char *argv[]) \
setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test") ), 1); \
setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test/xdg/local") ), 1); \
setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test/xdg/config") ), 1); \
setenv("KDE_SKIP_KDERC", "1", 1); \
unsetenv("KDE_COLOR_DEBUG"); \
QFile::remove(QDir::homePath() + QLatin1String("/.kde-unit-test/share/config/qttestrc")); \
KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("KDE Test Program"), QByteArray("version") ); \

1
kdeui/tests/kstartupinfo_unittest.cpp
View file

@ -102,7 +102,6 @@ int main(int argc, char *argv[]) \
setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test") ), 1); \
setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test/xdg/local") ), 1); \
setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test/xdg/config") ), 1); \
setenv("KDE_SKIP_KDERC", "1", 1); \
unsetenv("KDE_COLOR_DEBUG"); \
QFile::remove(QDir::homePath() + QLatin1String("/.kde-unit-test/share/config/qttestrc")); \
KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("KDE Test Program"), QByteArray("version") ); \