aboutsummaryrefslogtreecommitdiffstats
path: root/community/cppcheck/set_datadir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/cppcheck/set_datadir.patch')
-rw-r--r--community/cppcheck/set_datadir.patch25
1 files changed, 14 insertions, 11 deletions
diff --git a/community/cppcheck/set_datadir.patch b/community/cppcheck/set_datadir.patch
index 23bec8bdaec..db7e391f35b 100644
--- a/community/cppcheck/set_datadir.patch
+++ b/community/cppcheck/set_datadir.patch
@@ -1,21 +1,24 @@
---- cppcheck-1.73-origin/gui/main.cpp
-+++ cppcheck-1.73/gui/main.cpp
-@@ -62,12 +57,18 @@
+diff --git a/gui/main.cpp b/gui/main.cpp
+index fc68b7f..a682178 100644
+--- a/gui/main.cpp
++++ b/gui/main.cpp
+@@ -57,6 +57,9 @@ int main(int argc, char *argv[])
QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app);
// Set data dir..
+ if ((settings->value("DATADIR", QString()).toString()).isEmpty())
+ settings->setValue("DATADIR", "/usr/share/cppcheck");
+
- foreach (const QString arg, app.arguments()) {
- if (arg.startsWith("--data-dir=")) {
- settings->setValue("DATADIR", arg.mid(11));
- return 0;
- }
+ const QStringList args = QApplication::arguments();
+ auto it = std::find_if(args.cbegin(), args.cend(), [](const QString& arg) {
+ return arg.startsWith("--data-dir=");
+@@ -66,6 +69,9 @@ int main(int argc, char *argv[])
+ return 0;
}
-+
+
+ if ((settings->value(SETTINGS_LANGUAGE, QString()).toString()).isEmpty())
+ settings->setValue(SETTINGS_LANGUAGE, "en");
-
++
TranslationHandler* th = new TranslationHandler(&app);
- th->SetLanguage(settings->value(SETTINGS_LANGUAGE, th->SuggestLanguage()).toString());
+ th->setLanguage(settings->value(SETTINGS_LANGUAGE, th->suggestLanguage()).toString());
+