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

Clang: Make some functions available for reuse

Browse Source 
Change-Id: I7b85ea104a852c1168578949247efb8387a95f30
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-01-29 16:03:38 +01:00
parent e101a629dd
commit 07c66495d8
6 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@
#include <utils/algorithm.h>
#include <QCoreApplication>
#include <QUuid>
namespace CppTools {
@@ -203,11 +204,18 @@ void ClangDiagnosticConfigsModel::removeConfigWithId(const Core::Id &id)
m_diagnosticConfigs.removeOne(configWithId(id));
}
ClangDiagnosticConfigs ClangDiagnosticConfigsModel::configs() const
ClangDiagnosticConfigs ClangDiagnosticConfigsModel::allConfigs() const
{
return m_diagnosticConfigs;
}
ClangDiagnosticConfigs ClangDiagnosticConfigsModel::customConfigs() const
{
return Utils::filtered(allConfigs(), [](const ClangDiagnosticConfig &config) {
return !config.isReadOnly();
});
}
bool ClangDiagnosticConfigsModel::hasConfigWithId(const Core::Id &id) const
{
return indexOfConfig(id) != -1;
@@ -237,13 +245,24 @@ QVector<Core::Id> ClangDiagnosticConfigsModel::changedOrRemovedConfigs(
const int i = newConfigsModel.indexOfConfig(old.id());
if (i == -1)
changedConfigs.append(old.id()); // Removed
else if (newConfigsModel.configs().value(i) != old)
else if (newConfigsModel.allConfigs().value(i) != old)
changedConfigs.append(old.id()); // Changed
}
return changedConfigs;
}
ClangDiagnosticConfig ClangDiagnosticConfigsModel::createCustomConfig(
const ClangDiagnosticConfig &config, const QString &displayName)
{
ClangDiagnosticConfig copied = config;
copied.setId(Core::Id::fromString(QUuid::createUuid().toString()));
copied.setDisplayName(displayName);
copied.setIsReadOnly(false);
return copied;
}
QStringList ClangDiagnosticConfigsModel::globalDiagnosticOptions()
{
return {