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/cpptools/clangdiagnosticconfig.cpp
View File

@@ -32,12 +32,12 @@
namespace CppTools {
Core::Id ClangDiagnosticConfig::id() const
Utils::Id ClangDiagnosticConfig::id() const
{
return m_id;
}
void ClangDiagnosticConfig::setId(const Core::Id &id)
void ClangDiagnosticConfig::setId(const Utils::Id &id)
{
m_id = id;
}
@@ -199,7 +199,7 @@ ClangDiagnosticConfigs diagnosticConfigsFromSettings(QSettings *s)
s->setArrayIndex(i);
ClangDiagnosticConfig config;
config.setId(Core::Id::fromSetting(s->value(diagnosticConfigIdKey)));
config.setId(Utils::Id::fromSetting(s->value(diagnosticConfigIdKey)));
config.setDisplayName(s->value(diagnosticConfigDisplayNameKey).toString());
config.setClangOptions(s->value(diagnosticConfigWarningsKey).toStringList());
config.setUseBuildSystemWarnings(s->value(useBuildSystemFlagsKey, false).toBool());

8
src/plugins/cpptools/clangdiagnosticconfig.h
View File

@@ -27,7 +27,7 @@
#include "cpptools_global.h"
#include <coreplugin/id.h>
#include <utils/id.h>
#include <QStringList>
#include <QVector>
@@ -42,8 +42,8 @@ namespace CppTools {
class CPPTOOLS_EXPORT ClangDiagnosticConfig
{
public:
Core::Id id() const;
void setId(const Core::Id &id);
Utils::Id id() const;
void setId(const Utils::Id &id);
QString displayName() const;
void setDisplayName(const QString &displayName);
@@ -91,7 +91,7 @@ public:
bool operator!=(const ClangDiagnosticConfig &other) const;
private:
Core::Id m_id;
Utils::Id m_id;
QString m_displayName;
QStringList m_clangOptions;
TidyMode m_clangTidyMode = TidyMode::UseDefaultChecks;

14
src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
View File

@@ -60,7 +60,7 @@ void ClangDiagnosticConfigsModel::appendOrUpdate(const ClangDiagnosticConfig &co
m_diagnosticConfigs.append(config);
}
void ClangDiagnosticConfigsModel::removeConfigWithId(const Core::Id &id)
void ClangDiagnosticConfigsModel::removeConfigWithId(const Utils::Id &id)
{
m_diagnosticConfigs.removeOne(configWithId(id));
}
@@ -77,21 +77,21 @@ ClangDiagnosticConfigs ClangDiagnosticConfigsModel::customConfigs() const
});
}
bool ClangDiagnosticConfigsModel::hasConfigWithId(const Core::Id &id) const
bool ClangDiagnosticConfigsModel::hasConfigWithId(const Utils::Id &id) const
{
return indexOfConfig(id) != -1;
}
const ClangDiagnosticConfig &ClangDiagnosticConfigsModel::configWithId(const Core::Id &id) const
const ClangDiagnosticConfig &ClangDiagnosticConfigsModel::configWithId(const Utils::Id &id) const
{
return m_diagnosticConfigs.at(indexOfConfig(id));
}
QVector<Core::Id> ClangDiagnosticConfigsModel::changedOrRemovedConfigs(
QVector<Utils::Id> ClangDiagnosticConfigsModel::changedOrRemovedConfigs(
const ClangDiagnosticConfigs &oldConfigs, const ClangDiagnosticConfigs &newConfigs)
{
ClangDiagnosticConfigsModel newConfigsModel(newConfigs);
QVector<Core::Id> changedConfigs;
QVector<Utils::Id> changedConfigs;
for (const ClangDiagnosticConfig &old: oldConfigs) {
const int i = newConfigsModel.indexOfConfig(old.id());
@@ -108,7 +108,7 @@ ClangDiagnosticConfig ClangDiagnosticConfigsModel::createCustomConfig(
const ClangDiagnosticConfig &baseConfig, const QString &displayName)
{
ClangDiagnosticConfig copied = baseConfig;
copied.setId(Core::Id::fromString(QUuid::createUuid().toString()));
copied.setId(Utils::Id::fromString(QUuid::createUuid().toString()));
copied.setDisplayName(displayName);
copied.setIsReadOnly(false);
@@ -127,7 +127,7 @@ QStringList ClangDiagnosticConfigsModel::globalDiagnosticOptions()
};
}
int ClangDiagnosticConfigsModel::indexOfConfig(const Core::Id &id) const
int ClangDiagnosticConfigsModel::indexOfConfig(const Utils::Id &id) const
{
return Utils::indexOf(m_diagnosticConfigs, [&](const ClangDiagnosticConfig &config) {
return config.id() == id;

10
src/plugins/cpptools/clangdiagnosticconfigsmodel.h
View File

@@ -43,16 +43,16 @@ public:
const ClangDiagnosticConfig &at(int index) const;
void appendOrUpdate(const ClangDiagnosticConfig &config);
void removeConfigWithId(const Core::Id &id);
void removeConfigWithId(const Utils::Id &id);
ClangDiagnosticConfigs allConfigs() const;
ClangDiagnosticConfigs customConfigs() const;
bool hasConfigWithId(const Core::Id &id) const;
const ClangDiagnosticConfig &configWithId(const Core::Id &id) const;
int indexOfConfig(const Core::Id &id) const;
bool hasConfigWithId(const Utils::Id &id) const;
const ClangDiagnosticConfig &configWithId(const Utils::Id &id) const;
int indexOfConfig(const Utils::Id &id) const;
static QVector<Core::Id> changedOrRemovedConfigs(const ClangDiagnosticConfigs &oldConfigs,
static QVector<Utils::Id> changedOrRemovedConfigs(const ClangDiagnosticConfigs &oldConfigs,
const ClangDiagnosticConfigs &newConfigs);
static ClangDiagnosticConfig createCustomConfig(const ClangDiagnosticConfig &baseConfig,
const QString &displayName);

4
src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp
View File

@@ -58,7 +58,7 @@ ClangDiagnosticConfigsSelectionWidget::ClangDiagnosticConfigsSelectionWidget(QWi
}
void ClangDiagnosticConfigsSelectionWidget::refresh(const ClangDiagnosticConfigsModel &model,
const Core::Id &configToSelect,
const Utils::Id &configToSelect,
const CreateEditWidget &createEditWidget)
{
m_diagnosticConfigsModel = model;
@@ -69,7 +69,7 @@ void ClangDiagnosticConfigsSelectionWidget::refresh(const ClangDiagnosticConfigs
m_button->setText(config.displayName());
}
Core::Id ClangDiagnosticConfigsSelectionWidget::currentConfigId() const
Utils::Id ClangDiagnosticConfigsSelectionWidget::currentConfigId() const
{
return m_currentConfigId;
}

8
src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.h
View File

@@ -51,13 +51,13 @@ public:
using CreateEditWidget
= std::function<ClangDiagnosticConfigsWidget *(const ClangDiagnosticConfigs &configs,
const Core::Id &configToSelect)>;
const Utils::Id &configToSelect)>;
void refresh(const ClangDiagnosticConfigsModel &model,
const Core::Id &configToSelect,
const Utils::Id &configToSelect,
const CreateEditWidget &createEditWidget);
Core::Id currentConfigId() const;
Utils::Id currentConfigId() const;
ClangDiagnosticConfigs customConfigs() const;
signals:
@@ -67,7 +67,7 @@ private:
void onButtonClicked();
ClangDiagnosticConfigsModel m_diagnosticConfigsModel;
Core::Id m_currentConfigId;
Utils::Id m_currentConfigId;
bool m_showTidyClazyUi = true;
QLabel *m_label = nullptr;

8
src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
View File

@@ -109,13 +109,13 @@ public:
m_customRoot->appendChild(new ConfigNode(config));
}
void removeConfig(const Core::Id &id)
void removeConfig(const Utils::Id &id)
{
ConfigNode *node = itemForConfigId(id);
node->parent()->removeChildAt(node->indexInParent());
}
ConfigNode *itemForConfigId(const Core::Id &id) const
ConfigNode *itemForConfigId(const Utils::Id &id) const
{
return findItemAtLevel<2>([id](const ConfigNode *node) {
return node->config.id() == id;
@@ -128,7 +128,7 @@ private:
};
ClangDiagnosticConfigsWidget::ClangDiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs,
const Core::Id &configToSelect,
const Utils::Id &configToSelect,
QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::ClangDiagnosticConfigsWidget)
@@ -215,7 +215,7 @@ const ClangDiagnosticConfig ClangDiagnosticConfigsWidget::currentConfig() const
void ClangDiagnosticConfigsWidget::onRemoveButtonClicked()
{
const Core::Id configToRemove = currentConfig().id();
const Utils::Id configToRemove = currentConfig().id();
if (m_configsModel->customConfigsCount() == 1)
m_ui->configsView->setCurrentIndex(m_configsModel->fallbackConfigIndex());
m_configsModel->removeConfig(configToRemove);

4
src/plugins/cpptools/clangdiagnosticconfigswidget.h
View File

@@ -55,7 +55,7 @@ class CPPTOOLS_EXPORT ClangDiagnosticConfigsWidget : public QWidget
public:
explicit ClangDiagnosticConfigsWidget(const ClangDiagnosticConfigs &configs,
const Core::Id &configToSelect,
const Utils::Id &configToSelect,
QWidget *parent = nullptr);
~ClangDiagnosticConfigsWidget() override;
@@ -85,7 +85,7 @@ private:
private:
Ui::ClangDiagnosticConfigsWidget *m_ui;
ConfigsModel *m_configsModel = nullptr;
QHash<Core::Id, QString> m_notAcceptedOptions;
QHash<Utils::Id, QString> m_notAcceptedOptions;
std::unique_ptr<CppTools::Ui::ClangBaseChecks> m_clangBaseChecks;
QWidget *m_clangBaseChecksWidget = nullptr;

2
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -745,7 +745,7 @@ void CompilerOptionsBuilder::evaluateCompilerFlags()
qgetenv("QTC_CLANG_CMD_OPTIONS_BLACKLIST"))
.split(';', Utils::SkipEmptyParts);
const Core::Id &toolChain = m_projectPart.toolchainType;
const Utils::Id &toolChain = m_projectPart.toolchainType;
bool containsDriverMode = false;
bool skipNext = false;
const QStringList allFlags = m_projectPart.compilerFlags + m_projectPart.extraCodeModelFlags;

22
src/plugins/cpptools/cppcodemodelsettings.cpp
View File

@@ -36,7 +36,7 @@
using namespace CppTools;
static Core::Id initialClangDiagnosticConfigId()
static Utils::Id initialClangDiagnosticConfigId()
{ return Constants::CPP_CLANG_DIAG_CONFIG_QUESTIONABLE; }
static CppCodeModelSettings::PCHUsage initialPchUsage()
@@ -60,11 +60,11 @@ static QString skipIndexingBigFilesKey()
static QString indexerFileSizeLimitKey()
{ return QLatin1String(Constants::CPPTOOLS_INDEXER_FILE_SIZE_LIMIT); }
static Core::Id clangDiagnosticConfigIdFromSettings(QSettings *s)
static Utils::Id clangDiagnosticConfigIdFromSettings(QSettings *s)
{
QTC_ASSERT(s->group() == QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP), return Core::Id());
QTC_ASSERT(s->group() == QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP), return Utils::Id());
return Core::Id::fromSetting(
return Utils::Id::fromSetting(
s->value(clangDiagnosticConfigKey(), initialClangDiagnosticConfigId().toSetting()));
}
@@ -113,7 +113,7 @@ static ClangDiagnosticConfigs removedBuiltinConfigs()
return configs;
}
static ClangDiagnosticConfig convertToCustomConfig(const Core::Id &id)
static ClangDiagnosticConfig convertToCustomConfig(const Utils::Id &id)
{
const ClangDiagnosticConfig config
= Utils::findOrDefault(removedBuiltinConfigs(), [id](const ClangDiagnosticConfig &config) {
@@ -131,7 +131,7 @@ void CppCodeModelSettings::fromSettings(QSettings *s)
// Qt Creator 4.11 removes some built-in configs.
bool write = false;
const Core::Id id = m_clangDiagnosticConfigId;
const Utils::Id id = m_clangDiagnosticConfigId;
if (id == "Builtin.Pedantic" || id == "Builtin.EverythingWithExceptions") {
// If one of them was used, continue to use it, but convert it to a custom config.
const ClangDiagnosticConfig customConfig = convertToCustomConfig(id);
@@ -172,7 +172,7 @@ void CppCodeModelSettings::toSettings(QSettings *s)
{
s->beginGroup(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP));
const ClangDiagnosticConfigs previousConfigs = diagnosticConfigsFromSettings(s);
const Core::Id previousConfigId = clangDiagnosticConfigIdFromSettings(s);
const Utils::Id previousConfigId = clangDiagnosticConfigIdFromSettings(s);
diagnosticConfigsToSettings(s, m_clangCustomDiagnosticConfigs);
@@ -186,7 +186,7 @@ void CppCodeModelSettings::toSettings(QSettings *s)
s->endGroup();
QVector<Core::Id> invalidated
QVector<Utils::Id> invalidated
= ClangDiagnosticConfigsModel::changedOrRemovedConfigs(previousConfigs,
m_clangCustomDiagnosticConfigs);
@@ -198,19 +198,19 @@ void CppCodeModelSettings::toSettings(QSettings *s)
emit changed();
}
Core::Id CppCodeModelSettings::clangDiagnosticConfigId() const
Utils::Id CppCodeModelSettings::clangDiagnosticConfigId() const
{
if (!diagnosticConfigsModel().hasConfigWithId(m_clangDiagnosticConfigId))
return defaultClangDiagnosticConfigId();
return m_clangDiagnosticConfigId;
}
void CppCodeModelSettings::setClangDiagnosticConfigId(const Core::Id &configId)
void CppCodeModelSettings::setClangDiagnosticConfigId(const Utils::Id &configId)
{
m_clangDiagnosticConfigId = configId;
}
Core::Id CppCodeModelSettings::defaultClangDiagnosticConfigId()
Utils::Id CppCodeModelSettings::defaultClangDiagnosticConfigId()
{
return initialClangDiagnosticConfigId();
}

10
src/plugins/cpptools/cppcodemodelsettings.h
View File

@@ -53,9 +53,9 @@ public:
void toSettings(QSettings *s);
public:
Core::Id clangDiagnosticConfigId() const;
void setClangDiagnosticConfigId(const Core::Id &configId);
static Core::Id defaultClangDiagnosticConfigId() ;
Utils::Id clangDiagnosticConfigId() const;
void setClangDiagnosticConfigId(const Utils::Id &configId);
static Utils::Id defaultClangDiagnosticConfigId() ;
const ClangDiagnosticConfig clangDiagnosticConfig() const;
ClangDiagnosticConfigs clangCustomDiagnosticConfigs() const;
@@ -77,7 +77,7 @@ public:
void setIndexerFileSizeLimitInMb(int sizeInMB);
signals:
void clangDiagnosticConfigsInvalidated(const QVector<Core::Id> &configId);
void clangDiagnosticConfigsInvalidated(const QVector<Utils::Id> &configId);
void changed();
private:
@@ -86,7 +86,7 @@ private:
bool m_skipIndexingBigFiles = true;
int m_indexerFileSizeLimitInMB = 5;
ClangDiagnosticConfigs m_clangCustomDiagnosticConfigs;
Core::Id m_clangDiagnosticConfigId;
Utils::Id m_clangDiagnosticConfigId;
bool m_enableLowerClazyLevels = true; // For UI behavior only
};

6
src/plugins/cpptools/cppcodemodelsettingspage.cpp
View File

@@ -93,7 +93,7 @@ void CppCodeModelSettingsWidget::setupClangCodeModelWidgets()
->refresh(diagnosticConfigsModel(),
m_settings->clangDiagnosticConfigId(),
[](const CppTools::ClangDiagnosticConfigs &configs,
const Core::Id &configToSelect) {
const Utils::Id &configToSelect) {
return new CppTools::ClangDiagnosticConfigsWidget(configs, configToSelect);
});
@@ -123,8 +123,8 @@ bool CppCodeModelSettingsWidget::applyClangCodeModelWidgetsToSettings() const
{
bool changed = false;
const Core::Id oldConfigId = m_settings->clangDiagnosticConfigId();
const Core::Id currentConfigId = m_ui->clangDiagnosticConfigsSelectionWidget->currentConfigId();
const Utils::Id oldConfigId = m_settings->clangDiagnosticConfigId();
const Utils::Id currentConfigId = m_ui->clangDiagnosticConfigsSelectionWidget->currentConfigId();
if (oldConfigId != currentConfigId) {
m_settings->setClangDiagnosticConfigId(currentConfigId);
changed = true;

2
src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
View File

@@ -84,7 +84,7 @@ static const char *defaultPreviewText =
CppCodeStylePreferencesFactory::CppCodeStylePreferencesFactory() = default;
Core::Id CppCodeStylePreferencesFactory::languageId()
Utils::Id CppCodeStylePreferencesFactory::languageId()
{
return Constants::CPP_SETTINGS_ID;
}

2
src/plugins/cpptools/cppcodestylepreferencesfactory.h
View File

@@ -36,7 +36,7 @@ class CPPTOOLS_EXPORT CppCodeStylePreferencesFactory : public TextEditor::ICodeS
public:
CppCodeStylePreferencesFactory();
Core::Id languageId() override;
Utils::Id languageId() override;
QString displayName() override;
TextEditor::ICodeStylePreferences *createCodeStyle() const override;
QWidget *createEditor(TextEditor::ICodeStylePreferences *settings,

4
src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
View File

@@ -654,7 +654,7 @@ void CppToolsPlugin::test_format_pointerdeclaration_macros_data()
"public:\n"
" typedef QPair<QString, QString> Item;\n"
" \n"
" Core::Id dataId(); // the higher the closer to top.\n"
" Utils::Id dataId(); // the higher the closer to top.\n"
" \n"
" unsigned int priority() = 0;\n"
" \n"
@@ -675,7 +675,7 @@ void CppToolsPlugin::test_format_pointerdeclaration_macros_data()
"public:\n"
" typedef QPair<QString, QString> Item;\n"
" \n"
" Core::Id dataId(); // the higher the closer to top.\n"
" Utils::Id dataId(); // the higher the closer to top.\n"
" \n"
" unsigned int priority() = 0;\n"
" \n"

1
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -68,6 +68,7 @@
using namespace Core;
using namespace CPlusPlus;
using namespace Utils;
namespace CppTools {
namespace Internal {

2
src/plugins/cpptools/modelmanagertesthelper.cpp
View File

@@ -41,7 +41,7 @@ TestProject::TestProject(const QString &name, QObject *parent) :
m_name(name)
{
setParent(parent);
setId(Core::Id::fromString(name));
setId(Utils::Id::fromString(name));
setDisplayName(name);
qRegisterMetaType<QSet<QString> >();
}

7
src/plugins/cpptools/projectpart.h
View File

@@ -34,14 +34,11 @@
#include <projectexplorer/projectmacro.h>
#include <projectexplorer/rawprojectpart.h>
#include <coreplugin/id.h>
#include <utils/cpplanguage_details.h>
#include <cplusplus/Token.h>
#include <utils/cpplanguage_details.h>
#include <utils/fileutils.h>
#include <utils/id.h>
#include <QString>
#include <QSharedPointer>
@@ -104,7 +101,7 @@ public:
bool selectedForBuilding = true;
// ToolChain
Core::Id toolchainType;
Utils::Id toolchainType;
bool isMsvc2015Toolchain = false;
QString toolChainTargetTriple;
ToolChainWordWidth toolChainWordWidth = WordWidth32Bit;

1
src/plugins/cpptools/symbolsfindfilter.cpp
View File

@@ -46,6 +46,7 @@
#include <QButtonGroup>
using namespace Core;
using namespace Utils;
namespace CppTools {
namespace Internal {

4
src/plugins/cpptools/symbolsfindfilter.h
View File

@@ -79,8 +79,8 @@ private:
void finish();
void cancel();
void setPaused(bool paused);
void onTaskStarted(Core::Id type);
void onAllTasksFinished(Core::Id type);
void onTaskStarted(Utils::Id type);
void onAllTasksFinished(Utils::Id type);
void searchAgain();
QString label() const;