diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-24 02:35:01 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-24 02:35:01 +0100 |
| commit | 49dc9695f5204bb80a91214c411bcb1b868ee0db (patch) | |
| tree | a7867064f70ab7888c32eebf42e4bdc8bc59c32e /logic/BaseInstance.h | |
| parent | f7c97efcf3785f597417895945b24c2e7476cba8 (diff) | |
| parent | 0b56b5efafffca77d6deee966097c55e78fb0aef (diff) | |
| download | MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.gz MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.lz MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.xz MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.zip | |
Merge branch 'fix_json_version' into integration_json_and_tools
Conflicts:
logic/OneSixInstance.cpp
logic/OneSixVersionBuilder.cpp
Some fixage. Yay for conflicts.
Diffstat (limited to 'logic/BaseInstance.h')
| -rw-r--r-- | logic/BaseInstance.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h index 341a6adb..27f939bc 100644 --- a/logic/BaseInstance.h +++ b/logic/BaseInstance.h @@ -179,6 +179,17 @@ public: /// FIXME: this really should be elsewhere... virtual QString instanceConfigFolder() const = 0; + enum InstanceFlag + { + NoFlags = 0x00, + VersionBrokenFlag = 0x01 + }; + Q_DECLARE_FLAGS(InstanceFlags, InstanceFlag) + InstanceFlags flags() const; + void setFlags(const BaseInstance::InstanceFlags flags); + + bool canLaunch() const; + signals: /*! * \brief Signal emitted when properties relevant to the instance view change @@ -193,6 +204,8 @@ signals: */ void nuked(BaseInstance *inst); + void flagsChanged(); + protected slots: void iconUpdated(QString key); @@ -202,3 +215,5 @@ protected: // pointer for lazy people typedef std::shared_ptr<BaseInstance> InstancePtr; + +Q_DECLARE_OPERATORS_FOR_FLAGS(BaseInstance::InstanceFlags) |