Create DockWidgetBase_p.h and move the pimpl there

So we can reuse the pimpl and not have to expose public API
for implementation details

src/DockWidgetBase.cpp

@@ -23,6 +23,7 @@
 #include "WindowBeingDragged_p.h"
 #include "SideBar_p.h"
 #include "LayoutSaver_p.h"
+#include "DockWidgetBase_p.h"
 
 #include <QEvent>
 #include <QCloseEvent>
@@ -38,114 +39,6 @@
 
 using namespace KDDockWidgets;
 
-class DockWidgetBase::Private
-{
-public:
-    Private(const QString &dockName, DockWidgetBase::Options options_,
-            LayoutSaverOptions layoutSaverOptions_, DockWidgetBase *qq)
-        : name(dockName)
-        , title(dockName)
-        , q(qq)
-        , options(options_)
-        , layoutSaverOptions(layoutSaverOptions_)
-        , toggleAction(new QAction(q))
-        , floatAction(new QAction(q))
-    {
-        q->connect(toggleAction, &QAction::toggled, q, [this] (bool enabled) {
-            if (!m_updatingToggleAction) { // guard against recursiveness
-                toggleAction->blockSignals(true); // and don't emit spurious toggle. Like when a dock widget is inserted into a tab widget it might get hide events, ignore those. The Dock Widget is open.
-                m_processingToggleAction = true;
-                toggle(enabled);
-                toggleAction->blockSignals(false);
-                m_processingToggleAction = false;
-            }
-        });
-
-        q->connect(floatAction, &QAction::toggled, q, [this] (bool checked) {
-            if (!m_updatingFloatAction) { // guard against recursiveness
-                q->setFloating(checked);
-            }
-
-            Q_EMIT q->isFloatingChanged(checked);
-        });
-
-        toggleAction->setCheckable(true);
-        floatAction->setCheckable(true);
-    }
-
-    void init()
-    {
-        updateTitle();
-    }
-
-    FloatingWindow *floatingWindow() const
-    {
-        return qobject_cast<FloatingWindow*>(q->window());
-    }
-
-    MainWindowBase *mainWindow() const
-    {
-        if (q->isWindow())
-            return nullptr;
-
-        // Note: Don't simply use window(), as the MainWindow might be embedded into something else
-        QWidgetOrQuick *p = q->parentWidget();
-        while (p) {
-            if (auto window = qobject_cast<MainWindowBase*>(p))
-                return window;
-
-            if (p->isWindow())
-                return nullptr;
-
-            p = p->parentWidget();
-        }
-
-        return nullptr;
-    }
-
-    SideBar* sideBar() const
-    {
-        return DockRegistry::self()->sideBarForDockWidget(q);
-    }
-
-    QPoint defaultCenterPosForFloating();
-
-    void updateTitle();
-    void toggle(bool enabled);
-    void updateToggleAction();
-    void updateFloatAction();
-    void onDockWidgetShown();
-    void onDockWidgetHidden();
-    void show();
-    void close();
-    bool restoreToPreviousPosition();
-    void maybeRestoreToPreviousPosition();
-    int currentTabIndex() const;
-
-    /**
-     * Before floating a dock widget we save its position. So it can be restored when calling
-     * DockWidget::setFloating(false)
-     */
-    void saveTabIndex();
-
-    const QString name;
-    QStringList affinities;
-    QString title;
-    QIcon titleBarIcon;
-    QIcon tabBarIcon;
-    QWidgetOrQuick *widget = nullptr;
-    DockWidgetBase *const q;
-    DockWidgetBase::Options options;
-    const LayoutSaverOptions layoutSaverOptions;
-    QAction *const toggleAction;
-    QAction *const floatAction;
-    LastPositions m_lastPositions;
-    bool m_processingToggleAction = false;
-    bool m_updatingToggleAction = false;
-    bool m_updatingFloatAction = false;
-    bool m_isForceClosing = false;
-    QSize m_lastOverlayedSize = QSize(0, 0);
-};
 
 DockWidgetBase::DockWidgetBase(const QString &name, Options options,
                                LayoutSaverOptions layoutSaverOptions)

src/private/DockWidgetBase_p.h

@@ -0,0 +1,128 @@
+/*
+  This file is part of KDDockWidgets.
+
+  SPDX-FileCopyrightText: 2019-2021 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+  Author: Sérgio Martins <sergio.martins@kdab.com>
+
+  SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
+
+  Contact KDAB at <info@kdab.com> for commercial licensing options.
+*/
+
+#ifndef KD_DOCKWIDGET_BASE_P_H
+#define KD_DOCKWIDGET_BASE_P_H
+
+namespace KDDockWidgets {
+
+class DockWidgetBase::Private
+{
+public:
+    Private(const QString &dockName, DockWidgetBase::Options options_,
+            LayoutSaverOptions layoutSaverOptions_, DockWidgetBase *qq)
+        : name(dockName)
+        , title(dockName)
+        , q(qq)
+        , options(options_)
+        , layoutSaverOptions(layoutSaverOptions_)
+        , toggleAction(new QAction(q))
+        , floatAction(new QAction(q))
+    {
+        q->connect(toggleAction, &QAction::toggled, q, [this] (bool enabled) {
+            if (!m_updatingToggleAction) { // guard against recursiveness
+                toggleAction->blockSignals(true); // and don't emit spurious toggle. Like when a dock widget is inserted into a tab widget it might get hide events, ignore those. The Dock Widget is open.
+                m_processingToggleAction = true;
+                toggle(enabled);
+                toggleAction->blockSignals(false);
+                m_processingToggleAction = false;
+            }
+        });
+
+        q->connect(floatAction, &QAction::toggled, q, [this] (bool checked) {
+            if (!m_updatingFloatAction) { // guard against recursiveness
+                q->setFloating(checked);
+            }
+
+            Q_EMIT q->isFloatingChanged(checked);
+        });
+
+        toggleAction->setCheckable(true);
+        floatAction->setCheckable(true);
+    }
+
+    void init()
+    {
+        updateTitle();
+    }
+
+    FloatingWindow *floatingWindow() const
+    {
+        return qobject_cast<FloatingWindow*>(q->window());
+    }
+
+    MainWindowBase *mainWindow() const
+    {
+        if (q->isWindow())
+            return nullptr;
+
+        // Note: Don't simply use window(), as the MainWindow might be embedded into something else
+        QWidgetOrQuick *p = q->parentWidget();
+        while (p) {
+            if (auto window = qobject_cast<MainWindowBase*>(p))
+                return window;
+
+            if (p->isWindow())
+                return nullptr;
+
+            p = p->parentWidget();
+        }
+
+        return nullptr;
+    }
+
+    SideBar* sideBar() const
+    {
+        return DockRegistry::self()->sideBarForDockWidget(q);
+    }
+
+    QPoint defaultCenterPosForFloating();
+
+    void updateTitle();
+    void toggle(bool enabled);
+    void updateToggleAction();
+    void updateFloatAction();
+    void onDockWidgetShown();
+    void onDockWidgetHidden();
+    void show();
+    void close();
+    bool restoreToPreviousPosition();
+    void maybeRestoreToPreviousPosition();
+    int currentTabIndex() const;
+
+    /**
+     * Before floating a dock widget we save its position. So it can be restored when calling
+     * DockWidget::setFloating(false)
+     */
+    void saveTabIndex();
+
+    const QString name;
+    QStringList affinities;
+    QString title;
+    QIcon titleBarIcon;
+    QIcon tabBarIcon;
+    QWidgetOrQuick *widget = nullptr;
+    DockWidgetBase *const q;
+    DockWidgetBase::Options options;
+    const LayoutSaverOptions layoutSaverOptions;
+    QAction *const toggleAction;
+    QAction *const floatAction;
+    LastPositions m_lastPositions;
+    bool m_processingToggleAction = false;
+    bool m_updatingToggleAction = false;
+    bool m_updatingFloatAction = false;
+    bool m_isForceClosing = false;
+    QSize m_lastOverlayedSize = QSize(0, 0);
+};
+
+}
+
+#endif