diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2014-05-30 14:00:49 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-06-12 16:29:55 +0200 |
commit | 0511ac5cb2506f4943ddcc3f8f1a71df732abd9f (patch) | |
tree | d09a4fc057d9263b2f7f2282c04648e4f796ca16 | |
parent | afbb100c52954a0ff515226d8837e1b372e3b755 (diff) | |
download | qt-creator-0511ac5cb2506f4943ddcc3f8f1a71df732abd9f.tar.gz |
Rename ICustomWizardFactory to ICustomWizardMetaFactory
Also rename CustomWizardFactory to CustomWizardMetaFactory. These factories
are used to generate the actual factories that are visible in File->New, so
they are kind of Meta:-)
CustomWizardClassFactory was my first attempt, but since there are project-
and classwizards that are generated by this meta-factory that is not a good
name.
Get rid of a useless typedef while at it.
Change-Id: I3dc2cce3f52999af7e59d5f2ad5509153056ea49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
4 files changed, 11 insertions, 12 deletions
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index 39ee682d88..34da713eab 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<ICustomWizardFactory>( - [&p](ICustomWizardFactory *factory) { + ICustomWizardMetaFactory *factory = ExtensionSystem::PluginManager::getObject<ICustomWizardMetaFactory>( + [&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 d00c2894df..4c877c7a33 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 Wizard> class CustomWizardFactory : public ICustomWizardFactory +template <class Wizard> 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<QString, QString> FieldReplacementMap; - typedef QSharedPointer<ICustomWizardFactory> ICustomWizardFactoryPtr; CustomWizard(); ~CustomWizard(); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index f087abfeda..4695bafd9c 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<CustomProjectWizard>(Core::IWizardFactory::ProjectWizard)); - addAutoReleasedObject(new CustomWizardFactory<CustomWizard>(Core::IWizardFactory::FileWizard)); - addAutoReleasedObject(new CustomWizardFactory<CustomWizard>(Core::IWizardFactory::ClassWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory<CustomProjectWizard>(Core::IWizardFactory::ProjectWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory<CustomWizard>(Core::IWizardFactory::FileWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory<CustomWizard>(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 5ff0dc815f..0895a8d758 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<CustomQmakeProjectWizard> + addAutoReleasedObject(new CustomWizardMetaFactory<CustomQmakeProjectWizard> (QLatin1String("qmakeproject"), Core::IWizardFactory::ProjectWizard)); addAutoReleasedObject(new QMakeStepFactory); |