From a739ac8e957f036e230cd9c45b8558830756d418 Mon Sep 17 00:00:00 2001
From: Michael Winkelmann <michael.winkelmann@qt.io>
Date: Tue, 26 May 2020 14:47:16 +0200
Subject: [PATCH] Introduce standardViews() function for ViewManager

Change-Id: I699f081e23db92cf96292b10e9427d9747e76f22
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../designercore/include/viewmanager.h        |  1 +
 .../designercore/model/viewmanager.cpp        | 40 ++++++++-----------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/include/viewmanager.h b/src/plugins/qmldesigner/designercore/include/viewmanager.h
index ac31ba663fb..3862d541871 100644
--- a/src/plugins/qmldesigner/designercore/include/viewmanager.h
+++ b/src/plugins/qmldesigner/designercore/include/viewmanager.h
@@ -119,6 +119,7 @@ private: // functions
     void switchStateEditorViewToBaseState();
     void switchStateEditorViewToSavedState();
     QList<QPointer<AbstractView>> views() const;
+    QList<QPointer<AbstractView>> standardViews() const;
 
 private: // variables
     ViewManagerData *d;
diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
index c9a4e91a541..3173a68abd7 100644
--- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
@@ -169,15 +169,27 @@ void ViewManager::switchStateEditorViewToSavedState()
 QList<QPointer<AbstractView> > ViewManager::views() const
 {
     auto list = d->additionalViews;
-    list.append({
+    list.append(standardViews());
+    return list;
+}
+
+QList<QPointer<AbstractView> > ViewManager::standardViews() const
+{
+    QList<QPointer<AbstractView>> list = {
                     &d->edit3DView,
                     &d->formEditorView,
                     &d->textEditorView,
                     &d->itemLibraryView,
                     &d->navigatorView,
                     &d->propertyEditorView,
-                    &d->statesEditorView
-                });
+                    &d->statesEditorView,
+                    &d->designerActionManagerView
+                };
+
+    if (QmlDesignerPlugin::instance()->settings().value(
+                DesignerSettingsKey::ENABLE_DEBUGVIEW).toBool())
+         list.append(&d->debugView);
+
     return list;
 }
 
@@ -226,16 +238,7 @@ void ViewManager::detachAdditionalViews()
 
 void ViewManager::detachStandardViews()
 {
-
-    for (auto view : std::vector<AbstractView *>({ &d->designerActionManagerView,
-                                                &d->edit3DView,
-                                                &d->formEditorView,
-                                                &d->textEditorView,
-                                                &d->navigatorView,
-                                                &d->itemLibraryView,
-                                                &d->statesEditorView,
-                                                &d->propertyEditorView,
-                                                &d->debugView})) {
+    for (auto view : standardViews()) {
         if (view->isAttached())
             currentModel()->detachView(view);
     }
@@ -277,16 +280,7 @@ void ViewManager::attachViewsExceptRewriterAndComponetView()
     int last = time.elapsed();
     int currentTime = 0;
     if (!d->disableStandardViews) {
-        for (auto view : std::vector<AbstractView *>({&d->designerActionManagerView,
-                                                     &d->edit3DView,
-                                                     &d->formEditorView,
-                                                     &d->textEditorView,
-                                                     &d->navigatorView,
-                                                     &d->itemLibraryView,
-                                                     &d->statesEditorView,
-                                                     &d->propertyEditorView})) {
-
-
+        for (auto view : standardViews()) {
             currentModel()->attachView(view);
             currentTime = time.elapsed();
             qCInfo(viewBenchmark) << view->widgetInfo().uniqueId << currentTime - last;