From 68597cac22675791a7ff9bd6d7efa1f070372636 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 27 Jan 2021 22:26:55 +0000 Subject: [PATCH 1/3] install two more private includes --- src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5b6a816a..ccdc056b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -101,9 +101,11 @@ set(DOCKS_INSTALLABLE_INCLUDES set(DOCKS_INSTALLABLE_PRIVATE_INCLUDES private/DragController_p.h private/Draggable_p.h + private/DropArea_p.h private/DropIndicatorOverlayInterface_p.h private/FloatingWindow_p.h private/Frame_p.h + private/MultiSplitter_p.h private/SideBar_p.h private/TitleBar_p.h private/WindowBeingDragged_p.h From 2aa97e65657abf0e83b65bec54690968336ebfb4 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 27 Jan 2021 22:28:57 +0000 Subject: [PATCH 2/3] Add a fwd header for DragController_p.h --- .../kddockwidgets/private/DragController_p.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/fwd_headers/kddockwidgets/private/DragController_p.h diff --git a/src/fwd_headers/kddockwidgets/private/DragController_p.h b/src/fwd_headers/kddockwidgets/private/DragController_p.h new file mode 100644 index 00000000..de8165a4 --- /dev/null +++ b/src/fwd_headers/kddockwidgets/private/DragController_p.h @@ -0,0 +1,12 @@ +/* + This file is part of KDDockWidgets. + + SPDX-FileCopyrightText: 2020-2021 Klarälvdalens Datakonsult AB, a KDAB Group company + Author: Sergio Martins + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only + + Contact KDAB at for commercial licensing options. +*/ + +#include "../../../private/DragController_p.h" From db06c496cfae93e00b8a100e1e21a34ed02bd615 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 27 Jan 2021 22:51:41 +0000 Subject: [PATCH 3/3] Remove dependencies to LayoutSaver_p.h Only the impl needs to include it --- src/DockWidgetBase.cpp | 1 + src/DockWidgetBase.h | 7 ++++--- src/MainWindowBase.cpp | 1 + src/MainWindowBase.h | 2 +- src/private/FloatingWindow.cpp | 1 + src/private/FloatingWindow_p.h | 2 +- src/private/Frame.cpp | 1 + src/private/Frame_p.h | 2 +- src/private/MultiSplitter.cpp | 1 + src/private/MultiSplitter_p.h | 2 +- 10 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/DockWidgetBase.cpp b/src/DockWidgetBase.cpp index 4dcb8ac3..81ef09d5 100644 --- a/src/DockWidgetBase.cpp +++ b/src/DockWidgetBase.cpp @@ -23,6 +23,7 @@ #include "private/Position_p.h" #include "WindowBeingDragged_p.h" #include "SideBar_p.h" +#include "LayoutSaver_p.h" #include #include diff --git a/src/DockWidgetBase.h b/src/DockWidgetBase.h index a43f8003..41329de1 100644 --- a/src/DockWidgetBase.h +++ b/src/DockWidgetBase.h @@ -22,9 +22,10 @@ #include "docks_export.h" #include "KDDockWidgets.h" #include "QWidgetAdapter.h" -#include "LayoutSaver_p.h" +#include "LayoutSaver.h" #include +#include // clazy:excludeall=ctor-missing-parent-argument @@ -173,12 +174,12 @@ public: * @brief Constructs a dock widget from its serialized form. * @internal */ - static DockWidgetBase *deserialize(const LayoutSaver::DockWidget::Ptr &); + static DockWidgetBase *deserialize(const std::shared_ptr &); /** * @brief Serializes this dock widget into an intermediate form */ - LayoutSaver::DockWidget::Ptr serialize() const; + std::shared_ptr serialize() const; /** * @brief docks @p other widget into this one. Tabs will be shown if not already. diff --git a/src/MainWindowBase.cpp b/src/MainWindowBase.cpp index 2a9358df..2ddd690e 100644 --- a/src/MainWindowBase.cpp +++ b/src/MainWindowBase.cpp @@ -28,6 +28,7 @@ #include "WidgetResizeHandler_p.h" #include "FrameworkWidgetFactory.h" #include "DropAreaWithCentralFrame_p.h" +#include "LayoutSaver_p.h" using namespace KDDockWidgets; diff --git a/src/MainWindowBase.h b/src/MainWindowBase.h index a6ff20c4..b7ec660b 100644 --- a/src/MainWindowBase.h +++ b/src/MainWindowBase.h @@ -23,7 +23,7 @@ #include "docks_export.h" #include "KDDockWidgets.h" #include "QWidgetAdapter.h" -#include "LayoutSaver_p.h" +#include "LayoutSaver.h" #include #include diff --git a/src/private/FloatingWindow.cpp b/src/private/FloatingWindow.cpp index a79725e4..147dc560 100644 --- a/src/private/FloatingWindow.cpp +++ b/src/private/FloatingWindow.cpp @@ -20,6 +20,7 @@ #include "DockRegistry_p.h" #include "Config.h" #include "FrameworkWidgetFactory.h" +#include "../LayoutSaver_p.h" #include #include diff --git a/src/private/FloatingWindow_p.h b/src/private/FloatingWindow_p.h index 9bd95147..4583c1bb 100644 --- a/src/private/FloatingWindow_p.h +++ b/src/private/FloatingWindow_p.h @@ -14,7 +14,7 @@ #include "kddockwidgets/docks_export.h" #include "kddockwidgets/QWidgetAdapter.h" -#include "LayoutSaver_p.h" +#include "kddockwidgets/LayoutSaver.h" #include "Frame_p.h" #include "Draggable_p.h" #include "DropArea_p.h" diff --git a/src/private/Frame.cpp b/src/private/Frame.cpp index fed835b9..030c7aef 100644 --- a/src/private/Frame.cpp +++ b/src/private/Frame.cpp @@ -26,6 +26,7 @@ #include "Config.h" #include "TitleBar_p.h" #include "FrameworkWidgetFactory.h" +#include "kddockwidgets/LayoutSaver.h" #include #include diff --git a/src/private/Frame_p.h b/src/private/Frame_p.h index 5a1b6a05..c0193d53 100644 --- a/src/private/Frame_p.h +++ b/src/private/Frame_p.h @@ -22,7 +22,7 @@ #include "kddockwidgets/docks_export.h" #include "kddockwidgets/QWidgetAdapter.h" #include "kddockwidgets/FocusScope.h" -#include "../LayoutSaver_p.h" +#include "kddockwidgets/LayoutSaver.h" #include "multisplitter/Widget.h" #include "multisplitter/Item_p.h" diff --git a/src/private/MultiSplitter.cpp b/src/private/MultiSplitter.cpp index b71cc59b..31f5b81d 100644 --- a/src/private/MultiSplitter.cpp +++ b/src/private/MultiSplitter.cpp @@ -28,6 +28,7 @@ #include "Position_p.h" #include "DockRegistry_p.h" #include "Config.h" +#include "../LayoutSaver_p.h" #include "FrameworkWidgetFactory.h" #include "multisplitter/Widget.h" #include "DropArea_p.h" diff --git a/src/private/MultiSplitter_p.h b/src/private/MultiSplitter_p.h index e30650cb..b7df1767 100644 --- a/src/private/MultiSplitter_p.h +++ b/src/private/MultiSplitter_p.h @@ -26,7 +26,7 @@ #include "multisplitter/Separator_p.h" #include "QWidgetAdapter.h" #include "KDDockWidgets.h" -#include "LayoutSaver_p.h" +#include "kddockwidgets/LayoutSaver.h" namespace Layouting {