diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-02-26 02:04:21 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-02-26 02:04:21 +0100 |
| commit | 71e4b147ec3b8c5f3e2a004920ffbc0a3b6e18c8 (patch) | |
| tree | 2b96e6bc1c531c094a1a9d41e171cbed9e97210e /logic/minecraft/VersionFile.cpp | |
| parent | f6b2ccb110f0bb4071044456a93c6edc1de50922 (diff) | |
| download | MultiMC-71e4b147ec3b8c5f3e2a004920ffbc0a3b6e18c8.tar MultiMC-71e4b147ec3b8c5f3e2a004920ffbc0a3b6e18c8.tar.gz MultiMC-71e4b147ec3b8c5f3e2a004920ffbc0a3b6e18c8.tar.lz MultiMC-71e4b147ec3b8c5f3e2a004920ffbc0a3b6e18c8.tar.xz MultiMC-71e4b147ec3b8c5f3e2a004920ffbc0a3b6e18c8.zip | |
NOISSUE remove OneSixLibrary
Diffstat (limited to 'logic/minecraft/VersionFile.cpp')
| -rw-r--r-- | logic/minecraft/VersionFile.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/logic/minecraft/VersionFile.cpp b/logic/minecraft/VersionFile.cpp index 2bc08d20..e0b4aa85 100644 --- a/logic/minecraft/VersionFile.cpp +++ b/logic/minecraft/VersionFile.cpp @@ -4,7 +4,7 @@ #include <QDebug> #include "minecraft/VersionFile.h" -#include "minecraft/OneSixLibrary.h" +#include "minecraft/RawLibrary.h" #include "minecraft/MinecraftProfile.h" #include "minecraft/JarMod.h" #include "ParseUtils.h" @@ -32,7 +32,7 @@ static QString readStringRet(const QJsonObject &root, const QString &key) return QString(); } -int findLibraryByName(QList<OneSixLibraryPtr> haystack, const GradleSpecifier &needle) +int findLibraryByName(QList<RawLibraryPtr> haystack, const GradleSpecifier &needle) { int retval = -1; for (int i = 0; i < haystack.size(); ++i) @@ -379,10 +379,10 @@ void VersionFile::applyTo(MinecraftProfile *version) version->traits.unite(traits); if (shouldOverwriteLibs) { - QList<OneSixLibraryPtr> libs; + QList<RawLibraryPtr> libs; for (auto lib : overwriteLibs) { - libs.append(OneSixLibrary::fromRawLibrary(lib)); + libs.append(RawLibrary::limitedCopy(lib)); } if (isMinecraftVersion()) { @@ -397,14 +397,14 @@ void VersionFile::applyTo(MinecraftProfile *version) // library not found? just add it. if (index < 0) { - version->libraries.append(OneSixLibrary::fromRawLibrary(addedLibrary)); + version->libraries.append(RawLibrary::limitedCopy(addedLibrary)); continue; } auto existingLibrary = version->libraries.at(index); // if we are higher it means we should update if (Version(addedLibrary->version()) > Version(existingLibrary->version())) { - auto library = OneSixLibrary::fromRawLibrary(addedLibrary); + auto library = RawLibrary::limitedCopy(addedLibrary); version->libraries.replace(index, library); } } |