diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index ffa050e5a056e3e35579d00390e7df4a61e196fd..e4ce23df18a9cf9960937761846b1d02c4759ba2 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -185,6 +185,8 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
InfoBar::initializeGloballySuppressed();
}
+ IWizardFactory::initialize();
+
// Make sure we respect the process's umask when creating new files
SaveFile::initializeUmask();
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index dce4a74a21f8063927234673f04632eb78446312..3550d827bdde0080703fddbd6bc8eba62e482f33 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -533,11 +533,6 @@ void ICore::openFiles(const QStringList &arguments, ICore::OpenFilesFlags flags)
m_mainwindow->openFiles(arguments, flags);
}
-void ICore::emitNewItemsDialogRequested()
-{
- emit m_instance->newItemsDialogRequested();
-}
-
void ICore::saveSettings()
{
emit m_instance->saveSettingsRequested();
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index ffb45dcd7c43a014b169207afaa8b6f864359122..61df88c61b202f6c5d24c73ac9e141b5c4b29039 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -123,15 +123,12 @@ public:
};
static void openFiles(const QStringList &fileNames, OpenFilesFlags flags = None);
- static void emitNewItemsDialogRequested();
-
public slots:
static void saveSettings();
signals:
void coreAboutToOpen();
void coreOpened();
- void newItemsDialogRequested();
void newItemDialogRunningChanged();
void saveSettingsRequested();
void optionsDialogRequested();
diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp
index 4262b4abc53b4a875afb39801a88f8b7b50f643f..0feac766a19cdd0b36e849f19bd11528ea6446ea 100644
--- a/src/plugins/coreplugin/iwizardfactory.cpp
+++ b/src/plugins/coreplugin/iwizardfactory.cpp
@@ -147,16 +147,18 @@
using namespace Core;
+
namespace {
static QList<IFeatureProvider *> s_providerList;
+QList<IWizardFactory *> s_allFactories;
+QList<IWizardFactory::FactoryCreator> s_factoryCreators;
+bool s_areFactoriesLoaded = false;
}
/* A utility to find all wizards supporting a view mode and matching a predicate */
template <class Predicate>
QList<IWizardFactory*> findWizardFactories(Predicate predicate)
{
- // Hack: Trigger delayed creation of wizards
- ICore::emitNewItemsDialogRequested();
// Filter all wizards
const QList<IWizardFactory*> allFactories = IWizardFactory::allWizardFactories();
QList<IWizardFactory*> rc;
@@ -169,9 +171,33 @@ template <class Predicate>
QList<IWizardFactory*> IWizardFactory::allWizardFactories()
{
- // Hack: Trigger delayed creation of wizards
- ICore::emitNewItemsDialogRequested();
- return ExtensionSystem::PluginManager::getObjects<IWizardFactory>();
+ if (!s_areFactoriesLoaded) {
+ QTC_ASSERT(s_allFactories.isEmpty(), return s_allFactories);
+
+ s_areFactoriesLoaded = true;
+
+ QHash<Id, IWizardFactory *> sanityCheck;
+ foreach (const FactoryCreator &fc, s_factoryCreators) {
+ QList<IWizardFactory *> tmp = fc();
+ foreach (IWizardFactory *newFactory, tmp) {
+ QTC_ASSERT(newFactory, continue);
+ IWizardFactory *existingFactory = sanityCheck.value(newFactory->id());
+
+ QTC_ASSERT(existingFactory != newFactory, continue);
+ if (existingFactory) {
+ qWarning("%s", qPrintable(tr("Factory with id=\"%1\" already registered. Deleting.")
+ .arg(existingFactory->id().toString())));
+ delete newFactory;
+ continue;
+ }
+
+ sanityCheck.insert(newFactory->id(), newFactory);
+ s_allFactories << newFactory;
+ }
+ }
+ }
+
+ return s_allFactories;
}
// Utility to find all registered wizards of a certain kind
@@ -211,6 +237,11 @@ QStringList IWizardFactory::supportedPlatforms() const
return stringList;
}
+void IWizardFactory::registerFactoryCreator(const IWizardFactory::FactoryCreator &creator)
+{
+ s_factoryCreators << creator;
+}
+
QStringList IWizardFactory::allAvailablePlatforms()
{
QStringList platforms;
@@ -257,3 +288,9 @@ FeatureSet IWizardFactory::pluginFeatures() const
}
return plugins;
}
+
+void IWizardFactory::initialize()
+{
+ connect(ICore::instance(), &ICore::coreAboutToClose,
+ ICore::instance(), []() { qDeleteAll(s_allFactories); s_allFactories.clear(); });
+}
diff --git a/src/plugins/coreplugin/iwizardfactory.h b/src/plugins/coreplugin/iwizardfactory.h
index df5a4e81399a8c19dcd059167cac5f075e95bf26..0d52a0e54a382c6397da25e3776b70f4e339478e 100644
--- a/src/plugins/coreplugin/iwizardfactory.h
+++ b/src/plugins/coreplugin/iwizardfactory.h
@@ -38,6 +38,8 @@
#include <QObject>
#include <QString>
+#include <functional>
+
namespace Core {
namespace Internal { class CorePlugin; }
@@ -87,6 +89,9 @@ public:
bool isAvailable(const QString &platformName) const;
QStringList supportedPlatforms() const;
+ typedef std::function<QList<IWizardFactory *>()> FactoryCreator;
+ static void registerFactoryCreator(const FactoryCreator &creator);
+
// Utility to find all registered wizards
static QList<IWizardFactory*> allWizardFactories();
// Utility to find all registered wizards of a certain kind
@@ -100,6 +105,7 @@ protected:
FeatureSet pluginFeatures() const;
private:
+ static void initialize();
static void destroyFeatureProvider();
IWizardFactory::WizardKind m_kind;
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 58bade244aa80253dd2a2927ea0b6c146b6ab173..97a3ec314dddd0fddfff6ff5def37ba23fe5ac59 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -85,7 +85,21 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
{
Q_UNUSED(arguments)
- initializeTemplates();
+#ifdef CPP_ENABLED
+ IWizardFactory::registerFactoryCreator(
+ []() -> QList<IWizardFactory *> {
+ IWizardFactory *wizard = new FormClassWizard;
+ wizard->setWizardKind(IWizardFactory::FileWizard);
+ wizard->setCategory(QLatin1String(Core::Constants::WIZARD_CATEGORY_QT));
+ wizard->setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT));
+ wizard->setDisplayName(tr("Qt Designer Form Class"));
+ wizard->setId("C.FormClass");
+ wizard->setDescription(tr("Creates a Qt Designer form along with a matching class (C++ header and source file) "
+ "for implementation purposes. You can add the form and class to an existing Qt Widget Project."));
+
+ return QList<IWizardFactory *>() << wizard;
+ });
+#endif
ProjectExplorer::JsonWizardFactory::registerPageFactory(new Internal::FormPageFactory);
addAutoReleasedObject(new FormEditorFactory);
@@ -130,21 +144,6 @@ void FormEditorPlugin::extensionsInitialized()
//
////////////////////////////////////////////////////
-void FormEditorPlugin::initializeTemplates()
-{
-#ifdef CPP_ENABLED
- IWizardFactory *wizard = new FormClassWizard;
- wizard->setWizardKind(IWizardFactory::FileWizard);
- wizard->setCategory(QLatin1String(Core::Constants::WIZARD_CATEGORY_QT));
- wizard->setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT));
- wizard->setDisplayName(tr("Qt Designer Form Class"));
- wizard->setId("C.FormClass");
- wizard->setDescription(tr("Creates a Qt Designer form along with a matching class (C++ header and source file) "
- "for implementation purposes. You can add the form and class to an existing Qt Widget Project."));
- addAutoReleasedObject(wizard);
-#endif
-}
-
// Find out current existing editor file
static QString currentFile()
{
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
index 2b784b2434687b059cffa7dc2f3ba35ae59675f1..2a595b4d26a63353025ce2f91625bb22475215dd 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -70,9 +70,10 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage
addAutoReleasedObject(new Manager);
addAutoReleasedObject(new ProjectFilesFactory);
addAutoReleasedObject(new GenericMakeStepFactory);
- addAutoReleasedObject(new GenericProjectWizard);
addAutoReleasedObject(new GenericBuildConfigurationFactory);
+ IWizardFactory::registerFactoryCreator([]() { return QList<IWizardFactory *>() << new GenericProjectWizard; });
+
ActionContainer *mproject =
ActionManager::actionContainer(ProjectExplorer::Constants::M_PROJECTCONTEXT);
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index bccd1d35d7fb7fbbc49fe58ed81d0c594989fbea..2336f57f923ee812ebf0abbe559e6f927b916399 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -356,9 +356,9 @@ CustomWizard *CustomWizard::createWizard(const CustomProjectWizard::CustomWizard
containing valid configuration files and parse them into wizards.
*/
-QList<CustomWizard*> CustomWizard::createWizards()
+QList<Core::IWizardFactory *> CustomWizard::createWizards()
{
- QList<CustomWizard*> rc;
+ QList<Core::IWizardFactory *> rc;
QString errorMessage;
QString verboseLog;
const QString templateDirName = Core::ICore::resourcePath() +
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h
index f31b956b1fa096009df8f2dadc2ae6c9b23917c9..6974ad9be2228a79a8349693e14265973b4e364b 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.h
+++ b/src/plugins/projectexplorer/customwizard/customwizard.h
@@ -102,7 +102,7 @@ public:
// Create all wizards. As other plugins might register factories for derived
// classes, call it in extensionsInitialized().
- static QList<CustomWizard*> createWizards();
+ static QList<IWizardFactory *> createWizards();
static void setVerbose(int);
static int verbose();
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index e889bd040a1062ba798567b6fdaa9899844e77d6..ce23bc51f8bff36fbf77c031008bec5a3c2f6a59 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -205,13 +205,13 @@ static JsonWizardFactory::Page parsePage(const QVariant &value, QString *errorMe
return p;
}
-QList<JsonWizardFactory *> JsonWizardFactory::createWizardFactories()
+QList<Core::IWizardFactory *> JsonWizardFactory::createWizardFactories()
{
QString errorMessage;
QString verboseLog;
const QString wizardFileName = QLatin1String(WIZARD_FILE);
- QList <JsonWizardFactory *> result;
+ QList <Core::IWizardFactory *> result;
foreach (const Utils::FileName &path, searchPaths()) {
if (path.isEmpty())
continue;
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
index ff7389d088d9df6b199050fc21aa0427f69fa744..5098930bfb9422df8ccd94c31b8b31b3d38746de 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
@@ -95,7 +95,7 @@ public:
private:
// Create all wizards. As other plugins might register factories for derived
// classes. Called when the new file dialog is shown for the first time.
- static QList<JsonWizardFactory *> createWizardFactories();
+ static QList<IWizardFactory *> createWizardFactories();
static JsonWizardFactory *createWizardFactory(const QVariantMap &data, const QDir &baseDir,
QString *errorMessage);
static QList<Utils::FileName> &searchPaths();
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 609b24bd56d367f278bbe3f7f146c02352dda4d3..18e3e63cfea91c2cb878ef917a102fa4877640d7 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -284,7 +284,6 @@ public:
void slotUpdateRunActions();
void currentModeChanged(Core::IMode *mode, Core::IMode *oldMode);
- void loadCustomWizards();
void updateWelcomePage();
@@ -490,8 +489,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
addAutoReleasedObject(new TaskHub);
- connect(ICore::instance(), &ICore::newItemsDialogRequested,
- dd, &ProjectExplorerPluginPrivate::loadCustomWizards);
+ IWizardFactory::registerFactoryCreator([]() -> QList<IWizardFactory *> {
+ QList<IWizardFactory *> result;
+ result << CustomWizard::createWizards();
+ result << JsonWizardFactory::createWizardFactories();
+ return result;
+ });
dd->m_welcomePage = new ProjectWelcomePage;
connect(dd->m_welcomePage, &ProjectWelcomePage::manageSessions,
@@ -1504,20 +1507,6 @@ void ProjectExplorerPlugin::extensionsInitialized()
dd->m_kitManager->restoreKits();
}
-void ProjectExplorerPluginPrivate::loadCustomWizards()
-{
- // Add custom wizards, for which other plugins might have registered
- // class factories
- static bool firstTime = true;
- if (firstTime) {
- firstTime = false;
- foreach (IWizardFactory *cpw, CustomWizard::createWizards())
- m_instance->addAutoReleasedObject(cpw);
- foreach (IWizardFactory *cpw, JsonWizardFactory::createWizardFactories())
- m_instance->addAutoReleasedObject(cpw);
- }
-}
-
void ProjectExplorerPluginPrivate::updateRunWithoutDeployMenu()
{
m_runWithoutDeployAction->setVisible(m_projectExplorerSettings.deployBeforeRun);
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
index c402e2f2f78e1bc8f764f1461820d55dd61ed6de..9500d0d6d9dd912ffccfe316164dad51060ab9c4 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
@@ -106,11 +106,12 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
ProjectExplorer::KitManager::registerKitInformation(new QmakeKitInformation);
- addAutoReleasedObject(new SubdirsProjectWizard);
- addAutoReleasedObject(new GuiAppWizard);
- addAutoReleasedObject(new LibraryWizard);
- addAutoReleasedObject(new TestWizard);
- addAutoReleasedObject(new CustomWidgetWizard);
+ IWizardFactory::registerFactoryCreator([]() {
+ QList<IWizardFactory *> result;
+ result << new SubdirsProjectWizard << new GuiAppWizard << new LibraryWizard
+ << new TestWizard << new CustomWidgetWizard;
+ return result;
+ });
addAutoReleasedObject(new CustomWizardMetaFactory<CustomQmakeProjectWizard>
(QLatin1String("qmakeproject"), IWizardFactory::ProjectWizard));