Index: sources/view/hd/alarm/VAlarmInstructionsModel.h =================================================================== diff -u -r71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b -rb45c898bb2fef51abb9460a1306f07eaa8dcbab0 --- sources/view/hd/alarm/VAlarmInstructionsModel.h (.../VAlarmInstructionsModel.h) (revision 71918fbc2b8b5c01cb0a348ffd3b83adbca79c9b) +++ sources/view/hd/alarm/VAlarmInstructionsModel.h (.../VAlarmInstructionsModel.h) (revision b45c898bb2fef51abb9460a1306f07eaa8dcbab0) @@ -17,25 +17,21 @@ { Q_OBJECT - QHash _dataRoles { - { eRole_Instruction , "instruction" }, - { eRole_Image , "image" }, - }; - public: - typedef enum { + enum { eRole_Instruction = Qt::UserRole, eRole_Image , } DataRole; + Q_INVOKABLE QVariantMap get (int vRow ) const; // Exposed to QML + QHash roleNames ( ) const override; int rowCount (const QModelIndex & = QModelIndex() ) const override; QVariant data (const QModelIndex &vIndex, int vRole = Qt::DisplayRole ) const override; bool setData (const QModelIndex &vIndex, const QVariant& vValue, int vRole = Qt::EditRole) override; void clear ( ); - void appendData (const QHash &vData ); - Q_INVOKABLE QVariantMap get (int vRow ) const; // Exposed to QML + VAlarmInstructionsModel& operator = (const QList> &src); VIEW_DEC_CLASS_EX(VAlarmInstructionsModel, QAbstractListModel)