From 64dc5717f154bd2a3a523f632b56d6d97c1112ce Mon Sep 17 00:00:00 2001 From: James Duley Date: Sat, 9 May 2015 19:49:21 +1200 Subject: [PATCH] OP-1879 remove openpilot hardcoding: use Utils::PathUtils.GetDataPath() instead of hardcoding in main.cpp --- ground/openpilotgcs/src/app/main.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/ground/openpilotgcs/src/app/main.cpp b/ground/openpilotgcs/src/app/main.cpp index d9ef8375e..1cb6207ce 100644 --- a/ground/openpilotgcs/src/app/main.cpp +++ b/ground/openpilotgcs/src/app/main.cpp @@ -79,6 +79,7 @@ #include "qtsingleapplication.h" #include "utils/xmlconfig.h" +#include "utils/pathutils.h" #include "gcssplashscreen.h" #include @@ -117,12 +118,6 @@ const QLatin1String CORE_PLUGIN_NAME("Core"); const QLatin1String SETTINGS_ORG_NAME("OpenPilot"); const QLatin1String SETTINGS_APP_NAME("OpenPilotGCS_config"); -#ifdef Q_OS_MAC -const QLatin1String SHARE_PATH("/../Resources"); -#else -const QLatin1String SHARE_PATH("/../share/openpilotgcs"); -#endif - const char *DEFAULT_CONFIG_FILENAME = "OpenPilotGCS.xml"; const char *fixedOptionsC = " [OPTION]... [FILE]...\n" @@ -349,7 +344,7 @@ AppOptionValues parseCommandLine(SharedTools::QtSingleApplication &app, void loadFactoryDefaults(QSettings &settings, AppOptionValues &appOptionValues) { - QDir directory(QCoreApplication::applicationDirPath() + SHARE_PATH + QString("/default_configurations")); + QDir directory(Utils::PathUtils().GetDataPath() + QString("default_configurations")); qDebug() << "Looking for factory defaults configuration files in:" << directory.absolutePath(); @@ -421,8 +416,7 @@ void overrideSettings(QSettings &settings, int argc, char * *argv) void loadTranslators(QString language, QTranslator &translator, QTranslator &qtTranslator) { - const QString &creatorTrPath = QCoreApplication::applicationDirPath() + SHARE_PATH - + QLatin1String("/translations"); + const QString &creatorTrPath = Utils::PathUtils().GetDataPath() + QLatin1String("translations"); if (translator.load(QLatin1String("openpilotgcs_") + language, creatorTrPath)) { const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); @@ -476,7 +470,7 @@ int main(int argc, char * *argv) // load user settings // Must be done before any QSettings class is created // keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp - QString settingsPath = QCoreApplication::applicationDirPath() + SHARE_PATH; + QString settingsPath = Utils::PathUtils().GetDataPath(); qDebug() << "Loading system settings from" << settingsPath; QSettings::setPath(XmlConfig::XmlSettingsFormat, QSettings::SystemScope, settingsPath); qDebug() << "Loading user settings from" << SETTINGS_ORG_NAME << "/" << SETTINGS_APP_NAME;