diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index 39ee682d88b..34da713eab1 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -321,8 +321,8 @@ CustomWizard::CustomWizardContextPtr CustomWizard::context() const CustomWizard *CustomWizard::createWizard(const CustomProjectWizard::CustomWizardParametersPtr &p) { - ICustomWizardFactory *factory = ExtensionSystem::PluginManager::getObject( - [&p](ICustomWizardFactory *factory) { + ICustomWizardMetaFactory *factory = ExtensionSystem::PluginManager::getObject( + [&p](ICustomWizardMetaFactory *factory) { return p->klass.isEmpty() ? (p->kind == factory->kind()) : (p->klass == factory->klass()); }); diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h index d00c2894dfe..4c877c7a330 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.h +++ b/src/plugins/projectexplorer/customwizard/customwizard.h @@ -55,12 +55,12 @@ namespace Internal { } // Documentation inside. -class PROJECTEXPLORER_EXPORT ICustomWizardFactory : public QObject +class PROJECTEXPLORER_EXPORT ICustomWizardMetaFactory : public QObject { Q_OBJECT public: - ICustomWizardFactory(const QString &klass, Core::IWizardFactory::WizardKind kind) : + ICustomWizardMetaFactory(const QString &klass, Core::IWizardFactory::WizardKind kind) : m_klass(klass), m_kind(kind) { } @@ -74,11 +74,11 @@ private: }; // Convenience template to create wizard factory classes. -template class CustomWizardFactory : public ICustomWizardFactory +template class CustomWizardMetaFactory : public ICustomWizardMetaFactory { public: - CustomWizardFactory(const QString &klass, Core::IWizardFactory::WizardKind kind) : ICustomWizardFactory(klass, kind) { } - CustomWizardFactory(Core::IWizardFactory::WizardKind kind) : ICustomWizardFactory(QString(), kind) { } + CustomWizardMetaFactory(const QString &klass, Core::IWizardFactory::WizardKind kind) : ICustomWizardMetaFactory(klass, kind) { } + CustomWizardMetaFactory(Core::IWizardFactory::WizardKind kind) : ICustomWizardMetaFactory(QString(), kind) { } CustomWizard *create() const { return new Wizard; } }; @@ -89,7 +89,6 @@ class PROJECTEXPLORER_EXPORT CustomWizard : public Core::BaseFileWizardFactory public: typedef QMap FieldReplacementMap; - typedef QSharedPointer ICustomWizardFactoryPtr; CustomWizard(); ~CustomWizard(); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index f087abfedae..4695bafd9c5 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -398,9 +398,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er connect(sessionManager, SIGNAL(sessionLoaded(QString)), this, SLOT(updateWelcomePage())); - addAutoReleasedObject(new CustomWizardFactory(Core::IWizardFactory::ProjectWizard)); - addAutoReleasedObject(new CustomWizardFactory(Core::IWizardFactory::FileWizard)); - addAutoReleasedObject(new CustomWizardFactory(Core::IWizardFactory::ClassWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory(Core::IWizardFactory::ProjectWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory(Core::IWizardFactory::FileWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory(Core::IWizardFactory::ClassWizard)); d->m_proWindow = new ProjectWindow; addAutoReleasedObject(d->m_proWindow); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index 5ff0dc815f7..0895a8d758e 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -125,7 +125,7 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString addAutoReleasedObject(new TestWizard); addAutoReleasedObject(new CustomWidgetWizard); - addAutoReleasedObject(new CustomWizardFactory + addAutoReleasedObject(new CustomWizardMetaFactory (QLatin1String("qmakeproject"), Core::IWizardFactory::ProjectWizard)); addAutoReleasedObject(new QMakeStepFactory);