mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 20:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: reinstate override modifiers

Browse source 
This reverts commit 1c4a859c8d,
where the override modifiers were removed owing to the noisy
"inconsistent override modifiers" which is default-on in clang.

This warning was disabled in 77577f717f,
so we can reinstate the overrides.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Berthold Stoeger 2018-09-29 22:13:44 +02:00 • committed by Dirk Hohndel
parent d7e3d68f36
commit 574065b314
48 changed files with 196 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/divesitehelpers.h
View file

@ -10,7 +10,7 @@ Q_OBJECT
public: public:
static ReverseGeoLookupThread *instance(); static ReverseGeoLookupThread *instance();
void lookup(struct dive_site *ds); void lookup(struct dive_site *ds);
void run(); void run() override;
private: private:
ReverseGeoLookupThread(QObject *parent = 0); ReverseGeoLookupThread(QObject *parent = 0);

2
core/downloadfromdcthread.h
View file

@ -63,7 +63,7 @@ class DownloadThread : public QThread {
public: public:
DownloadThread(); DownloadThread();
void run(); void run() override;
DCDeviceData *data(); DCDeviceData *data();
QString error; QString error;

2
desktop-widgets/btdeviceselectiondialog.h
View file

@ -39,7 +39,7 @@ public:
bool isActive() const; bool isActive() const;
QString errorToString() const; QString errorToString() const;
QBluetoothDeviceDiscoveryAgent::Error error() const; QBluetoothDeviceDiscoveryAgent::Error error() const;
void run(); void run() override;
void stop(); void stop();
private: private:

12
desktop-widgets/configuredivecomputerdialog.h
View file

@ -26,9 +26,9 @@ public:
GasSpinBoxItemDelegate(QObject *parent = 0, column_type type = PERCENT); GasSpinBoxItemDelegate(QObject *parent = 0, column_type type = PERCENT);
~GasSpinBoxItemDelegate(); ~GasSpinBoxItemDelegate();
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const; void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
private: private:
column_type type; column_type type;
@ -46,9 +46,9 @@ public:
GasTypeComboBoxItemDelegate(QObject *parent = 0, computer_type type = OSTC3); GasTypeComboBoxItemDelegate(QObject *parent = 0, computer_type type = OSTC3);
~GasTypeComboBoxItemDelegate(); ~GasTypeComboBoxItemDelegate();
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const; void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
private: private:
computer_type type; computer_type type;

4
desktop-widgets/divelistview.h
View file

@ -45,8 +45,8 @@ slots:
void removeFromTrip(); void removeFromTrip();
void deleteDive(); void deleteDive();
void markDiveInvalid(); void markDiveInvalid();
void rowsInserted(const QModelIndex &parent, int start, int end); void rowsInserted(const QModelIndex &parent, int start, int end) override;
void reset(); void reset() override;
void mergeTripAbove(); void mergeTripAbove();
void mergeTripBelow(); void mergeTripBelow();
void newTripAbove(); void newTripAbove();

6
desktop-widgets/divepicturewidget.h
View file

@ -12,9 +12,9 @@ class DivePictureWidget : public QListView {
public: public:
DivePictureWidget(QWidget *parent); DivePictureWidget(QWidget *parent);
protected: protected:
void mouseDoubleClickEvent(QMouseEvent *event); void mouseDoubleClickEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event) override;
void wheelEvent(QWheelEvent *event); void wheelEvent(QWheelEvent *event) override;
signals: signals:
void photoDoubleClicked(const QString filePath); void photoDoubleClicked(const QString filePath);

8
desktop-widgets/groupedlineedit.h
View file

@ -55,15 +55,15 @@ public:
void addColor(QColor color); void addColor(QColor color);
QSize sizeHint() const; QSize sizeHint() const override;
QSize minimumSizeHint() const; QSize minimumSizeHint() const override;
signals: signals:
void editingFinished(); void editingFinished();
protected: protected:
void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e) override;
void keyPressEvent(QKeyEvent *e); void keyPressEvent(QKeyEvent *e) override;
private: private:
struct Private; struct Private;

12
desktop-widgets/kmessagewidget.h
View file

@ -186,18 +186,18 @@ public:
/** /**
* Returns the preferred size of the message widget. * Returns the preferred size of the message widget.
*/ */
QSize sizeHint() const; QSize sizeHint() const override;
/** /**
* Returns the minimum size of the message widget. * Returns the minimum size of the message widget.
*/ */
QSize minimumSizeHint() const; QSize minimumSizeHint() const override;
/** /**
* Returns the required height for @p width. * Returns the required height for @p width.
* @param width the width in pixels * @param width the width in pixels
*/ */
int heightForWidth(int width) const; int heightForWidth(int width) const override;
/** /**
* The icon shown on the left of the text. By default, no icon is shown. * The icon shown on the left of the text. By default, no icon is shown.
@ -326,11 +326,11 @@ Q_SIGNALS:
void showAnimationFinished(); void showAnimationFinished();
protected: protected:
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) override;
bool event(QEvent *event); bool event(QEvent *event) override;
void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event) override;
private: private:
KMessageWidgetPrivate *const d; KMessageWidgetPrivate *const d;

8
desktop-widgets/locationinformation.h
View file

@ -11,7 +11,7 @@ class LocationInformationWidget : public QGroupBox {
Q_OBJECT Q_OBJECT
public: public:
LocationInformationWidget(QWidget *parent = 0); LocationInformationWidget(QWidget *parent = 0);
bool eventFilter(QObject*, QEvent*); bool eventFilter(QObject*, QEvent*) override;
protected: protected:
void showEvent(QShowEvent *); void showEvent(QShowEvent *);
@ -56,8 +56,8 @@ class DiveLocationFilterProxyModel : public QSortFilterProxyModel {
Q_OBJECT Q_OBJECT
public: public:
DiveLocationFilterProxyModel(QObject *parent = 0); DiveLocationFilterProxyModel(QObject *parent = 0);
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const; bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
}; };
class DiveLocationModel : public QAbstractTableModel { class DiveLocationModel : public QAbstractTableModel {
@ -79,7 +79,7 @@ class DiveLocationListView : public QListView {
public: public:
DiveLocationListView(QWidget *parent = 0); DiveLocationListView(QWidget *parent = 0);
protected: protected:
void currentChanged(const QModelIndex& current, const QModelIndex& previous); void currentChanged(const QModelIndex& current, const QModelIndex& previous) override;
signals: signals:
void currentIndexChanged(const QModelIndex& current); void currentIndexChanged(const QModelIndex& current);
}; };

38
desktop-widgets/modeldelegates.h
View file

@ -19,8 +19,8 @@ class StarWidgetsDelegate : public QStyledItemDelegate {
Q_OBJECT Q_OBJECT
public: public:
explicit StarWidgetsDelegate(QWidget *parent = 0); explicit StarWidgetsDelegate(QWidget *parent = 0);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
const QSize& starSize() const; const QSize& starSize() const;
private: private:
@ -32,10 +32,10 @@ class ComboBoxDelegate : public QStyledItemDelegate {
Q_OBJECT Q_OBJECT
public: public:
explicit ComboBoxDelegate(QAbstractItemModel *model, QObject *parent = 0, bool allowEdit = true); explicit ComboBoxDelegate(QAbstractItemModel *model, QObject *parent = 0, bool allowEdit = true);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const; void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const; void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
bool eventFilter(QObject *object, QEvent *event); bool eventFilter(QObject *object, QEvent *event) override;
public public
slots: slots:
void testActivation(const QString &currString = QString()); void testActivation(const QString &currString = QString());
@ -54,8 +54,8 @@ class TankInfoDelegate : public ComboBoxDelegate {
Q_OBJECT Q_OBJECT
public: public:
explicit TankInfoDelegate(QObject *parent = 0); explicit TankInfoDelegate(QObject *parent = 0);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
public public
slots: slots:
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint); void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
@ -66,17 +66,17 @@ class TankUseDelegate : public QStyledItemDelegate {
Q_OBJECT Q_OBJECT
public: public:
explicit TankUseDelegate(QObject *parent = 0); explicit TankUseDelegate(QObject *parent = 0);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget * editor, const QModelIndex & index) const; void setEditorData(QWidget * editor, const QModelIndex & index) const override;
}; };
class WSInfoDelegate : public ComboBoxDelegate { class WSInfoDelegate : public ComboBoxDelegate {
Q_OBJECT Q_OBJECT
public: public:
explicit WSInfoDelegate(QObject *parent = 0); explicit WSInfoDelegate(QObject *parent = 0);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
public public
slots: slots:
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint); void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
@ -86,7 +86,7 @@ class AirTypesDelegate : public ComboBoxDelegate {
Q_OBJECT Q_OBJECT
public: public:
explicit AirTypesDelegate(QObject *parent = 0); explicit AirTypesDelegate(QObject *parent = 0);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
public public
slots: slots:
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint); void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
@ -96,7 +96,7 @@ class DiveTypesDelegate : public ComboBoxDelegate {
Q_OBJECT Q_OBJECT
public: public:
explicit DiveTypesDelegate(QObject *parent = 0); explicit DiveTypesDelegate(QObject *parent = 0);
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
public public
slots: slots:
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint); void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
@ -106,7 +106,7 @@ class SpinBoxDelegate : public QStyledItemDelegate {
Q_OBJECT Q_OBJECT
public: public:
SpinBoxDelegate(int min, int max, int step, QObject *parent = 0); SpinBoxDelegate(int min, int max, int step, QObject *parent = 0);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private: private:
int min; int min;
int max; int max;
@ -117,7 +117,7 @@ class DoubleSpinBoxDelegate : public QStyledItemDelegate {
Q_OBJECT Q_OBJECT
public: public:
DoubleSpinBoxDelegate(double min, double max, double step, QObject *parent = 0); DoubleSpinBoxDelegate(double min, double max, double step, QObject *parent = 0);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private: private:
double min; double min;
double max; double max;
@ -128,8 +128,8 @@ class LocationFilterDelegate : public QStyledItemDelegate {
Q_OBJECT Q_OBJECT
public: public:
LocationFilterDelegate(QObject *parent = 0); LocationFilterDelegate(QObject *parent = 0);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
}; };
#endif // MODELDELEGATES_H #endif // MODELDELEGATES_H

12
desktop-widgets/plugins/facebook/facebook_integration.h
View file

@ -13,12 +13,12 @@ class FacebookPlugin : public ISocialNetworkIntegration {
Q_OBJECT Q_OBJECT
public: public:
explicit FacebookPlugin(QObject* parent = 0); explicit FacebookPlugin(QObject* parent = 0);
bool isConnected(); bool isConnected() override;
void requestLogin(); void requestLogin() override;
void requestLogoff(); void requestLogoff() override;
QString socialNetworkIcon() const; QString socialNetworkIcon() const override;
QString socialNetworkName() const; QString socialNetworkName() const override;
void requestUpload(); void requestUpload() override;
private: private:
FacebookConnectWidget *fbConnectWidget; FacebookConnectWidget *fbConnectWidget;
}; };

4
desktop-widgets/preferences/preferences_defaults.h
View file

@ -14,8 +14,8 @@ class PreferencesDefaults : public AbstractPreferencesWidget {
public: public:
PreferencesDefaults(); PreferencesDefaults();
~PreferencesDefaults(); ~PreferencesDefaults();
void refreshSettings(); void refreshSettings() override;
void syncSettings(); void syncSettings() override;
public slots: public slots:
void on_chooseFile_clicked(); void on_chooseFile_clicked();
void on_btnUseDefaultFile_toggled(bool toggled); void on_btnUseDefaultFile_toggled(bool toggled);

4
desktop-widgets/preferences/preferences_georeference.h
View file

@ -13,8 +13,8 @@ class PreferencesGeoreference : public AbstractPreferencesWidget {
public: public:
PreferencesGeoreference(); PreferencesGeoreference();
~PreferencesGeoreference(); ~PreferencesGeoreference();
void refreshSettings(); void refreshSettings() override;
void syncSettings(); void syncSettings() override;
private: private:
Ui::PreferencesGeoreference *ui; Ui::PreferencesGeoreference *ui;
}; };

4
desktop-widgets/preferences/preferences_graph.h
View file

@ -13,8 +13,8 @@ class PreferencesGraph : public AbstractPreferencesWidget {
public: public:
PreferencesGraph(); PreferencesGraph();
~PreferencesGraph(); ~PreferencesGraph();
void refreshSettings(); void refreshSettings() override;
void syncSettings(); void syncSettings() override;
private slots: private slots:
void on_gflow_valueChanged(int gf); void on_gflow_valueChanged(int gf);

4
desktop-widgets/preferences/preferences_language.h
View file

@ -14,8 +14,8 @@ class PreferencesLanguage : public AbstractPreferencesWidget {
public: public:
PreferencesLanguage(); PreferencesLanguage();
~PreferencesLanguage(); ~PreferencesLanguage();
void refreshSettings(); void refreshSettings() override;
void syncSettings(); void syncSettings() override;
private: private:
Ui::PreferencesLanguage *ui; Ui::PreferencesLanguage *ui;
QMap<QString, QString> dateFormatShortMap; QMap<QString, QString> dateFormatShortMap;

4
desktop-widgets/preferences/preferences_network.h
View file

@ -14,8 +14,8 @@ class PreferencesNetwork : public AbstractPreferencesWidget {
public: public:
PreferencesNetwork(); PreferencesNetwork();
~PreferencesNetwork(); ~PreferencesNetwork();
void refreshSettings(); void refreshSettings() override;
void syncSettings(); void syncSettings() override;
public slots: public slots:
void proxyType_changed(int i); void proxyType_changed(int i);

4
desktop-widgets/preferences/preferences_units.h
View file

@ -13,8 +13,8 @@ class PreferencesUnits : public AbstractPreferencesWidget {
public: public:
PreferencesUnits(); PreferencesUnits();
~PreferencesUnits(); ~PreferencesUnits();
void refreshSettings(); void refreshSettings() override;
void syncSettings(); void syncSettings() override;
private: private:
Ui::PreferencesUnits *ui; Ui::PreferencesUnits *ui;
}; };

6
desktop-widgets/simplewidgets.h
View file

@ -174,8 +174,8 @@ protected:
FilterBase(FilterModelBase *model, QWidget *parent = 0); FilterBase(FilterModelBase *model, QWidget *parent = 0);
FilterModelBase *model; FilterModelBase *model;
Ui::FilterWidget ui; Ui::FilterWidget ui;
void showEvent(QShowEvent *); void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *); void hideEvent(QHideEvent *) override;
friend class MultiFilter; friend class MultiFilter;
}; };
@ -208,7 +208,7 @@ class TextHyperlinkEventFilter : public QObject {
public: public:
explicit TextHyperlinkEventFilter(QTextEdit *txtEdit); explicit TextHyperlinkEventFilter(QTextEdit *txtEdit);
bool eventFilter(QObject *target, QEvent *evt); bool eventFilter(QObject *target, QEvent *evt) override;
private: private:
void handleUrlClick(const QString &urlStr); void handleUrlClick(const QString &urlStr);

12
desktop-widgets/starwidget.h
View file

@ -14,7 +14,7 @@ public:
explicit StarWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); explicit StarWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
int currentStars() const; int currentStars() const;
QSize sizeHint() const; QSize sizeHint() const override;
static const QImage& starActive(); static const QImage& starActive();
static const QImage& starInactive(); static const QImage& starInactive();
@ -28,11 +28,11 @@ slots:
void setReadOnly(bool readOnly); void setReadOnly(bool readOnly);
protected: protected:
void mouseReleaseEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *) override;
void paintEvent(QPaintEvent *); void paintEvent(QPaintEvent *) override;
void focusInEvent(QFocusEvent *); void focusInEvent(QFocusEvent *) override;
void focusOutEvent(QFocusEvent *); void focusOutEvent(QFocusEvent *) override;
void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent *) override;
private: private:
int current; int current;

2
desktop-widgets/statistics/statisticswidget.h
View file

@ -13,7 +13,7 @@ public:
YearlyStatisticsWidget(QWidget *parent = 0); YearlyStatisticsWidget(QWidget *parent = 0);
void setModel(YearlyStatisticsModel *m); void setModel(YearlyStatisticsModel *m);
protected: protected:
void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event) override;
public slots: public slots:
void modelRowsInserted(const QModelIndex& index, int first, int last); void modelRowsInserted(const QModelIndex& index, int first, int last);
void modelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight); void modelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);

4
desktop-widgets/tab-widgets/TabDiveExtraInfo.h
View file

@ -15,8 +15,8 @@ class TabDiveExtraInfo : public TabBase {
public: public:
TabDiveExtraInfo(QWidget *parent = 0); TabDiveExtraInfo(QWidget *parent = 0);
~TabDiveExtraInfo(); ~TabDiveExtraInfo();
void updateData(); void updateData() override;
void clear(); void clear() override;
private: private:
Ui::TabDiveExtraInfo *ui; Ui::TabDiveExtraInfo *ui;
ExtraDataModel *extraDataModel; ExtraDataModel *extraDataModel;

4
desktop-widgets/tab-widgets/TabDiveInformation.h
View file

@ -13,8 +13,8 @@ class TabDiveInformation : public TabBase {
public: public:
TabDiveInformation(QWidget *parent = 0); TabDiveInformation(QWidget *parent = 0);
~TabDiveInformation(); ~TabDiveInformation();
void updateData(); void updateData() override;
void clear(); void clear() override;
private: private:
Ui::TabDiveInformation *ui; Ui::TabDiveInformation *ui;

6
desktop-widgets/tab-widgets/TabDivePhotos.h
View file

@ -15,11 +15,11 @@ class TabDivePhotos : public TabBase {
public: public:
TabDivePhotos(QWidget *parent = 0); TabDivePhotos(QWidget *parent = 0);
~TabDivePhotos(); ~TabDivePhotos();
void updateData(); void updateData() override;
void clear(); void clear() override;
protected: protected:
void contextMenuEvent(QContextMenuEvent *ev); void contextMenuEvent(QContextMenuEvent *ev) override;
private slots: private slots:
void addPhotosFromFile(); void addPhotosFromFile();

4
desktop-widgets/tab-widgets/TabDiveStatistics.h
View file

@ -13,8 +13,8 @@ class TabDiveStatistics : public TabBase {
public: public:
TabDiveStatistics(QWidget *parent = 0); TabDiveStatistics(QWidget *parent = 0);
~TabDiveStatistics(); ~TabDiveStatistics();
void updateData(); void updateData() override;
void clear(); void clear() override;
private: private:
Ui::TabDiveStatistics *ui; Ui::TabDiveStatistics *ui;

4
desktop-widgets/tableview.h
View file

@ -40,8 +40,8 @@ public:
QTableView *view(); QTableView *view();
protected: protected:
void showEvent(QShowEvent *); void showEvent(QShowEvent *) override;
void resizeEvent(QResizeEvent *); void resizeEvent(QResizeEvent *) override;
signals: signals:
void addButtonClicked(); void addButtonClicked();

16
desktop-widgets/undocommands.h
View file

@ -8,8 +8,8 @@
class UndoDeleteDive : public QUndoCommand { class UndoDeleteDive : public QUndoCommand {
public: public:
UndoDeleteDive(QList<struct dive*> deletedDives); UndoDeleteDive(QList<struct dive*> deletedDives);
void undo(); void undo() override;
void redo(); void redo() override;
private: private:
QList<struct dive*> diveList; QList<struct dive*> diveList;
@ -19,8 +19,8 @@ private:
class UndoShiftTime : public QUndoCommand { class UndoShiftTime : public QUndoCommand {
public: public:
UndoShiftTime(QList<int> changedDives, int amount); UndoShiftTime(QList<int> changedDives, int amount);
void undo(); void undo() override;
void redo(); void redo() override;
private: private:
QList<int> diveList; QList<int> diveList;
@ -30,8 +30,8 @@ private:
class UndoRenumberDives : public QUndoCommand { class UndoRenumberDives : public QUndoCommand {
public: public:
UndoRenumberDives(QMap<int, QPair<int, int> > originalNumbers); UndoRenumberDives(QMap<int, QPair<int, int> > originalNumbers);
void undo(); void undo() override;
void redo(); void redo() override;
private: private:
QMap<int,QPair<int, int> > oldNumbers; QMap<int,QPair<int, int> > oldNumbers;
@ -40,8 +40,8 @@ private:
class UndoRemoveDivesFromTrip : public QUndoCommand { class UndoRemoveDivesFromTrip : public QUndoCommand {
public: public:
UndoRemoveDivesFromTrip(QMap<struct dive*, dive_trip*> removedDives); UndoRemoveDivesFromTrip(QMap<struct dive*, dive_trip*> removedDives);
void undo(); void undo() override;
void redo(); void redo() override;
private: private:
QMap<struct dive*, dive_trip*> divesToUndo; QMap<struct dive*, dive_trip*> divesToUndo;

2
profile-widget/divepixmapitem.h
View file

@ -20,7 +20,7 @@ class CloseButtonItem : public DivePixmapItem {
public: public:
CloseButtonItem(QGraphicsItem *parent = 0); CloseButtonItem(QGraphicsItem *parent = 0);
protected: protected:
void mousePressEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
public slots: public slots:
void hide(); void hide();
void show(); void show();

50
profile-widget/diveprofileitem.h
View file

@ -72,10 +72,10 @@ class DiveProfileItem : public AbstractProfilePolygonItem {
public: public:
DiveProfileItem(); DiveProfileItem();
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
void settingsToggled(bool toggled); void settingsToggled(bool toggled);
void settingsChanged(); void settingsChanged() override;
void plot_depth_sample(struct plot_data *entry, QFlags<Qt::AlignmentFlag> flags, const QColor &color); void plot_depth_sample(struct plot_data *entry, QFlags<Qt::AlignmentFlag> flags, const QColor &color);
int maxCeiling(int row); int maxCeiling(int row);
@ -89,8 +89,8 @@ class DiveMeanDepthItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveMeanDepthItem(); DiveMeanDepthItem();
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
private: private:
void createTextItem(); void createTextItem();
@ -102,8 +102,8 @@ class DiveTemperatureItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveTemperatureItem(); DiveTemperatureItem();
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
private: private:
void createTextItem(int seconds, int mkelvin); void createTextItem(int seconds, int mkelvin);
@ -113,8 +113,8 @@ class DiveHeartrateItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveHeartrateItem(); DiveHeartrateItem();
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
private: private:
void createTextItem(int seconds, int hr); void createTextItem(int seconds, int hr);
@ -125,8 +125,8 @@ class DivePercentageItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DivePercentageItem(int i); DivePercentageItem(int i);
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
private: private:
QString visibilityKey; QString visibilityKey;
@ -139,8 +139,8 @@ class DiveAmbPressureItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveAmbPressureItem(); DiveAmbPressureItem();
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
private: private:
QString visibilityKey; QString visibilityKey;
@ -150,8 +150,8 @@ class DiveGFLineItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveGFLineItem(); DiveGFLineItem();
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
private: private:
QString visibilityKey; QString visibilityKey;
@ -161,8 +161,8 @@ class DiveGasPressureItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
private: private:
void plotPressureValue(int mbar, int sec, QFlags<Qt::AlignmentFlag> align, double offset); void plotPressureValue(int mbar, int sec, QFlags<Qt::AlignmentFlag> align, double offset);
@ -175,9 +175,9 @@ class DiveCalculatedCeiling : public AbstractProfilePolygonItem {
public: public:
DiveCalculatedCeiling(ProfileWidget2 *profileWidget); DiveCalculatedCeiling(ProfileWidget2 *profileWidget);
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
void settingsChanged(); void settingsChanged() override;
public public
slots: slots:
@ -195,8 +195,8 @@ class DiveReportedCeiling : public AbstractProfilePolygonItem {
public: public:
DiveReportedCeiling(); DiveReportedCeiling();
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
}; };
class DiveCalculatedTissue : public DiveCalculatedCeiling { class DiveCalculatedTissue : public DiveCalculatedCeiling {
@ -204,15 +204,15 @@ class DiveCalculatedTissue : public DiveCalculatedCeiling {
public: public:
DiveCalculatedTissue(ProfileWidget2 *profileWidget); DiveCalculatedTissue(ProfileWidget2 *profileWidget);
void setVisible(bool visible); void setVisible(bool visible);
void settingsChanged(); void settingsChanged() override;
}; };
class PartialPressureGasItem : public AbstractProfilePolygonItem { class PartialPressureGasItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
PartialPressureGasItem(); PartialPressureGasItem();
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
void setThresholdSettingsKey(const double *prefPointerMin, const double *prefPointerMax); void setThresholdSettingsKey(const double *prefPointerMin, const double *prefPointerMax);
void setVisibilitySettingsKey(const QString &setVisibilitySettingsKey); void setVisibilitySettingsKey(const QString &setVisibilitySettingsKey);
void setColors(const QColor &normalColor, const QColor &alertColor); void setColors(const QColor &normalColor, const QColor &alertColor);

22
profile-widget/profilewidget2.h
View file

@ -84,7 +84,7 @@ public:
double getFontPrintScale(); double getFontPrintScale();
void setFontPrintScale(double scale); void setFontPrintScale(double scale);
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
bool eventFilter(QObject *, QEvent *); bool eventFilter(QObject *, QEvent *) override;
void clearHandlers(); void clearHandlers();
#endif #endif
void recalcCeiling(); void recalcCeiling();
@ -146,18 +146,18 @@ slots: // Necessary to call from QAction's signals.
#endif #endif
protected: protected:
void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event) override;
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
void wheelEvent(QWheelEvent *event); void wheelEvent(QWheelEvent *event) override;
void mouseMoveEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event) override;
void contextMenuEvent(QContextMenuEvent *event); void contextMenuEvent(QContextMenuEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent *event); void mouseDoubleClickEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event) override;
#endif #endif
void dropEvent(QDropEvent *event); void dropEvent(QDropEvent *event) override;
void dragEnterEvent(QDragEnterEvent *event); void dragEnterEvent(QDragEnterEvent *event) override;
void dragMoveEvent(QDragMoveEvent *event); void dragMoveEvent(QDragMoveEvent *event) override;
private: /*methods*/ private: /*methods*/

2
profile-widget/ruleritem.h
View file

@ -22,7 +22,7 @@ public:
void recalculate(); void recalculate();
protected: protected:
void mouseMoveEvent(QGraphicsSceneMouseEvent *event); void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
private: private:
struct plot_info pInfo; struct plot_info pInfo;
struct plot_data *entry; struct plot_data *entry;

4
qt-models/cleanertablemodel.h
View file

@ -20,8 +20,8 @@ class CleanerTableModel : public QAbstractTableModel {
Q_OBJECT Q_OBJECT
public: public:
explicit CleanerTableModel(QObject *parent = 0); explicit CleanerTableModel(QObject *parent = 0);
int columnCount(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; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
protected: protected:
void setHeaderDataStrings(const QStringList &headers); void setHeaderDataStrings(const QStringList &headers);

10
qt-models/cylindermodel.h
View file

@ -28,10 +28,10 @@ public:
explicit CylindersModel(QObject *parent = 0); explicit CylindersModel(QObject *parent = 0);
static CylindersModel *instance(); static CylindersModel *instance();
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
void passInData(const QModelIndex &index, const QVariant &value); void passInData(const QModelIndex &index, const QVariant &value);
void add(); void add();
@ -43,7 +43,7 @@ public:
void moveAtFirst(int cylid); void moveAtFirst(int cylid);
cylinder_t *cylinderAt(const QModelIndex &index); cylinder_t *cylinderAt(const QModelIndex &index);
bool changed; bool changed;
QVariant headerData(int section, Qt::Orientation orientation, int role) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
public public
slots: slots:

4
qt-models/divecomputerextradatamodel.h
View file

@ -13,8 +13,8 @@ public:
VALUE VALUE
}; };
explicit ExtraDataModel(QObject *parent = 0); explicit ExtraDataModel(QObject *parent = 0);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
void clear(); void clear();
void updateDive(); void updateDive();

8
qt-models/divecomputermodel.h
View file

@ -15,10 +15,10 @@ public:
NICKNAME NICKNAME
}; };
DiveComputerModel(QObject *parent = 0); DiveComputerModel(QObject *parent = 0);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
void keepWorkingList(); void keepWorkingList();
public public

6
qt-models/divepicturemodel.h
View file

@ -20,9 +20,9 @@ class DivePictureModel : public QAbstractTableModel {
Q_OBJECT Q_OBJECT
public: public:
static DivePictureModel *instance(); static DivePictureModel *instance();
int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
void updateDivePictures(); void updateDivePictures();
void removePictures(const QVector<QString> &fileUrls); void removePictures(const QVector<QString> &fileUrls);
void updateDivePictureOffset(int diveId, const QString &filename, int offsetSeconds); void updateDivePictureOffset(int diveId, const QString &filename, int offsetSeconds);

12
qt-models/diveplannermodel.h
View file

@ -26,12 +26,12 @@ public:
PLAN, PLAN,
ADD ADD
}; };
int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
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;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
void gasChange(const QModelIndex &index, int newcylinderid); void gasChange(const QModelIndex &index, int newcylinderid);
void cylinderRenumber(int mapping[]); void cylinderRenumber(int mapping[]);
void removeSelectedPoints(const QVector<int> &rows); void removeSelectedPoints(const QVector<int> &rows);

8
qt-models/diveplotdatamodel.h
View file

@ -72,10 +72,10 @@ public:
COLUMNS COLUMNS
}; };
explicit DivePlotDataModel(QObject *parent = 0); explicit DivePlotDataModel(QObject *parent = 0);
int columnCount(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; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
void clear(); void clear();
void setDive(struct dive *d, const plot_info &pInfo); void setDive(struct dive *d, const plot_info &pInfo);
const plot_info &data() const; const plot_info &data() const;

12
qt-models/divetripmodel.h
View file

@ -31,10 +31,10 @@ public:
COLUMNS COLUMNS
}; };
QVariant data(int column, int role) const; QVariant data(int column, int role) const override;
int diveId; int diveId;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
QString displayDate() const; QString displayDate() const;
QString displayDuration() const; QString displayDuration() const;
QString displayDepth() const; QString displayDepth() const;
@ -53,7 +53,7 @@ public:
struct TripItem : public TreeItem { struct TripItem : public TreeItem {
Q_DECLARE_TR_FUNCTIONS(TripItem) Q_DECLARE_TR_FUNCTIONS(TripItem)
public: public:
QVariant data(int column, int role) const; QVariant data(int column, int role) const override;
dive_trip_t *trip; dive_trip_t *trip;
}; };
@ -97,8 +97,8 @@ public:
static DiveTripModel *instance(); static DiveTripModel *instance();
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const;
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;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
DiveTripModel(QObject *parent = 0); DiveTripModel(QObject *parent = 0);
Layout layout() const; Layout layout() const;
void setLayout(Layout layout); void setLayout(Layout layout);

2
qt-models/filtermodels.h
View file

@ -105,7 +105,7 @@ class MultiFilterSortModel : public QSortFilterProxyModel {
Q_OBJECT Q_OBJECT
public: public:
static MultiFilterSortModel *instance(); 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 addFilterModel(FilterModelBase *model);
void removeFilterModel(FilterModelBase *model); void removeFilterModel(FilterModelBase *model);
bool showDive(const struct dive *d) const; bool showDive(const struct dive *d) const;

6
qt-models/maplocationmodel.h
View file

@ -56,8 +56,8 @@ public:
~MapLocationModel(); ~MapLocationModel();
Q_INVOKABLE MapLocation *get(int row); Q_INVOKABLE MapLocation *get(int row);
QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const override;
int rowCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent) const override;
int count(); int count();
void add(MapLocation *); void add(MapLocation *);
void addList(QVector<MapLocation *>); void addList(QVector<MapLocation *>);
@ -68,7 +68,7 @@ public:
quint32 selectedUuid(); quint32 selectedUuid();
protected: protected:
QHash<int, QByteArray> roleNames() const; QHash<int, QByteArray> roleNames() const override;
private: private:
QVector<MapLocation *> m_mapLocations; QVector<MapLocation *> m_mapLocations;

6
qt-models/messagehandlermodel.h
View file

@ -10,9 +10,9 @@ class MessageHandlerModel : public QAbstractListModel {
public: public:
static MessageHandlerModel *self(); static MessageHandlerModel *self();
enum MsgTypes {Message = Qt::UserRole + 1, Severity}; enum MsgTypes {Message = Qt::UserRole + 1, Severity};
int rowCount(const QModelIndex& parent = QModelIndex()) const; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& idx, int role) const; QVariant data(const QModelIndex& idx, int role) const override;
QHash<int, QByteArray> roleNames() const; QHash<int, QByteArray> roleNames() const override;
void addLog(QtMsgType type, const QString& message); void addLog(QtMsgType type, const QString& message);
const QString logAsString(); const QString logAsString();

8
qt-models/models.h
View file

@ -27,7 +27,7 @@ class GasSelectionModel : public QStringListModel {
public: public:
static GasSelectionModel *instance(); static GasSelectionModel *instance();
Qt::ItemFlags flags(const QModelIndex &index) const; 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 public
slots: slots:
void repopulate(); void repopulate();
@ -38,7 +38,7 @@ class DiveTypeSelectionModel : public QStringListModel {
public: public:
static DiveTypeSelectionModel *instance(); static DiveTypeSelectionModel *instance();
Qt::ItemFlags flags(const QModelIndex &index) const; 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 public
slots: slots:
void repopulate(); void repopulate();
@ -49,8 +49,8 @@ class LanguageModel : public QAbstractListModel {
Q_OBJECT Q_OBJECT
public: public:
static LanguageModel *instance(); static LanguageModel *instance();
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
private: private:
LanguageModel(QObject *parent = 0); LanguageModel(QObject *parent = 0);

6
qt-models/ssrfsortfilterproxymodel.h
View file

@ -17,9 +17,9 @@ class SsrfSortFilterProxyModel : public QSortFilterProxyModel {
public: public:
SsrfSortFilterProxyModel(QObject *parent = 0); SsrfSortFilterProxyModel(QObject *parent = 0);
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const; bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
bool filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const; bool filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const override;
void setLessThan(less_than_cb func); void setLessThan(less_than_cb func);
void setFilterRow(filter_accepts_row_cb func); void setFilterRow(filter_accepts_row_cb func);

8
qt-models/tankinfomodel.h
View file

@ -18,10 +18,10 @@ public:
}; };
TankInfoModel(); TankInfoModel();
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
const QString &biggerString() const; const QString &biggerString() const;
void clear(); void clear();
public public

10
qt-models/treemodel.h
View file

@ -26,11 +26,11 @@ class TreeModel : public QAbstractItemModel {
Q_OBJECT Q_OBJECT
public: public:
TreeModel(QObject *parent = 0); TreeModel(QObject *parent = 0);
QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
void clear(); void clear();
protected: protected:

8
qt-models/weightmodel.h
View file

@ -17,10 +17,10 @@ public:
}; };
explicit WeightModel(QObject *parent = 0); explicit WeightModel(QObject *parent = 0);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
void passInData(const QModelIndex &index, const QVariant &value); void passInData(const QModelIndex &index, const QVariant &value);
void add(); void add();

8
qt-models/weightsysteminfomodel.h
View file

@ -16,10 +16,10 @@ public:
}; };
WSInfoModel(); WSInfoModel();
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
const QString &biggerString() const; const QString &biggerString() const;
void clear(); void clear();
void update(); void update();

2
qt-models/yearlystatisticsmodel.h
View file

@ -26,7 +26,7 @@ public:
COLUMNS 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); YearlyStatisticsModel(QObject *parent = 0);
void update_yearly_stats(); void update_yearly_stats();
}; };