ClangFormat: Move settings to the Code Style widget

It makes sense to unify the indenter creation by replacing
the CppCodeStylePreferencesFactory instead of removing it.
We are reusing the same options page but with different
kind of settings.

With this change wizards will no more be confused by missing
factory and will create the proper indenter.

Fixes: QTCREATORBUG-21516
Change-Id: I38964d5fa1f2257617c66a1441db723d239a3237
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

src/plugins/cpptools/cppcodestylepreferencesfactory.h

@@ -25,11 +25,13 @@
 
 #pragma once
 
+#include "cpptools_global.h"
+
 #include <texteditor/icodestylepreferencesfactory.h>
 
 namespace CppTools {
 
-class CppCodeStylePreferencesFactory : public TextEditor::ICodeStylePreferencesFactory
+class CPPTOOLS_EXPORT CppCodeStylePreferencesFactory : public TextEditor::ICodeStylePreferencesFactory
 {
 public:
     CppCodeStylePreferencesFactory();

src/plugins/cpptools/cppcodestylesettingspage.cpp

@@ -35,6 +35,7 @@
 #include <coreplugin/icore.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <texteditor/codestyleeditor.h>
+#include <texteditor/icodestylepreferencesfactory.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/displaysettings.h>
 #include <texteditor/snippets/snippetprovider.h>
@@ -523,16 +524,19 @@ CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) :
 QWidget *CppCodeStyleSettingsPage::widget()
 {
     if (!m_widget) {
-        CppCodeStylePreferences *originalCodeStylePreferences
-                = CppToolsSettings::instance()->cppCodeStyle();
-        m_pageCppCodeStylePreferences = new CppCodeStylePreferences(m_widget);
-        m_pageCppCodeStylePreferences->setDelegatingPool(originalCodeStylePreferences->delegatingPool());
-        m_pageCppCodeStylePreferences->setCodeStyleSettings(originalCodeStylePreferences->codeStyleSettings());
-        m_pageCppCodeStylePreferences->setCurrentDelegate(originalCodeStylePreferences->currentDelegate());
+        CppCodeStylePreferences *originalCodeStylePreferences = CppToolsSettings::instance()
+                                                                    ->cppCodeStyle();
+        m_pageCppCodeStylePreferences = new CppCodeStylePreferences();
+        m_pageCppCodeStylePreferences->setDelegatingPool(
+            originalCodeStylePreferences->delegatingPool());
+        m_pageCppCodeStylePreferences->setCodeStyleSettings(
+            originalCodeStylePreferences->codeStyleSettings());
+        m_pageCppCodeStylePreferences->setCurrentDelegate(
+            originalCodeStylePreferences->currentDelegate());
         // we set id so that it won't be possible to set delegate to the original prefs
         m_pageCppCodeStylePreferences->setId(originalCodeStylePreferences->id());
-        m_widget = new CodeStyleEditor(TextEditorSettings::codeStyleFactory(CppTools::Constants::CPP_SETTINGS_ID),
-                                       m_pageCppCodeStylePreferences);
+        m_widget = TextEditorSettings::codeStyleFactory(CppTools::Constants::CPP_SETTINGS_ID)
+                       ->createCodeStyleEditor(m_pageCppCodeStylePreferences);
     }
     return m_widget;
 }

src/plugins/cpptools/cppcodestylesettingspage.h

@@ -91,7 +91,7 @@ public:
 
 private:
     CppCodeStylePreferences *m_pageCppCodeStylePreferences;
-    QPointer<TextEditor::CodeStyleEditor> m_widget;
+    QPointer<QWidget> m_widget;
 };
 
 } // namespace Internal

src/plugins/cpptools/cppmodelmanager.cpp

@@ -39,7 +39,6 @@
 #include "cpplocatordata.h"
 #include "cpplocatorfilter.h"
 #include "cppbuiltinmodelmanagersupport.h"
-#include "cppqtstyleindenter.h"
 #include "cpprefactoringchanges.h"
 #include "cpprefactoringengine.h"
 #include "cppsourceprocessor.h"
@@ -510,7 +509,6 @@ void CppModelManager::initializeBuiltinModelManagerSupport()
 
 CppModelManager::CppModelManager()
     : CppModelManagerBase(nullptr)
-    , createCppIndenter([]() { return new CppQtStyleIndenter; })
     , d(new CppModelManagerPrivate)
 {
     d->m_indexingSupporter = 0;

src/plugins/cpptools/cppmodelmanager.h

@@ -215,13 +215,6 @@ public:
                                      RefactoringEngineInterface *refactoringEngine);
     static void removeRefactoringEngine(RefactoringEngineType type);
 
-    using CppIndenterCreator = std::function<TextEditor::Indenter *()>;
-    void setCppIndenterCreator(CppIndenterCreator indenterCreator)
-    {
-        createCppIndenter = std::move(indenterCreator);
-    }
-    CppIndenterCreator createCppIndenter;
-
     void setLocatorFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
     void setClassesFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
     void setIncludesFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);