diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-19 22:25:36 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-19 22:25:36 +0100 |
| commit | 26b485d82f03c0191142cf9b660b4ab43962878d (patch) | |
| tree | 092364c614f29865fec4bdb6bd158de1c2d4db9a /logic/BaseInstance.h | |
| parent | 919dea0de60d058f57a4b9bd1e5f4513a014c693 (diff) | |
| parent | ad9b16bd3d6a71b4cdf1763d166bc9cc633e147c (diff) | |
| download | MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.tar MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.tar.gz MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.tar.lz MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.tar.xz MultiMC-26b485d82f03c0191142cf9b660b4ab43962878d.zip | |
Merge remote-tracking branch 'origin/feature_badges' into develop
Diffstat (limited to 'logic/BaseInstance.h')
| -rw-r--r-- | logic/BaseInstance.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h index 195fd339..d38ae409 100644 --- a/logic/BaseInstance.h +++ b/logic/BaseInstance.h @@ -17,6 +17,7 @@ #include <QObject> #include <QDateTime> +#include <QSet> #include <settingsobject.h> @@ -184,9 +185,8 @@ public: NoFlags = 0x00, VersionBrokenFlag = 0x01 }; - Q_DECLARE_FLAGS(InstanceFlags, InstanceFlag) - InstanceFlags flags() const; - void setFlags(const BaseInstance::InstanceFlags flags); + QSet<InstanceFlag> flags() const; + void setFlags(const QSet<InstanceFlag> &flags); bool canLaunch() const; @@ -218,4 +218,4 @@ protected: // pointer for lazy people typedef std::shared_ptr<BaseInstance> InstancePtr; -Q_DECLARE_OPERATORS_FOR_FLAGS(BaseInstance::InstanceFlags) +Q_DECLARE_METATYPE(BaseInstance::InstanceFlag) |