summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-18 12:51:16 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-18 12:51:16 (GMT)
commit2defba730357a5182cf3c6492f9f5c957570de0d (patch)
treec0639d408ae87e4167f45290bdb78856eee11a3c
parent75741de5e6acf5d31f0dc8a2c507702dd434e7a2 (diff)
Load all rename files
-rw-r--r--src/kdebugsettingsdialog.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/kdebugsettingsdialog.cpp b/src/kdebugsettingsdialog.cpp
index 8ca1163..1d48853 100644
--- a/src/kdebugsettingsdialog.cpp
+++ b/src/kdebugsettingsdialog.cpp
@@ -131,9 +131,15 @@ void KDebugSettingsDialog::readCategoriesFiles(const QString &path)
Q_FOREACH (const QString &dir, dirs) {
const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.renamecategories"));
Q_FOREACH (const QString &file, fileNames) {
- if (file != QStringLiteral("kde.categories")) {
- mRenameCategoriesList.append(KDebugSettingsUtil::readRenameCategories(dir + file));
- }
+ mRenameCategoriesList.append(KDebugSettingsUtil::readRenameCategories(dir + file));
+ }
+ }
+ //TODO add load rename file from external kde apps.
+ dirs = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("qdebug.categories/"), QStandardPaths::LocateDirectory);
+ Q_FOREACH (const QString &dir, dirs) {
+ const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.renamecategories"));
+ Q_FOREACH (const QString &file, fileNames) {
+ mRenameCategoriesList.append(KDebugSettingsUtil::readRenameCategories(dir + file));
}
}
@@ -157,7 +163,6 @@ void KDebugSettingsDialog::readCategoriesFiles(const QString &path)
}
}
- //TODO add load rename file from external kde apps.
const QByteArray rulesFilePath = qgetenv("QT_LOGGING_CONF");
if (!rulesFilePath.isEmpty()) {