From 20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 6 Sep 2014 18:16:56 +0200 Subject: Sync from quickmods --- logic/forge/ForgeInstaller.h | 4 ++-- logic/forge/ForgeVersion.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'logic/forge') diff --git a/logic/forge/ForgeInstaller.h b/logic/forge/ForgeInstaller.h index 1c7452d7..655fbc89 100644 --- a/logic/forge/ForgeInstaller.h +++ b/logic/forge/ForgeInstaller.h @@ -29,11 +29,11 @@ class ForgeInstaller : public BaseInstaller friend class ForgeInstallTask; public: ForgeInstaller(); - virtual ~ForgeInstaller(){}; + virtual ~ForgeInstaller(){} virtual ProgressProvider *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) override; + virtual QString id() const override { return "net.minecraftforge"; } protected: - virtual QString id() const override { return "net.minecraftforge"; } void prepare(const QString &filename, const QString &universalUrl); bool add(OneSixInstance *to) override; bool addLegacy(OneSixInstance *to); diff --git a/logic/forge/ForgeVersion.h b/logic/forge/ForgeVersion.h index c7adc572..e3c1aab9 100644 --- a/logic/forge/ForgeVersion.h +++ b/logic/forge/ForgeVersion.h @@ -38,3 +38,5 @@ struct ForgeVersion : public BaseVersion QString installer_filename; bool is_recommended = false; }; + +Q_DECLARE_METATYPE(ForgeVersionPtr) -- cgit v1.2.3