diff options
author | hjk <hjk@qt.io> | 2024-01-12 17:48:01 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2024-01-12 17:00:50 +0000 |
commit | bc14d32a8cf8e5c2dddfd02fa6e8bf1227bbf877 (patch) | |
tree | 75fcf97f76691799ce2a9be20d86fda2f67d1902 | |
parent | a3bad897af32d7e0069d8b82a74cec89fa427844 (diff) |
CppCheck: Hide plugin class definition in .cpp
Change-Id: I960ec6e0e4d63cf0edf7af55d191ba666f44739b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
-rw-r--r-- | src/plugins/cppcheck/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/cppcheck/cppcheck.qbs | 1 | ||||
-rw-r--r-- | src/plugins/cppcheck/cppcheckplugin.cpp | 62 | ||||
-rw-r--r-- | src/plugins/cppcheck/cppcheckplugin.h | 29 |
4 files changed, 35 insertions, 59 deletions
diff --git a/src/plugins/cppcheck/CMakeLists.txt b/src/plugins/cppcheck/CMakeLists.txt index fb1aea634c..6404ee1087 100644 --- a/src/plugins/cppcheck/CMakeLists.txt +++ b/src/plugins/cppcheck/CMakeLists.txt @@ -8,7 +8,7 @@ add_qtc_plugin(Cppcheck cppcheckdiagnosticsmodel.cpp cppcheckdiagnosticsmodel.h cppcheckdiagnosticview.cpp cppcheckdiagnosticview.h cppcheckmanualrundialog.cpp cppcheckmanualrundialog.h - cppcheckplugin.cpp cppcheckplugin.h + cppcheckplugin.cpp cppcheckrunner.cpp cppcheckrunner.h cppchecksettings.cpp cppchecksettings.h cppchecktextmark.cpp cppchecktextmark.h diff --git a/src/plugins/cppcheck/cppcheck.qbs b/src/plugins/cppcheck/cppcheck.qbs index f1a8026fed..86510243bc 100644 --- a/src/plugins/cppcheck/cppcheck.qbs +++ b/src/plugins/cppcheck/cppcheck.qbs @@ -24,7 +24,6 @@ QtcPlugin { "cppcheckmanualrundialog.cpp", "cppcheckmanualrundialog.h", "cppcheckplugin.cpp", - "cppcheckplugin.h", "cppcheckrunner.cpp", "cppcheckrunner.h", "cppchecksettings.cpp", diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp index 56e8bb1d1f..496d9af6cd 100644 --- a/src/plugins/cppcheck/cppcheckplugin.cpp +++ b/src/plugins/cppcheck/cppcheckplugin.cpp @@ -1,8 +1,6 @@ // Copyright (C) 2018 Sergey Morozov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "cppcheckplugin.h" - #include "cppcheckconstants.h" #include "cppcheckdiagnosticview.h" #include "cppchecksettings.h" @@ -13,6 +11,14 @@ #include "cppcheckdiagnosticsmodel.h" #include "cppcheckmanualrundialog.h" +#include <coreplugin/actionmanager/actioncontainer.h> +#include <coreplugin/actionmanager/actionmanager.h> + +#include <debugger/analyzer/analyzerconstants.h> +#include <debugger/debuggermainwindow.h> + +#include <extensionsystem/iplugin.h> + #include <projectexplorer/kitaspects.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> @@ -20,12 +26,6 @@ #include <projectexplorer/projectmanager.h> #include <projectexplorer/target.h> -#include <coreplugin/actionmanager/actioncontainer.h> -#include <coreplugin/actionmanager/actionmanager.h> - -#include <debugger/analyzer/analyzerconstants.h> -#include <debugger/debuggermainwindow.h> - #include <utils/layoutbuilder.h> #include <utils/qtcassert.h> #include <utils/utilsicons.h> @@ -139,30 +139,36 @@ void CppcheckPluginPrivate::updateManualRunAction() manualRunAction->setEnabled(canRun); } -CppcheckPlugin::CppcheckPlugin() = default; - -CppcheckPlugin::~CppcheckPlugin() = default; - -void CppcheckPlugin::initialize() +class CppcheckPlugin final : public ExtensionSystem::IPlugin { - d.reset(new CppcheckPluginPrivate); - - using namespace Core; - ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER); + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Cppcheck.json") + void initialize() final { - auto action = new QAction(Tr::tr("Cppcheck..."), this); - menu->addAction(ActionManager::registerAction(action, Constants::MANUAL_RUN_ACTION), - Debugger::Constants::G_ANALYZER_TOOLS); - connect(action, &QAction::triggered, - d.get(), &CppcheckPluginPrivate::startManualRun); - d->manualRunAction = action; + d.reset(new CppcheckPluginPrivate); + + using namespace Core; + ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER); + + { + auto action = new QAction(Tr::tr("Cppcheck..."), this); + menu->addAction(ActionManager::registerAction(action, Constants::MANUAL_RUN_ACTION), + Debugger::Constants::G_ANALYZER_TOOLS); + connect(action, &QAction::triggered, + d.get(), &CppcheckPluginPrivate::startManualRun); + d->manualRunAction = action; + } + + using ProjectExplorer::ProjectExplorerPlugin; + connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated, + d.get(), &CppcheckPluginPrivate::updateManualRunAction); + d->updateManualRunAction(); } - using ProjectExplorer::ProjectExplorerPlugin; - connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated, - d.get(), &CppcheckPluginPrivate::updateManualRunAction); - d->updateManualRunAction(); -} + std::unique_ptr<CppcheckPluginPrivate> d; +}; } // Cppcheck::Internal + +#include "cppcheckplugin.moc" diff --git a/src/plugins/cppcheck/cppcheckplugin.h b/src/plugins/cppcheck/cppcheckplugin.h deleted file mode 100644 index d6911b5638..0000000000 --- a/src/plugins/cppcheck/cppcheckplugin.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2018 Sergey Morozov -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include <extensionsystem/iplugin.h> - -#include <memory> - -namespace Cppcheck::Internal { - -class CppcheckPluginPrivate; - -class CppcheckPlugin final : public ExtensionSystem::IPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Cppcheck.json") - -public: - CppcheckPlugin(); - ~CppcheckPlugin() override; - -private: - void initialize() final; - - std::unique_ptr<CppcheckPluginPrivate> d; -}; - -} // Cppcheck |