From 047201211b60bbe604dac29c11e8822522051a19 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Mon, 8 Oct 2012 21:26:39 +0100 Subject: [PATCH] GCS-Change config file name This is to force a new configuration to be loaded and used. --- ground/openpilotgcs/src/app/main.cpp | 2 +- ground/openpilotgcs/src/libs/utils/pathutils.cpp | 2 +- ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ground/openpilotgcs/src/app/main.cpp b/ground/openpilotgcs/src/app/main.cpp index 88eacd532..9d4010165 100644 --- a/ground/openpilotgcs/src/app/main.cpp +++ b/ground/openpilotgcs/src/app/main.cpp @@ -252,7 +252,7 @@ int main(int argc, char **argv) QCoreApplication::applicationDirPath()+QLatin1String(SHARE_PATH)); // keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp QSettings settings(XmlConfig::XmlSettingsFormat, QSettings::UserScope, - QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS")); + QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config")); overrideSettings(settings, argc, argv); locale = settings.value("General/OverrideLanguage", locale).toString(); diff --git a/ground/openpilotgcs/src/libs/utils/pathutils.cpp b/ground/openpilotgcs/src/libs/utils/pathutils.cpp index 0ecdd3c85..3c06cd497 100644 --- a/ground/openpilotgcs/src/libs/utils/pathutils.cpp +++ b/ground/openpilotgcs/src/libs/utils/pathutils.cpp @@ -98,7 +98,7 @@ QString PathUtils::GetStoragePath() { // This routine works with "/" as the standard: // Work out where the settings are stored on the machine - QSettings set(XmlConfig::XmlSettingsFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS")); + QSettings set(XmlConfig::XmlSettingsFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config")); QFileInfo f(set.fileName()); QDir dir(f.absoluteDir()); diff --git a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp index 2df94e9c9..dc74094a5 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp @@ -102,11 +102,11 @@ MainWindow::MainWindow() : m_additionalContexts(m_globalContext), // keep this in sync with main() in app/main.cpp m_settings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::UserScope, - QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"), this)), + QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"), this)), m_globalSettings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::SystemScope, - QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"), this)), + QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"), this)), m_settingsDatabase(new SettingsDatabase(QFileInfo(m_settings->fileName()).path(), - QLatin1String("OpenPilotGCS"), + QLatin1String("OpenPilotGCS_config"), this)), m_dontSaveSettings(false), m_actionManager(new ActionManagerPrivate(this)),