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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ public:
public:
bool isValid() const { return typeId.isValid(); }
Core::Id typeId;
Utils::Id typeId;
QVariant data;
};
@@ -73,7 +73,7 @@ public:
QString subTitle;
QString shortTitle;
int index = -1; // page index in the wizard
Core::Id typeId;
Utils::Id typeId;
QVariant enabled;
QVariant data;
};
@@ -85,10 +85,10 @@ public:
static QString localizedString(const QVariant &value);
bool isAvailable(Core::Id platformId) const override;
bool isAvailable(Utils::Id platformId) const override;
private:
Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Core::Id platform,
Utils::Wizard *runWizardImpl(const QString &path, QWidget *parent, Utils::Id platform,
const QVariantMap &variables) override;
// Create all wizards. As other plugins might register factories for derived
@@ -111,7 +111,7 @@ private:
QList<Page> m_pages;
QList<JsonWizard::OptionDefinition> m_options;
QSet<Core::Id> m_preferredFeatures;
QSet<Utils::Id> m_preferredFeatures;
static int m_verbose;
@@ -125,16 +125,16 @@ class JsonWizardFactoryJsExtension : public QObject
{
Q_OBJECT
public:
JsonWizardFactoryJsExtension(Core::Id platformId,
const QSet<Core::Id> &availableFeatures,
const QSet<Core::Id> &pluginFeatures);
JsonWizardFactoryJsExtension(Utils::Id platformId,
const QSet<Utils::Id> &availableFeatures,
const QSet<Utils::Id> &pluginFeatures);
Q_INVOKABLE QVariant value(const QString &name) const;
private:
Core::Id m_platformId;
QSet<Core::Id> m_availableFeatures;
QSet<Core::Id> m_pluginFeatures;
Utils::Id m_platformId;
QSet<Utils::Id> m_availableFeatures;
QSet<Utils::Id> m_pluginFeatures;
};
} // namespace Internal