diff options
Diffstat (limited to 'desktop-widgets')
24 files changed, 97 insertions, 97 deletions
diff --git a/desktop-widgets/btdeviceselectiondialog.h b/desktop-widgets/btdeviceselectiondialog.h index 016bb74c0..3e034d73f 100644 --- a/desktop-widgets/btdeviceselectiondialog.h +++ b/desktop-widgets/btdeviceselectiondialog.h @@ -39,8 +39,8 @@ public: bool isActive() const; QString errorToString() const; QBluetoothDeviceDiscoveryAgent::Error error() const; - virtual void run(); - virtual void stop(); + void run() override; + void stop(); private: bool running; diff --git a/desktop-widgets/configuredivecomputerdialog.h b/desktop-widgets/configuredivecomputerdialog.h index 5451b9b9a..71bfbc0ac 100644 --- a/desktop-widgets/configuredivecomputerdialog.h +++ b/desktop-widgets/configuredivecomputerdialog.h @@ -26,9 +26,9 @@ public: GasSpinBoxItemDelegate(QObject *parent = 0, column_type type = PERCENT); ~GasSpinBoxItemDelegate(); - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; - virtual void setEditorData(QWidget *editor, const QModelIndex &index) const; - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; private: column_type type; @@ -46,9 +46,9 @@ public: GasTypeComboBoxItemDelegate(QObject *parent = 0, computer_type type = OSTC3); ~GasTypeComboBoxItemDelegate(); - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; - virtual void setEditorData(QWidget *editor, const QModelIndex &index) const; - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; private: computer_type type; diff --git a/desktop-widgets/divepicturewidget.h b/desktop-widgets/divepicturewidget.h index bf48a9d1b..d5457cbc2 100644 --- a/desktop-widgets/divepicturewidget.h +++ b/desktop-widgets/divepicturewidget.h @@ -12,9 +12,9 @@ class DivePictureWidget : public QListView { public: DivePictureWidget(QWidget *parent); protected: - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *event) override; signals: void photoDoubleClicked(const QString filePath); diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h index 441e90bdd..bf35ed7ec 100644 --- a/desktop-widgets/diveplanner.h +++ b/desktop-widgets/diveplanner.h @@ -67,7 +67,7 @@ class PlannerSettingsWidget : public QWidget { Q_OBJECT public: explicit PlannerSettingsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); - virtual ~PlannerSettingsWidget(); + ~PlannerSettingsWidget(); public slots: void settingsChanged(); diff --git a/desktop-widgets/groupedlineedit.h b/desktop-widgets/groupedlineedit.h index 20f0c8cc2..36f1f8b4f 100644 --- a/desktop-widgets/groupedlineedit.h +++ b/desktop-widgets/groupedlineedit.h @@ -39,7 +39,7 @@ class GroupedLineEdit : public QPlainTextEdit { public: explicit GroupedLineEdit(QWidget *parent = 0); - virtual ~GroupedLineEdit(); + ~GroupedLineEdit(); QString text() const; @@ -55,15 +55,15 @@ public: void addColor(QColor color); - virtual QSize sizeHint() const; - virtual QSize minimumSizeHint() const; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; signals: void editingFinished(); protected: - virtual void paintEvent(QPaintEvent *e); - virtual void keyPressEvent(QKeyEvent *e); + void paintEvent(QPaintEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; private: struct Private; diff --git a/desktop-widgets/kmessagewidget.h b/desktop-widgets/kmessagewidget.h index 73fb97ce1..61a034280 100644 --- a/desktop-widgets/kmessagewidget.h +++ b/desktop-widgets/kmessagewidget.h @@ -186,18 +186,18 @@ public: /** * 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. */ - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; /** * Returns the required height for @p width. * @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. @@ -326,11 +326,11 @@ Q_SIGNALS: void showAnimationFinished(); 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: KMessageWidgetPrivate *const d; diff --git a/desktop-widgets/locationinformation.h b/desktop-widgets/locationinformation.h index 114626454..3b88bd030 100644 --- a/desktop-widgets/locationinformation.h +++ b/desktop-widgets/locationinformation.h @@ -11,7 +11,7 @@ class LocationInformationWidget : public QGroupBox { Q_OBJECT public: LocationInformationWidget(QWidget *parent = 0); - virtual bool eventFilter(QObject*, QEvent*); + bool eventFilter(QObject*, QEvent*) override; protected: void showEvent(QShowEvent *); @@ -56,8 +56,8 @@ class DiveLocationFilterProxyModel : public QSortFilterProxyModel { Q_OBJECT public: DiveLocationFilterProxyModel(QObject *parent = 0); - virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; - virtual bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const; + bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override; + bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override; }; class DiveLocationModel : public QAbstractTableModel { @@ -79,7 +79,7 @@ class DiveLocationListView : public QListView { public: DiveLocationListView(QWidget *parent = 0); protected: - virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous); + void currentChanged(const QModelIndex& current, const QModelIndex& previous) override; signals: void currentIndexChanged(const QModelIndex& current); }; diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h index da3396981..06365a8e6 100644 --- a/desktop-widgets/mainwindow.h +++ b/desktop-widgets/mainwindow.h @@ -58,7 +58,7 @@ public: }; MainWindow(); - virtual ~MainWindow(); + ~MainWindow(); static MainWindow *instance(); MainTab *information(); void loadRecentFiles(); diff --git a/desktop-widgets/modeldelegates.h b/desktop-widgets/modeldelegates.h index a479b36f0..ae1292030 100644 --- a/desktop-widgets/modeldelegates.h +++ b/desktop-widgets/modeldelegates.h @@ -19,8 +19,8 @@ class StarWidgetsDelegate : public QStyledItemDelegate { Q_OBJECT public: explicit StarWidgetsDelegate(QWidget *parent = 0); - virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - virtual QSize sizeHint(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 override; const QSize& starSize() const; private: @@ -32,10 +32,10 @@ class ComboBoxDelegate : public QStyledItemDelegate { Q_OBJECT public: explicit ComboBoxDelegate(QAbstractItemModel *model, QObject *parent = 0, bool allowEdit = true); - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; - virtual void setEditorData(QWidget *editor, const QModelIndex &index) const; - virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const; - virtual bool eventFilter(QObject *object, QEvent *event); + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + bool eventFilter(QObject *object, QEvent *event) override; public slots: void testActivation(const QString &currString = QString()); @@ -54,8 +54,8 @@ class TankInfoDelegate : public ComboBoxDelegate { Q_OBJECT public: explicit TankInfoDelegate(QObject *parent = 0); - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, 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 override; public slots: void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint); @@ -66,17 +66,17 @@ class TankUseDelegate : public QStyledItemDelegate { Q_OBJECT public: explicit TankUseDelegate(QObject *parent = 0); - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; - virtual void setEditorData(QWidget * editor, 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 override; + void setEditorData(QWidget * editor, const QModelIndex & index) const override; }; class WSInfoDelegate : public ComboBoxDelegate { Q_OBJECT public: explicit WSInfoDelegate(QObject *parent = 0); - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, 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 override; public slots: void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint); @@ -86,7 +86,7 @@ class AirTypesDelegate : public ComboBoxDelegate { Q_OBJECT public: 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 slots: void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint); @@ -96,7 +96,7 @@ class DiveTypesDelegate : public ComboBoxDelegate { Q_OBJECT public: 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 slots: void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint); @@ -106,7 +106,7 @@ class SpinBoxDelegate : public QStyledItemDelegate { Q_OBJECT public: 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: int min; int max; @@ -117,7 +117,7 @@ class DoubleSpinBoxDelegate : public QStyledItemDelegate { Q_OBJECT public: 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: double min; double max; @@ -128,8 +128,8 @@ class LocationFilterDelegate : public QStyledItemDelegate { Q_OBJECT public: LocationFilterDelegate(QObject *parent = 0); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; - QSize sizeHint(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 override; }; #endif // MODELDELEGATES_H diff --git a/desktop-widgets/plugins/facebook/facebook_integration.h b/desktop-widgets/plugins/facebook/facebook_integration.h index 53e072565..7a9ebc700 100644 --- a/desktop-widgets/plugins/facebook/facebook_integration.h +++ b/desktop-widgets/plugins/facebook/facebook_integration.h @@ -13,12 +13,12 @@ class FacebookPlugin : public ISocialNetworkIntegration { Q_OBJECT public: explicit FacebookPlugin(QObject* parent = 0); - virtual bool isConnected(); - virtual void requestLogin(); - virtual void requestLogoff(); - virtual QString socialNetworkIcon() const; - virtual QString socialNetworkName() const; - virtual void requestUpload(); + bool isConnected() override; + void requestLogin() override; + void requestLogoff() override; + QString socialNetworkIcon() const override; + QString socialNetworkName() const override; + void requestUpload() override; private: FacebookConnectWidget *fbConnectWidget; }; diff --git a/desktop-widgets/preferences/preferences_defaults.h b/desktop-widgets/preferences/preferences_defaults.h index d7bb7db7f..47ae4a5e5 100644 --- a/desktop-widgets/preferences/preferences_defaults.h +++ b/desktop-widgets/preferences/preferences_defaults.h @@ -13,9 +13,9 @@ class PreferencesDefaults : public AbstractPreferencesWidget { Q_OBJECT public: PreferencesDefaults(); - virtual ~PreferencesDefaults(); - virtual void refreshSettings(); - virtual void syncSettings(); + ~PreferencesDefaults(); + void refreshSettings() override; + void syncSettings() override; public slots: void on_chooseFile_clicked(); void on_btnUseDefaultFile_toggled(bool toggled); diff --git a/desktop-widgets/preferences/preferences_georeference.h b/desktop-widgets/preferences/preferences_georeference.h index 8f76294cd..a24603bc2 100644 --- a/desktop-widgets/preferences/preferences_georeference.h +++ b/desktop-widgets/preferences/preferences_georeference.h @@ -12,9 +12,9 @@ class PreferencesGeoreference : public AbstractPreferencesWidget { Q_OBJECT public: PreferencesGeoreference(); - virtual ~PreferencesGeoreference(); - virtual void refreshSettings(); - virtual void syncSettings(); + ~PreferencesGeoreference(); + void refreshSettings() override; + void syncSettings() override; private: Ui::PreferencesGeoreference *ui; }; diff --git a/desktop-widgets/preferences/preferences_graph.h b/desktop-widgets/preferences/preferences_graph.h index d38275729..4fc9cd5b3 100644 --- a/desktop-widgets/preferences/preferences_graph.h +++ b/desktop-widgets/preferences/preferences_graph.h @@ -12,9 +12,9 @@ class PreferencesGraph : public AbstractPreferencesWidget { Q_OBJECT public: PreferencesGraph(); - virtual ~PreferencesGraph(); - virtual void refreshSettings(); - virtual void syncSettings(); + ~PreferencesGraph(); + void refreshSettings() override; + void syncSettings() override; private slots: void on_gflow_valueChanged(int gf); diff --git a/desktop-widgets/preferences/preferences_language.h b/desktop-widgets/preferences/preferences_language.h index 4ff268b87..a62d4d3dc 100644 --- a/desktop-widgets/preferences/preferences_language.h +++ b/desktop-widgets/preferences/preferences_language.h @@ -13,9 +13,9 @@ class PreferencesLanguage : public AbstractPreferencesWidget { Q_OBJECT public: PreferencesLanguage(); - virtual ~PreferencesLanguage(); - virtual void refreshSettings(); - virtual void syncSettings(); + ~PreferencesLanguage(); + void refreshSettings() override; + void syncSettings() override; private: Ui::PreferencesLanguage *ui; QMap<QString, QString> dateFormatShortMap; diff --git a/desktop-widgets/preferences/preferences_network.h b/desktop-widgets/preferences/preferences_network.h index 844cce3f0..f4b2125aa 100644 --- a/desktop-widgets/preferences/preferences_network.h +++ b/desktop-widgets/preferences/preferences_network.h @@ -13,9 +13,9 @@ class PreferencesNetwork : public AbstractPreferencesWidget { public: PreferencesNetwork(); - virtual ~PreferencesNetwork(); - virtual void refreshSettings(); - virtual void syncSettings(); + ~PreferencesNetwork(); + void refreshSettings() override; + void syncSettings() override; public slots: void proxyType_changed(int i); diff --git a/desktop-widgets/preferences/preferences_units.h b/desktop-widgets/preferences/preferences_units.h index fb20588a2..1f276d178 100644 --- a/desktop-widgets/preferences/preferences_units.h +++ b/desktop-widgets/preferences/preferences_units.h @@ -12,9 +12,9 @@ class PreferencesUnits : public AbstractPreferencesWidget { Q_OBJECT public: PreferencesUnits(); - virtual ~PreferencesUnits(); - virtual void refreshSettings(); - virtual void syncSettings(); + ~PreferencesUnits(); + void refreshSettings() override; + void syncSettings() override; private: Ui::PreferencesUnits *ui; }; diff --git a/desktop-widgets/preferences/preferencesdialog.h b/desktop-widgets/preferences/preferencesdialog.h index 34d542b03..2a1b53315 100644 --- a/desktop-widgets/preferences/preferencesdialog.h +++ b/desktop-widgets/preferences/preferencesdialog.h @@ -15,7 +15,7 @@ class PreferencesDialog : public QDialog { Q_OBJECT public: static PreferencesDialog* instance(); - virtual ~PreferencesDialog(); + ~PreferencesDialog(); void addPreferencePage(AbstractPreferencesWidget *page); void refreshPages(); void emitSettingsChanged(); diff --git a/desktop-widgets/printdialog.h b/desktop-widgets/printdialog.h index 6f0095a50..51cee8214 100644 --- a/desktop-widgets/printdialog.h +++ b/desktop-widgets/printdialog.h @@ -19,7 +19,7 @@ class PrintDialog : public QDialog { public: explicit PrintDialog(QWidget *parent = 0, Qt::WindowFlags f = 0); - virtual ~PrintDialog(); + ~PrintDialog(); private: PrintOptions *optionsWidget; diff --git a/desktop-widgets/simplewidgets.h b/desktop-widgets/simplewidgets.h index fdaa4587e..6125f800d 100644 --- a/desktop-widgets/simplewidgets.h +++ b/desktop-widgets/simplewidgets.h @@ -172,8 +172,8 @@ protected: FilterBase(FilterModelBase *model, QWidget *parent = 0); FilterModelBase *model; Ui::FilterWidget ui; - virtual void showEvent(QShowEvent *); - virtual void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; friend class MultiFilter; }; @@ -201,7 +201,7 @@ class TextHyperlinkEventFilter : public QObject { public: explicit TextHyperlinkEventFilter(QTextEdit *txtEdit); - virtual bool eventFilter(QObject *target, QEvent *evt); + bool eventFilter(QObject *target, QEvent *evt) override; private: void handleUrlClick(const QString &urlStr); diff --git a/desktop-widgets/starwidget.h b/desktop-widgets/starwidget.h index 0b5b5071b..daa4ffbf5 100644 --- a/desktop-widgets/starwidget.h +++ b/desktop-widgets/starwidget.h @@ -14,7 +14,7 @@ public: explicit StarWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); int currentStars() const; - /*reimp*/ QSize sizeHint() const; + QSize sizeHint() const override; static const QImage& starActive(); static const QImage& starInactive(); @@ -28,11 +28,11 @@ slots: void setReadOnly(bool readOnly); protected: - /*reimp*/ void mouseReleaseEvent(QMouseEvent *); - /*reimp*/ void paintEvent(QPaintEvent *); - /*reimp*/ void focusInEvent(QFocusEvent *); - /*reimp*/ void focusOutEvent(QFocusEvent *); - /*reimp*/ void keyPressEvent(QKeyEvent *); + void mouseReleaseEvent(QMouseEvent *) override; + void paintEvent(QPaintEvent *) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; + void keyPressEvent(QKeyEvent *) override; private: int current; diff --git a/desktop-widgets/statistics/statisticswidget.h b/desktop-widgets/statistics/statisticswidget.h index 9579f68c3..4ffd3ff88 100644 --- a/desktop-widgets/statistics/statisticswidget.h +++ b/desktop-widgets/statistics/statisticswidget.h @@ -13,7 +13,7 @@ public: YearlyStatisticsWidget(QWidget *parent = 0); void setModel(YearlyStatisticsModel *m); protected: - virtual void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) override; public slots: void modelRowsInserted(const QModelIndex& index, int first, int last); void modelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight); diff --git a/desktop-widgets/subsurfacewebservices.h b/desktop-widgets/subsurfacewebservices.h index 455f42ca6..557f1e247 100644 --- a/desktop-widgets/subsurfacewebservices.h +++ b/desktop-widgets/subsurfacewebservices.h @@ -105,9 +105,9 @@ public: private slots: // need to declare them as no ops or Qt4 is unhappy - virtual void startDownload() { } - virtual void startUpload() { } - virtual void buttonClicked(QAbstractButton *button) { Q_UNUSED(button) } + void startDownload() override { } + void startUpload() override { } + void buttonClicked(QAbstractButton *button) override { Q_UNUSED(button) } }; #endif // SUBSURFACEWEBSERVICES_H diff --git a/desktop-widgets/tableview.h b/desktop-widgets/tableview.h index 313a474f4..5dc5db2b5 100644 --- a/desktop-widgets/tableview.h +++ b/desktop-widgets/tableview.h @@ -27,7 +27,7 @@ class TableView : public QGroupBox { }; public: TableView(QWidget *parent = 0); - virtual ~TableView(); + ~TableView(); /* 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 * proxy model and add that column, will mark that as TODO. see? marked. @@ -40,8 +40,8 @@ public: QTableView *view(); protected: - virtual void showEvent(QShowEvent *); - virtual void resizeEvent(QResizeEvent *); + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *) override; signals: void addButtonClicked(); diff --git a/desktop-widgets/undocommands.h b/desktop-widgets/undocommands.h index 1403b23bb..4e485e5ed 100644 --- a/desktop-widgets/undocommands.h +++ b/desktop-widgets/undocommands.h @@ -8,8 +8,8 @@ class UndoDeleteDive : public QUndoCommand { public: UndoDeleteDive(QList<struct dive*> deletedDives); - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: QList<struct dive*> diveList; @@ -19,8 +19,8 @@ private: class UndoShiftTime : public QUndoCommand { public: UndoShiftTime(QList<int> changedDives, int amount); - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: QList<int> diveList; @@ -30,8 +30,8 @@ private: class UndoRenumberDives : public QUndoCommand { public: UndoRenumberDives(QMap<int, QPair<int, int> > originalNumbers); - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: QMap<int,QPair<int, int> > oldNumbers; @@ -40,8 +40,8 @@ private: class UndoRemoveDivesFromTrip : public QUndoCommand { public: UndoRemoveDivesFromTrip(QMap<struct dive*, dive_trip*> removedDives); - virtual void undo(); - virtual void redo(); + void undo() override; + void redo() override; private: QMap<struct dive*, dive_trip*> divesToUndo; |