From 8890a7412c154d48fc160a366fdbe28021ca0138 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Tue, 27 Aug 2019 16:36:27 +0200
Subject: [PATCH] ClangTools: Rename ClangToolsBasicSettings ->
 BasicSettingsWidget

...as it's a widget.

Change-Id: If4f151e7b8ba8c8a6c2b5deb7cba34128a902e3e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
---
 src/plugins/clangtools/CMakeLists.txt               |  2 +-
 ...olsbasicsettings.cpp => basicsettingswidget.cpp} | 12 ++++++------
 ...ngtoolsbasicsettings.h => basicsettingswidget.h} | 12 ++++++------
 ...toolsbasicsettings.ui => basicsettingswidget.ui} |  4 ++--
 .../clangtools/clangselectablefilesdialog.cpp       | 13 +++++++------
 .../clangtools/clangselectablefilesdialog.ui        |  6 +++---
 src/plugins/clangtools/clangtools.pro               |  6 +++---
 src/plugins/clangtools/clangtools.qbs               |  6 +++---
 src/plugins/clangtools/settingswidget.cpp           |  6 +++---
 src/plugins/clangtools/settingswidget.ui            |  6 +++---
 10 files changed, 37 insertions(+), 36 deletions(-)
 rename src/plugins/clangtools/{clangtoolsbasicsettings.cpp => basicsettingswidget.cpp} (82%)
 rename src/plugins/clangtools/{clangtoolsbasicsettings.h => basicsettingswidget.h} (83%)
 rename src/plugins/clangtools/{clangtoolsbasicsettings.ui => basicsettingswidget.ui} (89%)

diff --git a/src/plugins/clangtools/CMakeLists.txt b/src/plugins/clangtools/CMakeLists.txt
index d93ce95664e..04f972b27d9 100644
--- a/src/plugins/clangtools/CMakeLists.txt
+++ b/src/plugins/clangtools/CMakeLists.txt
@@ -10,6 +10,7 @@ add_qtc_plugin(ClangTools
   PLUGIN_DEPENDS Core Debugger CppTools ${TST_COMPONENT}
   INCLUDES ${CLANG_INCLUDE_DIRS}
   SOURCES
+    basicsettingswidget.cpp basicsettingswidget.h basicsettingswidget.ui
     clangfileinfo.h
     clangfixitsrefactoringchanges.cpp clangfixitsrefactoringchanges.h
     clangselectablefilesdialog.cpp clangselectablefilesdialog.h clangselectablefilesdialog.ui
@@ -20,7 +21,6 @@ add_qtc_plugin(ClangTools
     clangtoolruncontrol.cpp clangtoolruncontrol.h
     clangtoolrunner.cpp clangtoolrunner.h
     clangtools_global.h
-    clangtoolsbasicsettings.cpp clangtoolsbasicsettings.h clangtoolsbasicsettings.ui
     clangtoolsconstants.h
     clangtoolsdiagnostic.cpp clangtoolsdiagnostic.h
     clangtoolsdiagnosticmodel.cpp clangtoolsdiagnosticmodel.h
diff --git a/src/plugins/clangtools/clangtoolsbasicsettings.cpp b/src/plugins/clangtools/basicsettingswidget.cpp
similarity index 82%
rename from src/plugins/clangtools/clangtoolsbasicsettings.cpp
rename to src/plugins/clangtools/basicsettingswidget.cpp
index bf1d5337006..f9f2ea8ee4a 100644
--- a/src/plugins/clangtools/clangtoolsbasicsettings.cpp
+++ b/src/plugins/clangtools/basicsettingswidget.cpp
@@ -23,27 +23,27 @@
 **
 ****************************************************************************/
 
-#include "clangtoolsbasicsettings.h"
-#include "ui_clangtoolsbasicsettings.h"
+#include "basicsettingswidget.h"
+#include "ui_basicsettingswidget.h"
 
 #include "clangtoolsutils.h"
 
 namespace ClangTools {
 namespace Internal {
 
-ClangToolsBasicSettings::ClangToolsBasicSettings(QWidget *parent)
+BasicSettingsWidget::BasicSettingsWidget(QWidget *parent)
     : QWidget(parent)
-    , m_ui(new Ui::ClangToolsBasicSettings)
+    , m_ui(new Ui::BasicSettingsWidget)
 {
     m_ui->setupUi(this);
 }
 
-ClangToolsBasicSettings::~ClangToolsBasicSettings()
+BasicSettingsWidget::~BasicSettingsWidget()
 {
     delete m_ui;
 }
 
-Ui::ClangToolsBasicSettings *ClangToolsBasicSettings::ui()
+Ui::BasicSettingsWidget *BasicSettingsWidget::ui()
 {
     return m_ui;
 }
diff --git a/src/plugins/clangtools/clangtoolsbasicsettings.h b/src/plugins/clangtools/basicsettingswidget.h
similarity index 83%
rename from src/plugins/clangtools/clangtoolsbasicsettings.h
rename to src/plugins/clangtools/basicsettingswidget.h
index b9ecb0285ec..02ad9d09894 100644
--- a/src/plugins/clangtools/clangtoolsbasicsettings.h
+++ b/src/plugins/clangtools/basicsettingswidget.h
@@ -30,21 +30,21 @@
 namespace ClangTools {
 namespace Internal {
 
-namespace Ui { class ClangToolsBasicSettings; }
+namespace Ui { class BasicSettingsWidget; }
 
 class ClangExecutableVersion;
 
-class ClangToolsBasicSettings : public QWidget
+class BasicSettingsWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit ClangToolsBasicSettings(QWidget *parent = nullptr);
-    ~ClangToolsBasicSettings() override;
+    explicit BasicSettingsWidget(QWidget *parent = nullptr);
+    ~BasicSettingsWidget() override;
 
-    Ui::ClangToolsBasicSettings *ui();
+    Ui::BasicSettingsWidget *ui();
 private:
-    Ui::ClangToolsBasicSettings *m_ui;
+    Ui::BasicSettingsWidget *m_ui;
 };
 
 } // namespace Internal
diff --git a/src/plugins/clangtools/clangtoolsbasicsettings.ui b/src/plugins/clangtools/basicsettingswidget.ui
similarity index 89%
rename from src/plugins/clangtools/clangtoolsbasicsettings.ui
rename to src/plugins/clangtools/basicsettingswidget.ui
index ccdba126bd3..924ba146cc9 100644
--- a/src/plugins/clangtools/clangtoolsbasicsettings.ui
+++ b/src/plugins/clangtools/basicsettingswidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ClangTools::Internal::ClangToolsBasicSettings</class>
- <widget class="QWidget" name="ClangTools::Internal::ClangToolsBasicSettings">
+ <class>ClangTools::Internal::BasicSettingsWidget</class>
+ <widget class="QWidget" name="ClangTools::Internal::BasicSettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/clangtools/clangselectablefilesdialog.cpp b/src/plugins/clangtools/clangselectablefilesdialog.cpp
index c6ad76ff0a1..23e82dbd3e0 100644
--- a/src/plugins/clangtools/clangselectablefilesdialog.cpp
+++ b/src/plugins/clangtools/clangselectablefilesdialog.cpp
@@ -24,8 +24,9 @@
 ****************************************************************************/
 
 #include "clangselectablefilesdialog.h"
+
 #include "ui_clangselectablefilesdialog.h"
-#include "ui_clangtoolsbasicsettings.h"
+#include "ui_basicsettingswidget.h"
 
 #include "clangtoolsprojectsettings.h"
 #include "clangtoolssettings.h"
@@ -293,8 +294,8 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
     m_ui->buttons->addButton(m_analyzeButton, QDialogButtonBox::AcceptRole);
 
     CppTools::ClangDiagnosticConfigsSelectionWidget *diagnosticConfigsSelectionWidget
-            = m_ui->clangToolsBasicSettings->ui()->clangDiagnosticConfigsSelectionWidget;
-    QCheckBox *buildBeforeAnalysis = m_ui->clangToolsBasicSettings->ui()->buildBeforeAnalysis;
+            = m_ui->basicSettingsWidget->ui()->clangDiagnosticConfigsSelectionWidget;
+    QCheckBox *buildBeforeAnalysis = m_ui->basicSettingsWidget->ui()->buildBeforeAnalysis;
     buildBeforeAnalysis->setToolTip(hintAboutBuildBeforeAnalysis());
 
     ClangToolsProjectSettings *settings = ClangToolsProjectSettingsManager::getSettings(m_project);
@@ -303,7 +304,7 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
 
     if (settings->useGlobalSettings()) {
         m_ui->globalOrCustom->setCurrentIndex(GlobalSettings);
-        m_ui->clangToolsBasicSettings->setEnabled(false);
+        m_ui->basicSettingsWidget->setEnabled(false);
         diagnosticConfigsSelectionWidget->refresh(
                     ClangToolsSettings::instance()->savedDiagnosticConfigId());
         buildBeforeAnalysis->setCheckState(
@@ -311,7 +312,7 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
                     ? Qt::Checked : Qt::Unchecked);
     } else {
         m_ui->globalOrCustom->setCurrentIndex(CustomSettings);
-        m_ui->clangToolsBasicSettings->setEnabled(true);
+        m_ui->basicSettingsWidget->setEnabled(true);
         diagnosticConfigsSelectionWidget->refresh(m_customDiagnosticConfig);
         buildBeforeAnalysis->setCheckState(m_buildBeforeAnalysis ? Qt::Checked : Qt::Unchecked);
     }
@@ -319,7 +320,7 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
     connect(m_ui->globalOrCustom,
             QOverload<int>::of(&QComboBox::currentIndexChanged),
             [=](int index){
-        m_ui->clangToolsBasicSettings->setEnabled(index == CustomSettings);
+        m_ui->basicSettingsWidget->setEnabled(index == CustomSettings);
         if (index == CustomSettings) {
             diagnosticConfigsSelectionWidget->refresh(m_customDiagnosticConfig);
             buildBeforeAnalysis->setCheckState(m_buildBeforeAnalysis ? Qt::Checked : Qt::Unchecked);
diff --git a/src/plugins/clangtools/clangselectablefilesdialog.ui b/src/plugins/clangtools/clangselectablefilesdialog.ui
index 2fe10139a31..e8cf6ff3e79 100644
--- a/src/plugins/clangtools/clangselectablefilesdialog.ui
+++ b/src/plugins/clangtools/clangselectablefilesdialog.ui
@@ -52,7 +52,7 @@
        </layout>
       </item>
       <item>
-       <widget class="ClangTools::Internal::ClangToolsBasicSettings" name="clangToolsBasicSettings" native="true"/>
+       <widget class="ClangTools::Internal::BasicSettingsWidget" name="basicSettingsWidget" native="true"/>
       </item>
      </layout>
     </widget>
@@ -87,9 +87,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>ClangTools::Internal::ClangToolsBasicSettings</class>
+   <class>ClangTools::Internal::BasicSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>clangtools/clangtoolsbasicsettings.h</header>
+   <header>clangtools/basicsettingswidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/plugins/clangtools/clangtools.pro b/src/plugins/clangtools/clangtools.pro
index 9a6f3bf24b4..6d563420a3f 100644
--- a/src/plugins/clangtools/clangtools.pro
+++ b/src/plugins/clangtools/clangtools.pro
@@ -16,6 +16,7 @@ isEmpty(EXTERNAL_YAML_CPP_FOUND) {
 }
 
 SOURCES += \
+    basicsettingswidget.cpp \
     clangfixitsrefactoringchanges.cpp \
     clangselectablefilesdialog.cpp \
     clangtoolsdiagnosticview.cpp \
@@ -26,7 +27,6 @@ SOURCES += \
     clangtool.cpp \
     clangtoolruncontrol.cpp \
     clangtoolrunner.cpp \
-    clangtoolsbasicsettings.cpp \
     clangtoolsdiagnostic.cpp \
     clangtoolsdiagnosticmodel.cpp \
     clangtoolslogfilereader.cpp \
@@ -37,6 +37,7 @@ SOURCES += \
     settingswidget.cpp \
 
 HEADERS += \
+    basicsettingswidget.h \
     clangfileinfo.h \
     clangfixitsrefactoringchanges.h \
     clangselectablefilesdialog.h \
@@ -49,7 +50,6 @@ HEADERS += \
     clangtoolruncontrol.h \
     clangtoolrunner.h \
     clangtools_global.h \
-    clangtoolsbasicsettings.h \
     clangtoolsconstants.h \
     clangtoolsdiagnostic.h \
     clangtoolsdiagnosticmodel.h \
@@ -61,8 +61,8 @@ HEADERS += \
     settingswidget.h \
 
 FORMS += \
+    basicsettingswidget.ui \
     clangtoolsprojectsettingswidget.ui \
-    clangtoolsbasicsettings.ui \
     settingswidget.ui \
 
 equals(TEST, 1) {
diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index 873f41c15e1..9cabd5d3d5e 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -31,6 +31,9 @@ QtcPlugin {
     cpp.rpaths: base.concat(libclang.llvmLibDir)
 
     files: [
+        "basicsettingswidget.cpp",
+        "basicsettingswidget.h",
+        "basicsettingswidget.ui",
         "clangfileinfo.h",
         "clangfixitsrefactoringchanges.cpp",
         "clangfixitsrefactoringchanges.h",
@@ -50,9 +53,6 @@ QtcPlugin {
         "clangtoolrunner.cpp",
         "clangtoolrunner.h",
         "clangtools_global.h",
-        "clangtoolsbasicsettings.cpp",
-        "clangtoolsbasicsettings.h",
-        "clangtoolsbasicsettings.ui",
         "clangtoolsconstants.h",
         "clangtoolsdiagnostic.cpp",
         "clangtoolsdiagnostic.h",
diff --git a/src/plugins/clangtools/settingswidget.cpp b/src/plugins/clangtools/settingswidget.cpp
index c1545b327de..08bd2978978 100644
--- a/src/plugins/clangtools/settingswidget.cpp
+++ b/src/plugins/clangtools/settingswidget.cpp
@@ -25,7 +25,7 @@
 
 #include "settingswidget.h"
 
-#include "ui_clangtoolsbasicsettings.h"
+#include "ui_basicsettingswidget.h"
 #include "ui_settingswidget.h"
 
 #include "clangtoolsutils.h"
@@ -56,7 +56,7 @@ SettingsWidget::SettingsWidget(
             QOverload<int>::of(&QSpinBox::valueChanged),
             [settings](int count) { settings->setSimultaneousProcesses(count); });
 
-    QCheckBox *buildBeforeAnalysis = m_ui->clangToolsBasicSettings->ui()->buildBeforeAnalysis;
+    QCheckBox *buildBeforeAnalysis = m_ui->basicSettingsWidget->ui()->buildBeforeAnalysis;
     buildBeforeAnalysis->setToolTip(hintAboutBuildBeforeAnalysis());
     buildBeforeAnalysis->setCheckState(settings->savedBuildBeforeAnalysis()
                                               ? Qt::Checked : Qt::Unchecked);
@@ -67,7 +67,7 @@ SettingsWidget::SettingsWidget(
     });
 
     CppTools::ClangDiagnosticConfigsSelectionWidget *clangDiagnosticConfigsSelectionWidget
-            = m_ui->clangToolsBasicSettings->ui()->clangDiagnosticConfigsSelectionWidget;
+            = m_ui->basicSettingsWidget->ui()->clangDiagnosticConfigsSelectionWidget;
     clangDiagnosticConfigsSelectionWidget->refresh(settings->savedDiagnosticConfigId());
 
     connect(clangDiagnosticConfigsSelectionWidget,
diff --git a/src/plugins/clangtools/settingswidget.ui b/src/plugins/clangtools/settingswidget.ui
index 082f8855512..b6b990aec8f 100644
--- a/src/plugins/clangtools/settingswidget.ui
+++ b/src/plugins/clangtools/settingswidget.ui
@@ -21,7 +21,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="ClangTools::Internal::ClangToolsBasicSettings" name="clangToolsBasicSettings" native="true"/>
+       <widget class="ClangTools::Internal::BasicSettingsWidget" name="basicSettingsWidget" native="true"/>
       </item>
       <item>
        <layout class="QHBoxLayout" name="processesLayout">
@@ -77,9 +77,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>ClangTools::Internal::ClangToolsBasicSettings</class>
+   <class>ClangTools::Internal::BasicSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>clangtools/clangtoolsbasicsettings.h</header>
+   <header>clangtools/basicsettingswidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>