Move the indicator classes into controllers/indicators/

2022-05-18 04:35:33 +01:00
parent 2b6c18dbcd
commit 30c3a047d1
13 changed files with 24 additions and 25 deletions
--- 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)
--- a/src/controllers/indicators/ClassicIndicators.cpp
+++ b/src/controllers/indicators/ClassicIndicators.cpp
@@ -9,10 +9,10 @@
  Contact KDAB at <info@kdab.com> 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"
--- a/src/controllers/indicators/ClassicIndicators.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 {

--- a/src/controllers/indicators/NullIndicators.cpp
+++ b/src/controllers/indicators/NullIndicators.cpp
@@ -9,7 +9,7 @@
  Contact KDAB at <info@kdab.com> for commercial licensing options.
 */

-#include "NullIndicators_p.h"
+#include "NullIndicators.h"

 namespace KDDockWidgets::Controllers {

--- a/src/controllers/indicators/NullIndicators.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 {

--- a/src/controllers/indicators/SegmentedIndicators.cpp
+++ b/src/controllers/indicators/SegmentedIndicators.cpp
@@ -9,7 +9,7 @@
  Contact KDAB at <info@kdab.com> for commercial licensing options.
 */

-#include "SegmentedIndicators_p.h"
+#include "SegmentedIndicators.h"
 #include "controllers/DropArea.h"
 #include "Config.h"

--- a/src/controllers/indicators/SegmentedIndicators.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 <QHash>
 #include <QPolygon>
--- 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;
--- 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

--- 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"
--- 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"
--- 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;
--- 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 <QPainter>