Core: Unify INavigationWidget creation a bit

Move toolbutton creation/listing closer to the widget.

Change-Id: I0e1342ede40fada1c5c9fb0b11d77852b78cc053
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

2 files changed, 7 insertions, 24 deletions

diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp
index 7c7e644b18..421479ab7a 100644
--- a/src/plugins/texteditor/outlinefactory.cpp
+++ b/src/plugins/texteditor/outlinefactory.cpp
@@ -110,27 +110,17 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) :
     updateCurrentEditor();
 }
 
-OutlineWidgetStack::~OutlineWidgetStack() = default;
-
-QToolButton *OutlineWidgetStack::toggleSyncButton()
-{
-    return m_toggleSync;
-}
-
-QToolButton *OutlineWidgetStack::filterButton()
+QList<QToolButton *> OutlineWidgetStack::toolButtons()
 {
-    return m_filterButton;
+    return {m_filterButton, m_toggleSort, m_toggleSync};
 }
 
-QToolButton *OutlineWidgetStack::sortButton()
-{
-    return m_toggleSort;
-}
+OutlineWidgetStack::~OutlineWidgetStack() = default;
 
 void OutlineWidgetStack::saveSettings(QSettings *settings, int position)
 {
     const QString baseKey = QStringLiteral("Outline.%1.").arg(position);
-    settings->setValue(baseKey + QLatin1String("SyncWithEditor"), toggleSyncButton()->isChecked());
+    settings->setValue(baseKey + QLatin1String("SyncWithEditor"), m_toggleSync->isChecked());
     for (auto iter = m_widgetSettings.constBegin(); iter != m_widgetSettings.constEnd(); ++iter)
         settings->setValue(baseKey + iter.key(), iter.value());
 }
@@ -154,7 +144,7 @@ void OutlineWidgetStack::restoreSettings(QSettings *settings, int position)
         m_widgetSettings.insert(key, settings->value(longKey));
     }
 
-    toggleSyncButton()->setChecked(syncWithEditor);
+    m_toggleSync->setChecked(syncWithEditor);
     if (auto outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget()))
         outlineWidget->restoreSettings(m_widgetSettings);
 }
@@ -241,13 +231,8 @@ OutlineFactory::OutlineFactory()
 
 Core::NavigationView OutlineFactory::createWidget()
 {
-    Core::NavigationView n;
     auto placeHolder = new OutlineWidgetStack(this);
-    n.widget = placeHolder;
-    n.dockToolBarWidgets.append(placeHolder->filterButton());
-    n.dockToolBarWidgets.append(placeHolder->sortButton());
-    n.dockToolBarWidgets.append(placeHolder->toggleSyncButton());
-    return n;
+    return {placeHolder, placeHolder->toolButtons()};
 }
 
 void OutlineFactory::saveSettings(Utils::QtcSettings *settings, int position, QWidget *widget)
diff --git a/src/plugins/texteditor/outlinefactory.h b/src/plugins/texteditor/outlinefactory.h
index 0f72bcf6e5..d231b700de 100644
--- a/src/plugins/texteditor/outlinefactory.h
+++ b/src/plugins/texteditor/outlinefactory.h
@@ -44,9 +44,7 @@ public:
     OutlineWidgetStack(OutlineFactory *factory);
     ~OutlineWidgetStack() override;
 
-    QToolButton *toggleSyncButton();
-    QToolButton *filterButton();
-    QToolButton *sortButton();
+    QList<QToolButton *> toolButtons();
 
     void saveSettings(QSettings *settings, int position);
     void restoreSettings(QSettings *settings, int position);