diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-09-06 18:16:56 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-09-06 19:03:05 +0200 |
| commit | 20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c (patch) | |
| tree | 56bf51e681f2e73590a549499bd83d7b505c39f8 /logic/minecraft/MinecraftVersionList.cpp | |
| parent | 36efcf8d3c0cbd7823fc65569cfc2b011435db2c (diff) | |
| download | MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.gz MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.lz MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.xz MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.zip | |
Sync from quickmods
Diffstat (limited to 'logic/minecraft/MinecraftVersionList.cpp')
| -rw-r--r-- | logic/minecraft/MinecraftVersionList.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/logic/minecraft/MinecraftVersionList.cpp b/logic/minecraft/MinecraftVersionList.cpp index bde2170b..598fecdb 100644 --- a/logic/minecraft/MinecraftVersionList.cpp +++ b/logic/minecraft/MinecraftVersionList.cpp @@ -116,15 +116,10 @@ void MinecraftVersionList::loadBuiltinList() { QLOG_INFO() << "Loading builtin version list."; // grab the version list data from internal resources. - QResource versionList(":/versions/minecraft.json"); - QFile filez(versionList.absoluteFilePath()); - filez.open(QIODevice::ReadOnly); - auto data = filez.readAll(); - - // parse the data as json - QJsonParseError jsonError; - QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError); - QJsonObject root = jsonDoc.object(); + const QJsonDocument doc = + MMCJson::parseFile(":/versions/minecraft.json", + "builtin version list"); + const QJsonObject root = doc.object(); // parse all the versions for (const auto version : MMCJson::ensureArray(root.value("versions"))) |