diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp index e64deb0c722..6de0a75fcb2 100644 --- a/src/libs/qmljs/qmljsdocument.cpp +++ b/src/libs/qmljs/qmljsdocument.cpp @@ -248,21 +248,22 @@ public: {} - virtual void pragmaLibrary(int line, int column) override + void pragmaLibrary(int line, int column) override { isLibrary = true; addLocation(line, column); } - virtual void importFile(const QString &jsfile, const QString &module, - int line, int column) override + + void importFile(const QString &jsfile, const QString &module, + int line, int column) override { imports += ImportInfo::pathImport( documentPath, jsfile, LanguageUtils::ComponentVersion(), module); addLocation(line, column); } - virtual void importModule(const QString &uri, const QString &version, const QString &module, - int line, int column) override + void importModule(const QString &uri, const QString &version, const QString &module, + int line, int column) override { imports += ImportInfo::moduleImport(uri, LanguageUtils::ComponentVersion(version), module); addLocation(line, column); diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index aed356185a0..74102c3c8d0 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 8c4942e11b7..74d2ed8d96b 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 cccb3ba98b2..fb854311a75 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 2fc5cf48ebc..12613d447df 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(); };