Continue refactor
This commit is contained in:
parent
18cf2b01bd
commit
219fbfb4c7
14 changed files with 104 additions and 125 deletions
|
|
@ -17,7 +17,9 @@ typedef enum {
|
|||
typedef enum {
|
||||
ITEM_UPDATE_USER = 0,
|
||||
ITEM_UPDATE_ACTOR,
|
||||
ITEM_UPDATE_REMOTE
|
||||
ITEM_UPDATE_REMOTE,
|
||||
ITEM_UPDATE_LOADED,
|
||||
ITEM_UPDATE_BACKEND
|
||||
} item_update_type_t;
|
||||
|
||||
class ItemData
|
||||
|
|
@ -52,6 +54,7 @@ public:
|
|||
bool hasChanged(const ItemData& other);
|
||||
void setName(QString name);
|
||||
uint8_t getValue() const;
|
||||
void setValueData(uint8_t value);
|
||||
bool getLoaded() const;
|
||||
void setLoaded(bool loaded);
|
||||
bool isHidden() const;
|
||||
|
|
@ -65,8 +68,8 @@ public:
|
|||
struct ItemUpdateRequest
|
||||
{
|
||||
item_update_type_t type;
|
||||
ItemData data;
|
||||
bool valueOnly;
|
||||
ItemData payload;
|
||||
std::vector<std::shared_ptr<Actor> > newActors;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -81,7 +84,7 @@ signals:
|
|||
void updated(ItemUpdateRequest update);
|
||||
|
||||
public slots:
|
||||
void requestUpdate(ItemUpdateRequest update);
|
||||
virtual void requestUpdate(ItemUpdateRequest update);
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -100,7 +103,9 @@ public:
|
|||
void setActorsActive(bool in);
|
||||
void setOverride(const bool in);
|
||||
bool getOverride();
|
||||
void mergeLoaded(Item& item);
|
||||
ItemUpdateRequest createValueUpdateRequest(uint8_t value,
|
||||
item_update_type_t type,
|
||||
bool withActors = false);
|
||||
|
||||
virtual void store(QJsonObject& json);
|
||||
virtual void load(const QJsonObject& json, const bool preserve = false);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue