From 574065b31430245a66808561b1b95139c4cd19f2 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 29 Sep 2018 22:13:44 +0200 Subject: Cleanup: reinstate override modifiers This reverts commit 1c4a859c8d0b37b2e938209fe9c4d99e9758327a, where the override modifiers were removed owing to the noisy "inconsistent override modifiers" which is default-on in clang. This warning was disabled in 77577f717f5aad38ea8c4c41c10c181486c4337f, so we can reinstate the overrides. Signed-off-by: Berthold Stoeger Signed-off-by: Dirk Hohndel --- desktop-widgets/configuredivecomputerdialog.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'desktop-widgets/configuredivecomputerdialog.h') diff --git a/desktop-widgets/configuredivecomputerdialog.h b/desktop-widgets/configuredivecomputerdialog.h index ba4e3361d..fe617b0ba 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(); - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; - void setEditorData(QWidget *editor, const QModelIndex &index) const; - 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(); - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; - void setEditorData(QWidget *editor, const QModelIndex &index) const; - 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; -- cgit v1.2.3-70-g09d2