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

ExtensionSystem: Remove the IPlugin back pointer to pluginspec

Browse Source 
The price of having to loop in two places seems small compared
to cleaner relations between the classes.

There's a new hack in the helpmanager to make sure we aren't
looping to often. The hack wouldn't be needed if the (odd(?))
check there weren't there.

Change-Id: Ifed50213b2de8feedfb45c185808d163c00c19ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-02-09 07:23:39 +01:00
parent 2a2f6afb04
commit 4b9aaf6ca1
13 changed files with 41 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/coreplugin/helpmanager.cpp
View File

@@ -5,7 +5,9 @@
#include "coreplugin.h"
#include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginspec.h>
#include <utils/qtcassert.h>
#include <QCoreApplication>
@@ -22,12 +24,17 @@ static Implementation *m_instance = nullptr;
static bool checkInstance()
{
auto plugin = Internal::CorePlugin::instance();
// HelpManager API can only be used after the actual implementation has been created by the
// Help plugin, so check that the plugins have all been created. That is the case
// when the Core plugin is initialized.
QTC_CHECK(plugin && plugin->pluginSpec()
&& plugin->pluginSpec()->state() >= ExtensionSystem::PluginSpec::Initialized);
static bool afterPluginCreation = false;
if (!afterPluginCreation) {
using namespace ExtensionSystem;
auto plugin = Internal::CorePlugin::instance();
// HelpManager API can only be used after the actual implementation has been created by the
// Help plugin, so check that the plugins have all been created. That is the case
// when the Core plugin is initialized.
PluginSpec *pluginSpec = PluginManager::specForPlugin(plugin);
afterPluginCreation = (plugin && pluginSpec && pluginSpec->state() >= PluginSpec::Initialized);
QTC_CHECK(afterPluginCreation);
}
return m_instance != nullptr;
}