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

Wizards: Turn "platform" into an Id

Browse Source 
It used to be a string constant.

Change-Id: Ibea34dc52e97a483989e6d628b908231f4e2dc54
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-27 12:07:56 +01:00
parent 4b0a8648e4
commit eebe44d3cf
24 changed files with 113 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/basefilewizardfactory.cpp
View File

@@ -80,7 +80,7 @@ static int indexOfFile(const GeneratedFiles &f, const QString &path)
*/ */
Utils::Wizard *BaseFileWizardFactory::runWizardImpl(const QString &path, QWidget *parent, Utils::Wizard *BaseFileWizardFactory::runWizardImpl(const QString &path, QWidget *parent,
const QString &platform, Id platform,
const QVariantMap &extraValues) const QVariantMap &extraValues)
{ {
QTC_ASSERT(!path.isEmpty(), return 0); QTC_ASSERT(!path.isEmpty(), return 0);

8
src/plugins/coreplugin/basefilewizardfactory.h
View File

@@ -62,7 +62,7 @@ public:
}; };
Q_DECLARE_FLAGS(DialogParameterFlags, DialogParameterEnum) Q_DECLARE_FLAGS(DialogParameterFlags, DialogParameterEnum)
explicit WizardDialogParameters(const QString &defaultPath, const QString &platform, explicit WizardDialogParameters(const QString &defaultPath, Id platform,
const QSet<Id> &requiredFeatures, DialogParameterFlags flags, const QSet<Id> &requiredFeatures, DialogParameterFlags flags,
QVariantMap extraValues) QVariantMap extraValues)
: m_defaultPath(defaultPath), : m_defaultPath(defaultPath),
@@ -75,7 +75,7 @@ public:
QString defaultPath() const QString defaultPath() const
{ return m_defaultPath; } { return m_defaultPath; }
QString selectedPlatform() const Id selectedPlatform() const
{ return m_selectedPlatform; } { return m_selectedPlatform; }
QSet<Id> requiredFeatures() const QSet<Id> requiredFeatures() const
@@ -89,7 +89,7 @@ public:
private: private:
QString m_defaultPath; QString m_defaultPath;
QString m_selectedPlatform; Id m_selectedPlatform;
QSet<Id> m_requiredFeatures; QSet<Id> m_requiredFeatures;
DialogParameterFlags m_parameterFlags; DialogParameterFlags m_parameterFlags;
QVariantMap m_extraValues; QVariantMap m_extraValues;
@@ -123,7 +123,7 @@ protected:
private: private:
// IWizard // IWizard
Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, const QString &platform, Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Id platform,
const QVariantMap &extraValues) override; const QVariantMap &extraValues) override;
}; };

23
src/plugins/coreplugin/dialogs/newdialog.cpp
View File

@@ -34,6 +34,7 @@
#include <coreplugin/coreicons.h> #include <coreplugin/coreicons.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QAbstractProxyModel> #include <QAbstractProxyModel>
@@ -76,7 +77,7 @@ class PlatformFilterProxyModel : public QSortFilterProxyModel
public: public:
PlatformFilterProxyModel(QObject *parent = 0): QSortFilterProxyModel(parent) {} PlatformFilterProxyModel(QObject *parent = 0): QSortFilterProxyModel(parent) {}
void setPlatform(const QString& platform) void setPlatform(Core::Id platform)
{ {
m_platform = platform; m_platform = platform;
invalidateFilter(); invalidateFilter();
@@ -95,7 +96,7 @@ public:
return true; return true;
} }
private: private:
QString m_platform; Core::Id m_platform;
}; };
class TwoLevelProxyModel : public QAbstractProxyModel class TwoLevelProxyModel : public QAbstractProxyModel
@@ -270,12 +271,12 @@ void NewDialog::setWizardFactories(QList<IWizardFactory *> factories,
if (m_dummyIcon.isNull()) if (m_dummyIcon.isNull())
m_dummyIcon = Core::Icons::NEWFILE.icon(); m_dummyIcon = Core::Icons::NEWFILE.icon();
QStringList availablePlatforms = IWizardFactory::allAvailablePlatforms(); QSet<Id> availablePlatforms = IWizardFactory::allAvailablePlatforms();
m_ui->comboBox->addItem(tr("All Templates"), QString()); m_ui->comboBox->addItem(tr("All Templates"), Id().toSetting());
foreach (const QString &platform, availablePlatforms) { foreach (Id platform, availablePlatforms) {
const QString displayNameForPlatform = IWizardFactory::displayNameForPlatform(platform); const QString displayNameForPlatform = IWizardFactory::displayNameForPlatform(platform);
m_ui->comboBox->addItem(tr("%1 Templates").arg(displayNameForPlatform), platform); m_ui->comboBox->addItem(tr("%1 Templates").arg(displayNameForPlatform), platform.toSetting());
} }
m_ui->comboBox->setCurrentIndex(0); // "All templates" m_ui->comboBox->setCurrentIndex(0); // "All templates"
@@ -334,11 +335,10 @@ void NewDialog::showDialog()
show(); show();
} }
QString NewDialog::selectedPlatform() const Id NewDialog::selectedPlatform() const
{ {
int index = m_ui->comboBox->currentIndex(); const int index = m_ui->comboBox->currentIndex();
return Id::fromSetting(m_ui->comboBox->itemData(index));
return m_ui->comboBox->itemData(index).toString();
} }
bool NewDialog::isRunning() bool NewDialog::isRunning()
@@ -422,8 +422,9 @@ void NewDialog::currentItemChanged(const QModelIndex &index)
if (const IWizardFactory *wizard = factoryOfItem(cat)) { if (const IWizardFactory *wizard = factoryOfItem(cat)) {
QString desciption = wizard->description(); QString desciption = wizard->description();
QStringList displayNamesForSupportedPlatforms; QStringList displayNamesForSupportedPlatforms;
foreach (const QString &platform, wizard->supportedPlatforms()) foreach (Id platform, wizard->supportedPlatforms())
displayNamesForSupportedPlatforms << IWizardFactory::displayNameForPlatform(platform); displayNamesForSupportedPlatforms << IWizardFactory::displayNameForPlatform(platform);
Utils::sort(displayNamesForSupportedPlatforms);
if (!Qt::mightBeRichText(desciption)) if (!Qt::mightBeRichText(desciption))
desciption.replace(QLatin1Char('\n'), QLatin1String("<br>")); desciption.replace(QLatin1Char('\n'), QLatin1String("<br>"));
desciption += QLatin1String("<br><br><b>"); desciption += QLatin1String("<br><br><b>");

2
src/plugins/coreplugin/dialogs/newdialog.h
View File

@@ -65,7 +65,7 @@ public:
void setWizardFactories(QList<IWizardFactory*> factories, const QString &defaultLocation, const QVariantMap &extraVariables); void setWizardFactories(QList<IWizardFactory*> factories, const QString &defaultLocation, const QVariantMap &extraVariables);
void showDialog(); void showDialog();
QString selectedPlatform() const; Id selectedPlatform() const;
static bool isRunning(); static bool isRunning();

6
src/plugins/coreplugin/featureprovider.h
View File

@@ -47,9 +47,9 @@ class CORE_EXPORT IFeatureProvider
public: public:
virtual ~IFeatureProvider() = default; virtual ~IFeatureProvider() = default;
virtual QSet<Id> availableFeatures(const QString &platform) const = 0; virtual QSet<Id> availableFeatures(Id id) const = 0;
virtual QStringList availablePlatforms() const = 0; virtual QSet<Id> availablePlatforms() const = 0;
virtual QString displayNameForPlatform(const QString &string) const = 0; virtual QString displayNameForPlatform(Id id) const = 0;
}; };
} // namespace Core } // namespace Core

34
src/plugins/coreplugin/iwizardfactory.cpp
View File

@@ -250,7 +250,7 @@ QList<IWizardFactory*> IWizardFactory::allWizardFactories()
connect(newFactory->m_action, &QAction::triggered, newFactory, [newFactory]() { connect(newFactory->m_action, &QAction::triggered, newFactory, [newFactory]() {
if (!ICore::isNewItemDialogRunning()) { if (!ICore::isNewItemDialogRunning()) {
QString path = newFactory->runPath(QString()); QString path = newFactory->runPath(QString());
newFactory->runWizard(path, ICore::dialogParent(), QString(), QVariantMap()); newFactory->runWizard(path, ICore::dialogParent(), Id(), QVariantMap());
} }
}); });
@@ -290,7 +290,7 @@ QString IWizardFactory::runPath(const QString &defaultPath)
return path; return path;
} }
Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &variables) Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, Id platform, const QVariantMap &variables)
{ {
QTC_ASSERT(!s_isWizardRunning, return 0); QTC_ASSERT(!s_isWizardRunning, return 0);
@@ -326,24 +326,24 @@ Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, c
return wizard; return wizard;
} }
bool IWizardFactory::isAvailable(const QString &platformName) const bool IWizardFactory::isAvailable(Id platformId) const
{ {
if (platformName.isEmpty()) if (!platformId.isValid())
return true; return true;
return availableFeatures(platformName).contains(requiredFeatures()); return availableFeatures(platformId).contains(requiredFeatures());
} }
QStringList IWizardFactory::supportedPlatforms() const QSet<Id> IWizardFactory::supportedPlatforms() const
{ {
QStringList stringList; QSet<Id> platformIds;
foreach (const QString &platform, allAvailablePlatforms()) { foreach (Id platform, allAvailablePlatforms()) {
if (isAvailable(platform)) if (isAvailable(platform))
stringList.append(platform); platformIds.insert(platform);
} }
return stringList; return platformIds;
} }
void IWizardFactory::registerFactoryCreator(const IWizardFactory::FactoryCreator &creator) void IWizardFactory::registerFactoryCreator(const IWizardFactory::FactoryCreator &creator)
@@ -351,20 +351,20 @@ void IWizardFactory::registerFactoryCreator(const IWizardFactory::FactoryCreator
s_factoryCreators << creator; s_factoryCreators << creator;
} }
QStringList IWizardFactory::allAvailablePlatforms() QSet<Id> IWizardFactory::allAvailablePlatforms()
{ {
QStringList platforms; QSet<Id> platforms;
foreach (const IFeatureProvider *featureManager, s_providerList) foreach (const IFeatureProvider *featureManager, s_providerList)
platforms.append(featureManager->availablePlatforms()); platforms.unite(featureManager->availablePlatforms());
return platforms; return platforms;
} }
QString IWizardFactory::displayNameForPlatform(const QString &string) QString IWizardFactory::displayNameForPlatform(Id i)
{ {
foreach (const IFeatureProvider *featureManager, s_providerList) { foreach (const IFeatureProvider *featureManager, s_providerList) {
QString displayName = featureManager->displayNameForPlatform(string); const QString displayName = featureManager->displayNameForPlatform(i);
if (!displayName.isEmpty()) if (!displayName.isEmpty())
return displayName; return displayName;
} }
@@ -420,12 +420,12 @@ QSet<Id> IWizardFactory::pluginFeatures() const
return plugins; return plugins;
} }
QSet<Id> IWizardFactory::availableFeatures(const QString &platformName) const QSet<Id> IWizardFactory::availableFeatures(Id platformId) const
{ {
QSet<Id> availableFeatures; QSet<Id> availableFeatures;
foreach (const IFeatureProvider *featureManager, s_providerList) foreach (const IFeatureProvider *featureManager, s_providerList)
availableFeatures.unite(featureManager->availableFeatures(platformName)); availableFeatures.unite(featureManager->availableFeatures(platformId));
return availableFeatures; return availableFeatures;
} }

14
src/plugins/coreplugin/iwizardfactory.h
View File

@@ -89,11 +89,11 @@ public:
QString runPath(const QString &defaultPath); QString runPath(const QString &defaultPath);
// Does bookkeeping and the calls runWizardImpl. Please implement that. // Does bookkeeping and the calls runWizardImpl. Please implement that.
virtual Utils::Wizard *runWizard(const QString &path, QWidget *parent, const QString &platform, virtual Utils::Wizard *runWizard(const QString &path, QWidget *parent, Id platform,
const QVariantMap &variables); const QVariantMap &variables);
virtual bool isAvailable(const QString &platformName) const; virtual bool isAvailable(Id platformId) const;
QStringList supportedPlatforms() const; QSet<Id> supportedPlatforms() const;
typedef std::function<QList<IWizardFactory *>()> FactoryCreator; typedef std::function<QList<IWizardFactory *>()> FactoryCreator;
static void registerFactoryCreator(const FactoryCreator &creator); static void registerFactoryCreator(const FactoryCreator &creator);
@@ -102,8 +102,8 @@ public:
static QList<IWizardFactory*> allWizardFactories(); static QList<IWizardFactory*> allWizardFactories();
// Utility to find all registered wizards of a certain kind // Utility to find all registered wizards of a certain kind
static QList<IWizardFactory*> wizardFactoriesOfKind(WizardKind kind); static QList<IWizardFactory*> wizardFactoriesOfKind(WizardKind kind);
static QStringList allAvailablePlatforms(); static QSet<Id> allAvailablePlatforms();
static QString displayNameForPlatform(const QString &string); static QString displayNameForPlatform(Id i);
static void registerFeatureProvider(IFeatureProvider *provider); static void registerFeatureProvider(IFeatureProvider *provider);
@@ -116,9 +116,9 @@ public:
protected: protected:
QSet<Id> pluginFeatures() const; QSet<Id> pluginFeatures() const;
QSet<Id> availableFeatures(const QString &platformName) const; QSet<Id> availableFeatures(Id platformId) const;
virtual Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, const QString &platform, virtual Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Id platform,
const QVariantMap &variables) = 0; const QVariantMap &variables) = 0;
private: private:

6
src/plugins/projectexplorer/baseprojectwizarddialog.cpp
View File

@@ -53,7 +53,7 @@ struct BaseProjectWizardDialogPrivate {
const int desiredIntroPageId; const int desiredIntroPageId;
Utils::ProjectIntroPage *introPage; Utils::ProjectIntroPage *introPage;
int introPageId; int introPageId;
QString selectedPlatform; Core::Id selectedPlatform;
QSet<Core::Id> requiredFeatureSet; QSet<Core::Id> requiredFeatureSet;
}; };
@@ -189,12 +189,12 @@ void BaseProjectWizardDialog::addExtensionPages(const QList<QWizardPage *> &wiza
addPage(p); addPage(p);
} }
QString BaseProjectWizardDialog::selectedPlatform() const Core::Id BaseProjectWizardDialog::selectedPlatform() const
{ {
return d->selectedPlatform; return d->selectedPlatform;
} }
void BaseProjectWizardDialog::setSelectedPlatform(const QString &platform) void BaseProjectWizardDialog::setSelectedPlatform(Core::Id platform)
{ {
d->selectedPlatform = platform; d->selectedPlatform = platform;
} }

4
src/plugins/projectexplorer/baseprojectwizarddialog.h
View File

@@ -77,8 +77,8 @@ signals:
protected: protected:
Utils::ProjectIntroPage *introPage() const; Utils::ProjectIntroPage *introPage() const;
QString selectedPlatform() const; Core::Id selectedPlatform() const;
void setSelectedPlatform(const QString &platform); void setSelectedPlatform(Core::Id platform);
QSet<Core::Id> requiredFeatures() const; QSet<Core::Id> requiredFeatures() const;
void setRequiredFeatures(const QSet<Core::Id> &featureSet); void setRequiredFeatures(const QSet<Core::Id> &featureSet);

2
src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
View File

@@ -62,7 +62,7 @@ void JsonKitsPage::initializePage()
connect(wiz, &JsonWizard::filesPolished, this, &JsonKitsPage::setupProjectFiles); connect(wiz, &JsonWizard::filesPolished, this, &JsonKitsPage::setupProjectFiles);
const QString platform = wiz->stringValue(QLatin1String("Platform")); const Id platform = Id::fromString(wiz->stringValue(QLatin1String("Platform")));
const QSet<Id> preferred const QSet<Id> preferred
= evaluate(m_preferredFeatures, wiz->value(QLatin1String("PreferredFeatures")), wiz); = evaluate(m_preferredFeatures, wiz->value(QLatin1String("PreferredFeatures")), wiz);
const QSet<Id> required const QSet<Id> required

12
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
View File

@@ -357,7 +357,7 @@ JsonWizardFactory::~JsonWizardFactory()
{ } { }
Utils::Wizard *JsonWizardFactory::runWizardImpl(const QString &path, QWidget *parent, Utils::Wizard *JsonWizardFactory::runWizardImpl(const QString &path, QWidget *parent,
const QString &platform, Core::Id platform,
const QVariantMap &variables) const QVariantMap &variables)
{ {
auto wizard = new JsonWizard(parent); auto wizard = new JsonWizard(parent);
@@ -380,7 +380,7 @@ Utils::Wizard *JsonWizardFactory::runWizardImpl(const QString &path, QWidget *pa
wizard->setValue(i.key(), i.value()); wizard->setValue(i.key(), i.value());
wizard->setValue(QStringLiteral("InitialPath"), path); wizard->setValue(QStringLiteral("InitialPath"), path);
wizard->setValue(QStringLiteral("Platform"), platform); wizard->setValue(QStringLiteral("Platform"), platform.toString());
QString kindStr = QLatin1String(Core::Constants::WIZARD_KIND_UNKNOWN); QString kindStr = QLatin1String(Core::Constants::WIZARD_KIND_UNKNOWN);
if (kind() == IWizardFactory::FileWizard) if (kind() == IWizardFactory::FileWizard)
@@ -483,17 +483,17 @@ QString JsonWizardFactory::localizedString(const QVariant &value)
return QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", value.toByteArray()); return QCoreApplication::translate("ProjectExplorer::JsonWizardFactory", value.toByteArray());
} }
bool JsonWizardFactory::isAvailable(const QString &platformName) const bool JsonWizardFactory::isAvailable(Core::Id platformId) const
{ {
if (!IWizardFactory::isAvailable(platformName)) // check for required features if (!IWizardFactory::isAvailable(platformId)) // check for required features
return false; return false;
Utils::MacroExpander expander; Utils::MacroExpander expander;
Utils::MacroExpander *e = &expander; Utils::MacroExpander *e = &expander;
expander.registerVariable("Platform", tr("The platform selected for the wizard."), expander.registerVariable("Platform", tr("The platform selected for the wizard."),
[platformName]() { return platformName; }); [platformId]() { return platformId.toString(); });
expander.registerVariable("Features", tr("The features available to this wizard."), expander.registerVariable("Features", tr("The features available to this wizard."),
[this, e, platformName]() { return JsonWizard::stringListToArrayString(Core::Id::toStringList(availableFeatures(platformName)), e); }); [this, e, platformId]() { return JsonWizard::stringListToArrayString(Core::Id::toStringList(availableFeatures(platformId)), e); });
expander.registerVariable("Plugins", tr("The plugins loaded."), expander.registerVariable("Plugins", tr("The plugins loaded."),
[this, e]() { return JsonWizard::stringListToArrayString(Core::Id::toStringList(pluginFeatures()), e); }); [this, e]() { return JsonWizard::stringListToArrayString(Core::Id::toStringList(pluginFeatures()), e); });

4
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
View File

@@ -91,10 +91,10 @@ public:
static QString localizedString(const QVariant &value); static QString localizedString(const QVariant &value);
bool isAvailable(const QString &platformName) const override; bool isAvailable(Core::Id platformId) const override;
private: private:
Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, const QString &platform, Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Core::Id platform,
const QVariantMap &variables) override; const QVariantMap &variables) override;
// Create all wizards. As other plugins might register factories for derived // Create all wizards. As other plugins might register factories for derived

4
src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
View File

@@ -312,7 +312,7 @@ FileGeneratorFactory::FileGeneratorFactory()
} }
JsonWizardGenerator *FileGeneratorFactory::create(Id typeId, const QVariant &data, JsonWizardGenerator *FileGeneratorFactory::create(Id typeId, const QVariant &data,
const QString &path, const QString &platform, const QString &path, Id platform,
const QVariantMap &variables) const QVariantMap &variables)
{ {
Q_UNUSED(path); Q_UNUSED(path);
@@ -352,7 +352,7 @@ ScannerGeneratorFactory::ScannerGeneratorFactory()
} }
JsonWizardGenerator *ScannerGeneratorFactory::create(Id typeId, const QVariant &data, JsonWizardGenerator *ScannerGeneratorFactory::create(Id typeId, const QVariant &data,
const QString &path, const QString &platform, const QString &path, Id platform,
const QVariantMap &variables) const QVariantMap &variables)
{ {
Q_UNUSED(path); Q_UNUSED(path);

6
src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h
View File

@@ -79,7 +79,7 @@ public:
QList<Core::Id> supportedIds() const { return m_typeIds; } QList<Core::Id> supportedIds() const { return m_typeIds; }
virtual JsonWizardGenerator *create(Core::Id typeId, const QVariant &data, virtual JsonWizardGenerator *create(Core::Id typeId, const QVariant &data,
const QString &path, const QString &platform, const QString &path, Core::Id platform,
const QVariantMap &variables) = 0; const QVariantMap &variables) = 0;
// Basic syntax check for the data taken from the wizard.json file: // Basic syntax check for the data taken from the wizard.json file:
@@ -104,7 +104,7 @@ public:
FileGeneratorFactory(); FileGeneratorFactory();
JsonWizardGenerator *create(Core::Id typeId, const QVariant &data, JsonWizardGenerator *create(Core::Id typeId, const QVariant &data,
const QString &path, const QString &platform, const QString &path, Core::Id platform,
const QVariantMap &variables); const QVariantMap &variables);
bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage);
}; };
@@ -117,7 +117,7 @@ public:
ScannerGeneratorFactory(); ScannerGeneratorFactory();
JsonWizardGenerator *create(Core::Id typeId, const QVariant &data, JsonWizardGenerator *create(Core::Id typeId, const QVariant &data,
const QString &path, const QString &platform, const QString &path, Core::Id platform,
const QVariantMap &variables); const QVariantMap &variables);
bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage);
}; };

10
src/plugins/projectexplorer/kit.cpp
View File

@@ -613,22 +613,22 @@ bool Kit::isMutable(Id id) const
return d->m_mutable.contains(id); return d->m_mutable.contains(id);
} }
QSet<QString> Kit::availablePlatforms() const QSet<Id> Kit::availablePlatforms() const
{ {
QSet<QString> platforms; QSet<Id> platforms;
foreach (const KitInformation *ki, KitManager::kitInformation()) foreach (const KitInformation *ki, KitManager::kitInformation())
platforms.unite(ki->availablePlatforms(this)); platforms.unite(ki->availablePlatforms(this));
return platforms; return platforms;
} }
bool Kit::hasPlatform(const QString &platform) const bool Kit::hasPlatform(Id platform) const
{ {
if (platform.isEmpty()) if (!platform.isValid())
return true; return true;
return availablePlatforms().contains(platform); return availablePlatforms().contains(platform);
} }
QString Kit::displayNameForPlatform(const QString &platform) const QString Kit::displayNameForPlatform(Id platform) const
{ {
foreach (const KitInformation *ki, KitManager::kitInformation()) { foreach (const KitInformation *ki, KitManager::kitInformation()) {
const QString displayName = ki->displayNameForPlatform(this, platform); const QString displayName = ki->displayNameForPlatform(this, platform);

6
src/plugins/projectexplorer/kit.h
View File

@@ -121,9 +121,9 @@ public:
void setMutable(Core::Id id, bool b); void setMutable(Core::Id id, bool b);
bool isMutable(Core::Id id) const; bool isMutable(Core::Id id) const;
QSet<QString> availablePlatforms() const; QSet<Core::Id> availablePlatforms() const;
bool hasPlatform(const QString &platform) const; bool hasPlatform(Core::Id platform) const;
QString displayNameForPlatform(const QString &platform) const; QString displayNameForPlatform(Core::Id platform) const;
QSet<Core::Id> availableFeatures() const; QSet<Core::Id> availableFeatures() const;
bool hasFeatures(const QSet<Core::Id> &features) const; bool hasFeatures(const QSet<Core::Id> &features) const;
Utils::MacroExpander *macroExpander() const; Utils::MacroExpander *macroExpander() const;

6
src/plugins/projectexplorer/kitfeatureprovider.h
View File

@@ -40,9 +40,9 @@ namespace Internal {
class KitFeatureProvider : public Core::IFeatureProvider class KitFeatureProvider : public Core::IFeatureProvider
{ {
public: public:
QSet<Core::Id> availableFeatures(const QString &platform) const; QSet<Core::Id> availableFeatures(Core::Id id) const;
QStringList availablePlatforms() const; QSet<Core::Id> availablePlatforms() const;
QString displayNameForPlatform(const QString &string) const; QString displayNameForPlatform(Core::Id id) const;
}; };
} // namespace Internal } // namespace Internal

32
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -302,15 +302,15 @@ void KitManager::deregisterKitInformation(KitInformation *ki)
delete ki; delete ki;
} }
QSet<QString> KitManager::availablePlatforms() QSet<Id> KitManager::availablePlatforms()
{ {
QSet<QString> platforms; QSet<Id> platforms;
foreach (const Kit *k, kits()) foreach (const Kit *k, kits())
platforms.unite(k->availablePlatforms()); platforms.unite(k->availablePlatforms());
return platforms; return platforms;
} }
QString KitManager::displayNameForPlatform(const QString &platform) QString KitManager::displayNameForPlatform(Id platform)
{ {
foreach (const Kit *k, kits()) { foreach (const Kit *k, kits()) {
const QString displayName = k->displayNameForPlatform(platform); const QString displayName = k->displayNameForPlatform(platform);
@@ -320,13 +320,13 @@ QString KitManager::displayNameForPlatform(const QString &platform)
return QString(); return QString();
} }
QSet<Id> KitManager::availableFeatures(const QString &platform) QSet<Id> KitManager::availableFeatures(Id platform)
{ {
QSet<Id> features; QSet<Id> features;
foreach (const Kit *k, kits()) { foreach (const Kit *k, kits()) {
QSet<QString> kitPlatforms = k->availablePlatforms(); QSet<Id> kitPlatforms = k->availablePlatforms();
if (kitPlatforms.isEmpty() || kitPlatforms.contains(platform) || platform.isEmpty()) if (kitPlatforms.isEmpty() || kitPlatforms.contains(platform) || !platform.isValid())
features |= k->availableFeatures(); features.unite(k->availableFeatures());
} }
return features; return features;
} }
@@ -553,13 +553,13 @@ QString KitInformation::displayNamePostfix(const Kit *k) const
return QString(); return QString();
} }
QSet<QString> KitInformation::availablePlatforms(const Kit *k) const QSet<Id> KitInformation::availablePlatforms(const Kit *k) const
{ {
Q_UNUSED(k); Q_UNUSED(k);
return QSet<QString>(); return QSet<Id>();
} }
QString KitInformation::displayNameForPlatform(const Kit *k, const QString &platform) const QString KitInformation::displayNameForPlatform(const Kit *k, Id platform) const
{ {
Q_UNUSED(k); Q_UNUSED(k);
Q_UNUSED(platform); Q_UNUSED(platform);
@@ -588,19 +588,19 @@ void KitInformation::notifyAboutUpdate(Kit *k)
// KitFeatureProvider: // KitFeatureProvider:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
QSet<Id> KitFeatureProvider::availableFeatures(const QString &platform) const QSet<Id> KitFeatureProvider::availableFeatures(Id id) const
{ {
return KitManager::availableFeatures(platform); return KitManager::availableFeatures(id);
} }
QStringList KitFeatureProvider::availablePlatforms() const QSet<Id> KitFeatureProvider::availablePlatforms() const
{ {
return KitManager::availablePlatforms().toList(); return KitManager::availablePlatforms();
} }
QString KitFeatureProvider::displayNameForPlatform(const QString &string) const QString KitFeatureProvider::displayNameForPlatform(Id id) const
{ {
return KitManager::displayNameForPlatform(string); return KitManager::displayNameForPlatform(id);
} }
} // namespace ProjectExplorer } // namespace ProjectExplorer

10
src/plugins/projectexplorer/kitmanager.h
View File

@@ -95,8 +95,8 @@ public:
virtual QString displayNamePostfix(const Kit *k) const; virtual QString displayNamePostfix(const Kit *k) const;
virtual QSet<QString> availablePlatforms(const Kit *k) const; virtual QSet<Core::Id> availablePlatforms(const Kit *k) const;
virtual QString displayNameForPlatform(const Kit *k, const QString &platform) const; virtual QString displayNameForPlatform(const Kit *k, Core::Id platform) const;
virtual QSet<Core::Id> availableFeatures(const Kit *k) const; virtual QSet<Core::Id> availableFeatures(const Kit *k) const;
virtual void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const; virtual void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const;
@@ -152,9 +152,9 @@ public:
static void registerKitInformation(KitInformation *ki); static void registerKitInformation(KitInformation *ki);
static void deregisterKitInformation(KitInformation *ki); static void deregisterKitInformation(KitInformation *ki);
static QSet<QString> availablePlatforms(); static QSet<Core::Id> availablePlatforms();
static QString displayNameForPlatform(const QString &platform); static QString displayNameForPlatform(Core::Id platform);
static QSet<Core::Id> availableFeatures(const QString &platform); static QSet<Core::Id> availableFeatures(Core::Id platform);
static QList<Kit *> sortKits(const QList<Kit *> kits); // Avoid sorting whenever possible! static QList<Kit *> sortKits(const QList<Kit *> kits); // Avoid sorting whenever possible!

2
src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.cpp
View File

@@ -110,7 +110,7 @@ GuiAppParameters GuiAppWizardDialog::parameters() const
rc.formFileName = m_filesPage->formFileName(); rc.formFileName = m_filesPage->formFileName();
rc.designerForm = m_filesPage->formInputChecked(); rc.designerForm = m_filesPage->formInputChecked();
rc.isMobileApplication = true; rc.isMobileApplication = true;
if (isQtPlatformSelected(QLatin1String(QtSupport::Constants::ANDROID_PLATFORM))) { if (isQtPlatformSelected(QtSupport::Constants::ANDROID_PLATFORM)) {
rc.widgetWidth = 800; rc.widgetWidth = 800;
rc.widgetHeight = 480; rc.widgetHeight = 480;
} else { } else {

6
src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
View File

@@ -203,9 +203,9 @@ int BaseQmakeProjectWizardDialog::addModulesPage(int id)
int BaseQmakeProjectWizardDialog::addTargetSetupPage(int id) int BaseQmakeProjectWizardDialog::addTargetSetupPage(int id)
{ {
m_targetSetupPage = new ProjectExplorer::TargetSetupPage; m_targetSetupPage = new ProjectExplorer::TargetSetupPage;
const QString platform = selectedPlatform(); const Core::Id platform = selectedPlatform();
QSet<Core::Id> features = { QtSupport::Constants::FEATURE_DESKTOP }; QSet<Core::Id> features = { QtSupport::Constants::FEATURE_DESKTOP };
if (platform.isEmpty()) if (!platform.isValid())
m_targetSetupPage->setPreferredKitMatcher(QtKitInformation::qtVersionMatcher(features)); m_targetSetupPage->setPreferredKitMatcher(QtKitInformation::qtVersionMatcher(features));
else else
m_targetSetupPage->setPreferredKitMatcher(QtKitInformation::platformMatcher(platform)); m_targetSetupPage->setPreferredKitMatcher(QtKitInformation::platformMatcher(platform));
@@ -278,7 +278,7 @@ bool BaseQmakeProjectWizardDialog::setupProject(QmakeProject *project) const
return m_targetSetupPage->setupProject(project); return m_targetSetupPage->setupProject(project);
} }
bool BaseQmakeProjectWizardDialog::isQtPlatformSelected(const QString &platform) const bool BaseQmakeProjectWizardDialog::isQtPlatformSelected(Core::Id platform) const
{ {
QList<Core::Id> selectedKitList = selectedKits(); QList<Core::Id> selectedKitList = selectedKits();

2
src/plugins/qmakeprojectmanager/wizards/qtwizard.h
View File

@@ -131,7 +131,7 @@ public:
bool writeUserFile(const QString &proFileName) const; bool writeUserFile(const QString &proFileName) const;
bool setupProject(QmakeProject *project) const; bool setupProject(QmakeProject *project) const;
bool isQtPlatformSelected(const QString &platform) const; bool isQtPlatformSelected(Core::Id platform) const;
QList<Core::Id> selectedKits() const; QList<Core::Id> selectedKits() const;
void addExtensionPages(const QList<QWizardPage *> &wizardPageList); void addExtensionPages(const QList<QWizardPage *> &wizardPageList);

21
src/plugins/qtsupport/qtkitinformation.cpp
View File

@@ -220,11 +220,11 @@ void QtKitInformation::kitsWereLoaded()
this, SLOT(qtVersionsChanged(QList<int>,QList<int>,QList<int>))); this, SLOT(qtVersionsChanged(QList<int>,QList<int>,QList<int>)));
} }
KitMatcher QtKitInformation::platformMatcher(const QString &platform) KitMatcher QtKitInformation::platformMatcher(Core::Id platform)
{ {
return std::function<bool(const Kit *)>([platform](const Kit *kit) -> bool { return std::function<bool(const Kit *)>([platform](const Kit *kit) -> bool {
BaseQtVersion *version = QtKitInformation::qtVersion(kit); BaseQtVersion *version = QtKitInformation::qtVersion(kit);
return version && version->platformName() == platform; return version && Core::Id::fromString(version->platformName()) == platform;
}); });
} }
@@ -244,22 +244,19 @@ KitMatcher QtKitInformation::qtVersionMatcher(const QSet<Core::Id> &required,
}); });
} }
QSet<QString> QtKitInformation::availablePlatforms(const Kit *k) const QSet<Core::Id> QtKitInformation::availablePlatforms(const Kit *k) const
{ {
QSet<QString> result;
BaseQtVersion *version = QtKitInformation::qtVersion(k); BaseQtVersion *version = QtKitInformation::qtVersion(k);
if (version) { const QString platform = version ? version->platformName() : QString();
QString platform = version->platformName(); if (!platform.isEmpty())
if (!platform.isEmpty()) return { Core::Id::fromString(platform) };
result.insert(version->platformName()); return QSet<Core::Id>();
}
return result;
} }
QString QtKitInformation::displayNameForPlatform(const Kit *k, const QString &platform) const QString QtKitInformation::displayNameForPlatform(const Kit *k, Core::Id platform) const
{ {
BaseQtVersion *version = QtKitInformation::qtVersion(k); BaseQtVersion *version = QtKitInformation::qtVersion(k);
if (version && version->platformName() == platform) if (version && Core::Id::fromString(version->platformName()) == platform)
return version->platformDisplayName(); return version->platformDisplayName();
return QString(); return QString();
} }

6
src/plugins/qtsupport/qtkitinformation.h
View File

@@ -69,13 +69,13 @@ public:
static BaseQtVersion *qtVersion(const ProjectExplorer::Kit *k); static BaseQtVersion *qtVersion(const ProjectExplorer::Kit *k);
static void setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion *v); static void setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion *v);
static ProjectExplorer::KitMatcher platformMatcher(const QString &availablePlatforms); static ProjectExplorer::KitMatcher platformMatcher(Core::Id availablePlatforms);
static ProjectExplorer::KitMatcher qtVersionMatcher(const QSet<Core::Id> &required = QSet<Core::Id>(), static ProjectExplorer::KitMatcher qtVersionMatcher(const QSet<Core::Id> &required = QSet<Core::Id>(),
const QtVersionNumber &min = QtVersionNumber(0, 0, 0), const QtVersionNumber &min = QtVersionNumber(0, 0, 0),
const QtVersionNumber &max = QtVersionNumber(INT_MAX, INT_MAX, INT_MAX)); const QtVersionNumber &max = QtVersionNumber(INT_MAX, INT_MAX, INT_MAX));
QSet<QString> availablePlatforms(const ProjectExplorer::Kit *k) const; QSet<Core::Id> availablePlatforms(const ProjectExplorer::Kit *k) const;
QString displayNameForPlatform(const ProjectExplorer::Kit *k, const QString &platform) const; QString displayNameForPlatform(const ProjectExplorer::Kit *k, Core::Id platform) const;
QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const; QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const;
private slots: private slots: