From 8afa7a64cccf06895f46af4e7be42e45c14eb281 Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Mon, 4 Dec 2017 10:44:52 +0100
Subject: [PATCH] Clang: Plugins: Put settings into the TabWidget

Make tidy/clazy switch more intuitive.

Change-Id: I13d17376bdace039ae371693e28f6fcb0b493244
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../cpptools/cppcodemodelsettingspage.cpp     | 10 ++-------
 .../cpptools/cppcodemodelsettingspage.ui      | 22 +------------------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
index 6ee472a614e..d7f404fb03b 100644
--- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp
+++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
@@ -101,16 +101,10 @@ void CppCodeModelSettingsWidget::setupPluginsWidgets()
     m_tidyChecksWidget = new QWidget();
     m_tidyChecks->setupUi(m_tidyChecksWidget);
 
-    m_ui->pluginChecks->addWidget(m_tidyChecksWidget);
-    m_ui->pluginChecks->addWidget(m_clazyChecksWidget);
+    m_ui->pluginChecks->addTab(m_tidyChecksWidget, tr("ClangTidy"));
+    m_ui->pluginChecks->addTab(m_clazyChecksWidget, tr("Clazy"));
     m_ui->pluginChecks->setCurrentIndex(0);
 
-    connect(m_ui->pluginSelection,
-            static_cast<void (QComboBox::*)(int index)>(&QComboBox::currentIndexChanged),
-            [this](int index) {
-        m_ui->pluginChecks->setCurrentIndex(index);
-    });
-
     setupTidyChecks();
     setupClazyChecks();
 }
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.ui b/src/plugins/cpptools/cppcodemodelsettingspage.ui
index a53a1957374..35d4c37a427 100644
--- a/src/plugins/cpptools/cppcodemodelsettingspage.ui
+++ b/src/plugins/cpptools/cppcodemodelsettingspage.ui
@@ -121,27 +121,7 @@
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
-       <widget class="QComboBox" name="pluginSelection">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <item>
-         <property name="text">
-          <string>ClangTidy</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Clazy</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item>
-       <widget class="QStackedWidget" name="pluginChecks"/>
+       <widget class="QTabWidget" name="pluginChecks"/>
       </item>
      </layout>
     </widget>