From 30c3a047d1291927059caaf83c1166b33fb97704 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 18 May 2022 04:35:33 +0100 Subject: [PATCH] Move the indicator classes into controllers/indicators/ --- src/CMakeLists.txt | 14 +++++++------- .../indicators/ClassicIndicators.cpp | 4 ++-- .../indicators/ClassicIndicators.h} | 2 +- .../indicators/NullIndicators.cpp | 2 +- .../indicators/NullIndicators.h} | 2 +- .../indicators/SegmentedIndicators.cpp | 2 +- .../indicators/SegmentedIndicators.h} | 2 +- src/private/indicators/ClassicIndicatorsWindow.cpp | 2 +- src/private/indicators/ClassicIndicatorsWindow_p.h | 2 +- src/qtquick/FrameworkWidgetFactory_qtquick.cpp | 6 +++--- src/qtwidgets/FrameworkWidgetFactory_qtwidgets.cpp | 7 +++---- .../views/ClassicIndicatorsOverlay_qtwidgets.cpp | 2 +- .../views/SegmentedIndicatorsOverlay_qtwidgets.cpp | 2 +- 13 files changed, 24 insertions(+), 25 deletions(-) rename src/{private => controllers}/indicators/ClassicIndicators.cpp (98%) rename src/{private/indicators/ClassicIndicators_p.h => controllers/indicators/ClassicIndicators.h} (98%) rename src/{private => controllers}/indicators/NullIndicators.cpp (94%) rename src/{private/indicators/NullIndicators_p.h => controllers/indicators/NullIndicators.h} (95%) rename src/{private => controllers}/indicators/SegmentedIndicators.cpp (99%) rename src/{private/indicators/SegmentedIndicators_p.h => controllers/indicators/SegmentedIndicators.h} (96%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 57c97a0f..21deb542 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -53,10 +53,6 @@ set(DOCKSLIBS_SRCS private/WidgetResizeHandler.cpp private/WidgetResizeHandler_p.h private/WindowZOrder_x11_p.h - private/indicators/NullIndicators.cpp - private/indicators/NullIndicators_p.h - private/indicators/ClassicIndicators.cpp - private/indicators/ClassicIndicators_p.h private/indicators/ClassicIndicatorsWindow.cpp private/indicators/ClassicIndicatorsWindow_p.h @@ -91,6 +87,12 @@ set(DOCKSLIBS_SRCS controllers/TitleBar.h controllers/TabBar.cpp controllers/TabBar.h + controllers/indicators/NullIndicators.cpp + controllers/indicators/NullIndicators.h + controllers/indicators/ClassicIndicators.cpp + controllers/indicators/ClassicIndicators.h + controllers/indicators/SegmentedIndicators.cpp + controllers/indicators/SegmentedIndicators.h Window.cpp Window.h View.cpp @@ -309,8 +311,6 @@ else() # private/widgets/DockWidget.cpp # private/widgets/QWidgetAdapter_widgets.cpp # private/widgets/QWidgetAdapter_widgets_p.h - private/indicators/SegmentedIndicators.cpp - private/indicators/SegmentedIndicators_p.h # private/indicators/AnimatedIndicators.cpp ) @@ -470,7 +470,7 @@ install(FILES ${DOCKS_INSTALLABLE_INCLUDES} DESTINATION ${DOCKS_INCLUDES_INSTALL install(FILES ${DOCKS_INSTALLABLE_PRIVATE_INCLUDES} DESTINATION ${DOCKS_INCLUDES_INSTALL_PATH}/kddockwidgets/private) install(FILES private/multisplitter/Item_p.h DESTINATION ${DOCKS_INCLUDES_INSTALL_PATH}/kddockwidgets/private/multisplitter) install(FILES private/indicators/ClassicIndicators_p.h DESTINATION ${DOCKS_INCLUDES_INSTALL_PATH}/kddockwidgets/private/indicators) -install(FILES private/indicators/SegmentedIndicators_p.h DESTINATION ${DOCKS_INCLUDES_INSTALL_PATH}/kddockwidgets/private/indicators) +# install(FILES private/indicators/SegmentedIndicators_p.h DESTINATION ${DOCKS_INCLUDES_INSTALL_PATH}/kddockwidgets/private/indicators) if(KDDockWidgets_QTQUICK) install(FILES ${DOCKS_INSTALLABLE_PRIVATE_QUICK_INCLUDES} DESTINATION ${DOCKS_INCLUDES_INSTALL_PATH}/kddockwidgets/private/quick) diff --git a/src/private/indicators/ClassicIndicators.cpp b/src/controllers/indicators/ClassicIndicators.cpp similarity index 98% rename from src/private/indicators/ClassicIndicators.cpp rename to src/controllers/indicators/ClassicIndicators.cpp index 00b3e997..0988cc05 100644 --- a/src/private/indicators/ClassicIndicators.cpp +++ b/src/controllers/indicators/ClassicIndicators.cpp @@ -9,10 +9,10 @@ Contact KDAB at for commercial licensing options. */ -#include "ClassicIndicators_p.h" +#include "ClassicIndicators.h" #include "Config.h" #include "FrameworkWidgetFactory.h" -#include "ClassicIndicatorsWindow_p.h" +#include "private/indicators/ClassicIndicatorsWindow_p.h" #include "controllers/DropArea.h" #include "private/DragController_p.h" diff --git a/src/private/indicators/ClassicIndicators_p.h b/src/controllers/indicators/ClassicIndicators.h similarity index 98% rename from src/private/indicators/ClassicIndicators_p.h rename to src/controllers/indicators/ClassicIndicators.h index b4e42f20..0361431a 100644 --- a/src/private/indicators/ClassicIndicators_p.h +++ b/src/controllers/indicators/ClassicIndicators.h @@ -12,7 +12,7 @@ #ifndef KD_INDICATORS_CLASSICINDICATORS_P_H #define KD_INDICATORS_CLASSICINDICATORS_P_H -#include "../DropIndicatorOverlayInterface_p.h" +#include "private/DropIndicatorOverlayInterface_p.h" namespace KDDockWidgets { diff --git a/src/private/indicators/NullIndicators.cpp b/src/controllers/indicators/NullIndicators.cpp similarity index 94% rename from src/private/indicators/NullIndicators.cpp rename to src/controllers/indicators/NullIndicators.cpp index b606409b..5c4639c4 100644 --- a/src/private/indicators/NullIndicators.cpp +++ b/src/controllers/indicators/NullIndicators.cpp @@ -9,7 +9,7 @@ Contact KDAB at for commercial licensing options. */ -#include "NullIndicators_p.h" +#include "NullIndicators.h" namespace KDDockWidgets::Controllers { diff --git a/src/private/indicators/NullIndicators_p.h b/src/controllers/indicators/NullIndicators.h similarity index 95% rename from src/private/indicators/NullIndicators_p.h rename to src/controllers/indicators/NullIndicators.h index ad47e386..5ec9f568 100644 --- a/src/private/indicators/NullIndicators_p.h +++ b/src/controllers/indicators/NullIndicators.h @@ -12,7 +12,7 @@ #ifndef KD_NULL_INDICATORS_P_H #define KD_NULL_INDICATORS_P_H -#include "../DropIndicatorOverlayInterface_p.h" +#include "private/DropIndicatorOverlayInterface_p.h" namespace KDDockWidgets { diff --git a/src/private/indicators/SegmentedIndicators.cpp b/src/controllers/indicators/SegmentedIndicators.cpp similarity index 99% rename from src/private/indicators/SegmentedIndicators.cpp rename to src/controllers/indicators/SegmentedIndicators.cpp index 9c88bbfb..5c166d85 100644 --- a/src/private/indicators/SegmentedIndicators.cpp +++ b/src/controllers/indicators/SegmentedIndicators.cpp @@ -9,7 +9,7 @@ Contact KDAB at for commercial licensing options. */ -#include "SegmentedIndicators_p.h" +#include "SegmentedIndicators.h" #include "controllers/DropArea.h" #include "Config.h" diff --git a/src/private/indicators/SegmentedIndicators_p.h b/src/controllers/indicators/SegmentedIndicators.h similarity index 96% rename from src/private/indicators/SegmentedIndicators_p.h rename to src/controllers/indicators/SegmentedIndicators.h index 29c93c84..e8e683c6 100644 --- a/src/private/indicators/SegmentedIndicators_p.h +++ b/src/controllers/indicators/SegmentedIndicators.h @@ -12,7 +12,7 @@ #ifndef KD_SEGMENTED_INDICATORS_P_H #define KD_SEGMENTED_INDICATORS_P_H -#include "../DropIndicatorOverlayInterface_p.h" +#include "private/DropIndicatorOverlayInterface_p.h" #include #include diff --git a/src/private/indicators/ClassicIndicatorsWindow.cpp b/src/private/indicators/ClassicIndicatorsWindow.cpp index b2bb46e0..64c5b5e9 100644 --- a/src/private/indicators/ClassicIndicatorsWindow.cpp +++ b/src/private/indicators/ClassicIndicatorsWindow.cpp @@ -10,7 +10,7 @@ */ #include "ClassicIndicatorsWindow_p.h" -#include "ClassicIndicators_p.h" +#include "controllers/indicators/ClassicIndicators.h" #include "../Utils_p.h" using namespace KDDockWidgets; diff --git a/src/private/indicators/ClassicIndicatorsWindow_p.h b/src/private/indicators/ClassicIndicatorsWindow_p.h index ad4c8866..b7baa7b3 100644 --- a/src/private/indicators/ClassicIndicatorsWindow_p.h +++ b/src/private/indicators/ClassicIndicatorsWindow_p.h @@ -13,7 +13,7 @@ #define KD_INDICATORS_CLASSICINDICATORS_WINDOW_P_H #include "../DropIndicatorOverlayInterface_p.h" -#include "ClassicIndicators_p.h" +#include "controllers/indicators/ClassicIndicators.h" #ifdef KDDOCKWIDGETS_QTWIDGETS diff --git a/src/qtquick/FrameworkWidgetFactory_qtquick.cpp b/src/qtquick/FrameworkWidgetFactory_qtquick.cpp index 0f5d294b..0c2e8237 100644 --- a/src/qtquick/FrameworkWidgetFactory_qtquick.cpp +++ b/src/qtquick/FrameworkWidgetFactory_qtquick.cpp @@ -12,10 +12,10 @@ #include "FrameworkWidgetFactory_qtquick.h" #include "Config.h" -#include "private/indicators/ClassicIndicators_p.h" -#include "private/indicators/NullIndicators_p.h" +#include "controllers/indicators/ClassicIndicators.h" +#include "controllers/indicators/NullIndicators.h" +#include "controllers/indicators/SegmentedIndicators.h" #include "private/Utils_p.h" -#include "private/indicators/SegmentedIndicators_p.h" #include "controllers/MainWindow.h" #include "controllers/TabBar.h" diff --git a/src/qtwidgets/FrameworkWidgetFactory_qtwidgets.cpp b/src/qtwidgets/FrameworkWidgetFactory_qtwidgets.cpp index 9281f9e9..3a760ac2 100644 --- a/src/qtwidgets/FrameworkWidgetFactory_qtwidgets.cpp +++ b/src/qtwidgets/FrameworkWidgetFactory_qtwidgets.cpp @@ -12,15 +12,14 @@ #include "FrameworkWidgetFactory_qtwidgets.h" #include "Config.h" -#include "private/indicators/ClassicIndicators_p.h" -#include "private/indicators/NullIndicators_p.h" #include "private/Utils_p.h" #include "controllers/TabBar.h" #include "controllers/Stack.h" #include "controllers/FloatingWindow.h" - -#include "private/indicators/SegmentedIndicators_p.h" +#include "controllers/indicators/ClassicIndicators.h" +#include "controllers/indicators/NullIndicators.h" +#include "controllers/indicators/SegmentedIndicators.h" #include "qtwidgets/views/FloatingWindow_qtwidgets.h" #include "qtwidgets/views/DockWidget_qtwidgets.h" diff --git a/src/qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.cpp b/src/qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.cpp index a283bed2..1e8746eb 100644 --- a/src/qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.cpp +++ b/src/qtwidgets/views/ClassicIndicatorsOverlay_qtwidgets.cpp @@ -10,7 +10,7 @@ */ #include "ClassicIndicatorsOverlay_qtwidgets.h" -#include "private/indicators/ClassicIndicators_p.h" +#include "controllers/indicators/ClassicIndicators.h" using namespace KDDockWidgets; using namespace KDDockWidgets::Views; diff --git a/src/qtwidgets/views/SegmentedIndicatorsOverlay_qtwidgets.cpp b/src/qtwidgets/views/SegmentedIndicatorsOverlay_qtwidgets.cpp index 051fef3f..b3c65cc6 100644 --- a/src/qtwidgets/views/SegmentedIndicatorsOverlay_qtwidgets.cpp +++ b/src/qtwidgets/views/SegmentedIndicatorsOverlay_qtwidgets.cpp @@ -10,7 +10,7 @@ */ #include "SegmentedIndicatorsOverlay_qtwidgets.h" -#include "private/indicators/SegmentedIndicators_p.h" +#include "controllers/indicators/SegmentedIndicators.h" #include