mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: replace virtual by override where appropriate

Browse source 
The keyword "virtual" signalizes that the function is virtual,
i.e. the function of the derived class is called, even if the
call is on the parent class.

It is not necessary to repeat the "virtual" keyword in derived
classes. To highlight derived virtual functions, the keyword
"override" should be used instead. It results in a hard compile-
error, if no function is overridden, thus avoiding subtle bugs.

Replace "virtual" by "override" where appropriate. Moreover,
replace Q_DECL_OVERRIDE by override, since we require reasonably
recent compilers anyway. Likewise, replace /* reimp */ by
"override" for consistency and compiler support.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-07-31 07:41:19 +02:00 • committed by Tomaz Canabrava
parent 7fe76a5dbd
commit df156a56c0
49 changed files with 200 additions and 203 deletions
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() Q_DECL_OVERRIDE; void run() override;
private: private:
ReverseGeoLookupThread(QObject *parent = 0); ReverseGeoLookupThread(QObject *parent = 0);

4
desktop-widgets/btdeviceselectiondialog.h
View file

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

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();
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const; void setEditorData(QWidget *editor, const QModelIndex &index) const override;
virtual 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();
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const; void setEditorData(QWidget *editor, const QModelIndex &index) const override;
virtual 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;

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) Q_DECL_OVERRIDE; void mouseDoubleClickEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mousePressEvent(QMouseEvent *event) override;
void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; void wheelEvent(QWheelEvent *event) override;
signals: signals:
void photoDoubleClicked(const QString filePath); void photoDoubleClicked(const QString filePath);

2
desktop-widgets/diveplanner.h
View file

@ -67,7 +67,7 @@ class PlannerSettingsWidget : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
explicit PlannerSettingsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); explicit PlannerSettingsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
virtual ~PlannerSettingsWidget(); ~PlannerSettingsWidget();
public public
slots: slots:
void settingsChanged(); void settingsChanged();

10
desktop-widgets/groupedlineedit.h
View file

@ -39,7 +39,7 @@ class GroupedLineEdit : public QPlainTextEdit {
public: public:
explicit GroupedLineEdit(QWidget *parent = 0); explicit GroupedLineEdit(QWidget *parent = 0);
virtual ~GroupedLineEdit(); ~GroupedLineEdit();
QString text() const; QString text() const;
@ -55,15 +55,15 @@ public:
void addColor(QColor color); void addColor(QColor color);
virtual QSize sizeHint() const; QSize sizeHint() const override;
virtual QSize minimumSizeHint() const; QSize minimumSizeHint() const override;
signals: signals:
void editingFinished(); void editingFinished();
protected: protected:
virtual void paintEvent(QPaintEvent *e); void paintEvent(QPaintEvent *e) override;
virtual 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 Q_DECL_OVERRIDE; QSize sizeHint() const override;
/** /**
* Returns the minimum size of the message widget. * Returns the minimum size of the message widget.
*/ */
QSize minimumSizeHint() const Q_DECL_OVERRIDE; 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 Q_DECL_OVERRIDE; 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) Q_DECL_OVERRIDE; void paintEvent(QPaintEvent *event) override;
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; 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);
virtual 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);
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
virtual 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:
virtual 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);
}; };

2
desktop-widgets/mainwindow.h
View file

@ -58,7 +58,7 @@ public:
}; };
MainWindow(); MainWindow();
virtual ~MainWindow(); ~MainWindow();
static MainWindow *instance(); static MainWindow *instance();
MainTab *information(); MainTab *information();
void loadRecentFiles(); void loadRecentFiles();

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);
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual 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);
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const; void setEditorData(QWidget *editor, const QModelIndex &index) const override;
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const; void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual 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);
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
virtual 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);
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual 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);
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
virtual 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);
virtual 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);
virtual 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);
virtual 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);
virtual 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 Q_DECL_OVERRIDE; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; 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);
virtual bool isConnected(); bool isConnected() override;
virtual void requestLogin(); void requestLogin() override;
virtual void requestLogoff(); void requestLogoff() override;
virtual QString socialNetworkIcon() const; QString socialNetworkIcon() const override;
virtual QString socialNetworkName() const; QString socialNetworkName() const override;
virtual void requestUpload(); void requestUpload() override;
private: private:
FacebookConnectWidget *fbConnectWidget; FacebookConnectWidget *fbConnectWidget;
}; };

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

@ -13,9 +13,9 @@ class PreferencesDefaults : public AbstractPreferencesWidget {
Q_OBJECT Q_OBJECT
public: public:
PreferencesDefaults(); PreferencesDefaults();
virtual ~PreferencesDefaults(); ~PreferencesDefaults();
virtual void refreshSettings(); void refreshSettings() override;
virtual 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);

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

@ -12,9 +12,9 @@ class PreferencesGeoreference : public AbstractPreferencesWidget {
Q_OBJECT Q_OBJECT
public: public:
PreferencesGeoreference(); PreferencesGeoreference();
virtual ~PreferencesGeoreference(); ~PreferencesGeoreference();
virtual void refreshSettings(); void refreshSettings() override;
virtual void syncSettings(); void syncSettings() override;
private: private:
Ui::PreferencesGeoreference *ui; Ui::PreferencesGeoreference *ui;
}; };

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

@ -12,9 +12,9 @@ class PreferencesGraph : public AbstractPreferencesWidget {
Q_OBJECT Q_OBJECT
public: public:
PreferencesGraph(); PreferencesGraph();
virtual ~PreferencesGraph(); ~PreferencesGraph();
virtual void refreshSettings(); void refreshSettings() override;
virtual void syncSettings(); void syncSettings() override;
private slots: private slots:
void on_gflow_valueChanged(int gf); void on_gflow_valueChanged(int gf);

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

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

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

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

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

@ -12,9 +12,9 @@ class PreferencesUnits : public AbstractPreferencesWidget {
Q_OBJECT Q_OBJECT
public: public:
PreferencesUnits(); PreferencesUnits();
virtual ~PreferencesUnits(); ~PreferencesUnits();
virtual void refreshSettings(); void refreshSettings() override;
virtual void syncSettings(); void syncSettings() override;
private: private:
Ui::PreferencesUnits *ui; Ui::PreferencesUnits *ui;
}; };

2
desktop-widgets/preferences/preferencesdialog.h
View file

@ -15,7 +15,7 @@ class PreferencesDialog : public QDialog {
Q_OBJECT Q_OBJECT
public: public:
static PreferencesDialog* instance(); static PreferencesDialog* instance();
virtual ~PreferencesDialog(); ~PreferencesDialog();
void addPreferencePage(AbstractPreferencesWidget *page); void addPreferencePage(AbstractPreferencesWidget *page);
void refreshPages(); void refreshPages();
void emitSettingsChanged(); void emitSettingsChanged();

2
desktop-widgets/printdialog.h
View file

@ -19,7 +19,7 @@ class PrintDialog : public QDialog {
public: public:
explicit PrintDialog(QWidget *parent = 0, Qt::WindowFlags f = 0); explicit PrintDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
virtual ~PrintDialog(); ~PrintDialog();
private: private:
PrintOptions *optionsWidget; PrintOptions *optionsWidget;

6
desktop-widgets/simplewidgets.h
View file

@ -172,8 +172,8 @@ protected:
FilterBase(FilterModelBase *model, QWidget *parent = 0); FilterBase(FilterModelBase *model, QWidget *parent = 0);
FilterModelBase *model; FilterModelBase *model;
Ui::FilterWidget ui; Ui::FilterWidget ui;
virtual void showEvent(QShowEvent *); void showEvent(QShowEvent *) override;
virtual void hideEvent(QHideEvent *); void hideEvent(QHideEvent *) override;
friend class MultiFilter; friend class MultiFilter;
}; };
@ -201,7 +201,7 @@ class TextHyperlinkEventFilter : public QObject {
public: public:
explicit TextHyperlinkEventFilter(QTextEdit *txtEdit); explicit TextHyperlinkEventFilter(QTextEdit *txtEdit);
virtual 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;
/*reimp*/ 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:
/*reimp*/ void mouseReleaseEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *) override;
/*reimp*/ void paintEvent(QPaintEvent *); void paintEvent(QPaintEvent *) override;
/*reimp*/ void focusInEvent(QFocusEvent *); void focusInEvent(QFocusEvent *) override;
/*reimp*/ void focusOutEvent(QFocusEvent *); void focusOutEvent(QFocusEvent *) override;
/*reimp*/ 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:
virtual 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);

6
desktop-widgets/subsurfacewebservices.h
View file

@ -105,9 +105,9 @@ public:
private private
slots: slots:
// need to declare them as no ops or Qt4 is unhappy // need to declare them as no ops or Qt4 is unhappy
virtual void startDownload() { } void startDownload() override { }
virtual void startUpload() { } void startUpload() override { }
virtual void buttonClicked(QAbstractButton *button) { Q_UNUSED(button) } void buttonClicked(QAbstractButton *button) override { Q_UNUSED(button) }
}; };
#endif // SUBSURFACEWEBSERVICES_H #endif // SUBSURFACEWEBSERVICES_H

6
desktop-widgets/tableview.h
View file

@ -27,7 +27,7 @@ class TableView : public QGroupBox {
}; };
public: public:
TableView(QWidget *parent = 0); TableView(QWidget *parent = 0);
virtual ~TableView(); ~TableView();
/* The model is expected to have a 'remove' slot, that takes a QModelIndex as parameter. /* The model is expected to have a 'remove' slot, that takes a QModelIndex as parameter.
* It's also expected to have the column '1' as a trash icon. I most probably should create a * It's also expected to have the column '1' as a trash icon. I most probably should create a
* proxy model and add that column, will mark that as TODO. see? marked. * proxy model and add that column, will mark that as TODO. see? marked.
@ -40,8 +40,8 @@ public:
QTableView *view(); QTableView *view();
protected: protected:
virtual void showEvent(QShowEvent *); void showEvent(QShowEvent *) override;
virtual 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);
virtual void undo(); void undo() override;
virtual 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);
virtual void undo(); void undo() override;
virtual 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);
virtual void undo(); void undo() override;
virtual 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);
virtual void undo(); void undo() override;
virtual void redo(); void redo() override;
private: private:
QMap<struct dive*, dive_trip*> divesToUndo; QMap<struct dive*, dive_trip*> divesToUndo;

2
profile-widget/divecartesianaxis.h
View file

@ -29,7 +29,7 @@ public:
RightToLeft RightToLeft
}; };
DiveCartesianAxis(ProfileWidget2 *widget); DiveCartesianAxis(ProfileWidget2 *widget);
virtual ~DiveCartesianAxis(); ~DiveCartesianAxis();
void setPrintMode(bool mode); void setPrintMode(bool mode);
void setMinimum(double minimum); void setMinimum(double minimum);
void setMaximum(double maximum); void setMaximum(double maximum);

2
profile-widget/diveeventitem.h
View file

@ -12,7 +12,7 @@ class DiveEventItem : public DivePixmapItem {
Q_OBJECT Q_OBJECT
public: public:
DiveEventItem(QGraphicsItem *parent = 0); DiveEventItem(QGraphicsItem *parent = 0);
virtual ~DiveEventItem(); ~DiveEventItem();
void setEvent(struct event *ev, struct gasmix *lastgasmix); void setEvent(struct event *ev, struct gasmix *lastgasmix);
struct event *getEvent(); struct event *getEvent();
void eventVisibilityChanged(const QString &eventName, bool visible); void eventVisibilityChanged(const QString &eventName, bool visible);

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:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
public slots: public slots:
void hide(); void hide();
void show(); void show();

53
profile-widget/diveprofileitem.h
View file

@ -42,9 +42,6 @@ public:
void setHorizontalDataColumn(int column); void setHorizontalDataColumn(int column);
void setVerticalDataColumn(int column); void setVerticalDataColumn(int column);
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) = 0; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) = 0;
virtual void clear()
{
}
public public
slots: slots:
virtual void settingsChanged(); virtual void settingsChanged();
@ -75,10 +72,10 @@ class DiveProfileItem : public AbstractProfilePolygonItem {
public: public:
DiveProfileItem(); DiveProfileItem();
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
virtual 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);
virtual 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);
@ -92,8 +89,8 @@ class DiveMeanDepthItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveMeanDepthItem(); DiveMeanDepthItem();
virtual void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
virtual 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();
@ -105,8 +102,8 @@ class DiveTemperatureItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveTemperatureItem(); DiveTemperatureItem();
virtual void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
virtual 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);
@ -116,8 +113,8 @@ class DiveHeartrateItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveHeartrateItem(); DiveHeartrateItem();
virtual void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
virtual 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);
@ -128,8 +125,8 @@ class DivePercentageItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DivePercentageItem(int i); DivePercentageItem(int i);
virtual void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
virtual 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;
@ -142,8 +139,8 @@ class DiveAmbPressureItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveAmbPressureItem(); DiveAmbPressureItem();
virtual void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
virtual 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;
@ -153,8 +150,8 @@ class DiveGFLineItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
DiveGFLineItem(); DiveGFLineItem();
virtual void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
virtual 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;
@ -164,8 +161,8 @@ class DiveGasPressureItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
virtual void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
virtual 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);
@ -178,9 +175,9 @@ class DiveCalculatedCeiling : public AbstractProfilePolygonItem {
public: public:
DiveCalculatedCeiling(ProfileWidget2 *profileWidget); DiveCalculatedCeiling(ProfileWidget2 *profileWidget);
virtual void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
virtual void settingsChanged(); void settingsChanged() override;
public public
slots: slots:
@ -198,8 +195,8 @@ class DiveReportedCeiling : public AbstractProfilePolygonItem {
public: public:
DiveReportedCeiling(); DiveReportedCeiling();
virtual void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
virtual 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 {
@ -207,15 +204,15 @@ class DiveCalculatedTissue : public DiveCalculatedCeiling {
public: public:
DiveCalculatedTissue(ProfileWidget2 *profileWidget); DiveCalculatedTissue(ProfileWidget2 *profileWidget);
void setVisible(bool visible); void setVisible(bool visible);
virtual void settingsChanged(); void settingsChanged() override;
}; };
class PartialPressureGasItem : public AbstractProfilePolygonItem { class PartialPressureGasItem : public AbstractProfilePolygonItem {
Q_OBJECT Q_OBJECT
public: public:
PartialPressureGasItem(); PartialPressureGasItem();
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
virtual void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
void setThresholdSettingsKey(double *prefPointerMin, double *prefPointerMax); void setThresholdSettingsKey(double *prefPointerMin, 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);

2
profile-widget/divetooltipitem.h
View file

@ -30,7 +30,7 @@ public:
}; };
explicit ToolTipItem(QGraphicsItem *parent = 0); explicit ToolTipItem(QGraphicsItem *parent = 0);
virtual ~ToolTipItem(); ~ToolTipItem();
void collapse(); void collapse();
void expand(); void expand();

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
virtual bool eventFilter(QObject *, QEvent *) override; 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) Q_DECL_OVERRIDE; void resizeEvent(QResizeEvent *event) override;
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; void wheelEvent(QWheelEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent *event) override;
void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; void contextMenuEvent(QContextMenuEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseDoubleClickEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent *event) override;
#endif #endif
void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; void dropEvent(QDropEvent *event) override;
void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; void dragEnterEvent(QDragEnterEvent *event) override;
void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; 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:
virtual 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;

2
profile-widget/tankitem.h
View file

@ -22,7 +22,7 @@ public:
signals: signals:
public slots: public slots:
virtual void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex());
private: private:
void createBar(qreal x, qreal w, struct gasmix *gas); void createBar(qreal x, qreal w, struct gasmix *gas);

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);
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
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;
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();
/*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
/*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
/*reimp*/ Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
/*reimp*/ 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;
virtual 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);
/*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
/*reimp*/ 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);
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
virtual Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
virtual 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

8
qt-models/divepicturemodel.h
View file

@ -20,10 +20,10 @@ class DivePictureModel : public QAbstractTableModel {
Q_OBJECT Q_OBJECT
public: public:
static DivePictureModel *instance(); static DivePictureModel *instance();
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
virtual 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);
signals: signals:

12
qt-models/diveplannermodel.h
View file

@ -26,12 +26,12 @@ public:
PLAN, PLAN,
ADD ADD
}; };
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
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;
virtual 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;
virtual 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);
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
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;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
virtual 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

@ -30,10 +30,10 @@ public:
COLUMNS COLUMNS
}; };
virtual QVariant data(int column, int role) const; QVariant data(int column, int role) const override;
int diveId; int diveId;
virtual 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;
virtual 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;
@ -52,7 +52,7 @@ public:
struct TripItem : public TreeItem { struct TripItem : public TreeItem {
Q_DECLARE_TR_FUNCTIONS(TripItem) Q_DECLARE_TR_FUNCTIONS(TripItem)
public: public:
virtual QVariant data(int column, int role) const; QVariant data(int column, int role) const override;
dive_trip_t *trip; dive_trip_t *trip;
}; };
@ -94,8 +94,8 @@ public:
}; };
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const;
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;
virtual 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

@ -92,7 +92,7 @@ class MultiFilterSortModel : public QSortFilterProxyModel {
Q_OBJECT Q_OBJECT
public: public:
static MultiFilterSortModel *instance(); 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 addFilterModel(FilterModelBase *model);
void removeFilterModel(FilterModelBase *model); void removeFilterModel(FilterModelBase *model);
int divesDisplayed; int divesDisplayed;

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;
virtual 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;
virtual 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();
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
virtual 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);
virtual bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const; bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
virtual 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();
/*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
/*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
/*reimp*/ bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
/*reimp*/ 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

12
qt-models/treemodel.h
View file

@ -25,12 +25,12 @@ class TreeModel : public QAbstractItemModel {
Q_OBJECT Q_OBJECT
public: public:
TreeModel(QObject *parent = 0); TreeModel(QObject *parent = 0);
virtual ~TreeModel(); ~TreeModel();
virtual QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const override;
/*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
/*reimp*/ int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
/*reimp*/ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
/*reimp*/ QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const override;
protected: protected:
int columns; int columns;

8
qt-models/weightmodel.h
View file

@ -17,10 +17,10 @@ public:
}; };
explicit WeightModel(QObject *parent = 0); explicit WeightModel(QObject *parent = 0);
/*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
/*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
/*reimp*/ Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const override;
/*reimp*/ 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();
/*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
/*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
/*reimp*/ bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
/*reimp*/ 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
}; };
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); YearlyStatisticsModel(QObject *parent = 0);
void update_yearly_stats(); void update_yearly_stats();
}; };