feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Coco: Move plugin class definition to .cpp

Browse Source 
Change-Id: Ic183657636ab2d8094eee5253a0d6679ea5a805d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2023-12-19 18:29:22 +01:00
parent 3f24752247
commit 913a17734b
4 changed files with 78 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coco/CMakeLists.txt
View File

@@ -2,6 +2,6 @@ add_qtc_plugin(Coco
PLUGIN_DEPENDS Core LanguageClient PLUGIN_DEPENDS Core LanguageClient
SOURCES SOURCES
cocolanguageclient.cpp cocolanguageclient.h cocolanguageclient.cpp cocolanguageclient.h
cocoplugin.cpp cocoplugin.h cocoplugin.cpp
cocotr.h cocotr.h
) )

1
src/plugins/coco/coco.qbs
View File

@@ -11,7 +11,6 @@ QtcPlugin {
files: [ files: [
"cocoplugin.cpp", "cocoplugin.cpp",
"cocoplugin.h",
"cocolanguageclient.cpp", "cocolanguageclient.cpp",
"cocolanguageclient.h", "cocolanguageclient.h",
] ]

62
src/plugins/coco/cocoplugin.cpp
View File

@@ -1,15 +1,17 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "cocoplugin.h"
#include "cocolanguageclient.h" #include "cocolanguageclient.h"
#include "cocotr.h" #include "cocotr.h"
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <debugger/analyzer/analyzerconstants.h> #include <debugger/analyzer/analyzerconstants.h>
#include <extensionsystem/iplugin.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
@@ -21,16 +23,32 @@ using namespace Utils;
namespace Coco { namespace Coco {
class CocoPluginPrivate class CocoPlugin final : public ExtensionSystem::IPlugin
{ {
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Coco.json")
public: public:
void startCoco(); ~CocoPlugin() final
{
// FIXME: Kill m_client?
}
CocoLanguageClient *m_client = nullptr; void initialize() final
}; {
using namespace Core;
ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
if (menu) {
auto startCoco = new QAction("Squish Coco ...", this);
Command *cmd = ActionManager::registerAction(startCoco, "Coco.startCoco");
menu->addAction(cmd, Debugger::Constants::G_ANALYZER_TOOLS);
void CocoPluginPrivate::startCoco() connect(startCoco, &QAction::triggered, this, [this] { this->startCoco(); });
{ }
}
void startCoco()
{
if (m_client) if (m_client)
m_client->shutdown(); m_client->shutdown();
m_client = nullptr; m_client = nullptr;
@@ -76,30 +94,12 @@ void CocoPluginPrivate::startCoco()
m_client->start(); m_client->start();
} }
} }
}
CocoPlugin::CocoPlugin()
: d (new CocoPluginPrivate)
{}
CocoPlugin::~CocoPlugin()
{
delete d;
}
void CocoPlugin::initialize()
{
using namespace Core;
ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
if (menu) {
auto startCoco = new QAction("Squish Coco ...", this);
Command *cmd = ActionManager::registerAction(startCoco, "Coco.startCoco");
menu->addAction(cmd, Debugger::Constants::G_ANALYZER_TOOLS);
connect(startCoco, &QAction::triggered, this, [this] { d->startCoco(); });
} }
}
private:
CocoLanguageClient *m_client = nullptr;
};
} // namespace Coco } // namespace Coco
#include "cocoplugin.moc"

26
src/plugins/coco/cocoplugin.h
View File

@@ -1,26 +0,0 @@
// Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include <extensionsystem/iplugin.h>
namespace Coco {
class CocoPluginPrivate;
class CocoPlugin : public ExtensionSystem::IPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Coco.json")
public:
CocoPlugin();
~CocoPlugin() override;
void initialize() override;
private:
CocoPluginPrivate *d;
};
} // namespace Coco