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.cpp | |
| 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.cpp')
| -rw-r--r-- | logic/BaseInstance.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index c565ab59..c7b29548 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -37,7 +37,6 @@ BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir, I_D(BaseInstance); d->m_settings = settings_obj; d->m_rootDir = rootDir; - d->m_flags = 0; settings().registerSetting("name", "Unnamed Instance"); settings().registerSetting("iconKey", "default"); @@ -147,13 +146,13 @@ SettingsObject &BaseInstance::settings() const return *d->m_settings; } -BaseInstance::InstanceFlags BaseInstance::flags() const +QSet<BaseInstance::InstanceFlag> BaseInstance::flags() const { I_D(const BaseInstance); - return InstanceFlags(d->m_flags); + return QSet<InstanceFlag>(d->m_flags); } -void BaseInstance::setFlags(const BaseInstance::InstanceFlags flags) +void BaseInstance::setFlags(const QSet<InstanceFlag> &flags) { I_D(BaseInstance); if (flags != d->m_flags) @@ -166,7 +165,7 @@ void BaseInstance::setFlags(const BaseInstance::InstanceFlags flags) bool BaseInstance::canLaunch() const { - return !(flags() & VersionBrokenFlag); + return !flags().contains(VersionBrokenFlag); } bool BaseInstance::reload() |