ClangTools: Rename ClangToolsConfigWidget -> SettingsWidget

Change-Id: I37ee3435054b27fd9e990f2923e6246ecb9e631f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

7 files changed, 23 insertions, 25 deletions

diff --git a/src/plugins/clangtools/CMakeLists.txt b/src/plugins/clangtools/CMakeLists.txt
index ba6c1bce62..d93ce95664 100644
--- a/src/plugins/clangtools/CMakeLists.txt
+++ b/src/plugins/clangtools/CMakeLists.txt
@@ -21,7 +21,6 @@ add_qtc_plugin(ClangTools
     clangtoolrunner.cpp clangtoolrunner.h
     clangtools_global.h
     clangtoolsbasicsettings.cpp clangtoolsbasicsettings.h clangtoolsbasicsettings.ui
-    clangtoolsconfigwidget.cpp clangtoolsconfigwidget.h clangtoolsconfigwidget.ui
     clangtoolsconstants.h
     clangtoolsdiagnostic.cpp clangtoolsdiagnostic.h
     clangtoolsdiagnosticmodel.cpp clangtoolsdiagnosticmodel.h
@@ -32,6 +31,7 @@ add_qtc_plugin(ClangTools
     clangtoolsprojectsettingswidget.cpp clangtoolsprojectsettingswidget.h clangtoolsprojectsettingswidget.ui
     clangtoolssettings.cpp clangtoolssettings.h
     clangtoolsutils.cpp clangtoolsutils.h
+    settingswidget.cpp settingswidget.h settingswidget.ui
 )
 
 extend_qtc_plugin(ClangTools
diff --git a/src/plugins/clangtools/clangtools.pro b/src/plugins/clangtools/clangtools.pro
index cf6e62c103..9a6f3bf24b 100644
--- a/src/plugins/clangtools/clangtools.pro
+++ b/src/plugins/clangtools/clangtools.pro
@@ -34,7 +34,7 @@ SOURCES += \
     clangtoolsprojectsettings.cpp \
     clangtoolssettings.cpp \
     clangtoolsutils.cpp \
-    clangtoolsconfigwidget.cpp
+    settingswidget.cpp \
 
 HEADERS += \
     clangfileinfo.h \
@@ -58,13 +58,12 @@ HEADERS += \
     clangtoolsprojectsettings.h \
     clangtoolssettings.h \
     clangtoolsutils.h \
-    clangtoolsconfigwidget.h
+    settingswidget.h \
 
 FORMS += \
     clangtoolsprojectsettingswidget.ui \
-    clangtoolsconfigwidget.ui \
-    clangselectablefilesdialog.ui \
-    clangtoolsbasicsettings.ui
+    clangtoolsbasicsettings.ui \
+    settingswidget.ui \
 
 equals(TEST, 1) {
     HEADERS += \
diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index 896ced43e3..873f41c15e 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -53,9 +53,6 @@ QtcPlugin {
         "clangtoolsbasicsettings.cpp",
         "clangtoolsbasicsettings.h",
         "clangtoolsbasicsettings.ui",
-        "clangtoolsconfigwidget.cpp",
-        "clangtoolsconfigwidget.h",
-        "clangtoolsconfigwidget.ui",
         "clangtoolsconstants.h",
         "clangtoolsdiagnostic.cpp",
         "clangtoolsdiagnostic.h",
@@ -76,6 +73,9 @@ QtcPlugin {
         "clangtoolsutils.h",
         "clangtoolsplugin.cpp",
         "clangtoolsplugin.h",
+        "settingswidget.cpp",
+        "settingswidget.h",
+        "settingswidget.ui",
     ]
 
     Group {
diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index 8fcd5f61b9..c99c0d2ccd 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -25,11 +25,11 @@
 
 #include "clangtoolsplugin.h"
 
-#include "clangtoolsconfigwidget.h"
 #include "clangtoolsconstants.h"
 #include "clangtoolsprojectsettingswidget.h"
 #include "clangtidyclazytool.h"
 #include "clangtoolsprojectsettings.h"
+#include "settingswidget.h"
 
 #ifdef WITH_TESTS
 #include "clangtoolspreconfiguredsessiontests.h"
@@ -83,7 +83,7 @@ public:
     QWidget *widget() override
     {
         if (!m_widget)
-            m_widget = new ClangToolsConfigWidget(ClangToolsSettings::instance());
+            m_widget = new SettingsWidget(ClangToolsSettings::instance());
         return m_widget;
     }
 
diff --git a/src/plugins/clangtools/clangtoolsconfigwidget.cpp b/src/plugins/clangtools/settingswidget.cpp
index b634875f97..c1545b327d 100644
--- a/src/plugins/clangtools/clangtoolsconfigwidget.cpp
+++ b/src/plugins/clangtools/settingswidget.cpp
@@ -23,9 +23,10 @@
 **
 ****************************************************************************/
 
-#include "clangtoolsconfigwidget.h"
+#include "settingswidget.h"
+
 #include "ui_clangtoolsbasicsettings.h"
-#include "ui_clangtoolsconfigwidget.h"
+#include "ui_settingswidget.h"
 
 #include "clangtoolsutils.h"
 
@@ -39,11 +40,11 @@
 namespace ClangTools {
 namespace Internal {
 
-ClangToolsConfigWidget::ClangToolsConfigWidget(
+SettingsWidget::SettingsWidget(
         ClangToolsSettings *settings,
         QWidget *parent)
     : QWidget(parent)
-    , m_ui(new Ui::ClangToolsConfigWidget)
+    , m_ui(new Ui::SettingsWidget)
     , m_settings(settings)
 {
     m_ui->setupUi(this);
@@ -83,7 +84,7 @@ ClangToolsConfigWidget::ClangToolsConfigWidget(
     });
 }
 
-ClangToolsConfigWidget::~ClangToolsConfigWidget() = default;
+SettingsWidget::~SettingsWidget() = default;
 
 } // namespace Internal
 } // namespace ClangTools
diff --git a/src/plugins/clangtools/clangtoolsconfigwidget.h b/src/plugins/clangtools/settingswidget.h
index 177aadd259..6eeaeb5d98 100644
--- a/src/plugins/clangtools/clangtoolsconfigwidget.h
+++ b/src/plugins/clangtools/settingswidget.h
@@ -34,19 +34,17 @@
 namespace ClangTools {
 namespace Internal {
 
-namespace Ui { class ClangToolsConfigWidget; }
+namespace Ui { class SettingsWidget; }
 
-class ClangExecutableVersion;
-
-class ClangToolsConfigWidget : public QWidget
+class SettingsWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    ClangToolsConfigWidget(ClangToolsSettings *settings, QWidget *parent = nullptr);
-    ~ClangToolsConfigWidget() override;
+    SettingsWidget(ClangToolsSettings *settings, QWidget *parent = nullptr);
+    ~SettingsWidget() override;
 private:
-    std::unique_ptr<Ui::ClangToolsConfigWidget> m_ui;
+    std::unique_ptr<Ui::SettingsWidget> m_ui;
     ClangToolsSettings *m_settings;
 };
 
diff --git a/src/plugins/clangtools/clangtoolsconfigwidget.ui b/src/plugins/clangtools/settingswidget.ui
index b2d5aa9875..082f885551 100644
--- a/src/plugins/clangtools/clangtoolsconfigwidget.ui
+++ b/src/plugins/clangtools/settingswidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ClangTools::Internal::ClangToolsConfigWidget</class>
- <widget class="QWidget" name="ClangTools::Internal::ClangToolsConfigWidget">
+ <class>ClangTools::Internal::SettingsWidget</class>
+ <widget class="QWidget" name="ClangTools::Internal::SettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>