diff options
Diffstat (limited to 'qt-models')
-rw-r--r-- | qt-models/cleanertablemodel.h | 4 | ||||
-rw-r--r-- | qt-models/cylindermodel.h | 10 | ||||
-rw-r--r-- | qt-models/divecomputerextradatamodel.h | 4 | ||||
-rw-r--r-- | qt-models/divecomputermodel.h | 8 | ||||
-rw-r--r-- | qt-models/divepicturemodel.h | 6 | ||||
-rw-r--r-- | qt-models/diveplannermodel.h | 12 | ||||
-rw-r--r-- | qt-models/diveplotdatamodel.h | 8 | ||||
-rw-r--r-- | qt-models/divetripmodel.h | 12 | ||||
-rw-r--r-- | qt-models/filtermodels.h | 2 | ||||
-rw-r--r-- | qt-models/maplocationmodel.h | 6 | ||||
-rw-r--r-- | qt-models/messagehandlermodel.h | 6 | ||||
-rw-r--r-- | qt-models/models.h | 8 | ||||
-rw-r--r-- | qt-models/ssrfsortfilterproxymodel.h | 6 | ||||
-rw-r--r-- | qt-models/tankinfomodel.h | 8 | ||||
-rw-r--r-- | qt-models/treemodel.h | 10 | ||||
-rw-r--r-- | qt-models/weightmodel.h | 8 | ||||
-rw-r--r-- | qt-models/weightsysteminfomodel.h | 8 | ||||
-rw-r--r-- | qt-models/yearlystatisticsmodel.h | 2 |
18 files changed, 64 insertions, 64 deletions
diff --git a/qt-models/cleanertablemodel.h b/qt-models/cleanertablemodel.h index fc543f170..d435dad32 100644 --- a/qt-models/cleanertablemodel.h +++ b/qt-models/cleanertablemodel.h @@ -20,8 +20,8 @@ class CleanerTableModel : public QAbstractTableModel { Q_OBJECT public: explicit CleanerTableModel(QObject *parent = 0); - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; protected: void setHeaderDataStrings(const QStringList &headers); diff --git a/qt-models/cylindermodel.h b/qt-models/cylindermodel.h index 1ec4c05ce..c97eac179 100644 --- a/qt-models/cylindermodel.h +++ b/qt-models/cylindermodel.h @@ -28,10 +28,10 @@ public: explicit CylindersModel(QObject *parent = 0); static CylindersModel *instance(); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; void passInData(const QModelIndex &index, const QVariant &value); void add(); @@ -43,7 +43,7 @@ public: void moveAtFirst(int cylid); cylinder_t *cylinderAt(const QModelIndex &index); bool changed; - QVariant headerData(int section, Qt::Orientation orientation, int role) const; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; public slots: diff --git a/qt-models/divecomputerextradatamodel.h b/qt-models/divecomputerextradatamodel.h index 562083afc..ab78e4541 100644 --- a/qt-models/divecomputerextradatamodel.h +++ b/qt-models/divecomputerextradatamodel.h @@ -13,8 +13,8 @@ public: VALUE }; explicit ExtraDataModel(QObject *parent = 0); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; void clear(); void updateDive(); diff --git a/qt-models/divecomputermodel.h b/qt-models/divecomputermodel.h index 6d92646cf..42e26d442 100644 --- a/qt-models/divecomputermodel.h +++ b/qt-models/divecomputermodel.h @@ -15,10 +15,10 @@ public: NICKNAME }; DiveComputerModel(QObject *parent = 0); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; void keepWorkingList(); public diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h index a1e117c39..6c9384c62 100644 --- a/qt-models/divepicturemodel.h +++ b/qt-models/divepicturemodel.h @@ -20,9 +20,9 @@ class DivePictureModel : public QAbstractTableModel { Q_OBJECT public: static DivePictureModel *instance(); - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; void updateDivePictures(); void removePictures(const QVector<QString> &fileUrls); void updateDivePictureOffset(int diveId, const QString &filename, int offsetSeconds); diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h index 729b0ca93..3ac5009fe 100644 --- a/qt-models/diveplannermodel.h +++ b/qt-models/diveplannermodel.h @@ -26,12 +26,12 @@ public: PLAN, ADD }; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - Qt::ItemFlags flags(const QModelIndex &index) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; void gasChange(const QModelIndex &index, int newcylinderid); void cylinderRenumber(int mapping[]); void removeSelectedPoints(const QVector<int> &rows); diff --git a/qt-models/diveplotdatamodel.h b/qt-models/diveplotdatamodel.h index fbf32ed84..39074c7ac 100644 --- a/qt-models/diveplotdatamodel.h +++ b/qt-models/diveplotdatamodel.h @@ -72,10 +72,10 @@ public: COLUMNS }; explicit DivePlotDataModel(QObject *parent = 0); - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; void clear(); void setDive(struct dive *d, const plot_info &pInfo); const plot_info &data() const; diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h index 700ae4c12..4164c5788 100644 --- a/qt-models/divetripmodel.h +++ b/qt-models/divetripmodel.h @@ -31,10 +31,10 @@ public: COLUMNS }; - QVariant data(int column, int role) const; + QVariant data(int column, int role) const override; int diveId; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - Qt::ItemFlags flags(const QModelIndex &index) const; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; QString displayDate() const; QString displayDuration() const; QString displayDepth() const; @@ -53,7 +53,7 @@ public: struct TripItem : public TreeItem { Q_DECLARE_TR_FUNCTIONS(TripItem) public: - QVariant data(int column, int role) const; + QVariant data(int column, int role) const override; dive_trip_t *trip; }; @@ -97,8 +97,8 @@ public: static DiveTripModel *instance(); Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; DiveTripModel(QObject *parent = 0); Layout layout() const; void setLayout(Layout layout); diff --git a/qt-models/filtermodels.h b/qt-models/filtermodels.h index 5c54a135b..08e99fd93 100644 --- a/qt-models/filtermodels.h +++ b/qt-models/filtermodels.h @@ -105,7 +105,7 @@ class MultiFilterSortModel : public QSortFilterProxyModel { Q_OBJECT public: static MultiFilterSortModel *instance(); - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const; + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; void addFilterModel(FilterModelBase *model); void removeFilterModel(FilterModelBase *model); bool showDive(const struct dive *d) const; diff --git a/qt-models/maplocationmodel.h b/qt-models/maplocationmodel.h index bfda83e90..e198773a5 100644 --- a/qt-models/maplocationmodel.h +++ b/qt-models/maplocationmodel.h @@ -56,8 +56,8 @@ public: ~MapLocationModel(); Q_INVOKABLE MapLocation *get(int row); - QVariant data(const QModelIndex &index, int role) const; - int rowCount(const QModelIndex &parent) const; + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &parent) const override; int count(); void add(MapLocation *); void addList(QVector<MapLocation *>); @@ -68,7 +68,7 @@ public: quint32 selectedUuid(); protected: - QHash<int, QByteArray> roleNames() const; + QHash<int, QByteArray> roleNames() const override; private: QVector<MapLocation *> m_mapLocations; diff --git a/qt-models/messagehandlermodel.h b/qt-models/messagehandlermodel.h index ae46bf347..3addee95f 100644 --- a/qt-models/messagehandlermodel.h +++ b/qt-models/messagehandlermodel.h @@ -10,9 +10,9 @@ class MessageHandlerModel : public QAbstractListModel { public: static MessageHandlerModel *self(); enum MsgTypes {Message = Qt::UserRole + 1, Severity}; - int rowCount(const QModelIndex& parent = QModelIndex()) const; - QVariant data(const QModelIndex& idx, int role) const; - QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& idx, int role) const override; + QHash<int, QByteArray> roleNames() const override; void addLog(QtMsgType type, const QString& message); const QString logAsString(); diff --git a/qt-models/models.h b/qt-models/models.h index 6140e702d..f45c5e614 100644 --- a/qt-models/models.h +++ b/qt-models/models.h @@ -27,7 +27,7 @@ class GasSelectionModel : public QStringListModel { public: static GasSelectionModel *instance(); Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant data(const QModelIndex &index, int role) const; + QVariant data(const QModelIndex &index, int role) const override; public slots: void repopulate(); @@ -38,7 +38,7 @@ class DiveTypeSelectionModel : public QStringListModel { public: static DiveTypeSelectionModel *instance(); Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant data(const QModelIndex &index, int role) const; + QVariant data(const QModelIndex &index, int role) const override; public slots: void repopulate(); @@ -49,8 +49,8 @@ class LanguageModel : public QAbstractListModel { Q_OBJECT public: static LanguageModel *instance(); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; private: LanguageModel(QObject *parent = 0); diff --git a/qt-models/ssrfsortfilterproxymodel.h b/qt-models/ssrfsortfilterproxymodel.h index 25bcaa310..0fb76d91e 100644 --- a/qt-models/ssrfsortfilterproxymodel.h +++ b/qt-models/ssrfsortfilterproxymodel.h @@ -17,9 +17,9 @@ class SsrfSortFilterProxyModel : public QSortFilterProxyModel { public: SsrfSortFilterProxyModel(QObject *parent = 0); - bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const; - bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; - bool filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const; + bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override; + bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override; + bool filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const override; void setLessThan(less_than_cb func); void setFilterRow(filter_accepts_row_cb func); diff --git a/qt-models/tankinfomodel.h b/qt-models/tankinfomodel.h index aa4113ca8..7f79a466b 100644 --- a/qt-models/tankinfomodel.h +++ b/qt-models/tankinfomodel.h @@ -18,10 +18,10 @@ public: }; TankInfoModel(); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; const QString &biggerString() const; void clear(); public diff --git a/qt-models/treemodel.h b/qt-models/treemodel.h index 3b2b407e0..44f1e7f35 100644 --- a/qt-models/treemodel.h +++ b/qt-models/treemodel.h @@ -26,11 +26,11 @@ class TreeModel : public QAbstractItemModel { Q_OBJECT public: TreeModel(QObject *parent = 0); - QVariant data(const QModelIndex &index, int role) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &child) const; + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; void clear(); protected: diff --git a/qt-models/weightmodel.h b/qt-models/weightmodel.h index ba1456158..574a40c29 100644 --- a/qt-models/weightmodel.h +++ b/qt-models/weightmodel.h @@ -17,10 +17,10 @@ public: }; explicit WeightModel(QObject *parent = 0); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; void passInData(const QModelIndex &index, const QVariant &value); void add(); diff --git a/qt-models/weightsysteminfomodel.h b/qt-models/weightsysteminfomodel.h index 3a84075cc..e94225f8f 100644 --- a/qt-models/weightsysteminfomodel.h +++ b/qt-models/weightsysteminfomodel.h @@ -16,10 +16,10 @@ public: }; WSInfoModel(); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; const QString &biggerString() const; void clear(); void update(); diff --git a/qt-models/yearlystatisticsmodel.h b/qt-models/yearlystatisticsmodel.h index e7c0c15f0..77a5ae074 100644 --- a/qt-models/yearlystatisticsmodel.h +++ b/qt-models/yearlystatisticsmodel.h @@ -26,7 +26,7 @@ public: COLUMNS }; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; YearlyStatisticsModel(QObject *parent = 0); void update_yearly_stats(); }; |