ClangTools: Rename configuration widget

This configuration is used not only for static
analyzer but for all tools.

Change-Id: I5ef282500e0addb4ca104b34530e56fba80f59b8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

src/plugins/clangtools/clangtools.pro

@@ -9,7 +9,6 @@ LIBS += $$LIBCLANG_LIBS
 INCLUDEPATH += $$LLVM_INCLUDEPATH
 
 SOURCES += \
-    clangstaticanalyzerconfigwidget.cpp \
     clangstaticanalyzerdiagnosticview.cpp \
     clangstaticanalyzerprojectsettings.cpp \
     clangstaticanalyzerprojectsettingsmanager.cpp \
@@ -28,10 +27,10 @@ SOURCES += \
     clangtoolslogfilereader.cpp \
     clangtoolsplugin.cpp \
     clangtoolssettings.cpp \
-    clangtoolsutils.cpp
+    clangtoolsutils.cpp \
+    clangtoolsconfigwidget.cpp
 
 HEADERS += \
-    clangstaticanalyzerconfigwidget.h \
     clangstaticanalyzerdiagnosticview.h \
     clangstaticanalyzerprojectsettings.h \
     clangstaticanalyzerprojectsettingsmanager.h \
@@ -52,11 +51,12 @@ HEADERS += \
     clangtoolslogfilereader.h \
     clangtoolsplugin.h \
     clangtoolssettings.h \
-    clangtoolsutils.h
+    clangtoolsutils.h \
+    clangtoolsconfigwidget.h
 
 FORMS += \
-    clangstaticanalyzerconfigwidget.ui \
+    clangstaticanalyzerprojectsettingswidget.ui \
-    clangstaticanalyzerprojectsettingswidget.ui
+    clangtoolsconfigwidget.ui
 
 equals(TEST, 1) {
     HEADERS += \

src/plugins/clangtools/clangtools.qbs

@@ -41,9 +41,6 @@ QtcPlugin {
     }
 
     files: [
-        "clangstaticanalyzerconfigwidget.cpp",
-        "clangstaticanalyzerconfigwidget.h",
-        "clangstaticanalyzerconfigwidget.ui",
         "clangstaticanalyzerdiagnosticview.cpp",
         "clangstaticanalyzerdiagnosticview.h",
         "clangstaticanalyzerprojectsettings.cpp",
@@ -72,6 +69,9 @@ QtcPlugin {
         "clangtoolrunner.cpp",
         "clangtoolrunner.h",
         "clangtools_global.h",
+        "clangtoolsconfigwidget.cpp",
+        "clangtoolsconfigwidget.h",
+        "clangtoolsconfigwidget.ui",
         "clangtoolsconstants.h",
         "clangtoolsdiagnostic.cpp",
         "clangtoolsdiagnostic.h",

src/plugins/clangtools/clangtoolsconfigwidget.cpp

@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#include "clangstaticanalyzerconfigwidget.h"
+#include "clangtoolsconfigwidget.h"
-#include "ui_clangstaticanalyzerconfigwidget.h"
+#include "ui_clangtoolsconfigwidget.h"
 
 #include "clangtoolsutils.h"
 
@@ -34,11 +34,11 @@
 namespace ClangTools {
 namespace Internal {
 
-ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget(
+ClangToolsConfigWidget::ClangToolsConfigWidget(
         ClangToolsSettings *settings,
         QWidget *parent)
     : QWidget(parent)
-    , m_ui(new Ui::ClangStaticAnalyzerConfigWidget)
+    , m_ui(new Ui::ClangToolsConfigWidget)
     , m_settings(settings)
 {
     m_ui->setupUi(this);
@@ -51,7 +51,7 @@ ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget(
             [settings](int count) { settings->setSimultaneousProcesses(count); });
 }
 
-ClangStaticAnalyzerConfigWidget::~ClangStaticAnalyzerConfigWidget()
+ClangToolsConfigWidget::~ClangToolsConfigWidget()
 {
     delete m_ui;
 }

src/plugins/clangtools/clangtoolsconfigwidget.h

@@ -32,21 +32,21 @@
 namespace ClangTools {
 namespace Internal {
 
-namespace Ui { class ClangStaticAnalyzerConfigWidget; }
+namespace Ui { class ClangToolsConfigWidget; }
 
 class ClangExecutableVersion;
 
-class ClangStaticAnalyzerConfigWidget : public QWidget
+class ClangToolsConfigWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit ClangStaticAnalyzerConfigWidget(ClangToolsSettings *settings,
+    explicit ClangToolsConfigWidget(ClangToolsSettings *settings,
                                              QWidget *parent = 0);
-    ~ClangStaticAnalyzerConfigWidget();
+    ~ClangToolsConfigWidget();
 
 private:
-    Ui::ClangStaticAnalyzerConfigWidget *m_ui;
+    Ui::ClangToolsConfigWidget *m_ui;
     ClangToolsSettings *m_settings;
 };
 

src/plugins/clangtools/clangtoolsconfigwidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ClangTools::Internal::ClangStaticAnalyzerConfigWidget</class>
+ <class>ClangTools::Internal::ClangToolsConfigWidget</class>
- <widget class="QWidget" name="ClangTools::Internal::ClangStaticAnalyzerConfigWidget">
+ <widget class="QWidget" name="ClangTools::Internal::ClangToolsConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

src/plugins/clangtools/clangtoolsplugin.cpp

@@ -25,7 +25,7 @@
 
 #include "clangtoolsplugin.h"
 
-#include "clangstaticanalyzerconfigwidget.h"
+#include "clangtoolsconfigwidget.h"
 #include "clangtoolsconstants.h"
 #include "clangstaticanalyzerprojectsettingswidget.h"
 #include "clangstaticanalyzerruncontrol.h"
@@ -66,15 +66,15 @@ using namespace ProjectExplorer;
 namespace ClangTools {
 namespace Internal {
 
-class ClangStaticAnalyzerOptionsPage : public Core::IOptionsPage
+class ClangToolsOptionsPage : public Core::IOptionsPage
 {
 public:
-    explicit ClangStaticAnalyzerOptionsPage()
+    explicit ClangToolsOptionsPage()
     {
-        setId("Analyzer.ClangStaticAnalyzer.Settings"); // TODO: Get it from "clangstaticanalyzersettings.h"
+        setId("Analyzer.ClangTools.Settings"); // TODO: Get it from "clangstaticanalyzersettings.h"
         setDisplayName(QCoreApplication::translate(
-                           "ClangTools::Internal::ClangStaticAnalyzerOptionsPage",
+                           "ClangTools::Internal::ClangToolsOptionsPage",
-                           "Clang Static Analyzer"));
+                           "Clang Tools"));
         setCategory("T.Analyzer");
         setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer"));
         setCategoryIcon(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER);
@@ -83,7 +83,7 @@ public:
     QWidget *widget()
     {
         if (!m_widget)
-            m_widget = new ClangStaticAnalyzerConfigWidget(ClangToolsSettings::instance());
+            m_widget = new ClangToolsConfigWidget(ClangToolsSettings::instance());
         return m_widget;
     }
 
@@ -106,7 +106,7 @@ class ClangToolsPluginPrivate
 public:
     ClangStaticAnalyzerTool staticAnalyzerTool;
     ClangTidyClazyTool clangTidyClazyTool;
-    ClangStaticAnalyzerOptionsPage optionsPage;
+    ClangToolsOptionsPage optionsPage;
 };
 
 ClangToolsPlugin::~ClangToolsPlugin()