summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-16 14:39:15 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-16 14:39:15 (GMT)
commita82412ad36ea3d8de1117bb7d57a58dc064599d0 (patch)
tree1a842e02269fba8b574c921f3afaf4a2f1506bcb
parent9f78f5a03b3652c571d2f4c714c118ae7f779402 (diff)
Load renameCategories
-rw-r--r--src/kdebugsettingsdialog.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/kdebugsettingsdialog.cpp b/src/kdebugsettingsdialog.cpp
index 1d813d6..cdb8a58 100644
--- a/src/kdebugsettingsdialog.cpp
+++ b/src/kdebugsettingsdialog.cpp
@@ -126,9 +126,20 @@ void KDebugSettingsDialog::readCategoriesFiles(const QString &path)
const QString confAreasFile = QStandardPaths::locate(QStandardPaths::ConfigLocation, QStringLiteral("kde.categories"));
KDebugSettingsUtil::readLoggingCategories(confAreasFile, mCategoriesList, false);
- // Load *.categories file in QStandardPaths::ConfigLocation for kde apps.
+ // Load *.renamecategories file in QStandardPaths::ConfigLocation for kde apps.
QStringList dirs = QStandardPaths::locateAll(QStandardPaths::ConfigLocation, QString(), QStandardPaths::LocateDirectory);
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));
+ }
+ }
+ }
+
+ // Load *.categories file in QStandardPaths::ConfigLocation for kde apps.
+ dirs = QStandardPaths::locateAll(QStandardPaths::ConfigLocation, QString(), QStandardPaths::LocateDirectory);
+ Q_FOREACH (const QString &dir, dirs) {
const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.categories"));
Q_FOREACH (const QString &file, fileNames) {
if (file != QStringLiteral("kde.categories")) {