diff options
author | Petr Mrázek <peterix@gmail.com> | 2016-02-28 19:01:54 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2016-02-28 19:01:54 +0100 |
commit | 9497b7e96cfac6e60a53fe05c0ca945ecc839533 (patch) | |
tree | a7b129de1109995e4416304e0e873af44bcca5ee /logic/minecraft/forge/ForgeInstaller.cpp | |
parent | a0b47aee5ba8d96e5ceec12798be9f63a16dbcd5 (diff) | |
download | MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.gz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.lz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.tar.xz MultiMC-9497b7e96cfac6e60a53fe05c0ca945ecc839533.zip |
NOISSUE even more version file refactors
There is no end to them in sight
Diffstat (limited to 'logic/minecraft/forge/ForgeInstaller.cpp')
-rw-r--r-- | logic/minecraft/forge/ForgeInstaller.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/minecraft/forge/ForgeInstaller.cpp b/logic/minecraft/forge/ForgeInstaller.cpp index 468414f8..bc0a967e 100644 --- a/logic/minecraft/forge/ForgeInstaller.cpp +++ b/logic/minecraft/forge/ForgeInstaller.cpp @@ -77,7 +77,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr // read the forge version info { - newVersion = OneSixVersionFormat::readProfileFromSingleFile(versionInfoVal.toObject()); + newVersion = OneSixVersionFormat::profileFromSingleJson(versionInfoVal.toObject()); if (!newVersion) return; } @@ -192,7 +192,7 @@ bool ForgeInstaller::add(OneSixInstance *to) } } - QJsonObject libObj = lib->toJson(); + QJsonObject libObj = OneSixVersionFormat::libraryToJson(lib.get()); bool found = false; bool equals = false; @@ -202,7 +202,7 @@ bool ForgeInstaller::add(OneSixInstance *to) if (tolib->artifactId() != libName) continue; found = true; - if (tolib->toJson() == libObj) + if (OneSixVersionFormat::libraryToJson(tolib.get()) == libObj) { equals = true; } |