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

ClangTools: Attach ClangToolsProjectSettings data to project itself

Browse Source 
Easier to reason about life time.

Change-Id: I2c61527532f6faa344fc59d858921e66daaf0b7e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-01-13 17:38:33 +01:00
parent 5a4b0b565a
commit 82265d51a7
10 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
View File

@@ -591,13 +591,13 @@ void DiagnosticFilterModel::setProject(ProjectExplorer::Project *project)
{
QTC_ASSERT(project, return);
if (m_project) {
disconnect(ClangToolsProjectSettingsManager::getSettings(m_project),
disconnect(ClangToolsProjectSettings::getSettings(m_project).data(),
&ClangToolsProjectSettings::suppressedDiagnosticsChanged, this,
&DiagnosticFilterModel::handleSuppressedDiagnosticsChanged);
}
m_project = project;
m_lastProjectDirectory = m_project->projectDirectory();
connect(ClangToolsProjectSettingsManager::getSettings(m_project),
connect(ClangToolsProjectSettings::getSettings(m_project).data(),
&ClangToolsProjectSettings::suppressedDiagnosticsChanged,
this, &DiagnosticFilterModel::handleSuppressedDiagnosticsChanged);
handleSuppressedDiagnosticsChanged();
@@ -755,7 +755,7 @@ void DiagnosticFilterModel::handleSuppressedDiagnosticsChanged()
{
QTC_ASSERT(m_project, return);
m_suppressedDiagnostics
= ClangToolsProjectSettingsManager::getSettings(m_project)->suppressedDiagnostics();
= ClangToolsProjectSettings::getSettings(m_project)->suppressedDiagnostics();
invalidate();
}