aboutsummaryrefslogtreecommitdiffstats
path: root/qt-models
diff options
context:
space:
mode:
Diffstat (limited to 'qt-models')
-rw-r--r--qt-models/cleanertablemodel.h4
-rw-r--r--qt-models/cylindermodel.h10
-rw-r--r--qt-models/divecomputerextradatamodel.h4
-rw-r--r--qt-models/divecomputermodel.h8
-rw-r--r--qt-models/divepicturemodel.h8
-rw-r--r--qt-models/diveplannermodel.h12
-rw-r--r--qt-models/diveplotdatamodel.h8
-rw-r--r--qt-models/divetripmodel.h12
-rw-r--r--qt-models/filtermodels.h2
-rw-r--r--qt-models/models.h8
-rw-r--r--qt-models/ssrfsortfilterproxymodel.h6
-rw-r--r--qt-models/tankinfomodel.h8
-rw-r--r--qt-models/treemodel.h12
-rw-r--r--qt-models/weightmodel.h8
-rw-r--r--qt-models/weightsysteminfomodel.h8
-rw-r--r--qt-models/yearlystatisticsmodel.h2
16 files changed, 60 insertions, 60 deletions
diff --git a/qt-models/cleanertablemodel.h b/qt-models/cleanertablemodel.h
index d524607dc..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);
- virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
- virtual 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 502780a6d..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();
- /*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const;
- /*reimp*/ Qt::ItemFlags flags(const QModelIndex &index) const;
- /*reimp*/ 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;
- virtual 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 694b88a1e..ab78e4541 100644
--- a/qt-models/divecomputerextradatamodel.h
+++ b/qt-models/divecomputerextradatamodel.h
@@ -13,8 +13,8 @@ public:
VALUE
};
explicit ExtraDataModel(QObject *parent = 0);
- /*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- /*reimp*/ 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 019bb8f62..42e26d442 100644
--- a/qt-models/divecomputermodel.h
+++ b/qt-models/divecomputermodel.h
@@ -15,10 +15,10 @@ public:
NICKNAME
};
DiveComputerModel(QObject *parent = 0);
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
- virtual Qt::ItemFlags flags(const QModelIndex &index) const;
- virtual 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 3bd872d6a..6c9384c62 100644
--- a/qt-models/divepicturemodel.h
+++ b/qt-models/divepicturemodel.h
@@ -20,10 +20,10 @@ class DivePictureModel : public QAbstractTableModel {
Q_OBJECT
public:
static DivePictureModel *instance();
- virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
- virtual void updateDivePictures();
+ 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);
signals:
diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h
index 57d1a9c50..3ac5009fe 100644
--- a/qt-models/diveplannermodel.h
+++ b/qt-models/diveplannermodel.h
@@ -26,12 +26,12 @@ public:
PLAN,
ADD
};
- virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
- virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
- virtual 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 51dc44176..39074c7ac 100644
--- a/qt-models/diveplotdatamodel.h
+++ b/qt-models/diveplotdatamodel.h
@@ -72,10 +72,10 @@ public:
COLUMNS
};
explicit DivePlotDataModel(QObject *parent = 0);
- virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- virtual 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 0d1cff5a0..78951e5bd 100644
--- a/qt-models/divetripmodel.h
+++ b/qt-models/divetripmodel.h
@@ -30,10 +30,10 @@ public:
COLUMNS
};
- virtual QVariant data(int column, int role) const;
+ QVariant data(int column, int role) const override;
int diveId;
- virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
- virtual 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;
@@ -52,7 +52,7 @@ public:
struct TripItem : public TreeItem {
Q_DECLARE_TR_FUNCTIONS(TripItem)
public:
- virtual QVariant data(int column, int role) const;
+ QVariant data(int column, int role) const override;
dive_trip_t *trip;
};
@@ -94,8 +94,8 @@ public:
};
Qt::ItemFlags flags(const QModelIndex &index) const;
- virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
- virtual 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 b866b68b2..2feb08988 100644
--- a/qt-models/filtermodels.h
+++ b/qt-models/filtermodels.h
@@ -92,7 +92,7 @@ class MultiFilterSortModel : public QSortFilterProxyModel {
Q_OBJECT
public:
static MultiFilterSortModel *instance();
- virtual 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);
int divesDisplayed;
diff --git a/qt-models/models.h b/qt-models/models.h
index 445e3a2a6..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;
- virtual 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;
- virtual 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();
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- virtual 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 0d038b645..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);
- virtual bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const;
- virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
- virtual 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 944757b1a..7f79a466b 100644
--- a/qt-models/tankinfomodel.h
+++ b/qt-models/tankinfomodel.h
@@ -18,10 +18,10 @@ public:
};
TankInfoModel();
- /*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const;
- /*reimp*/ bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex());
- /*reimp*/ 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 093df4ba0..eae36c58c 100644
--- a/qt-models/treemodel.h
+++ b/qt-models/treemodel.h
@@ -25,12 +25,12 @@ class TreeModel : public QAbstractItemModel {
Q_OBJECT
public:
TreeModel(QObject *parent = 0);
- virtual ~TreeModel();
- virtual QVariant data(const QModelIndex &index, int role) const;
- /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const;
- /*reimp*/ int columnCount(const QModelIndex &parent = QModelIndex()) const;
- /*reimp*/ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
- /*reimp*/ QModelIndex parent(const QModelIndex &child) const;
+ ~TreeModel();
+ 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;
protected:
int columns;
diff --git a/qt-models/weightmodel.h b/qt-models/weightmodel.h
index 8767da29e..574a40c29 100644
--- a/qt-models/weightmodel.h
+++ b/qt-models/weightmodel.h
@@ -17,10 +17,10 @@ public:
};
explicit WeightModel(QObject *parent = 0);
- /*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const;
- /*reimp*/ Qt::ItemFlags flags(const QModelIndex &index) const;
- /*reimp*/ 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 98c11d814..e94225f8f 100644
--- a/qt-models/weightsysteminfomodel.h
+++ b/qt-models/weightsysteminfomodel.h
@@ -16,10 +16,10 @@ public:
};
WSInfoModel();
- /*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const;
- /*reimp*/ bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex());
- /*reimp*/ 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 21ec4e0f0..77a5ae074 100644
--- a/qt-models/yearlystatisticsmodel.h
+++ b/qt-models/yearlystatisticsmodel.h
@@ -26,7 +26,7 @@ public:
COLUMNS
};
- virtual 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();
};
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 04:28:34 +0000