diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp index 05d63aedc78..edca2360b33 100644 --- a/src/plugins/coreplugin/plugindialog.cpp +++ b/src/plugins/coreplugin/plugindialog.cpp @@ -98,7 +98,7 @@ void PluginDialog::closeDialog() void PluginDialog::showInstallWizard() { - if (PluginInstallWizard::exec()) + if (executePluginInstallWizard()) m_isRestartRequired = true; } diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp index bc69e66913e..250ed0a31a5 100644 --- a/src/plugins/coreplugin/plugininstallwizard.cpp +++ b/src/plugins/coreplugin/plugininstallwizard.cpp @@ -71,7 +71,6 @@ static FilePath pluginInstallPath(bool installIntoApplication) } namespace Core { -namespace Internal { class SourcePage : public WizardPage { @@ -145,7 +144,7 @@ struct ArchiveIssue // Async. Result is set if any issue was found. void checkContents(QPromise &promise, const FilePath &tempDir) { - PluginSpec *coreplugin = PluginManager::specForPlugin(CorePlugin::instance()); + PluginSpec *coreplugin = PluginManager::specForPlugin(Internal::CorePlugin::instance()); // look for plugin QDirIterator it(tempDir.path(), libraryNameFilter(), QDir::Files | QDir::NoSymLinks, @@ -397,7 +396,7 @@ static bool copyPluginFile(const FilePath &src, const FilePath &dest) return true; } -bool PluginInstallWizard::exec(const FilePath &archive) +bool executePluginInstallWizard(const FilePath &archive) { Wizard wizard(ICore::dialogParent()); wizard.setWindowTitle(Tr::tr("Install Plugin")); @@ -442,5 +441,4 @@ bool PluginInstallWizard::exec(const FilePath &archive) return false; } -} // namespace Internal } // namespace Core diff --git a/src/plugins/coreplugin/plugininstallwizard.h b/src/plugins/coreplugin/plugininstallwizard.h index 076661b83cc..c5b1fb5d654 100644 --- a/src/plugins/coreplugin/plugininstallwizard.h +++ b/src/plugins/coreplugin/plugininstallwizard.h @@ -3,18 +3,14 @@ #pragma once +#include "core_global.h" + #include #include namespace Core { -namespace Internal { -class PluginInstallWizard -{ -public: - static bool exec(const Utils::FilePath &archive = {}); -}; +CORE_EXPORT bool executePluginInstallWizard(const Utils::FilePath &archive = {}); -} // namespace Internal } // namespace Core