From 791221e923586bb717396ecf18bd13e57034df99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 27 Jan 2015 22:31:07 +0100 Subject: NOISSUE Refactors and moving of things --- logic/minecraft/JarMod.cpp | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'logic/minecraft/JarMod.cpp') diff --git a/logic/minecraft/JarMod.cpp b/logic/minecraft/JarMod.cpp index 18a9411c..fce8a492 100644 --- a/logic/minecraft/JarMod.cpp +++ b/logic/minecraft/JarMod.cpp @@ -11,30 +11,6 @@ JarmodPtr Jarmod::fromJson(const QJsonObject &libObj, const QString &filename) "contains a jarmod that doesn't have a 'name' field"); } out->name = libObj.value("name").toString(); - - auto readString = [libObj, filename](const QString & key, QString & variable) - { - if (libObj.contains(key)) - { - QJsonValue val = libObj.value(key); - if (!val.isString()) - { - QLOG_WARN() << key << "is not a string in" << filename << "(skipping)"; - } - else - { - variable = val.toString(); - } - } - }; - - readString("url", out->baseurl); - readString("MMC-hint", out->hint); - readString("MMC-absoluteUrl", out->absoluteUrl); - if(!out->baseurl.isEmpty() && out->absoluteUrl.isEmpty()) - { - out->absoluteUrl = out->baseurl + out->name; - } return out; } @@ -42,15 +18,5 @@ QJsonObject Jarmod::toJson() { QJsonObject out; writeString(out, "name", name); - writeString(out, "url", baseurl); - writeString(out, "MMC-absoluteUrl", absoluteUrl); - writeString(out, "MMC-hint", hint); return out; } - -QString Jarmod::url() -{ - if(!absoluteUrl.isEmpty()) - return absoluteUrl; - else return baseurl + name; -} -- cgit v1.2.3