summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2018-06-15 19:26:02 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2018-06-18 08:41:37 +0000
commitb16ba2ba59b2877d6b6827f2d3717fd40c6a6627 (patch)
treeef676991e9e931fdbed5890d37fa9e09a44e16f7 /src/plugins
parentacb611c8cf28ff5bb14c95daea46dad2819b7a26 (diff)
downloadqt-creator-b16ba2ba59b2877d6b6827f2d3717fd40c6a6627.tar.gz
Remove a few redundant occurrences of 'virtual' and 'override'
warning: 'virtual' is redundant since the function is already declared 'override' [modernize-use-override] warning: 'override' is redundant since the function is already declared 'final' [modernize-use-override] Change-Id: I9036a0dc88ed70c4f6e37b916bb24ff65074863d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/coreplugin/mimetypesettings.cpp8
-rw-r--r--src/plugins/diffeditor/diffeditor.cpp2
-rw-r--r--src/plugins/qmakeprojectmanager/profileeditor.cpp8
-rw-r--r--src/plugins/serialterminal/serialoutputpane.cpp4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp
index aed356185a..74102c3c8d 100644
--- a/src/plugins/coreplugin/mimetypesettings.cpp
+++ b/src/plugins/coreplugin/mimetypesettings.cpp
@@ -85,11 +85,11 @@ public:
: QAbstractTableModel(parent) {}
virtual ~MimeTypeSettingsModel() {}
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
- virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override;
- virtual QVariant headerData(int section, Qt::Orientation orientation,
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const override;
- virtual QVariant data(const QModelIndex &modelIndex, int role = Qt::DisplayRole) const override;
+ QVariant data(const QModelIndex &modelIndex, int role = Qt::DisplayRole) const override;
void load();
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 8c4942e11b..74d2ed8d96 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -79,7 +79,7 @@ public:
DescriptionEditorWidget(QWidget *parent = nullptr);
~DescriptionEditorWidget() override;
- virtual QSize sizeHint() const override;
+ QSize sizeHint() const override;
protected:
void setDisplaySettings(const DisplaySettings &ds) override;
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index cccb3ba98b..fb854311a7 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -57,10 +57,10 @@ namespace Internal {
class ProFileEditorWidget : public TextEditorWidget
{
protected:
- virtual void findLinkAt(const QTextCursor &,
- Utils::ProcessLinkCallback &&processLinkCallback,
- bool resolveTarget = true,
- bool inNextSplit = false) override;
+ void findLinkAt(const QTextCursor &,
+ Utils::ProcessLinkCallback &&processLinkCallback,
+ bool resolveTarget = true,
+ bool inNextSplit = false) override;
void contextMenuEvent(QContextMenuEvent *) override;
};
diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp
index 2fc5cf48eb..12613d447d 100644
--- a/src/plugins/serialterminal/serialoutputpane.cpp
+++ b/src/plugins/serialterminal/serialoutputpane.cpp
@@ -66,7 +66,7 @@ public:
signals:
void contextMenuRequested(const QPoint &pos, int index);
protected:
- bool eventFilter(QObject *object, QEvent *event) override final;
+ bool eventFilter(QObject *object, QEvent *event) final;
private:
int m_tabIndexForMiddleClick = -1;
};
@@ -112,7 +112,7 @@ class ComboBox : public QComboBox
{
Q_OBJECT
public:
- void showPopup() override final;
+ void showPopup() final;
signals:
void opened();
};