From e8063d193d56acc10c5a533cffd95c9271b24e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 27 Dec 2015 03:34:03 +0100 Subject: [PATCH] GH-1308 remove use of static data (translations) and root (notifications.json) paths. --- application/MultiMC.cpp | 17 +++-------------- application/MultiMC.h | 9 --------- application/pages/global/MultiMCPage.cpp | 3 +-- logic/Env.cpp | 6 +++--- logic/Env.h | 2 +- 5 files changed, 8 insertions(+), 29 deletions(-) diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 0cf6cf92..1c1fe835 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -126,6 +126,7 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar QString origcwdPath = QDir::currentPath(); QString binPath = applicationDirPath(); QString adjustedBy; + QString dataPath; // change directory QString dirParam = args["dir"].toString(); if (!dirParam.isEmpty()) @@ -170,17 +171,6 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar #endif } -// static data paths... mostly just for translations -#ifdef Q_OS_LINUX - QDir foo(FS::PathCombine(binPath, "..")); - staticDataPath = foo.absolutePath(); -#elif defined(Q_OS_WIN32) - staticDataPath = binPath; -#elif defined(Q_OS_MAC) - QDir foo(FS::PathCombine(rootPath, "Contents/Resources")); - staticDataPath = foo.absolutePath(); -#endif - // init the logger initLogger(); @@ -199,7 +189,6 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar } qDebug() << "Binary path : " << binPath; qDebug() << "Application root path : " << rootPath; - qDebug() << "Static data path : " << staticDataPath; // load settings initGlobalSettings(test_mode); @@ -239,7 +228,7 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar m_accounts->loadList(); // init the http meta cache - ENV.initHttpMetaCache(rootPath, staticDataPath); + ENV.initHttpMetaCache(); // create the global network manager ENV.m_qnam.reset(new QNetworkAccessManager(this)); @@ -330,7 +319,7 @@ void MultiMC::initTranslations() } m_mmc_translator.reset(new QTranslator()); - if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), staticDataPath + "/translations")) + if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), FS::PathCombine(QDir::currentPath(), "translations"))) { qDebug() << "Loading MMC Language File for" << locale.bcp47Name().toLocal8Bit().constData() << "..."; diff --git a/application/MultiMC.h b/application/MultiMC.h index f32772ef..492544fc 100644 --- a/application/MultiMC.h +++ b/application/MultiMC.h @@ -124,13 +124,6 @@ public: bool openJsonEditor(const QString &filename); protected: /* to be removed! */ - // FIXME: remove. used by MultiMCPage to enumerate translations. - /// this is the static data. it stores things that don't move. - const QString &staticData() - { - return staticDataPath; - } - // FIXME: remove. used by MainWindow to create application update tasks /// this is the root of the 'installation'. Used for automatic updates const QString &root() @@ -175,8 +168,6 @@ private: QMap> m_tools; QString rootPath; - QString staticDataPath; - QString dataPath; Status m_status = MultiMC::Failed; public: diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp index 5b7a1204..18f30010 100644 --- a/application/pages/global/MultiMCPage.cpp +++ b/application/pages/global/MultiMCPage.cpp @@ -336,8 +336,7 @@ void MultiMCPage::loadSettings() // Language ui->languageBox->clear(); ui->languageBox->addItem(tr("English"), QLocale(QLocale::English)); - foreach(const QString & lang, QDir(MMC->staticData() + "/translations") - .entryList(QStringList() << "*.qm", QDir::Files)) + for(const QString & lang: QDir("translations").entryList(QStringList() << "*.qm", QDir::Files)) { QLocale locale(lang.section(QRegExp("[_\\.]"), 1)); ui->languageBox->addItem(QLocale::languageToString(locale.language()), locale); diff --git a/logic/Env.cpp b/logic/Env.cpp index 2f26f211..4214695d 100644 --- a/logic/Env.cpp +++ b/logic/Env.cpp @@ -134,7 +134,7 @@ void Env::registerVersionList(QString name, std::shared_ptr< BaseVersionList > v } -void Env::initHttpMetaCache(QString rootPath, QString staticDataPath) +void Env::initHttpMetaCache() { m_metacache.reset(new HttpMetaCache("metacache")); m_metacache->addBase("asset_indexes", QDir("assets/indexes").absolutePath()); @@ -146,8 +146,8 @@ void Env::initHttpMetaCache(QString rootPath, QString staticDataPath) m_metacache->addBase("liteloader", QDir("mods/liteloader").absolutePath()); m_metacache->addBase("general", QDir("cache").absolutePath()); m_metacache->addBase("skins", QDir("accounts/skins").absolutePath()); - m_metacache->addBase("root", QDir(rootPath).absolutePath()); - m_metacache->addBase("translations", QDir(staticDataPath + "/translations").absolutePath()); + m_metacache->addBase("root", QDir::currentPath()); + m_metacache->addBase("translations", QDir("translations").absolutePath()); m_metacache->addBase("icons", QDir("cache/icons").absolutePath()); m_metacache->Load(); } diff --git a/logic/Env.h b/logic/Env.h index b81cfa62..e3c5130a 100644 --- a/logic/Env.h +++ b/logic/Env.h @@ -35,7 +35,7 @@ public: std::shared_ptr icons(); /// init the cache. FIXME: possible future hook point - void initHttpMetaCache(QString rootPath, QString staticDataPath); + void initHttpMetaCache(); /// Updates the application proxy settings from the settings object. void updateProxySettings(QString proxyTypeStr, QString addr, int port, QString user, QString password);