summaryrefslogtreecommitdiffstats
path: root/logic/VersionFactory.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-09-18 00:08:42 +0200
committerPetr Mrázek <peterix@gmail.com>2013-09-18 00:08:42 +0200
commit930b07afd4229e952d0cd47ca62cd94235499a0c (patch)
tree34cd74c3652da4b3ad0fd008faa2ab67adb4901f /logic/VersionFactory.cpp
parent5cd3420c46e0b54f1479ddf720a8c9131c460a5e (diff)
parentb979d0ce5da515793a02802a6421ef607a498323 (diff)
downloadMultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar
MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.gz
MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.lz
MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.xz
MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.zip
Merge branch 'feature_library_model' into develop
Diffstat (limited to 'logic/VersionFactory.cpp')
-rw-r--r--logic/VersionFactory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/logic/VersionFactory.cpp b/logic/VersionFactory.cpp
index 71c4d747..4fa5ad3f 100644
--- a/logic/VersionFactory.cpp
+++ b/logic/VersionFactory.cpp
@@ -1,5 +1,6 @@
#include "VersionFactory.h"
#include "OneSixVersion.h"
+#include "OneSixRule.h"
// Library rules (if any)
QList<QSharedPointer<Rule> > FullVersionFactory::parse4rules(QJsonObject & baseObj)
@@ -103,7 +104,7 @@ QSharedPointer<OneSixVersion> FullVersionFactory::parse4(QJsonObject root, QShar
auto nameVal = libObj.value("name");
if(!nameVal.isString())
continue;
- QSharedPointer<Library> library(new Library(nameVal.toString()));
+ QSharedPointer<OneSixLibrary> library(new OneSixLibrary(nameVal.toString()));
auto urlVal = libObj.value("url");
if(urlVal.isString())