[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kxmlgui] src: Use GenericDataLocation instead of DataLocation here too for consistency.
From:       David Faure <faure () kde ! org>
Date:       2016-01-31 20:04:24
Message-ID: E1aPyES-0005lf-Mx () scm ! kde ! org
[Download RAW message or body]

Git commit d2155e977c393c4abaef007b6fda85ad22b23bd0 by David Faure.
Committed on 31/01/2016 at 20:03.
Pushed by dfaure into branch 'master'.

Use GenericDataLocation instead of DataLocation here too for consistency.

(otherwise the org name will be prepended)

M  +1    -1    src/kshortcutschemeseditor.cpp

http://commits.kde.org/kxmlgui/d2155e977c393c4abaef007b6fda85ad22b23bd0

diff --git a/src/kshortcutschemeseditor.cpp b/src/kshortcutschemeseditor.cpp
index f5b9f65..09b12e3 100644
--- a/src/kshortcutschemeseditor.cpp
+++ b/src/kshortcutschemeseditor.cpp
@@ -47,7 +47,7 @@ KShortcutSchemesEditor::KShortcutSchemesEditor(KShortcutsDialog \
*parent)  QStringList schemes;
     schemes << QStringLiteral("Default");
     // List files in the shortcuts subdir, each one is a theme. See \
                KShortcutSchemesHelper::{shortcutSchemeFileName,exportActionCollection}
                
-    const QStringList shortcutsDir = \
QStandardPaths::locateAll(QStandardPaths::DataLocation, QStringLiteral("shortcuts"), \
QStandardPaths::LocateDirectory); +    const QStringList shortcutsDir = \
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, \
QCoreApplication::applicationName() + QStringLiteral("/shortcuts"), \
QStandardPaths::LocateDirectory);  Q_FOREACH (const QString &dir, shortcutsDir) {
         Q_FOREACH (const QString &file, QDir(dir).entryList(QDir::Files | \
QDir::NoDotAndDotDot)) {  schemes << file;


[prev in list] [next in list] [prev in thread] [next in thread]