diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-08-28 04:38:29 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-08-28 04:38:29 +0200 |
commit | 5ff6fbf4648d286ff0f07a4dbf37c0b72651f66b (patch) | |
tree | 09f3f739d22370b8ce96144057d2cec2d74febb5 /logic/VersionFactory.cpp | |
parent | aa8766581ebad668194fcab87f53af4270e9679a (diff) | |
download | MultiMC-5ff6fbf4648d286ff0f07a4dbf37c0b72651f66b.tar MultiMC-5ff6fbf4648d286ff0f07a4dbf37c0b72651f66b.tar.gz MultiMC-5ff6fbf4648d286ff0f07a4dbf37c0b72651f66b.tar.lz MultiMC-5ff6fbf4648d286ff0f07a4dbf37c0b72651f66b.tar.xz MultiMC-5ff6fbf4648d286ff0f07a4dbf37c0b72651f66b.zip |
Basic 1.6 mod management (no jar mods)
Diffstat (limited to 'logic/VersionFactory.cpp')
-rw-r--r-- | logic/VersionFactory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/logic/VersionFactory.cpp b/logic/VersionFactory.cpp index 9eccce26..71c4d747 100644 --- a/logic/VersionFactory.cpp +++ b/logic/VersionFactory.cpp @@ -45,7 +45,7 @@ QList<QSharedPointer<Rule> > FullVersionFactory::parse4rules(QJsonObject & baseO } -QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QSharedPointer<FullVersion> fullVersion) +QSharedPointer<OneSixVersion> FullVersionFactory::parse4(QJsonObject root, QSharedPointer<OneSixVersion> fullVersion) { fullVersion->id = root.value("id").toString(); @@ -154,9 +154,9 @@ QSharedPointer<FullVersion> FullVersionFactory::parse4(QJsonObject root, QShared return fullVersion; } -QSharedPointer<FullVersion> FullVersionFactory::parse(QByteArray data) +QSharedPointer<OneSixVersion> FullVersionFactory::parse(QByteArray data) { - QSharedPointer<FullVersion> readVersion(new FullVersion()); + QSharedPointer<OneSixVersion> readVersion(new OneSixVersion()); QJsonParseError jsonError; QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError); @@ -165,14 +165,14 @@ QSharedPointer<FullVersion> FullVersionFactory::parse(QByteArray data) { error_string = QString( "Error reading version file :") + " " + jsonError.errorString(); m_error = FullVersionFactory::ParseError; - return QSharedPointer<FullVersion>(); + return QSharedPointer<OneSixVersion>(); } if(!jsonDoc.isObject()) { error_string = "Error reading version file."; m_error = FullVersionFactory::ParseError; - return QSharedPointer<FullVersion>(); + return QSharedPointer<OneSixVersion>(); } QJsonObject root = jsonDoc.object(); @@ -184,7 +184,7 @@ QSharedPointer<FullVersion> FullVersionFactory::parse(QByteArray data) { error_string = "Version file was for an unrecognized launcher version. RIP"; m_error = FullVersionFactory::UnsupportedVersion; - return QSharedPointer<FullVersion>(); + return QSharedPointer<OneSixVersion>(); } } |