diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-01 23:06:47 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-01 23:06:47 +0100 |
| commit | 7c24bcc83476dcbdd7f7acbe14ecef4398962689 (patch) | |
| tree | 4ab7e7020927d05274f079c3045bd572c218fa21 /logic/OneSixInstance.cpp | |
| parent | 7dfd6aa051c582e26125e17e1d6eed5e675e1027 (diff) | |
| download | MultiMC-7c24bcc83476dcbdd7f7acbe14ecef4398962689.tar MultiMC-7c24bcc83476dcbdd7f7acbe14ecef4398962689.tar.gz MultiMC-7c24bcc83476dcbdd7f7acbe14ecef4398962689.tar.lz MultiMC-7c24bcc83476dcbdd7f7acbe14ecef4398962689.tar.xz MultiMC-7c24bcc83476dcbdd7f7acbe14ecef4398962689.zip | |
Reorganize the version-related code.
Diffstat (limited to 'logic/OneSixInstance.cpp')
| -rw-r--r-- | logic/OneSixInstance.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 10411c56..bd5d559e 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -19,7 +19,7 @@ #include "OneSixInstance_p.h" #include "OneSixUpdate.h" -#include "OneSixVersion.h" +#include "VersionFinal.h" #include "pathutils.h" #include "logger/QsLog.h" #include "assets/AssetsUtils.h" @@ -34,8 +34,8 @@ OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings, I_D(OneSixInstance); d->m_settings->registerSetting("IntendedVersion", ""); d->m_settings->registerSetting("ShouldUpdate", false); - d->version.reset(new OneSixVersion(this, this)); - d->vanillaVersion.reset(new OneSixVersion(this, this)); + d->version.reset(new VersionFinal(this, this)); + d->vanillaVersion.reset(new VersionFinal(this, this)); } void OneSixInstance::init() @@ -79,7 +79,7 @@ QString replaceTokensIn(QString text, QMap<QString, QString> with) return result; } -QDir OneSixInstance::reconstructAssets(std::shared_ptr<OneSixVersion> version) +QDir OneSixInstance::reconstructAssets(std::shared_ptr<VersionFinal> version) { QDir assetsDir = QDir("assets/"); QDir indexDir = QDir(PathCombine(assetsDir.path(), "indexes")); @@ -345,13 +345,13 @@ void OneSixInstance::clearVersion() emit versionReloaded(); } -std::shared_ptr<OneSixVersion> OneSixInstance::getFullVersion() const +std::shared_ptr<VersionFinal> OneSixInstance::getFullVersion() const { I_D(const OneSixInstance); return d->version; } -std::shared_ptr<OneSixVersion> OneSixInstance::getVanillaVersion() const +std::shared_ptr<VersionFinal> OneSixInstance::getVanillaVersion() const { I_D(const OneSixInstance); return d->vanillaVersion; |