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
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent c9eedbe0f3
commit e1c88116b3
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/externaleditors.cpp
View File

@@ -97,7 +97,7 @@ static const char designerDisplayName[] = QT_TRANSLATE_NOOP("OpenWith::Editors",
static const char linguistDisplayName[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Qt Linguist");
// -------------- ExternalQtEditor
ExternalQtEditor::ExternalQtEditor(Core::Id id,
ExternalQtEditor::ExternalQtEditor(Utils::Id id,
const QString &displayName,
const QString &mimetype,
const CommandForQtVersion &commandForQtVersion) :
@@ -133,7 +133,7 @@ QStringList ExternalQtEditor::mimeTypes() const
return m_mimeTypes;
}
Core::Id ExternalQtEditor::id() const
Utils::Id ExternalQtEditor::id() const
{
return m_id;
}

10
src/plugins/qmakeprojectmanager/externaleditors.h
View File

@@ -26,12 +26,12 @@
#pragma once
#include <coreplugin/editormanager/iexternaleditor.h>
#include <coreplugin/id.h>
#include <functional>
#include <QStringList>
#include <QMap>
#include <functional>
QT_BEGIN_NAMESPACE
class QTcpSocket;
QT_END_NAMESPACE
@@ -59,7 +59,7 @@ public:
static ExternalQtEditor *createDesignerEditor();
QStringList mimeTypes() const override;
Core::Id id() const override;
Utils::Id id() const override;
QString displayName() const override;
bool startEditor(const QString &fileName, QString *errorMessage) override;
@@ -72,7 +72,7 @@ public:
};
protected:
ExternalQtEditor(Core::Id id,
ExternalQtEditor(Utils::Id id,
const QString &displayName,
const QString &mimetype,
const CommandForQtVersion &commandForQtVersion);
@@ -89,7 +89,7 @@ protected:
private:
const QStringList m_mimeTypes;
const Core::Id m_id;
const Utils::Id m_id;
const QString m_displayName;
const CommandForQtVersion m_commandForQtVersion;
};

2
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -103,7 +103,7 @@ FilePath QmakeBuildConfiguration::shadowBuildDirectory(const FilePath &proFilePa
const char BUILD_CONFIGURATION_KEY[] = "Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration";
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id)
QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Utils::Id id)
: BuildConfiguration(target, id)
{
setConfigWidgetDisplayName(tr("General"));

2
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
View File

@@ -45,7 +45,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfiguration : public ProjectExplore
Q_OBJECT
public:
QmakeBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
QmakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
~QmakeBuildConfiguration() override;
ProjectExplorer::BuildSystem *buildSystem() const final;

2
src/plugins/qmakeprojectmanager/qmakekitinformation.cpp
View File

@@ -124,7 +124,7 @@ void QmakeKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const
});
}
Core::Id QmakeKitAspect::id()
Utils::Id QmakeKitAspect::id()
{
return Constants::KIT_INFORMATION_ID;
}

2
src/plugins/qmakeprojectmanager/qmakekitinformation.h
View File

@@ -45,7 +45,7 @@ public:
void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
static Core::Id id();
static Utils::Id id();
enum class MkspecSource { User, Code };
static void setMkspec(ProjectExplorer::Kit *k, const QString &mkspec, MkspecSource source);
static QString mkspec(const ProjectExplorer::Kit *k);

2
src/plugins/qmakeprojectmanager/qmakemakestep.cpp
View File

@@ -52,7 +52,7 @@ using namespace ProjectExplorer;
using namespace QmakeProjectManager;
using namespace QmakeProjectManager::Internal;
QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Core::Id id)
QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Utils::Id id)
: MakeStep(bsl, id)
{
if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {

2
src/plugins/qmakeprojectmanager/qmakemakestep.h
View File

@@ -47,7 +47,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeMakeStep : public ProjectExplorer::MakeSte
Q_OBJECT
public:
QmakeMakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
QmakeMakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
private:
void finish(bool success) override;

4
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -358,7 +358,7 @@ QStringList QmakeProFileNode::targetApplications() const
return apps;
}
QVariant QmakeProFileNode::data(Core::Id role) const
QVariant QmakeProFileNode::data(Utils::Id role) const
{
if (role == Android::Constants::AndroidPackageSourceDir)
return singleVariableValue(Variable::AndroidPackageSourceDir);
@@ -412,7 +412,7 @@ QVariant QmakeProFileNode::data(Core::Id role) const
return {};
}
bool QmakeProFileNode::setData(Core::Id role, const QVariant &value) const
bool QmakeProFileNode::setData(Utils::Id role, const QVariant &value) const
{
QmakeProFile *pro = proFile();
if (!pro)

4
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -94,8 +94,8 @@ public:
QStringList targetApplications() const override;
AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
QVariant data(Core::Id role) const override;
bool setData(Core::Id role, const QVariant &value) const override;
QVariant data(Utils::Id role) const override;
bool setData(Utils::Id role, const QVariant &value) const override;
QmakeProjectManager::ProjectType projectType() const;

2
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -1393,7 +1393,7 @@ QStringList QmakeBuildSystem::filesGeneratedFrom(const QString &input) const
return {};
}
QVariant QmakeBuildSystem::additionalData(Core::Id id) const
QVariant QmakeBuildSystem::additionalData(Utils::Id id) const
{
if (id == "QmlDesignerImportPath")
return m_rootProFile->variableValue(Variable::QmlDesignerImportPath);

2
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -107,7 +107,7 @@ public:
void triggerParsing() final;
QStringList filesGeneratedFrom(const QString &file) const final;
QVariant additionalData(Core::Id id) const final;
QVariant additionalData(Utils::Id id) const final;
void asyncUpdate();
void buildFinished(bool success);

2
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -80,7 +80,7 @@ struct DirectoryData
namespace QmakeProjectManager {
namespace Internal {
const Core::Id QT_IS_TEMPORARY("Qmake.TempQt");
const Utils::Id QT_IS_TEMPORARY("Qmake.TempQt");
const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // ugly
QmakeProjectImporter::QmakeProjectImporter(const FilePath &path) :

2
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -75,7 +75,7 @@ const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced";
const char QMAKE_SELECTED_ABIS_KEY[] = "QtProjectManager.QMakeBuildStep.SelectedAbis";
}
QMakeStep::QMakeStep(BuildStepList *bsl, Core::Id id)
QMakeStep::QMakeStep(BuildStepList *bsl, Utils::Id id)
: AbstractProcessStep(bsl, id)
{
//: QMakeStep default display name

2
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -116,7 +116,7 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractPro
friend class Internal::QMakeStepFactory;
public:
QMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
QMakeStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
QmakeBuildSystem *qmakeBuildSystem() const;

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

@@ -147,7 +147,7 @@ BaseQmakeProjectWizardDialog::BaseQmakeProjectWizardDialog(
m_profileIds = Utils::transform(parameters.extraValues()
.value(ProjectExplorer::Constants::PROJECT_KIT_IDS)
.toStringList(),
&Core::Id::fromString);
&Utils::Id::fromString);
connect(this, &BaseProjectWizardDialog::projectParametersChanged,
this, &BaseQmakeProjectWizardDialog::generateProfileName);
@@ -164,7 +164,7 @@ BaseQmakeProjectWizardDialog::BaseQmakeProjectWizardDialog(
m_profileIds = Utils::transform(parameters.extraValues()
.value(ProjectExplorer::Constants::PROJECT_KIT_IDS)
.toStringList(),
&Core::Id::fromString);
&Utils::Id::fromString);
connect(this, &BaseProjectWizardDialog::projectParametersChanged,
this, &BaseQmakeProjectWizardDialog::generateProfileName);
}
@@ -184,12 +184,12 @@ int BaseQmakeProjectWizardDialog::addTargetSetupPage(int id)
return {
ProjectExplorer::CompileTask(Task::Error, tr("Required Qt features not present."))};
const Core::Id platform = selectedPlatform();
const Utils::Id platform = selectedPlatform();
if (platform.isValid() && !QtKitAspect::platformPredicate(platform)(k))
return {ProjectExplorer::CompileTask(
ProjectExplorer::Task::Warning,
tr("Qt version does not target the expected platform."))};
QSet<Core::Id> features = {QtSupport::Constants::FEATURE_DESKTOP};
QSet<Utils::Id> features = {QtSupport::Constants::FEATURE_DESKTOP};
if (!QtKitAspect::qtVersionPredicate(features)(k))
return {ProjectExplorer::CompileTask(ProjectExplorer::Task::Unknown,
tr("Qt version does not provide all features."))};
@@ -218,7 +218,7 @@ bool BaseQmakeProjectWizardDialog::writeUserFile(const QString &proFileName) con
return success;
}
QList<Core::Id> BaseQmakeProjectWizardDialog::selectedKits() const
QList<Utils::Id> BaseQmakeProjectWizardDialog::selectedKits() const
{
if (!m_targetSetupPage)
return m_profileIds;

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

@@ -114,13 +114,13 @@ public:
int addTargetSetupPage(int id = -1);
bool writeUserFile(const QString &proFileName) const;
QList<Core::Id> selectedKits() const;
QList<Utils::Id> selectedKits() const;
private:
void generateProfileName(const QString &name, const QString &path);
ProjectExplorer::TargetSetupPage *m_targetSetupPage = nullptr;
QList<Core::Id> m_profileIds;
QList<Utils::Id> m_profileIds;
};
} // namespace Internal

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

@@ -90,7 +90,7 @@ bool SubdirsProjectWizard::postGenerateFiles(const QWizard *w, const Core::Gener
QVariantMap map;
map.insert(QLatin1String(ProjectExplorer::Constants::PREFERRED_PROJECT_NODE), profileName);
map.insert(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS),
Utils::transform<QStringList>(wizard->selectedKits(), &Core::Id::toString));
Utils::transform<QStringList>(wizard->selectedKits(), &Utils::Id::toString));
IWizardFactory::requestNewItemDialog(tr("New Subproject", "Title of dialog"),
Utils::filtered(Core::IWizardFactory::allWizardFactories(),
[](Core::IWizardFactory *f) {