aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-11-18 17:04:54 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-11-19 09:45:53 +0000
commit48c2afe1576932ebeea1307e4e312e69a50955b6 (patch)
treeeaf6269000b4ba96c1453ea45ee2a6dbea1d39bf
parentb2a766a79ac778febff87f0def34cf6d3f4f93e3 (diff)
Decorate some classes and methods with final keyword
This way we silence the clang warnings about calling virtual methods from c'tor or from d'tor: [clang-analyzer-optin.cplusplus.VirtualCall] Change-Id: I8d6318b490152133da4833bda2ba28622bce30dd Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/advanceddockingsystem/workspacemodel.h2
-rw-r--r--src/libs/utils/flowlayout.h2
-rw-r--r--src/libs/utils/progressindicator.h2
-rw-r--r--src/plugins/android/androidruncontrol.h2
-rw-r--r--src/plugins/clangcodemodel/clanghoverhandler.h2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakekitinformation.cpp6
-rw-r--r--src/plugins/coreplugin/locator/basefilefilter.h2
-rw-r--r--src/plugins/cpptools/cppincludesfilter.cpp2
-rw-r--r--src/plugins/debugger/console/console.h2
-rw-r--r--src/plugins/debugger/debuggerkitinformation.cpp2
-rw-r--r--src/plugins/diffeditor/unifieddiffeditorwidget.h2
-rw-r--r--src/plugins/ios/iostoolhandler.cpp2
-rw-r--r--src/plugins/languageclient/languageclientcompletionassist.cpp2
-rw-r--r--src/plugins/languageclient/languageclienthoverhandler.h2
-rw-r--r--src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h4
-rw-r--r--src/plugins/projectexplorer/compileoutputwindow.h2
-rw-r--r--src/plugins/projectexplorer/kitinformation.cpp8
-rw-r--r--src/plugins/projectexplorer/taskwindow.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildstep.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbscleanstep.h2
-rw-r--r--src/plugins/qbsprojectmanager/qbsinstallstep.h2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakekitinformation.cpp2
-rw-r--r--src/plugins/qmldesigner/components/componentcore/abstractaction.h2
-rw-r--r--src/plugins/qtsupport/qtkitinformation.cpp2
-rw-r--r--src/plugins/scxmleditor/plugin_interface/parallelitem.h2
-rw-r--r--src/plugins/scxmleditor/plugin_interface/scshapeprovider.h2
-rw-r--r--src/plugins/texteditor/findincurrentfile.h2
-rw-r--r--src/plugins/updateinfo/updateinfoplugin.h2
28 files changed, 34 insertions, 34 deletions
diff --git a/src/libs/advanceddockingsystem/workspacemodel.h b/src/libs/advanceddockingsystem/workspacemodel.h
index 9b4ce5fc48b..ecde0e91318 100644
--- a/src/libs/advanceddockingsystem/workspacemodel.h
+++ b/src/libs/advanceddockingsystem/workspacemodel.h
@@ -44,7 +44,7 @@ namespace ADS {
class DockManager;
class WorkspaceNameInputDialog;
-class WorkspaceModel : public QAbstractTableModel
+class WorkspaceModel final : public QAbstractTableModel
{
Q_OBJECT
diff --git a/src/libs/utils/flowlayout.h b/src/libs/utils/flowlayout.h
index ed150163161..7e70e152104 100644
--- a/src/libs/utils/flowlayout.h
+++ b/src/libs/utils/flowlayout.h
@@ -32,7 +32,7 @@
namespace Utils {
-class QTCREATOR_UTILS_EXPORT FlowLayout : public QLayout
+class QTCREATOR_UTILS_EXPORT FlowLayout final : public QLayout
{
public:
explicit FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1);
diff --git a/src/libs/utils/progressindicator.h b/src/libs/utils/progressindicator.h
index 0d13cf89524..1cf41806c87 100644
--- a/src/libs/utils/progressindicator.h
+++ b/src/libs/utils/progressindicator.h
@@ -53,7 +53,7 @@ public:
ProgressIndicatorPainter(ProgressIndicatorSize size);
virtual ~ProgressIndicatorPainter() = default;
- virtual void setIndicatorSize(ProgressIndicatorSize size);
+ void setIndicatorSize(ProgressIndicatorSize size);
ProgressIndicatorSize indicatorSize() const;
void setUpdateCallback(const UpdateCallback &cb);
diff --git a/src/plugins/android/androidruncontrol.h b/src/plugins/android/androidruncontrol.h
index 3fa963812e4..a8c782acdbd 100644
--- a/src/plugins/android/androidruncontrol.h
+++ b/src/plugins/android/androidruncontrol.h
@@ -34,7 +34,7 @@ namespace Internal {
class AndroidRunner;
-class AndroidRunSupport : public AndroidRunner
+class AndroidRunSupport final : public AndroidRunner
{
Q_OBJECT
diff --git a/src/plugins/clangcodemodel/clanghoverhandler.h b/src/plugins/clangcodemodel/clanghoverhandler.h
index 0bf1d88ee38..6f26926e926 100644
--- a/src/plugins/clangcodemodel/clanghoverhandler.h
+++ b/src/plugins/clangcodemodel/clanghoverhandler.h
@@ -32,7 +32,7 @@
namespace ClangCodeModel {
namespace Internal {
-class ClangHoverHandler : public TextEditor::BaseHoverHandler
+class ClangHoverHandler final : public TextEditor::BaseHoverHandler
{
Q_DECLARE_TR_FUNCTIONS(ClangHoverHandler)
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index bfafbd42ac0..fc1a4d01516 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -74,7 +74,7 @@ static Utils::Id defaultCMakeToolId()
static const char TOOL_ID[] = "CMakeProjectManager.CMakeKitInformation";
-class CMakeKitAspectWidget : public KitAspectWidget
+class CMakeKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeKitAspect)
public:
@@ -316,7 +316,7 @@ static const char EXTRA_GENERATOR_KEY[] = "ExtraGenerator";
static const char PLATFORM_KEY[] = "Platform";
static const char TOOLSET_KEY[] = "Toolset";
-class CMakeGeneratorKitAspectWidget : public KitAspectWidget
+class CMakeGeneratorKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeGeneratorKitAspect)
public:
@@ -822,7 +822,7 @@ static const char CMAKE_CXX_TOOLCHAIN_KEY[] = "CMAKE_CXX_COMPILER";
static const char CMAKE_QMAKE_KEY[] = "QT_QMAKE_EXECUTABLE";
static const char CMAKE_PREFIX_PATH_KEY[] = "CMAKE_PREFIX_PATH";
-class CMakeConfigurationKitAspectWidget : public KitAspectWidget
+class CMakeConfigurationKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeConfigurationKitAspect)
public:
diff --git a/src/plugins/coreplugin/locator/basefilefilter.h b/src/plugins/coreplugin/locator/basefilefilter.h
index e988d4a12f3..29e0546e9b2 100644
--- a/src/plugins/coreplugin/locator/basefilefilter.h
+++ b/src/plugins/coreplugin/locator/basefilefilter.h
@@ -49,7 +49,7 @@ public:
virtual Utils::FilePath filePath() const = 0;
};
- class CORE_EXPORT ListIterator : public Iterator {
+ class CORE_EXPORT ListIterator final : public Iterator {
public:
ListIterator(const Utils::FilePaths &filePaths);
diff --git a/src/plugins/cpptools/cppincludesfilter.cpp b/src/plugins/cpptools/cppincludesfilter.cpp
index 146a548c025..7286982c91e 100644
--- a/src/plugins/cpptools/cppincludesfilter.cpp
+++ b/src/plugins/cpptools/cppincludesfilter.cpp
@@ -43,7 +43,7 @@ using namespace Utils;
namespace CppTools {
namespace Internal {
-class CppIncludesIterator : public BaseFileFilter::Iterator
+class CppIncludesIterator final : public BaseFileFilter::Iterator
{
public:
CppIncludesIterator(CPlusPlus::Snapshot snapshot, const QSet<QString> &seedPaths);
diff --git a/src/plugins/debugger/console/console.h b/src/plugins/debugger/console/console.h
index 10800e93ef6..21fbc277b50 100644
--- a/src/plugins/debugger/console/console.h
+++ b/src/plugins/debugger/console/console.h
@@ -48,7 +48,7 @@ using ScriptEvaluator = std::function<void (QString)>;
class ConsoleItemModel;
class ConsoleView;
-class Console : public Core::IOutputPane
+class Console final : public Core::IOutputPane
{
Q_OBJECT
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index 3893f227688..bf3a5977aa6 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -55,7 +55,7 @@ namespace Debugger {
namespace Internal {
-class DebuggerKitAspectWidget : public KitAspectWidget
+class DebuggerKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(Debugger::DebuggerKitAspect)
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.h b/src/plugins/diffeditor/unifieddiffeditorwidget.h
index cea94acdafd..d5f6811ded7 100644
--- a/src/plugins/diffeditor/unifieddiffeditorwidget.h
+++ b/src/plugins/diffeditor/unifieddiffeditorwidget.h
@@ -45,7 +45,7 @@ namespace Internal {
class DiffEditorDocument;
-class UnifiedDiffEditorWidget : public SelectableTextEditorWidget
+class UnifiedDiffEditorWidget final : public SelectableTextEditorWidget
{
Q_OBJECT
public:
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 3d55dbb6662..f9318712a68 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -218,7 +218,7 @@ protected:
IosDeviceType m_devType;
};
-class IosDeviceToolHandlerPrivate : public IosToolHandlerPrivate
+class IosDeviceToolHandlerPrivate final : public IosToolHandlerPrivate
{
enum State {
NonStarted,
diff --git a/src/plugins/languageclient/languageclientcompletionassist.cpp b/src/plugins/languageclient/languageclientcompletionassist.cpp
index 2114257faef..950b58e6549 100644
--- a/src/plugins/languageclient/languageclientcompletionassist.cpp
+++ b/src/plugins/languageclient/languageclientcompletionassist.cpp
@@ -271,7 +271,7 @@ public:
};
-class LanguageClientCompletionAssistProcessor : public IAssistProcessor
+class LanguageClientCompletionAssistProcessor final : public IAssistProcessor
{
public:
LanguageClientCompletionAssistProcessor(Client *client);
diff --git a/src/plugins/languageclient/languageclienthoverhandler.h b/src/plugins/languageclient/languageclienthoverhandler.h
index c702cd3c585..4c09f11063c 100644
--- a/src/plugins/languageclient/languageclienthoverhandler.h
+++ b/src/plugins/languageclient/languageclienthoverhandler.h
@@ -32,7 +32,7 @@ namespace LanguageClient {
class Client;
-class HoverHandler : public TextEditor::BaseHoverHandler
+class HoverHandler final : public TextEditor::BaseHoverHandler
{
Q_DECLARE_TR_FUNCTIONS(HoverHandler)
public:
diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h b/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h
index 68d077a1d13..83d4deee8c8 100644
--- a/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h
+++ b/src/plugins/mesonprojectmanager/mesoninfoparser/buildoptions.h
@@ -145,7 +145,7 @@ protected:
QString m_currentValue;
};
-struct FeatureBuildOption : BuildOption
+struct FeatureBuildOption final : BuildOption
{
QVariant value() const override { return QVariant::fromValue(m_currentValue); }
QString valueStr() const override { return m_currentValue.value(); }
@@ -225,7 +225,7 @@ protected:
QStringList m_currentValue;
};
-struct BooleanBuildOption : BuildOption
+struct BooleanBuildOption final : BuildOption
{
QVariant value() const override { return m_currentValue; }
QString valueStr() const override
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index babdfc17dfb..24265f42198 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -47,7 +47,7 @@ namespace Internal {
class ShowOutputTaskHandler;
class CompileOutputTextEdit;
-class CompileOutputWindow : public Core::IOutputPane
+class CompileOutputWindow final : public Core::IOutputPane
{
Q_OBJECT
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 8649a22cc32..1e0f8f73055 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -205,7 +205,7 @@ void SysRootKitAspect::setSysRoot(Kit *k, const Utils::FilePath &v)
// --------------------------------------------------------------------------
namespace Internal {
-class ToolChainKitAspectWidget : public KitAspectWidget
+class ToolChainKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::ToolChainKitAspect)
@@ -693,7 +693,7 @@ void ToolChainKitAspect::toolChainRemoved(ToolChain *tc)
// DeviceTypeKitAspect:
// --------------------------------------------------------------------------
namespace Internal {
-class DeviceTypeKitAspectWidget : public KitAspectWidget
+class DeviceTypeKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::DeviceTypeKitAspect)
@@ -811,7 +811,7 @@ QSet<Utils::Id> DeviceTypeKitAspect::availableFeatures(const Kit *k) const
// DeviceKitAspect:
// --------------------------------------------------------------------------
namespace Internal {
-class DeviceKitAspectWidget : public KitAspectWidget
+class DeviceKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::DeviceKitAspect)
@@ -1062,7 +1062,7 @@ void DeviceKitAspect::devicesChanged()
// EnvironmentKitAspect:
// --------------------------------------------------------------------------
namespace Internal {
-class EnvironmentKitAspectWidget : public KitAspectWidget
+class EnvironmentKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::EnvironmentKitAspect)
diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h
index 98877157959..69efe999662 100644
--- a/src/plugins/projectexplorer/taskwindow.h
+++ b/src/plugins/projectexplorer/taskwindow.h
@@ -43,7 +43,7 @@ namespace Internal {
class TaskWindowPrivate;
// Show issues (warnings or errors) and open the editor on click.
-class TaskWindow : public Core::IOutputPane
+class TaskWindow final : public Core::IOutputPane
{
Q_OBJECT
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index ea9109169d0..06e676e7943 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -39,7 +39,7 @@ class QbsSession;
class QbsBuildStepConfigWidget;
-class QbsBuildStep : public ProjectExplorer::BuildStep
+class QbsBuildStep final : public ProjectExplorer::BuildStep
{
Q_OBJECT
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h
index 3e2f87e6021..c8f96b958e1 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.h
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.h
@@ -38,7 +38,7 @@ namespace Internal {
class ErrorInfo;
class QbsSession;
-class QbsCleanStep : public ProjectExplorer::BuildStep
+class QbsCleanStep final : public ProjectExplorer::BuildStep
{
Q_OBJECT
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h
index 537b7053e63..76ed9ad2aa2 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.h
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h
@@ -39,7 +39,7 @@ namespace Internal {
class ErrorInfo;
class QbsSession;
-class QbsInstallStep : public ProjectExplorer::BuildStep
+class QbsInstallStep final : public ProjectExplorer::BuildStep
{
Q_OBJECT
diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
index 07dc1d66b16..631f9ee3ee6 100644
--- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
@@ -45,7 +45,7 @@ using namespace Utils;
namespace QmakeProjectManager {
namespace Internal {
-class QmakeKitAspectWidget : public KitAspectWidget
+class QmakeKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(QmakeProjectManager::Internal::QmakeKitAspect)
diff --git a/src/plugins/qmldesigner/components/componentcore/abstractaction.h b/src/plugins/qmldesigner/components/componentcore/abstractaction.h
index 9fd34d92229..39c5c19f4a7 100644
--- a/src/plugins/qmldesigner/components/componentcore/abstractaction.h
+++ b/src/plugins/qmldesigner/components/componentcore/abstractaction.h
@@ -56,7 +56,7 @@ public:
AbstractAction(const QString &description = QString());
AbstractAction(DefaultAction *action);
- QAction *action() const override;
+ QAction *action() const override final;
DefaultAction *defaultAction() const;
void currentContextChanged(const SelectionContext &selectionContext) override;
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp
index 2b94066158c..b867c173bf4 100644
--- a/src/plugins/qtsupport/qtkitinformation.cpp
+++ b/src/plugins/qtsupport/qtkitinformation.cpp
@@ -49,7 +49,7 @@ using namespace Utils;
namespace QtSupport {
namespace Internal {
-class QtKitAspectWidget : public KitAspectWidget
+class QtKitAspectWidget final : public KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(QtSupport::QtKitAspectWidget)
public:
diff --git a/src/plugins/scxmleditor/plugin_interface/parallelitem.h b/src/plugins/scxmleditor/plugin_interface/parallelitem.h
index 8b0ae52ec63..27a789c8b51 100644
--- a/src/plugins/scxmleditor/plugin_interface/parallelitem.h
+++ b/src/plugins/scxmleditor/plugin_interface/parallelitem.h
@@ -34,7 +34,7 @@ namespace PluginInterface {
/**
* @brief The ParalllelItem class represents Parallel-state of the SCXML-standard. It is a extended class from the StateItem.
*/
-class ParallelItem : public StateItem
+class ParallelItem final : public StateItem
{
public:
explicit ParallelItem(const QPointF &pos = QPointF(), BaseItem *parent = nullptr);
diff --git a/src/plugins/scxmleditor/plugin_interface/scshapeprovider.h b/src/plugins/scxmleditor/plugin_interface/scshapeprovider.h
index f3a97842687..98a2e626cc4 100644
--- a/src/plugins/scxmleditor/plugin_interface/scshapeprovider.h
+++ b/src/plugins/scxmleditor/plugin_interface/scshapeprovider.h
@@ -35,7 +35,7 @@ namespace PluginInterface {
class ScxmlTag;
-class SCShapeProvider : public ShapeProvider
+class SCShapeProvider final : public ShapeProvider
{
Q_OBJECT
public:
diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h
index 59015a9cfe0..a321dc363d2 100644
--- a/src/plugins/texteditor/findincurrentfile.h
+++ b/src/plugins/texteditor/findincurrentfile.h
@@ -37,7 +37,7 @@ class IDocument;
namespace TextEditor {
namespace Internal {
-class FindInCurrentFile : public BaseFileFind
+class FindInCurrentFile final : public BaseFileFind
{
Q_OBJECT
diff --git a/src/plugins/updateinfo/updateinfoplugin.h b/src/plugins/updateinfo/updateinfoplugin.h
index ecd3c6f1350..4140107f3ea 100644
--- a/src/plugins/updateinfo/updateinfoplugin.h
+++ b/src/plugins/updateinfo/updateinfoplugin.h
@@ -37,7 +37,7 @@ namespace Internal {
class UpdateInfoPluginPrivate;
-class UpdateInfoPlugin : public ExtensionSystem::IPlugin
+class UpdateInfoPlugin final : public ExtensionSystem::IPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "UpdateInfo.json")