diff options
41 files changed, 113 insertions, 113 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h index f40e8a4569..6347520e69 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h @@ -100,7 +100,7 @@ signals: void lockedStateChanged(QQuick3DNode *node); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) final; private: void handlePendingToolStateUpdate(); diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp index d5701d7fc9..fa4f4bd7c2 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp @@ -441,7 +441,7 @@ ComponentCompleteDisabler::~ComponentCompleteDisabler() class QrcEngineHandler : public QAbstractFileEngineHandler { public: - QAbstractFileEngine *create(const QString &fileName) const; + QAbstractFileEngine *create(const QString &fileName) const final; }; QAbstractFileEngine *QrcEngineHandler::create(const QString &fileName) const diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp index 5b55d09c19..7df5603837 100644 --- a/src/libs/cplusplus/CppDocument.cpp +++ b/src/libs/cplusplus/CppDocument.cpp @@ -82,7 +82,7 @@ public: } protected: - bool preVisit(Symbol *s) + bool preVisit(Symbol *s) final { if (s->line() < line || (s->line() == line && s->column() <= column)) { // skip blocks diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp index 6349b7db30..7b866490c4 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp @@ -78,12 +78,12 @@ public: { } - QRectF boundingRect() const + QRectF boundingRect() const final { return QRectF(0.0, 0.0, 20.0, 20.0); } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) final { Q_UNUSED(option) Q_UNUSED(widget) diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp index 6759378b3c..c8d9442f17 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp @@ -58,7 +58,7 @@ public: { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) final { QMT_ASSERT(option, return); diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp index cb5aab1a6a..a29f1c6fc6 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp @@ -60,7 +60,7 @@ public: { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) final { QMT_ASSERT(option, return); diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp index 92b89bfea5..1f757c7ab4 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp @@ -68,7 +68,7 @@ public: { } - void visitDInheritance(const DInheritance *inheritance) + void visitDInheritance(const DInheritance *inheritance) final { DObject *baseObject = m_diagramSceneModel->diagramController()->findElement<DObject>(inheritance->base(), m_diagramSceneModel->diagram()); QMT_ASSERT(baseObject, return); @@ -99,7 +99,7 @@ public: m_arrow->setPoints(m_points); } - void visitDDependency(const DDependency *dependency) + void visitDDependency(const DDependency *dependency) final { ArrowItem::Head endAHead = ArrowItem::HeadNone; ArrowItem::Head endBHead = ArrowItem::HeadNone; @@ -126,7 +126,7 @@ public: m_arrow->setPoints(m_points); } - void visitDAssociation(const DAssociation *association) + void visitDAssociation(const DAssociation *association) final { m_arrow->setShaft(ArrowItem::ShaftSolid); m_arrow->setArrowSize(12.0); @@ -170,7 +170,7 @@ public: m_arrow->setPoints(m_points); } - void visitDConnection(const DConnection *connection) + void visitDConnection(const DConnection *connection) final { ArrowItem::Shaft shaft = ArrowItem::ShaftSolid; diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp index d675db9ef6..a9d81e68b1 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp @@ -52,7 +52,7 @@ public: QString identifier() const { return m_identifier; } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) final { Q_UNUSED(option) Q_UNUSED(widget) @@ -64,12 +64,12 @@ public: painter->restore(); } - void mousePressEvent(QGraphicsSceneMouseEvent *event) + void mousePressEvent(QGraphicsSceneMouseEvent *event) final { Q_UNUSED(event) } - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) final { if (contains(event->pos())) m_alignable->align(m_alignType, m_identifier); diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp index 937541f896..25e9dab258 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp @@ -81,7 +81,7 @@ public: } protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event) + void mousePressEvent(QGraphicsSceneMouseEvent *event) final { m_startPos = event->scenePos(); m_lastPos = m_startPos; @@ -90,14 +90,14 @@ protected: setFocus(); } - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) final { m_lastPos = event->scenePos(); QPointF delta = m_lastPos - m_startPos; m_owner->moveHandle(m_pointIndex, delta, Move, m_qualifier); } - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) final { m_lastPos = event->scenePos(); QPointF delta = m_lastPos - m_startPos; @@ -105,7 +105,7 @@ protected: clearFocus(); } - void keyPressEvent(QKeyEvent *event) + void keyPressEvent(QKeyEvent *event) final { m_owner->keyPressed(m_pointIndex, event, m_lastPos); } diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp index 6478e41f1e..4153d6cc4a 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp @@ -64,21 +64,21 @@ public: } protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event) + void mousePressEvent(QGraphicsSceneMouseEvent *event) final { m_startPos = mapToScene(event->pos()); if (!m_isSecondarySelected) m_owner->moveHandle(m_handle, QPointF(0.0, 0.0), Press, None); } - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) final { QPointF pos = mapToScene(event->pos()) - m_startPos; if (!m_isSecondarySelected) m_owner->moveHandle(m_handle, pos, Move, None); } - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) final { QPointF pos = mapToScene(event->pos()) - m_startPos; if (!m_isSecondarySelected) diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp index 404599682d..0ebee2c9a0 100644 --- a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp +++ b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp @@ -78,20 +78,20 @@ public: ModelItem *product() const { return m_item; } - void visitMElement(const MElement *element) + void visitMElement(const MElement *element) final { Q_UNUSED(element) QMT_CHECK(false); } - void visitMObject(const MObject *object) + void visitMObject(const MObject *object) final { Q_UNUSED(object) QMT_ASSERT(m_item, return); m_item->setEditable(false); } - void visitMPackage(const MPackage *package) + void visitMPackage(const MPackage *package) final { QMT_CHECK(!m_item); @@ -101,7 +101,7 @@ public: visitMObject(package); } - void visitMClass(const MClass *klass) + void visitMClass(const MClass *klass) final { QMT_CHECK(!m_item); @@ -113,7 +113,7 @@ public: visitMObject(klass); } - void visitMComponent(const MComponent *component) + void visitMComponent(const MComponent *component) final { QMT_CHECK(!m_item); @@ -126,13 +126,13 @@ public: visitMObject(component); } - void visitMDiagram(const MDiagram *diagram) + void visitMDiagram(const MDiagram *diagram) final { visitMObject(diagram); m_item->setData(TreeModel::Diagram, TreeModel::RoleItemType); } - void visitMCanvasDiagram(const MCanvasDiagram *diagram) + void visitMCanvasDiagram(const MCanvasDiagram *diagram) final { QMT_CHECK(!m_item); @@ -141,7 +141,7 @@ public: visitMDiagram(diagram); } - void visitMItem(const MItem *item) + void visitMItem(const MItem *item) final { QMT_CHECK(!m_item); @@ -154,7 +154,7 @@ public: visitMObject(item); } - void visitMRelation(const MRelation *relation) + void visitMRelation(const MRelation *relation) final { Q_UNUSED(relation) QMT_ASSERT(m_item, return); @@ -162,7 +162,7 @@ public: m_item->setData(TreeModel::Relation, TreeModel::RoleItemType); } - void visitMDependency(const MDependency *dependency) + void visitMDependency(const MDependency *dependency) final { QMT_CHECK(!m_item); @@ -171,7 +171,7 @@ public: visitMRelation(dependency); } - void visitMInheritance(const MInheritance *inheritance) + void visitMInheritance(const MInheritance *inheritance) final { QMT_CHECK(!m_item); @@ -180,7 +180,7 @@ public: visitMRelation(inheritance); } - void visitMAssociation(const MAssociation *association) + void visitMAssociation(const MAssociation *association) final { QMT_CHECK(!m_item); @@ -189,7 +189,7 @@ public: visitMRelation(association); } - void visitMConnection(const MConnection *connection) + void visitMConnection(const MConnection *connection) final { QMT_CHECK(!m_item); @@ -214,23 +214,23 @@ public: QMT_CHECK(m_item); } - void visitMElement(const MElement *element) + void visitMElement(const MElement *element) final { Q_UNUSED(element) QMT_CHECK(false); } - void visitMObject(const MObject *object) + void visitMObject(const MObject *object) final { updateObjectLabel(object); } - void visitMPackage(const MPackage *package) + void visitMPackage(const MPackage *package) final { visitMObject(package); } - void visitMClass(const MClass *klass) + void visitMClass(const MClass *klass) final { if (klass->stereotypes() != m_item->stereotypes()) { QIcon icon = m_treeModel->createIcon(StereotypeIcon::ElementClass, StyleEngine::TypeClass, @@ -241,7 +241,7 @@ public: visitMObject(klass); } - void visitMComponent(const MComponent *component) + void visitMComponent(const MComponent *component) final { if (component->stereotypes() != m_item->stereotypes()) { QIcon icon = m_treeModel->createIcon(StereotypeIcon::ElementComponent, StyleEngine::TypeComponent, @@ -253,17 +253,17 @@ public: visitMObject(component); } - void visitMDiagram(const MDiagram *diagram) + void visitMDiagram(const MDiagram *diagram) final { visitMObject(diagram); } - void visitMCanvasDiagram(const MCanvasDiagram *diagram) + void visitMCanvasDiagram(const MCanvasDiagram *diagram) final { visitMDiagram(diagram); } - void visitMItem(const MItem *item) + void visitMItem(const MItem *item) final { QList<QString> stereotypes = item->stereotypes() << item->variety(); if (stereotypes != m_item->stereotypes()) { @@ -275,27 +275,27 @@ public: visitMObject(item); } - void visitMRelation(const MRelation *relation) + void visitMRelation(const MRelation *relation) final { updateRelationLabel(relation); } - void visitMDependency(const MDependency *dependency) + void visitMDependency(const MDependency *dependency) final { visitMRelation(dependency); } - void visitMInheritance(const MInheritance *inheritance) + void visitMInheritance(const MInheritance *inheritance) final { visitMRelation(inheritance); } - void visitMAssociation(const MAssociation *association) + void visitMAssociation(const MAssociation *association) final { visitMRelation(association); } - void visitMConnection(const MConnection *connection) + void visitMConnection(const MConnection *connection) final { visitMRelation(connection); } diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.cpp b/src/libs/modelinglib/qmt/style/stylecontroller.cpp index 947fef9445..d92affef85 100644 --- a/src/libs/modelinglib/qmt/style/stylecontroller.cpp +++ b/src/libs/modelinglib/qmt/style/stylecontroller.cpp @@ -41,7 +41,7 @@ public: { } - bool suppressGradients() const + bool suppressGradients() const final { return m_styleController->suppressGradients(); } diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h index 1954de4eef..23c02069aa 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h @@ -68,11 +68,11 @@ signals: void rightMarginChanged(); protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent * event); - void mouseReleaseEvent(QMouseEvent * event); - void mouseMoveEvent(QMouseEvent * event); - void leaveEvent(QEvent* event ); + void paintEvent(QPaintEvent *event) final; + void mousePressEvent(QMouseEvent * event) final; + void mouseReleaseEvent(QMouseEvent * event) final; + void mouseMoveEvent(QMouseEvent * event) final; + void leaveEvent(QEvent* event ) final; private: bool m_showBorders; int m_left, m_right, m_top, m_bottom; @@ -102,7 +102,7 @@ public: void onSliderMoved(int value); protected: - void wheelEvent(QWheelEvent* event); + void wheelEvent(QWheelEvent* event) final; private: PreviewLabel *m_label; @@ -165,7 +165,7 @@ public: signals: void doubleClicked(); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) final; }; class WheelFilter: public QObject { @@ -175,7 +175,7 @@ public: WheelFilter(QObject* parent =nullptr) : QObject(parent) {} void setTarget(QObject *target) { m_target = target; } protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) final; QObject *m_target; }; diff --git a/src/libs/tracing/timelineitemsrenderpass.cpp b/src/libs/tracing/timelineitemsrenderpass.cpp index 2a4727f056..310c7bb6ef 100644 --- a/src/libs/tracing/timelineitemsrenderpass.cpp +++ b/src/libs/tracing/timelineitemsrenderpass.cpp @@ -39,8 +39,8 @@ public: QSGNode *expandedRow(int row) const { return m_expandedRows[row]; } QSGNode *collapsedRow(int row) const { return m_collapsedRows[row]; } - const QVector<QSGNode *> &expandedRows() const { return m_expandedRows; } - const QVector<QSGNode *> &collapsedRows() const { return m_collapsedRows; } + const QVector<QSGNode *> &expandedRows() const final { return m_expandedRows; } + const QVector<QSGNode *> &collapsedRows() const final { return m_collapsedRows; } TimelineItemsMaterial *collapsedRowMaterial() { return &m_collapsedRowMaterial; } int indexFrom() const { return m_indexFrom; } diff --git a/src/libs/tracing/timelinenotesrenderpass.cpp b/src/libs/tracing/timelinenotesrenderpass.cpp index de41d5a1b1..b1cb402ba8 100644 --- a/src/libs/tracing/timelinenotesrenderpass.cpp +++ b/src/libs/tracing/timelinenotesrenderpass.cpp @@ -39,8 +39,8 @@ struct Point2DWithDistanceFromTop { class NotesMaterial : public QSGMaterial { public: - QSGMaterialType *type() const; - QSGMaterialShader *createShader() const; + QSGMaterialType *type() const final; + QSGMaterialShader *createShader() const final; }; struct NotesGeometry @@ -61,8 +61,8 @@ public: ~TimelineNotesRenderPassState(); QSGNode *expandedRow(int row) const { return m_expandedRows[row]; } - QSGNode *collapsedOverlay() const { return m_collapsedOverlay; } - const QVector<QSGNode *> &expandedRows() const { return m_expandedRows; } + QSGNode *collapsedOverlay() const final { return m_collapsedOverlay; } + const QVector<QSGNode *> &expandedRows() const final { return m_expandedRows; } QSGGeometry *nullGeometry() { return &m_nullGeometry; } NotesMaterial *material() { return &m_material; } diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp index 953f96a9e2..ddb7690bc0 100644 --- a/src/plugins/android/createandroidmanifestwizard.cpp +++ b/src/plugins/android/createandroidmanifestwizard.cpp @@ -145,8 +145,8 @@ public: ChooseDirectoryPage(CreateAndroidManifestWizard *wizard); private: - void initializePage(); - bool isComplete() const; + void initializePage() final; + bool isComplete() const final; void checkPackageSourceDir(); CreateAndroidManifestWizard *m_wizard; diff --git a/src/plugins/autotest/testresultspane.h b/src/plugins/autotest/testresultspane.h index 0f3d05c1cf..b13796b5a9 100644 --- a/src/plugins/autotest/testresultspane.h +++ b/src/plugins/autotest/testresultspane.h @@ -69,7 +69,7 @@ signals: void copyShortcutTriggered(); protected: - void keyPressEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) final; }; class TestResultsPane : public Core::IOutputPane diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h index 389d0c555b..6621e78245 100644 --- a/src/plugins/autotest/testtreemodel.h +++ b/src/plugins/autotest/testtreemodel.h @@ -134,8 +134,8 @@ public: static FilterMode toFilterMode(int f); protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const; - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const final; + bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const final; private: Autotest::TestTreeItem::SortMode m_sortMode = Autotest::TestTreeItem::Alphabetically; diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.h b/src/plugins/boot2qt/qdbmakedefaultappservice.h index 4e900a0bb6..2c75016e64 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappservice.h +++ b/src/plugins/boot2qt/qdbmakedefaultappservice.h @@ -44,12 +44,12 @@ private: void handleStdErr(); void handleProcessFinished(const QString &error); - bool isDeploymentNecessary() const { return true; } - void doDeviceSetup() { handleDeviceSetupDone(true); } - void stopDeviceSetup() { handleDeviceSetupDone(false); } + bool isDeploymentNecessary() const final { return true; } + void doDeviceSetup() final { handleDeviceSetupDone(true); } + void stopDeviceSetup() final { handleDeviceSetupDone(false); } - void doDeploy(); - void stopDeployment(); + void doDeploy() final; + void stopDeployment() final; void cleanup(); diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index fde13609b6..e984eb846c 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -188,7 +188,7 @@ class SelectFixitsCheckBox : public QCheckBox Q_OBJECT private: - void nextCheckState() final override + void nextCheckState() final { setCheckState(checkState() == Qt::Checked ? Qt::Unchecked : Qt::Checked); } diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h index 7a9a1ecce6..75646ef265 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h @@ -57,8 +57,8 @@ private slots: #endif private: - bool initialize(const QStringList &arguments, QString *errorMessage); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorMessage) final; + void extensionsInitialized() final; void updateContextActions(); diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp index 59380bd191..6ca5443b80 100644 --- a/src/plugins/coreplugin/plugininstallwizard.cpp +++ b/src/plugins/coreplugin/plugininstallwizard.cpp @@ -130,7 +130,7 @@ public: emit completeChanged(); } - bool isComplete() const + bool isComplete() const final { const FilePath path = m_data->sourcePath; if (!QFile::exists(path.toString())) { @@ -148,7 +148,7 @@ public: return true; } - int nextId() const + int nextId() const final { if (hasLibSuffix(m_data->sourcePath)) return WizardPage::nextId() + 1; // jump over check archive @@ -192,7 +192,7 @@ public: vlayout->addWidget(m_output); } - void initializePage() + void initializePage() final { m_isComplete = false; emit completeChanged(); @@ -303,7 +303,7 @@ public: InfoLabel::Error}); } - void cleanupPage() + void cleanupPage() final { // back button pressed m_cancelButton->disconnect(); @@ -319,7 +319,7 @@ public: m_tempDir.reset(); } - bool isComplete() const { return m_isComplete; } + bool isComplete() const final { return m_isComplete; } std::unique_ptr<TemporaryDirectory> m_tempDir; Archive *m_archive = nullptr; @@ -402,7 +402,7 @@ public: vlayout->addWidget(m_summaryLabel); } - void initializePage() + void initializePage() final { m_summaryLabel->setText( PluginInstallWizard::tr("\"%1\" will be installed into \"%2\".") diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp index 3d388b74e4..c41df55807 100644 --- a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp +++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp @@ -62,8 +62,8 @@ public: : Utils::StaticTreeItem(text) {} - Qt::ItemFlags flags(int) const { return {}; } - QVariant data(int column, int role) const + Qt::ItemFlags flags(int) const final { return {}; } + QVariant data(int column, int role) const final { if (role == Qt::ForegroundRole) { // Avoid disabled color. diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index 5e48526a3d..bb17ee5996 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -385,8 +385,8 @@ public: m_group.insert(action(MaximalStringLength), spinBoxMaximalStringLength); } - void apply() { m_group.apply(ICore::settings()); } - void finish() { m_group.finish(); } + void apply() final { m_group.apply(ICore::settings()); } + void finish() final { m_group.finish(); } private: Utils::SavedActionSet m_group; diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index b354111bc9..91353479bd 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -204,7 +204,7 @@ private: ////////// General Interface ////////// void executeRunToFunction(const QString &functionName) final; void executeJumpToLine(const ContextData &data) final; void executeReturn() final; - void executeRecordReverse(bool reverse); + void executeRecordReverse(bool reverse) final; void handleExecuteContinue(const DebuggerResponse &response); void handleExecuteStep(const DebuggerResponse &response); diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h index 8dc4868a5e..60bbec5cd5 100644 --- a/src/plugins/designer/cpp/formclasswizard.h +++ b/src/plugins/designer/cpp/formclasswizard.h @@ -44,9 +44,9 @@ public: QString formSuffix() const; private: - Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const; + Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const final; - Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; + Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const final; }; } // namespace Internal diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h index 69b3deff45..93dcb8e603 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.h +++ b/src/plugins/designer/cpp/formclasswizarddialog.h @@ -50,10 +50,10 @@ public: Designer::FormClassWizardParameters parameters() const; - bool validateCurrentPage(); + bool validateCurrentPage() final; protected: - void initializePage(int id); + void initializePage(int id) final; private: FormTemplateWizardPage *m_formPage = nullptr; diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index 7a54226e06..fdad257c2d 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -78,7 +78,7 @@ private: Utils::FilePath buildCommand() const; bool init() final; - void setupOutputFormatter(Utils::OutputFormatter *formatter); + void setupOutputFormatter(Utils::OutputFormatter *formatter) final; void doRun() final; bool fromMap(const QVariantMap &map) final; QVariantMap toMap() const final; diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index d53550c2e4..fcc09f3a8b 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -98,7 +98,7 @@ class IosDeviceInfoWidget : public IDeviceWidget public: IosDeviceInfoWidget(const ProjectExplorer::IDevice::Ptr &device); - void updateDeviceFromUi() {} + void updateDeviceFromUi() final {} }; IosDevice::IosDevice(CtorHelper) diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h b/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h index 1ceffdac05..af40bf6826 100644 --- a/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h +++ b/src/plugins/mesonprojectmanager/project/mesonprojectimporter.h @@ -51,7 +51,7 @@ private: // will get one of the results from examineDirectory const QList<ProjectExplorer::BuildInfo> buildInfoList(void *directoryData) const final; - virtual void deleteDirectoryData(void *directoryData) const final; + void deleteDirectoryData(void *directoryData) const final; }; } // namespace Internal diff --git a/src/plugins/modeleditor/componentviewcontroller.cpp b/src/plugins/modeleditor/componentviewcontroller.cpp index e35f2c1cb8..d54fb7dd10 100644 --- a/src/plugins/modeleditor/componentviewcontroller.cpp +++ b/src/plugins/modeleditor/componentviewcontroller.cpp @@ -60,7 +60,7 @@ class FindComponentFromFilePath : public: void setFilePath(const QString &filePath); qmt::MComponent *component() const { return m_bestComponent; } - void visitMComponent(qmt::MComponent *component); + void visitMComponent(qmt::MComponent *component) final; private: QString m_elementName; @@ -122,7 +122,7 @@ public: void setModelController(qmt::ModelController *modelController); void setModelUtilities(ModelUtilities *modelUtilities); void updateFilePaths(); - void visitMComponent(qmt::MComponent *component); + void visitMComponent(qmt::MComponent *component) final; private: QStringList findFilePathOfComponent(const qmt::MComponent *component); diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index 45136440ed..cc4fceeb5c 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -201,8 +201,8 @@ class ModelIndexer::DiagramsCollectorVisitor : public: DiagramsCollectorVisitor(ModelIndexer::IndexedModel *indexedModel); - void visitMObject(const qmt::MObject *object); - void visitMDiagram(const qmt::MDiagram *diagram); + void visitMObject(const qmt::MObject *object) final; + void visitMDiagram(const qmt::MDiagram *diagram) final; private: ModelIndexer::IndexedModel *m_indexedModel; diff --git a/src/plugins/nim/editor/nimcompletionassistprovider.cpp b/src/plugins/nim/editor/nimcompletionassistprovider.cpp index df3fa232a7..f8e6a24042 100644 --- a/src/plugins/nim/editor/nimcompletionassistprovider.cpp +++ b/src/plugins/nim/editor/nimcompletionassistprovider.cpp @@ -91,7 +91,7 @@ public: return nullptr; } - bool running() + bool running() final { return m_running; } diff --git a/src/plugins/perfprofiler/perfprofilerstatisticsmodel.h b/src/plugins/perfprofiler/perfprofilerstatisticsmodel.h index 1b2fcd8654..6fc4ff816e 100644 --- a/src/plugins/perfprofiler/perfprofilerstatisticsmodel.h +++ b/src/plugins/perfprofiler/perfprofilerstatisticsmodel.h @@ -63,8 +63,8 @@ public: uint occurrences; }; - int columnCount(const QModelIndex &parent) const; - QVariant headerData(int section, Qt::Orientation orientation, int role) const; + int columnCount(const QModelIndex &parent) const final; + QVariant headerData(int section, Qt::Orientation orientation, int role) const final; void resort(); protected: @@ -135,9 +135,9 @@ public: PerfProfilerStatisticsRelativesModel(Relation relation, PerfProfilerStatisticsMainModel *parent); - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; - void sort(int column, Qt::SortOrder order); + int rowCount(const QModelIndex &parent) const final; + QVariant data(const QModelIndex &index, int role) const final; + void sort(int column, Qt::SortOrder order) final; void sortForInsert(); void selectByTypeId(int typeId); diff --git a/src/plugins/perfprofiler/perfprofilerstatisticsview.cpp b/src/plugins/perfprofiler/perfprofilerstatisticsview.cpp index 78e9b57e7e..7f7875b895 100644 --- a/src/plugins/perfprofiler/perfprofilerstatisticsview.cpp +++ b/src/plugins/perfprofiler/perfprofilerstatisticsview.cpp @@ -55,7 +55,7 @@ class HexNumberDelegate : public QStyledItemDelegate public: HexNumberDelegate(QObject *parent = nullptr) : QStyledItemDelegate(parent) {} - QString displayText(const QVariant &value, const QLocale &locale) const + QString displayText(const QVariant &value, const QLocale &locale) const final { Q_UNUSED(locale) return QString::fromLatin1("0x%1").arg(value.toULongLong(), 16, 16, QLatin1Char('0')); diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index cdc5d3a4c7..d990d59f39 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -53,7 +53,7 @@ class ProcessStep final : public AbstractProcessStep public: ProcessStep(BuildStepList *bsl, Id id); - void setupOutputFormatter(OutputFormatter *formatter); + void setupOutputFormatter(OutputFormatter *formatter) final; }; ProcessStep::ProcessStep(BuildStepList *bsl, Id id) diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 332114d055..4aad5c4bfd 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -356,13 +356,13 @@ private: return HostOsInfo::isWindowsHost() && e->button() == Qt::RightButton; } - void mousePressEvent(QMouseEvent *e) + void mousePressEvent(QMouseEvent *e) final { if (!userWantsContextMenu(e)) BaseTreeView::mousePressEvent(e); } - void mouseReleaseEvent(QMouseEvent *e) + void mouseReleaseEvent(QMouseEvent *e) final { if (!userWantsContextMenu(e)) BaseTreeView::mouseReleaseEvent(e); diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index b27bc178ea..42f1002608 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -309,7 +309,7 @@ public: void redetectToolchains(); - void apply(); + void apply() final; private: TreeModel<TreeItem, ToolChainTreeItem> m_model; diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.h b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.h index 0615cdb217..68600e342d 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.h +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.h @@ -42,8 +42,8 @@ class AssetExporterPlugin : public QObject, QmlDesigner::IWidgetPlugin public: AssetExporterPlugin(); - QString metaInfo() const; - QString pluginName() const; + QString metaInfo() const final; + QString pluginName() const final; private: void onExport(); diff --git a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.h b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.h index 33b9d1830e..2b0ee223bc 100644 --- a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.h +++ b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.h @@ -70,9 +70,9 @@ public: ~BindingDocument(); protected: - void applyFontSettings(); + void applyFontSettings() final; - void triggerPendingUpdates(); + void triggerPendingUpdates() final; private: QmlJSEditor::SemanticHighlighter *m_semanticHighlighter = nullptr; diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index cd0001e946..f974a90685 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -103,7 +103,7 @@ public: return m_version; } - QVariant data(int column, int role) const + QVariant data(int column, int role) const final { if (!m_version) return TreeItem::data(column, role); |