ClangTools: Polish ClangDiagnosticConfigsWidget

* Improve distinction between built-in and custom configs by introducing
  corresponding parent nodes
* Add button to rename a config
* Make closing the dialog apply the selected config.
* Adapt also the related ClangDiagnosticConfigsSelectionWidget showing a
  combo box of the diagnostic configs and a "Manage..." button: Remove
  the combo box and show the current config as the button text.

Change-Id: Ic015df37f2532f84bd7da6cd20bfce07799a97b8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/plugins/clangcodemodel/clangprojectsettings.cpp b/src/plugins/clangcodemodel/clangprojectsettings.cpp
index 698447cc4b..c081203669 100644
--- a/src/plugins/clangcodemodel/clangprojectsettings.cpp
+++ b/src/plugins/clangcodemodel/clangprojectsettings.cpp
@@ -25,6 +25,9 @@
 
 #include "clangprojectsettings.h"
 
+#include <cpptools/cppcodemodelsettings.h>
+#include <cpptools/cpptoolsreuse.h>
+
 #include <utils/qtcassert.h>
 #include <utils/hostosinfo.h>
 
@@ -74,6 +77,9 @@ ClangProjectSettings::ClangProjectSettings(ProjectExplorer::Project *project)
 
 Core::Id ClangProjectSettings::warningConfigId() const
 {
+    const CppTools::ClangDiagnosticConfigsModel model = CppTools::diagnosticConfigsModel();
+    if (!model.hasConfigWithId(m_warningConfigId))
+        return CppTools::codeModelSettings()->defaultClangDiagnosticConfigId();
     return m_warningConfigId;
 }