diff --git a/examples/qtquick/customtitlebar/main.cpp b/examples/qtquick/customtitlebar/main.cpp index 738cc2a4..e20d141f 100644 --- a/examples/qtquick/customtitlebar/main.cpp +++ b/examples/qtquick/customtitlebar/main.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include "kddockwidgets/controllers/MainWindow.h" #include diff --git a/examples/qtquick/dockwidgets/main.cpp b/examples/qtquick/dockwidgets/main.cpp index db0a7148..3546a622 100644 --- a/examples/qtquick/dockwidgets/main.cpp +++ b/examples/qtquick/dockwidgets/main.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include #include #include diff --git a/examples/qtquick/mdi/main.cpp b/examples/qtquick/mdi/main.cpp index ef98fcfe..669eab17 100644 --- a/examples/qtquick/mdi/main.cpp +++ b/examples/qtquick/mdi/main.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include "kddockwidgets/controllers/MainWindow.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aa58dc5d..732042c4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,13 +32,12 @@ set(KDDW_BACKEND_SRCS ViewFactory.h LayoutSaver.cpp LayoutSaver.h + DockRegistry.cpp private/LayoutSaver_p.h private/Position.cpp private/Position_p.h private/Logging.cpp private/Logging_p.h - private/DockRegistry.cpp - private/DockRegistry_p.h private/Draggable.cpp private/Draggable_p.h private/WindowBeingDragged.cpp @@ -246,7 +245,7 @@ set(DOCKS_INSTALLABLE_PRIVATE_INCLUDES private/TitleBar_p.h private/WindowBeingDragged_p.h private/WidgetResizeHandler_p.h - private/DockRegistry_p.h + private/DockRegistry.h # private/TabWidget_p.h ) diff --git a/src/Config.cpp b/src/Config.cpp index b74856c1..a2a75c2c 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -20,7 +20,7 @@ #include "Platform.h" #include "View.h" #include "private/multisplitter/Item_p.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "private/Utils_p.h" #include "private/DragController_p.h" #include "kddockwidgets/ViewFactory.h" diff --git a/src/private/DockRegistry.cpp b/src/DockRegistry.cpp similarity index 98% rename from src/private/DockRegistry.cpp rename to src/DockRegistry.cpp index 44a922d8..51128186 100644 --- a/src/private/DockRegistry.cpp +++ b/src/DockRegistry.cpp @@ -9,14 +9,14 @@ Contact KDAB at for commercial licensing options. */ -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "Config.h" -#include "Logging_p.h" -#include "Position_p.h" -#include "Utils_p.h" -#include "WidgetResizeHandler_p.h" -#include "WindowBeingDragged_p.h" -#include "multisplitter/Item_p.h" +#include "private/Logging_p.h" +#include "private/Position_p.h" +#include "private/Utils_p.h" +#include "private/WidgetResizeHandler_p.h" +#include "private/WindowBeingDragged_p.h" +#include "private/multisplitter/Item_p.h" #include "Platform.h" #include "kddockwidgets/controllers/FloatingWindow.h" diff --git a/src/private/DockRegistry_p.h b/src/DockRegistry.h similarity index 100% rename from src/private/DockRegistry_p.h rename to src/DockRegistry.h diff --git a/src/FocusScope.cpp b/src/FocusScope.cpp index a235d879..1851ae99 100644 --- a/src/FocusScope.cpp +++ b/src/FocusScope.cpp @@ -21,7 +21,7 @@ #include "ViewGuard.h" #include "controllers/DockWidget.h" #include "controllers/Frame.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp index 60298f48..afdf2f8e 100644 --- a/src/LayoutSaver.cpp +++ b/src/LayoutSaver.cpp @@ -23,7 +23,7 @@ #include "private/multisplitter/Item_p.h" #include "private/LayoutSaver_p.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "private/Logging_p.h" #include "private/Position_p.h" #include "private/Utils_p.h" diff --git a/src/controllers/DockWidget.cpp b/src/controllers/DockWidget.cpp index ee4a3e69..7cdf3b0e 100644 --- a/src/controllers/DockWidget.cpp +++ b/src/controllers/DockWidget.cpp @@ -11,7 +11,7 @@ #include "DockWidget.h" #include "DockWidget_p.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "private/LayoutSaver_p.h" #include "private/Logging_p.h" #include "controllers/MDILayout.h" diff --git a/src/controllers/DockWidget_p.h b/src/controllers/DockWidget_p.h index bcae84a8..ab179ff3 100644 --- a/src/controllers/DockWidget_p.h +++ b/src/controllers/DockWidget_p.h @@ -13,7 +13,7 @@ #define KD_DOCKWIDGET_BASE_P_H #include "DockWidget.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "private/Position_p.h" #include "ViewWrapper.h" #include "Action.h" diff --git a/src/controllers/DropArea.cpp b/src/controllers/DropArea.cpp index 411a7fe2..8783cfdd 100644 --- a/src/controllers/DropArea.cpp +++ b/src/controllers/DropArea.cpp @@ -12,7 +12,7 @@ #include "DropArea.h" #include "Config.h" #include "kddockwidgets/ViewFactory.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "private/Draggable_p.h" #include "private/Logging_p.h" #include "private/Utils_p.h" diff --git a/src/controllers/DropIndicatorOverlay.cpp b/src/controllers/DropIndicatorOverlay.cpp index c8217100..c53ac267 100644 --- a/src/controllers/DropIndicatorOverlay.cpp +++ b/src/controllers/DropIndicatorOverlay.cpp @@ -17,7 +17,7 @@ #include "controllers/Frame.h" #include "private/DragController_p.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" using namespace KDDockWidgets; diff --git a/src/controllers/FloatingWindow.cpp b/src/controllers/FloatingWindow.cpp index 869d31c2..b04557b5 100644 --- a/src/controllers/FloatingWindow.cpp +++ b/src/controllers/FloatingWindow.cpp @@ -18,7 +18,7 @@ #include "private/WindowBeingDragged_p.h" #include "private/Utils_p.h" #include "private/WidgetResizeHandler_p.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "Config.h" #include "kddockwidgets/ViewFactory.h" #include "private/DragController_p.h" diff --git a/src/controllers/Frame.cpp b/src/controllers/Frame.cpp index 07075012..9ecd1f59 100644 --- a/src/controllers/Frame.cpp +++ b/src/controllers/Frame.cpp @@ -29,7 +29,7 @@ #include "private/Logging_p.h" #include "private/Utils_p.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "DockWidget_p.h" #include "private/LayoutSaver_p.h" #include "private/Position_p.h" diff --git a/src/controllers/MainWindow.cpp b/src/controllers/MainWindow.cpp index a43c4035..19e95599 100644 --- a/src/controllers/MainWindow.cpp +++ b/src/controllers/MainWindow.cpp @@ -19,7 +19,7 @@ #include "MainWindow.h" #include "kddockwidgets/KDDockWidgets.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "controllers/MDILayout.h" #include "controllers/DropArea.h" #include "private/Utils_p.h" diff --git a/src/controllers/indicators/ClassicIndicators.cpp b/src/controllers/indicators/ClassicIndicators.cpp index 20faec86..9ca80ff3 100644 --- a/src/controllers/indicators/ClassicIndicators.cpp +++ b/src/controllers/indicators/ClassicIndicators.cpp @@ -17,7 +17,7 @@ #include "controllers/DropArea.h" #include "private/DragController_p.h" #include "private/Logging_p.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "private/Utils_p.h" #include "controllers/Frame.h" diff --git a/src/fwd_headers/kddockwidgets/private/DockRegistry_p.h b/src/fwd_headers/kddockwidgets/private/DockRegistry.h similarity index 87% rename from src/fwd_headers/kddockwidgets/private/DockRegistry_p.h rename to src/fwd_headers/kddockwidgets/private/DockRegistry.h index da80c0d4..cfb1ded3 100644 --- a/src/fwd_headers/kddockwidgets/private/DockRegistry_p.h +++ b/src/fwd_headers/kddockwidgets/private/DockRegistry.h @@ -9,4 +9,4 @@ Contact KDAB at for commercial licensing options. */ -#include "../../../private/DockRegistry_p.h" +#include "../../../DockRegistry.h" diff --git a/src/private/DragController.cpp b/src/private/DragController.cpp index 84ac9365..777a8d94 100644 --- a/src/private/DragController.cpp +++ b/src/private/DragController.cpp @@ -10,7 +10,7 @@ */ #include "DragController_p.h" -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "Logging_p.h" #include "Qt5Qt6Compat_p.h" #include "Utils_p.h" diff --git a/src/private/DropIndicatorOverlayInterface.cpp b/src/private/DropIndicatorOverlayInterface.cpp index 61b785a5..6a4551de 100644 --- a/src/private/DropIndicatorOverlayInterface.cpp +++ b/src/private/DropIndicatorOverlayInterface.cpp @@ -12,7 +12,7 @@ #include "DropIndicatorOverlay.h" #include "kddockwidgets/controllers/DropArea.h" -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "DragController_p.h" #include "Config.h" #include "Platform.h" diff --git a/src/private/Position.cpp b/src/private/Position.cpp index 05801fb7..75caa7a4 100644 --- a/src/private/Position.cpp +++ b/src/private/Position.cpp @@ -16,7 +16,7 @@ */ #include "Position_p.h" -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "LayoutSaver_p.h" #include "multisplitter/Item_p.h" #include "kddockwidgets/controllers/FloatingWindow.h" diff --git a/src/private/WidgetResizeHandler.cpp b/src/private/WidgetResizeHandler.cpp index 3183b8c3..01c70619 100644 --- a/src/private/WidgetResizeHandler.cpp +++ b/src/private/WidgetResizeHandler.cpp @@ -14,7 +14,7 @@ #include "Config.h" #include "Qt5Qt6Compat_p.h" #include "Utils_p.h" -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "kddockwidgets/controllers/MDILayout.h" #include "kddockwidgets/controllers/TitleBar.h" diff --git a/src/private/WindowZOrder_x11_p.h b/src/private/WindowZOrder_x11_p.h index 833ea5b9..61c865ff 100644 --- a/src/private/WindowZOrder_x11_p.h +++ b/src/private/WindowZOrder_x11_p.h @@ -16,7 +16,7 @@ #ifdef KDDockWidgets_XLIB -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include diff --git a/src/qtquick/DockWidgetInstantiator.cpp b/src/qtquick/DockWidgetInstantiator.cpp index eb7dfd57..efcdbd3d 100644 --- a/src/qtquick/DockWidgetInstantiator.cpp +++ b/src/qtquick/DockWidgetInstantiator.cpp @@ -10,7 +10,7 @@ */ #include "DockWidgetInstantiator.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "kddockwidgets/controllers/DockWidget.h" #include "ViewFactory_qtquick.h" #include "Config.h" diff --git a/src/qtquick/MainWindowInstantiator.cpp b/src/qtquick/MainWindowInstantiator.cpp index 1cdc0bc3..3eed8a29 100644 --- a/src/qtquick/MainWindowInstantiator.cpp +++ b/src/qtquick/MainWindowInstantiator.cpp @@ -17,7 +17,7 @@ #include "DockWidgetInstantiator.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" using namespace KDDockWidgets; diff --git a/src/qtquick/Platform_qtquick.cpp b/src/qtquick/Platform_qtquick.cpp index a47b19d8..85414149 100644 --- a/src/qtquick/Platform_qtquick.cpp +++ b/src/qtquick/Platform_qtquick.cpp @@ -17,7 +17,7 @@ #include "Window_qtquick.h" #include "views/View_qtquick.h" #include "qtquick/Window_qtquick.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "private/DragController_p.h" #include "ViewFactory_qtquick.h" diff --git a/src/qtquick/views/MainWindow_qtquick.cpp b/src/qtquick/views/MainWindow_qtquick.cpp index c4dda384..96f34cb5 100644 --- a/src/qtquick/views/MainWindow_qtquick.cpp +++ b/src/qtquick/views/MainWindow_qtquick.cpp @@ -12,7 +12,7 @@ #include "MainWindow_qtquick.h" #include "kddockwidgets/controllers/Layout.h" #include "kddockwidgets/controllers/MainWindow.h" -#include "kddockwidgets/private/DockRegistry_p.h" +#include "kddockwidgets/private/DockRegistry.h" #include diff --git a/src/qtwidgets/DebugWindow.cpp b/src/qtwidgets/DebugWindow.cpp index e2b641dd..ed7f8549 100644 --- a/src/qtwidgets/DebugWindow.cpp +++ b/src/qtwidgets/DebugWindow.cpp @@ -17,7 +17,7 @@ */ #include "DebugWindow.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "LayoutSaver.h" #include "Qt5Qt6Compat_p.h" diff --git a/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp b/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp index 503bb36f..37a5de65 100644 --- a/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp +++ b/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp @@ -15,7 +15,7 @@ #include "kddockwidgets/controllers/TitleBar.h" #include "kddockwidgets/controllers/MainWindow.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "kddockwidgets/controllers/DropArea.h" #include "private/Logging_p.h" #include "private/Utils_p.h" diff --git a/src/qtwidgets/views/MainWindow_qtwidgets.cpp b/src/qtwidgets/views/MainWindow_qtwidgets.cpp index d537e78e..728e8a65 100644 --- a/src/qtwidgets/views/MainWindow_qtwidgets.cpp +++ b/src/qtwidgets/views/MainWindow_qtwidgets.cpp @@ -25,7 +25,7 @@ #include "kddockwidgets/controllers/Frame.h" #include "kddockwidgets/controllers/SideBar.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include "private/Logging_p.h" #include diff --git a/src/qtwidgets/views/Stack_qtwidgets.cpp b/src/qtwidgets/views/Stack_qtwidgets.cpp index c2edfe3b..edb1c4b8 100644 --- a/src/qtwidgets/views/Stack_qtwidgets.cpp +++ b/src/qtwidgets/views/Stack_qtwidgets.cpp @@ -15,7 +15,7 @@ #include "kddockwidgets/controllers/TitleBar.h" #include "qtwidgets/ViewFactory_qtwidgets.h" #include "qtwidgets/views/DockWidget_qtwidgets.h" -#include "private/DockRegistry_p.h" +#include "DockRegistry.h" #include #include diff --git a/src/qtwidgets/views/TabBar_qtwidgets.cpp b/src/qtwidgets/views/TabBar_qtwidgets.cpp index d7025530..4d243944 100644 --- a/src/qtwidgets/views/TabBar_qtwidgets.cpp +++ b/src/qtwidgets/views/TabBar_qtwidgets.cpp @@ -15,7 +15,7 @@ #include "private/Logging_p.h" #include "Config.h" #include "kddockwidgets/ViewFactory.h" -#include "kddockwidgets/private/DockRegistry_p.h" +#include "kddockwidgets/private/DockRegistry.h" #include #include diff --git a/src/qtwidgets/views/TitleBar_qtwidgets.cpp b/src/qtwidgets/views/TitleBar_qtwidgets.cpp index 5ff0e0ea..cb48b3cb 100644 --- a/src/qtwidgets/views/TitleBar_qtwidgets.cpp +++ b/src/qtwidgets/views/TitleBar_qtwidgets.cpp @@ -17,7 +17,7 @@ #include "private/Utils_p.h" #include "private/Logging_p.h" #include "kddockwidgets/ViewFactory.h" -#include "kddockwidgets/private/DockRegistry_p.h" +#include "kddockwidgets/private/DockRegistry.h" #include "qtwidgets/ViewFactory_qtwidgets.h" #include diff --git a/tests/fuzzer/Fuzzer.cpp b/tests/fuzzer/Fuzzer.cpp index f3f0b82c..ee5b0631 100644 --- a/tests/fuzzer/Fuzzer.cpp +++ b/tests/fuzzer/Fuzzer.cpp @@ -13,7 +13,7 @@ // clazy:excludeall=ctor-missing-parent-argument,missing-qobject-macro,range-loop,missing-typeinfo,detaching-member,function-args-by-ref,non-pod-global-static,reserve-candidates,qstring-allocations #include "Fuzzer.h" -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "DockWidget.h" #include "MainWindow.h" #include "kddockwidgets/controllers/FloatingWindow.h" diff --git a/tests/fuzzer/Operations.cpp b/tests/fuzzer/Operations.cpp index 223b8df1..a3775d0e 100644 --- a/tests/fuzzer/Operations.cpp +++ b/tests/fuzzer/Operations.cpp @@ -13,7 +13,7 @@ // clazy:excludeall=ctor-missing-parent-argument,missing-qobject-macro,range-loop,missing-typeinfo,detaching-member,function-args-by-ref,non-pod-global-static,reserve-candidates,qstring-allocations #include "Operations.h" -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "DockWidget.h" #include "DockWidget_p.h" #include "FloatingWindow_p.h" diff --git a/tests/fuzzer/main.cpp b/tests/fuzzer/main.cpp index 195bd414..8f0f1583 100644 --- a/tests/fuzzer/main.cpp +++ b/tests/fuzzer/main.cpp @@ -13,7 +13,7 @@ // clazy:excludeall=ctor-missing-parent-argument,missing-qobject-macro,range-loop,missing-typeinfo,detaching-member,function-args-by-ref,non-pod-global-static,reserve-candidates,qstring-allocations #include "Fuzzer.h" -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "../utils.h" #include diff --git a/tests/utils.h b/tests/utils.h index 45c6ab37..3058a2dd 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -15,7 +15,7 @@ // clazy:excludeall=ctor-missing-parent-argument,missing-qobject-macro,range-loop,missing-typeinfo,detaching-member,function-args-by-ref,non-pod-global-static,reserve-candidates,qstring-allocations #include "Config.h" -#include "DockRegistry_p.h" +#include "DockRegistry.h" #include "kddockwidgets/KDDockWidgets.h" #include "kddockwidgets/controllers/DropIndicatorOverlay.h"