From c9b81d2d39d155f4ce9660047b7ab1c10375328c Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 27 Aug 2019 16:09:39 +0200 Subject: [PATCH] ClangTools: Rename ClangToolsConfigWidget -> SettingsWidget Change-Id: I37ee3435054b27fd9e990f2923e6246ecb9e631f Reviewed-by: Cristian Adam Reviewed-by: Nikolai Kosjar --- src/plugins/clangtools/CMakeLists.txt | 2 +- src/plugins/clangtools/clangtools.pro | 9 ++++----- src/plugins/clangtools/clangtools.qbs | 6 +++--- src/plugins/clangtools/clangtoolsplugin.cpp | 4 ++-- ...clangtoolsconfigwidget.cpp => settingswidget.cpp} | 11 ++++++----- .../{clangtoolsconfigwidget.h => settingswidget.h} | 12 +++++------- .../{clangtoolsconfigwidget.ui => settingswidget.ui} | 4 ++-- 7 files changed, 23 insertions(+), 25 deletions(-) rename src/plugins/clangtools/{clangtoolsconfigwidget.cpp => settingswidget.cpp} (93%) rename src/plugins/clangtools/{clangtoolsconfigwidget.h => settingswidget.h} (82%) rename src/plugins/clangtools/{clangtoolsconfigwidget.ui => settingswidget.ui} (94%) diff --git a/src/plugins/clangtools/CMakeLists.txt b/src/plugins/clangtools/CMakeLists.txt index ba6c1bce623..d93ce95664e 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 cf6e62c1035..9a6f3bf24b4 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 896ced43e3b..873f41c15e1 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 8fcd5f61b96..c99c0d2ccd0 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 similarity index 93% rename from src/plugins/clangtools/clangtoolsconfigwidget.cpp rename to src/plugins/clangtools/settingswidget.cpp index b634875f979..c1545b327de 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 similarity index 82% rename from src/plugins/clangtools/clangtoolsconfigwidget.h rename to src/plugins/clangtools/settingswidget.h index 177aadd259b..6eeaeb5d987 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 m_ui; + std::unique_ptr m_ui; ClangToolsSettings *m_settings; }; diff --git a/src/plugins/clangtools/clangtoolsconfigwidget.ui b/src/plugins/clangtools/settingswidget.ui similarity index 94% rename from src/plugins/clangtools/clangtoolsconfigwidget.ui rename to src/plugins/clangtools/settingswidget.ui index b2d5aa9875c..082f8855512 100644 --- a/src/plugins/clangtools/clangtoolsconfigwidget.ui +++ b/src/plugins/clangtools/settingswidget.ui @@ -1,7 +1,7 @@ - ClangTools::Internal::ClangToolsConfigWidget - + ClangTools::Internal::SettingsWidget + 0