diff options
Diffstat (limited to 'api/logic/minecraft')
| -rw-r--r-- | api/logic/minecraft/Component.cpp | 4 | ||||
| -rw-r--r-- | api/logic/minecraft/Library.cpp | 8 | ||||
| -rw-r--r-- | api/logic/minecraft/MinecraftInstance.h | 2 | ||||
| -rw-r--r-- | api/logic/minecraft/World.cpp | 4 | ||||
| -rw-r--r-- | api/logic/minecraft/launch/ModMinecraftJar.h | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/api/logic/minecraft/Component.cpp b/api/logic/minecraft/Component.cpp index c6e41e65..7c52271e 100644 --- a/api/logic/minecraft/Component.cpp +++ b/api/logic/minecraft/Component.cpp @@ -145,7 +145,7 @@ QDateTime Component::getReleaseDateTime() bool Component::isEnabled() { return !canBeDisabled() || !m_disabled; -}; +} bool Component::canBeDisabled() { @@ -171,7 +171,7 @@ bool Component::setEnabled(bool state) bool Component::isCustom() { return m_file != nullptr; -}; +} bool Component::isCustomizable() { diff --git a/api/logic/minecraft/Library.cpp b/api/logic/minecraft/Library.cpp index cd1afde4..237edaf1 100644 --- a/api/logic/minecraft/Library.cpp +++ b/api/logic/minecraft/Library.cpp @@ -59,7 +59,7 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(OpSys system, class bool local = isLocal(); bool isForge = (hint() == "forge-pack-xz"); - auto add_download = [&](QString storage, QString url, QString sha1 = QString()) + auto add_download = [&](QString storage, QString url, QString sha1) { auto entry = cache->resolveEntry("libraries", storage); if(isAlwaysStale) @@ -208,14 +208,14 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(OpSys system, class { QString cooked_storage = raw_storage; QString cooked_dl = raw_dl; - add_download(cooked_storage.replace("${arch}", "32"), cooked_dl.replace("${arch}", "32")); + add_download(cooked_storage.replace("${arch}", "32"), cooked_dl.replace("${arch}", "32"), QString()); cooked_storage = raw_storage; cooked_dl = raw_dl; - add_download(cooked_storage.replace("${arch}", "64"), cooked_dl.replace("${arch}", "64")); + add_download(cooked_storage.replace("${arch}", "64"), cooked_dl.replace("${arch}", "64"), QString()); } else { - add_download(raw_storage, raw_dl); + add_download(raw_storage, raw_dl, QString()); } } return out; diff --git a/api/logic/minecraft/MinecraftInstance.h b/api/logic/minecraft/MinecraftInstance.h index 446a39d5..3be15b1c 100644 --- a/api/logic/minecraft/MinecraftInstance.h +++ b/api/logic/minecraft/MinecraftInstance.h @@ -18,7 +18,7 @@ public: MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir); virtual ~MinecraftInstance() {}; virtual void init() override; - virtual void saveNow(); + virtual void saveNow() override; // FIXME: remove QString typeName() const override; diff --git a/api/logic/minecraft/World.cpp b/api/logic/minecraft/World.cpp index 227a9b75..d7bc4553 100644 --- a/api/logic/minecraft/World.cpp +++ b/api/logic/minecraft/World.cpp @@ -275,7 +275,7 @@ static QString read_string (nbt::value& parent, const char * name, const QString qWarning() << "NBT tag" << name << "could not be converted to string. Defaulting to" << fallback; return fallback; } -}; +} static int64_t read_long (nbt::value& parent, const char * name, const int64_t & fallback = 0) { @@ -301,7 +301,7 @@ static int64_t read_long (nbt::value& parent, const char * name, const int64_t & qWarning() << "NBT tag" << name << "could not be converted to long. Defaulting to" << fallback; return fallback; } -}; +} void World::loadFromLevelDat(QByteArray data) { diff --git a/api/logic/minecraft/launch/ModMinecraftJar.h b/api/logic/minecraft/launch/ModMinecraftJar.h index b9a2d35b..dca484f8 100644 --- a/api/logic/minecraft/launch/ModMinecraftJar.h +++ b/api/logic/minecraft/launch/ModMinecraftJar.h @@ -25,8 +25,8 @@ public: explicit ModMinecraftJar(LaunchTask *parent) : LaunchStep(parent) {}; virtual ~ModMinecraftJar(){}; - virtual void executeTask(); - virtual bool canAbort() const + virtual void executeTask() override; + virtual bool canAbort() const override { return false; } |