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: GH-1308 remove use of static data (translations) and root (notifications.json) paths. --- logic/Env.cpp | 6 +++--- logic/Env.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'logic') 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); -- cgit v1.2.3