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

6
src/plugins/mesonprojectmanager/exewrappers/mesontools.cpp
View File

@@ -34,7 +34,7 @@ inline bool is(const MesonTools::Tool_t &tool)
}
template<typename T>
std::shared_ptr<T> tool(const Core::Id &id, const std::vector<MesonTools::Tool_t> &tools)
std::shared_ptr<T> tool(const Utils::Id &id, const std::vector<MesonTools::Tool_t> &tools)
{
static_assert(std::is_base_of<ToolWrapper, T>::value, "Type must derive from ToolWrapper");
const auto tool = std::find_if(std::cbegin(tools),
@@ -89,11 +89,11 @@ void MesonTools::setTools(std::vector<MesonTools::Tool_t> &&tools)
fixAutoDetected<NinjaWrapper>(self->m_tools);
}
std::shared_ptr<NinjaWrapper> MesonTools::ninjaWrapper(const Core::Id &id)
std::shared_ptr<NinjaWrapper> MesonTools::ninjaWrapper(const Utils::Id &id)
{
return tool<NinjaWrapper>(id, MesonTools::instance()->m_tools);
}
std::shared_ptr<MesonWrapper> MesonTools::mesonWrapper(const Core::Id &id)
std::shared_ptr<MesonWrapper> MesonTools::mesonWrapper(const Utils::Id &id)
{
return tool<MesonWrapper>(id, MesonTools::instance()->m_tools);
}

10
src/plugins/mesonprojectmanager/exewrappers/mesontools.h
View File

@@ -50,7 +50,7 @@ public:
static bool isMesonWrapper(const Tool_t &tool);
static bool isNinjaWrapper(const Tool_t &tool);
static inline void addTool(const Core::Id &itemId,
static inline void addTool(const Utils::Id &itemId,
const QString &name,
const Utils::FilePath &exe)
{
@@ -72,7 +72,7 @@ public:
static inline const std::vector<Tool_t> &tools() { return instance()->m_tools; }
static inline void updateTool(const Core::Id &itemId,
static inline void updateTool(const Utils::Id &itemId,
const QString &name,
const Utils::FilePath &exe)
{
@@ -87,7 +87,7 @@ public:
addTool(itemId, name, exe);
}
}
static void removeTool(const Core::Id &id)
static void removeTool(const Utils::Id &id)
{
auto self = instance();
auto item = Utils::take(self->m_tools, [&id](const auto &item) { return item->id() == id; });
@@ -95,8 +95,8 @@ public:
emit self->toolRemoved(*item);
}
static std::shared_ptr<NinjaWrapper> ninjaWrapper(const Core::Id &id);
static std::shared_ptr<MesonWrapper> mesonWrapper(const Core::Id &id);
static std::shared_ptr<NinjaWrapper> ninjaWrapper(const Utils::Id &id);
static std::shared_ptr<MesonWrapper> mesonWrapper(const Utils::Id &id);
static std::shared_ptr<NinjaWrapper> ninjaWrapper();
static std::shared_ptr<MesonWrapper> mesonWrapper();

4
src/plugins/mesonprojectmanager/exewrappers/mesonwrapper.h
View File

@@ -28,8 +28,8 @@
#include "toolwrapper.h"
#include "utils/environment.h"
#include "utils/fileutils.h"
#include <utils/id.h>
#include "utils/optional.h"
#include <coreplugin/id.h>
#include <tuple>
#include <QFile>
#include <QFileInfo>
@@ -120,7 +120,7 @@ inline MesonWrapper *fromVariantMap<MesonWrapper *>(const QVariantMap &data)
{
return new MesonWrapper(data[Constants::ToolsSettings::NAME_KEY].toString(),
Utils::FilePath::fromVariant(data[Constants::ToolsSettings::EXE_KEY]),
Core::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
Utils::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
data[Constants::ToolsSettings::AUTO_DETECTED_KEY].toBool());
}

2
src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
View File

@@ -56,7 +56,7 @@ inline NinjaWrapper *fromVariantMap<NinjaWrapper *>(const QVariantMap &data)
{
return new NinjaWrapper(data[Constants::ToolsSettings::NAME_KEY].toString(),
Utils::FilePath::fromVariant(data[Constants::ToolsSettings::EXE_KEY]),
Core::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
Utils::Id::fromSetting(data[Constants::ToolsSettings::ID_KEY]),
data[Constants::ToolsSettings::AUTO_DETECTED_KEY].toBool());
}

6
src/plugins/mesonprojectmanager/exewrappers/toolwrapper.cpp
View File

@@ -31,14 +31,14 @@ ToolWrapper::ToolWrapper(const QString &name, const Utils::FilePath &path, bool
: m_version(read_version(path))
, m_isValid{path.exists() && m_version.isValid}
, m_autoDetected{autoDetected}
, m_id{Core::Id::fromString(QUuid::createUuid().toString())}
, m_id{Utils::Id::fromString(QUuid::createUuid().toString())}
, m_exe{path}
, m_name{name}
{}
ToolWrapper::ToolWrapper(const QString &name,
const Utils::FilePath &path,
const Core::Id &id,
const Utils::Id &id,
bool autoDetected)
: m_version(read_version(path))
, m_isValid{path.exists() && m_version.isValid}
@@ -47,7 +47,7 @@ ToolWrapper::ToolWrapper(const QString &name,
, m_exe{path}
, m_name{name}
{
QTC_ASSERT(m_id.isValid(), m_id = Core::Id::fromString(QUuid::createUuid().toString()));
QTC_ASSERT(m_id.isValid(), m_id = Utils::Id::fromString(QUuid::createUuid().toString()));
}
void ToolWrapper::setExe(const Utils::FilePath &newExe)

8
src/plugins/mesonprojectmanager/exewrappers/toolwrapper.h
View File

@@ -23,9 +23,9 @@
**
****************************************************************************/
#pragma once
#include <coreplugin/id.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <utils/id.h>
#include <utils/qtcassert.h>
#include <versionhelper.h>
#include <QFileInfo>
@@ -64,7 +64,7 @@ public:
ToolWrapper(const QString &name, const Utils::FilePath &path, bool autoDetected = false);
ToolWrapper(const QString &name,
const Utils::FilePath &path,
const Core::Id &id,
const Utils::Id &id,
bool autoDetected = false);
ToolWrapper(const ToolWrapper &other) = default;
ToolWrapper(ToolWrapper &&other) = default;
@@ -74,7 +74,7 @@ public:
inline const Version &version() const noexcept { return m_version; };
inline bool isValid() const noexcept { return m_isValid; };
inline bool autoDetected() const noexcept { return m_autoDetected; };
inline Core::Id id() const noexcept { return m_id; };
inline Utils::Id id() const noexcept { return m_id; };
inline Utils::FilePath exe() const noexcept { return m_exe; };
inline QString name() const noexcept { return m_name; };
@@ -94,7 +94,7 @@ protected:
Version m_version;
bool m_isValid;
bool m_autoDetected;
Core::Id m_id;
Utils::Id m_id;
Utils::FilePath m_exe;
QString m_name;
};

2
src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.cpp
View File

@@ -45,7 +45,7 @@
namespace MesonProjectManager {
namespace Internal {
MesonBuildConfiguration::MesonBuildConfiguration(ProjectExplorer::Target *target, Core::Id id)
MesonBuildConfiguration::MesonBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id)
: ProjectExplorer::BuildConfiguration{target, id}
{
appendInitialBuildStep(Constants::MESON_BUILD_STEP_ID);

4
src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
View File

@@ -23,7 +23,7 @@
**
****************************************************************************/
#pragma once
#include "coreplugin/id.h"
#include "projectexplorer/buildconfiguration.h"
#include "projectexplorer/target.h"
#include "utils/fileutils.h"
@@ -95,7 +95,7 @@ class MesonBuildConfiguration final : public ProjectExplorer::BuildConfiguration
{
Q_OBJECT
public:
MesonBuildConfiguration(ProjectExplorer::Target *target, Core::Id id);
MesonBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
~MesonBuildConfiguration() final;
static Utils::FilePath shadowBuildDirectory(

4
src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
View File

@@ -105,7 +105,7 @@ QStringList toAbsolutePath(const Utils::FilePath &refPath, QStringList &pathList
return allAbs;
}
MesonProjectParser::MesonProjectParser(const Core::Id &meson,
MesonProjectParser::MesonProjectParser(const Utils::Id &meson,
Utils::Environment env,
ProjectExplorer::Project *project)
: m_env{env}
@@ -127,7 +127,7 @@ MesonProjectParser::MesonProjectParser(const Core::Id &meson,
m_outputParser.setFileFinder(fileFinder);
}
void MesonProjectParser::setMesonTool(const Core::Id &meson)
void MesonProjectParser::setMesonTool(const Utils::Id &meson)
{
m_meson = meson;
}

6
src/plugins/mesonprojectmanager/project/mesonprojectparser.h
View File

@@ -52,8 +52,8 @@ class MesonProjectParser : public QObject
};
public:
MesonProjectParser(const Core::Id &meson, Utils::Environment env, ProjectExplorer::Project* project);
void setMesonTool(const Core::Id &meson);
MesonProjectParser(const Utils::Id &meson, Utils::Environment env, ProjectExplorer::Project* project);
void setMesonTool(const Utils::Id &meson);
bool configure(const Utils::FilePath &sourcePath,
const Utils::FilePath &buildPath,
const QStringList &args);
@@ -112,7 +112,7 @@ private:
MesonProcess m_process;
MesonOutputParser m_outputParser;
Utils::Environment m_env;
Core::Id m_meson;
Utils::Id m_meson;
Utils::FilePath m_buildDir;
Utils::FilePath m_srcDir;
QFuture<ParserData *> m_parserFutureResult;

2
src/plugins/mesonprojectmanager/project/mesonrunconfiguration.cpp
View File

@@ -34,7 +34,7 @@
#include <QLatin1String>
namespace MesonProjectManager {
namespace Internal {
MesonRunConfiguration::MesonRunConfiguration(ProjectExplorer::Target *target, Core::Id id)
MesonRunConfiguration::MesonRunConfiguration(ProjectExplorer::Target *target, Utils::Id id)
: ProjectExplorer::RunConfiguration{target, id}
{
auto envAspect = addAspect<ProjectExplorer::LocalEnvironmentAspect>(target);

2
src/plugins/mesonprojectmanager/project/mesonrunconfiguration.h
View File

@@ -32,7 +32,7 @@ namespace Internal {
class MesonRunConfiguration final : public ProjectExplorer::RunConfiguration
{
public:
MesonRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
MesonRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
private:
void updateTargetInformation();

6
src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
View File

@@ -31,7 +31,7 @@
#include "mesonpluginconstants.h"
#include <settings/general/settings.h>
#include <settings/tools/kitaspect/ninjatoolkitaspect.h>
#include <coreplugin/id.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/processparameters.h>
@@ -43,7 +43,7 @@ namespace Internal {
const char TARGETS_KEY[] = "MesonProjectManager.BuildStep.BuildTargets";
const char TOOL_ARGUMENTS_KEY[] = "MesonProjectManager.BuildStep.AdditionalArguments";
NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id)
: ProjectExplorer::AbstractProcessStep{bsl, id}
{
setDefaultDisplayName(tr("Meson Build"));
@@ -116,7 +116,7 @@ QString NinjaBuildStep::defaultBuildTarget() const
{
const ProjectExplorer::BuildStepList *const bsl = stepList();
QTC_ASSERT(bsl, return {});
const Core::Id parentId = bsl->id();
const Utils::Id parentId = bsl->id();
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
return {Constants::Targets::clean};
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)

2
src/plugins/mesonprojectmanager/project/ninjabuildstep.h
View File

@@ -36,7 +36,7 @@ class NinjaBuildStep final : public ProjectExplorer::AbstractProcessStep
{
Q_OBJECT
public:
NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() final;
Utils::CommandLine command();
QStringList projectTargets();

6
src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.cpp
View File

@@ -82,16 +82,16 @@ ProjectExplorer::KitAspectWidget *MesonToolKitAspect::createConfigWidget(Project
return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Meson};
}
void MesonToolKitAspect::setMesonTool(ProjectExplorer::Kit *kit, Core::Id id)
void MesonToolKitAspect::setMesonTool(ProjectExplorer::Kit *kit, Utils::Id id)
{
QTC_ASSERT(kit && id.isValid(), return );
kit->setValue(TOOL_ID, id.toSetting());
}
Core::Id MesonToolKitAspect::mesonToolId(const ProjectExplorer::Kit *kit)
Utils::Id MesonToolKitAspect::mesonToolId(const ProjectExplorer::Kit *kit)
{
QTC_ASSERT(kit, return {});
return Core::Id::fromSetting(kit->value(TOOL_ID));
return Utils::Id::fromSetting(kit->value(TOOL_ID));
}
} // namespace Internal
} // namespace MesonProjectManager

5
src/plugins/mesonprojectmanager/settings/tools/kitaspect/mesontoolkitaspect.h
View File

@@ -26,7 +26,6 @@
#pragma once
#include <exewrappers/mesontools.h>
#include <coreplugin/id.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/kitmanager.h>
@@ -43,8 +42,8 @@ public:
ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const final;
static void setMesonTool(ProjectExplorer::Kit *kit, Core::Id id);
static Core::Id mesonToolId(const ProjectExplorer::Kit *kit);
static void setMesonTool(ProjectExplorer::Kit *kit, Utils::Id id);
static Utils::Id mesonToolId(const ProjectExplorer::Kit *kit);
static inline decltype(auto) mesonTool(const ProjectExplorer::Kit *kit)
{

6
src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.cpp
View File

@@ -82,16 +82,16 @@ ProjectExplorer::KitAspectWidget *NinjaToolKitAspect::createConfigWidget(Project
return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Ninja};
}
void NinjaToolKitAspect::setNinjaTool(ProjectExplorer::Kit *kit, Core::Id id)
void NinjaToolKitAspect::setNinjaTool(ProjectExplorer::Kit *kit, Utils::Id id)
{
QTC_ASSERT(kit && id.isValid(), return );
kit->setValue(TOOL_ID, id.toSetting());
}
Core::Id NinjaToolKitAspect::ninjaToolId(const ProjectExplorer::Kit *kit)
Utils::Id NinjaToolKitAspect::ninjaToolId(const ProjectExplorer::Kit *kit)
{
QTC_ASSERT(kit, return {});
return Core::Id::fromSetting(kit->value(TOOL_ID));
return Utils::Id::fromSetting(kit->value(TOOL_ID));
}
} // namespace Internal
} // namespace MesonProjectManager

5
src/plugins/mesonprojectmanager/settings/tools/kitaspect/ninjatoolkitaspect.h
View File

@@ -26,7 +26,6 @@
#pragma once
#include <exewrappers/mesontools.h>
#include <coreplugin/id.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/kitmanager.h>
@@ -43,8 +42,8 @@ public:
ItemList toUserOutput(const ProjectExplorer::Kit *k) const final;
ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *) const final;
static void setNinjaTool(ProjectExplorer::Kit *kit, Core::Id id);
static Core::Id ninjaToolId(const ProjectExplorer::Kit *kit);
static void setNinjaTool(ProjectExplorer::Kit *kit, Utils::Id id);
static Utils::Id ninjaToolId(const ProjectExplorer::Kit *kit);
static inline decltype(auto) ninjaTool(const ProjectExplorer::Kit *kit)
{

6
src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.cpp
View File

@@ -92,17 +92,17 @@ void ToolKitAspectWidget::removeTool(const MesonTools::Tool_t &tool)
void ToolKitAspectWidget::setCurrentToolIndex(int index)
{
const Core::Id id = Core::Id::fromSetting(m_toolsComboBox->itemData(index));
const Utils::Id id = Utils::Id::fromSetting(m_toolsComboBox->itemData(index));
if (m_type == ToolType::Meson)
MesonToolKitAspect::setMesonTool(m_kit, id);
else
NinjaToolKitAspect::setNinjaTool(m_kit, id);
}
int ToolKitAspectWidget::indexOf(const Core::Id &id)
int ToolKitAspectWidget::indexOf(const Utils::Id &id)
{
for (int i = 0; i < m_toolsComboBox->count(); ++i) {
if (id == Core::Id::fromSetting(m_toolsComboBox->itemData(i)))
if (id == Utils::Id::fromSetting(m_toolsComboBox->itemData(i)))
return i;
}
return -1;

2
src/plugins/mesonprojectmanager/settings/tools/kitaspect/toolkitaspectwidget.h
View File

@@ -50,7 +50,7 @@ private:
void addTool(const MesonTools::Tool_t &tool);
void removeTool(const MesonTools::Tool_t &tool);
void setCurrentToolIndex(int index);
int indexOf(const Core::Id &id);
int indexOf(const Utils::Id &id);
bool isCompatible(const MesonTools::Tool_t &tool);
void loadTools();
void setToDefault();

6
src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.h
View File

@@ -24,7 +24,7 @@
****************************************************************************/
#pragma once
#include "coreplugin/id.h"
#include "utils/id.h"
#include "utils/fileutils.h"
#include "utils/optional.h"
#include <QWidget>
@@ -47,11 +47,11 @@ public:
~ToolItemSettings();
void load(ToolTreeItem *item);
void store();
Q_SIGNAL void applyChanges(Core::Id itemId, const QString &name, const Utils::FilePath &exe);
Q_SIGNAL void applyChanges(Utils::Id itemId, const QString &name, const Utils::FilePath &exe);
private:
Ui::ToolItemSettings *ui;
Utils::optional<Core::Id> m_currentId{Utils::nullopt};
Utils::optional<Utils::Id> m_currentId{Utils::nullopt};
};
} // namespace Internal
} // namespace MesonProjectManager

4
src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
View File

@@ -47,7 +47,7 @@ ToolTreeItem *ToolsModel::mesoneToolTreeItem(const QModelIndex &index) const
return itemForIndexAtLevel<2>(index);
}
void ToolsModel::updateItem(const Core::Id &itemId, const QString &name, const Utils::FilePath &exe)
void ToolsModel::updateItem(const Utils::Id &itemId, const QString &name, const Utils::FilePath &exe)
{
auto treeItem = findItemAtLevel<2>([itemId](ToolTreeItem *n) { return n->id() == itemId; });
QTC_ASSERT(treeItem, return );
@@ -62,7 +62,7 @@ void ToolsModel::addMesonTool()
void ToolsModel::removeMesonTool(ToolTreeItem *item)
{
QTC_ASSERT(item, return );
const Core::Id id = item->id();
const Utils::Id id = item->id();
destroyItem(item);
m_itemsToRemove.enqueue(id);
}

4
src/plugins/mesonprojectmanager/settings/tools/toolsmodel.h
View File

@@ -41,7 +41,7 @@ class ToolsModel final : public Utils::TreeModel<Utils::TreeItem, Utils::TreeIte
public:
ToolsModel();
ToolTreeItem *mesoneToolTreeItem(const QModelIndex &index) const;
void updateItem(const Core::Id &itemId, const QString &name, const Utils::FilePath &exe);
void updateItem(const Utils::Id &itemId, const QString &name, const Utils::FilePath &exe);
void addMesonTool();
void removeMesonTool(ToolTreeItem *item);
ToolTreeItem *cloneMesonTool(ToolTreeItem *item);
@@ -52,7 +52,7 @@ private:
QString uniqueName(const QString &baseName);
Utils::TreeItem *autoDetectedGroup() const;
Utils::TreeItem *manualGroup() const;
QQueue<Core::Id> m_itemsToRemove;
QQueue<Utils::Id> m_itemsToRemove;
};
} // namespace Internal
} // namespace MesonProjectManager

4
src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.cpp
View File

@@ -33,7 +33,7 @@ namespace Internal {
ToolTreeItem::ToolTreeItem(const QString &name)
: m_name{name}
, m_autoDetected{false}
, m_id(Core::Id::fromString(QUuid::createUuid().toString()))
, m_id(Utils::Id::fromString(QUuid::createUuid().toString()))
, m_unsavedChanges{true}
{
self_check();
@@ -54,7 +54,7 @@ ToolTreeItem::ToolTreeItem(const ToolTreeItem &other)
: m_name{tr("Clone of %1").arg(other.m_name)}
, m_executable{other.m_executable}
, m_autoDetected{false}
, m_id{Core::Id::fromString(QUuid::createUuid().toString())}
, m_id{Utils::Id::fromString(QUuid::createUuid().toString())}
, m_unsavedChanges{true}
{
self_check();

6
src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
View File

@@ -26,7 +26,7 @@
#pragma once
#include "toolssettingspage.h"
#include <exewrappers/mesontools.h>
#include <coreplugin/id.h>
#include <utils/id.h>
#include <utils/fileutils.h>
#include <utils/optional.h>
#include <utils/treemodel.h>
@@ -46,7 +46,7 @@ public:
inline bool isAutoDetected() const noexcept { return m_autoDetected; }
inline QString name() const noexcept { return m_name; }
inline Utils::FilePath executable() const noexcept { return m_executable; }
inline Core::Id id() const noexcept { return m_id; }
inline Utils::Id id() const noexcept { return m_id; }
inline bool hasUnsavedChanges() const noexcept { return m_unsavedChanges; }
inline void setSaved() { m_unsavedChanges = false; }
void update(const QString &name, const Utils::FilePath &exe);
@@ -62,7 +62,7 @@ private:
bool m_pathExists;
bool m_pathIsFile;
bool m_pathIsExecutable;
Core::Id m_id;
Utils::Id m_id;
bool m_unsavedChanges = false;
};