From 4750969c2b0c5574ed4d4ae23d5c69b5d97e1a87 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Fri, 13 Sep 2019 10:49:14 +0200
Subject: ClangTools: Move run settings to projects mode

Make the global run settings available per project in project mode and
thus remove the diagnostic config selection from the
selectable-files-dialog:

 * Extract the classes RunSettings and RunSettingsWidget instead of
   duplicating stuff.
 * Ensure to pick up the old settings
 * Add some convenience buttons/links in projects mode allowing to
   restore the global settings, to open the global settings and to
   navigate (back) to the analyzer mode.

Change-Id: I1b91b6f8e58a87a025774e4643c46e176b2a8885
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 src/plugins/clangtools/clangtoolsprojectsettings.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/plugins/clangtools/clangtoolsprojectsettings.h')

diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.h b/src/plugins/clangtools/clangtoolsprojectsettings.h
index 0a6aa477d3..aaf045f056 100644
--- a/src/plugins/clangtools/clangtoolsprojectsettings.h
+++ b/src/plugins/clangtools/clangtoolsprojectsettings.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <QObject>
+#include "clangtoolssettings.h"
 
 #include <coreplugin/id.h>
 #include <projectexplorer/project.h>
@@ -70,11 +70,11 @@ public:
     ClangToolsProjectSettings(ProjectExplorer::Project *project);
     ~ClangToolsProjectSettings() override;
 
-    bool useGlobalSettings() const;
-    void setUseGlobalSettings(bool useGlobalSettings);
+    bool useGlobalSettings() const { return m_useGlobalSettings; }
+    void setUseGlobalSettings(bool useGlobalSettings) { m_useGlobalSettings = useGlobalSettings; }
 
-    Core::Id diagnosticConfig() const;
-    void setDiagnosticConfig(const Core::Id &diagnosticConfig);
+    RunSettings runSettings() const { return m_runSettings; }
+    void setRunSettings(const RunSettings &settings) { m_runSettings = settings; }
 
     QSet<Utils::FilePath> selectedDirs() const { return m_selectedDirs; }
     void setSelectedDirs(const QSet<Utils::FilePath> &value) { m_selectedDirs = value; }
@@ -95,10 +95,14 @@ private:
     void store();
 
     ProjectExplorer::Project *m_project;
+
     bool m_useGlobalSettings = true;
-    Core::Id m_diagnosticConfig;
+
+    RunSettings m_runSettings;
+
     QSet<Utils::FilePath> m_selectedDirs;
     QSet<Utils::FilePath> m_selectedFiles;
+
     SuppressedDiagnosticsList m_suppressedDiagnostics;
 };
 
-- 
cgit v1.2.3