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

ClangTools/CppTools: Code cosmetics

Browse Source 
Mostly namespaces.

Change-Id: Ife8bbcb128344cf56d444da8f9d76b1204b9fe34
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-12 09:39:02 +02:00
parent c3d9293004
commit 09ae643153
6 changed files with 112 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,11 +80,11 @@ static FilePath fallbackClangdFilePath()
return "clangd";
}
static Utils::Id clangDiagnosticConfigIdFromSettings(QSettings *s)
static Id clangDiagnosticConfigIdFromSettings(QSettings *s)
{
QTC_ASSERT(s->group() == QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP), return Utils::Id());
QTC_ASSERT(s->group() == QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP), return Id());
return Utils::Id::fromSetting(
return Id::fromSetting(
s->value(clangDiagnosticConfigKey(), initialClangDiagnosticConfigId().toSetting()));
}
@@ -133,7 +133,7 @@ static ClangDiagnosticConfigs removedBuiltinConfigs()
return configs;
}
static ClangDiagnosticConfig convertToCustomConfig(const Utils::Id &id)
static ClangDiagnosticConfig convertToCustomConfig(const Id &id)
{
const ClangDiagnosticConfig config
= Utils::findOrDefault(removedBuiltinConfigs(), [id](const ClangDiagnosticConfig &config) {
@@ -151,7 +151,7 @@ void CppCodeModelSettings::fromSettings(QSettings *s)
// Qt Creator 4.11 removes some built-in configs.
bool write = false;
const Utils::Id id = m_clangDiagnosticConfigId;
const 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);
@@ -192,7 +192,7 @@ void CppCodeModelSettings::toSettings(QSettings *s)
{
s->beginGroup(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP));
const ClangDiagnosticConfigs previousConfigs = diagnosticConfigsFromSettings(s);
const Utils::Id previousConfigId = clangDiagnosticConfigIdFromSettings(s);
const Id previousConfigId = clangDiagnosticConfigIdFromSettings(s);
diagnosticConfigsToSettings(s, m_clangCustomDiagnosticConfigs);
@@ -206,7 +206,7 @@ void CppCodeModelSettings::toSettings(QSettings *s)
s->endGroup();
QVector<Utils::Id> invalidated
QVector<Id> invalidated
= ClangDiagnosticConfigsModel::changedOrRemovedConfigs(previousConfigs,
m_clangCustomDiagnosticConfigs);
@@ -218,19 +218,19 @@ void CppCodeModelSettings::toSettings(QSettings *s)
emit changed();
}
Utils::Id CppCodeModelSettings::clangDiagnosticConfigId() const
Id CppCodeModelSettings::clangDiagnosticConfigId() const
{
if (!diagnosticConfigsModel().hasConfigWithId(m_clangDiagnosticConfigId))
return defaultClangDiagnosticConfigId();
return m_clangDiagnosticConfigId;
}
void CppCodeModelSettings::setClangDiagnosticConfigId(const Utils::Id &configId)
void CppCodeModelSettings::setClangDiagnosticConfigId(const Id &configId)
{
m_clangDiagnosticConfigId = configId;
}
Utils::Id CppCodeModelSettings::defaultClangDiagnosticConfigId()
Id CppCodeModelSettings::defaultClangDiagnosticConfigId()
{
return initialClangDiagnosticConfigId();
}
@@ -310,7 +310,7 @@ ClangdSettings &ClangdSettings::instance()
return settings;
}
void ClangdSettings::setDefaultClangdPath(const Utils::FilePath &filePath)
void ClangdSettings::setDefaultClangdPath(const FilePath &filePath)
{
g_defaultClangdFilePath = filePath;
}
@@ -343,7 +343,8 @@ void ClangdSettings::saveSettings()
#ifdef WITH_TESTS
void ClangdSettings::setUseClangd(bool use) { instance().m_data.useClangd = use; }
void ClangdSettings::setClangdFilePath(const Utils::FilePath &filePath)
void ClangdSettings::setClangdFilePath(const FilePath &filePath)
{
instance().m_data.executableFilePath = filePath;
}