Move krita/ui to libs/ui

This exposed a bunch more places where our promiscuous include_directories led to a mess...

Move krita/ui to libs/ui
This exposed a bunch more places where our promiscuous include_directories led to a mess...
16e71d41 · Halla Rempt · ba78c845 · 16e71d41 · 16e71d41 · 16e71d41
Commit 16e71d41 authored Jan 26, 2016 by Halla Rempt
1000 changed files
--- a/krita/CMakeLists.txt
+++ b/krita/CMakeLists.txt
 project(krita)

 set(KRITA_INCLUDES
-    # For config-*.h
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}/image
-
-    ${CMAKE_SOURCE_DIR}/krita/image
-    ${CMAKE_SOURCE_DIR}/krita/image/brushengine
-    ${CMAKE_SOURCE_DIR}/krita/image/tiles
-    ${CMAKE_SOURCE_DIR}/krita/ui
-    ${CMAKE_SOURCE_DIR}/krita/ui/canvas
-    ${CMAKE_SOURCE_DIR}/krita/ui/tool
-    ${CMAKE_SOURCE_DIR}/krita/ui/flake
-    ${CMAKE_SOURCE_DIR}/krita/ui/widgets
-
-    # For generated files from .ui
-    ${CMAKE_BINARY_DIR}/krita/ui
-
    ${PIGMENT_INCLUDES}
    ${BASICFLAKES_INCLUDES}
    ${TEXTLAYOUT_INCLUDES}
+    ${CMAKE_SOURCE_DIR}/libs/ui
+    ${CMAKE_SOURCE_DIR}/libs/ui/canvas
+    ${CMAKE_SOURCE_DIR}/libs/ui/widgets
+    ${CMAKE_SOURCE_DIR}/libs/ui/tool
+    ${CMAKE_SOURCE_DIR}/libs/ui/flake
+    ${CMAKE_SOURCE_DIR}/libs/ui/ora
    ${CMAKE_SOURCE_DIR}/libs/widgets
    ${CMAKE_SOURCE_DIR}/libs/widgets/resources
    ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
@@ -34,7 +24,6 @@ set(KRITA_INCLUDES

 include_directories(${KRITA_INCLUDES})

-add_subdirectory( ui )
 add_subdirectory( dtd )
 add_subdirectory( plugins )
 add_subdirectory( data )

--- a/krita/main.cc
+++ b/krita/main.cc
@@ -35,7 +35,7 @@

 #include "data/splash/splash_screen.xpm"
 #include "data/splash/splash_holidays.xpm"
-#include "ui/KisDocument.h"
+#include "KisDocument.h"
 #include "kis_splash_screen.h"
 #include "KisPart.h"
 #include "KisApplicationArguments.h"

--- a/krita/plugins/assistants/RulerAssistant/ConcentricEllipseAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/ConcentricEllipseAssistant.cc
@@ -23,8 +23,9 @@
 #include <QPainter>
 #include <QLinearGradient>
 #include <QTransform>
-
-#include "kis_coordinates_converter.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>
+#include <kis_algebra_2d.h>

 #include <math.h>


--- a/krita/plugins/assistants/RulerAssistant/EllipseAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/EllipseAssistant.cc
@@ -24,7 +24,8 @@
 #include <QLinearGradient>
 #include <QTransform>

-#include "kis_coordinates_converter.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>

 #include <math.h>


--- a/krita/plugins/assistants/RulerAssistant/FisheyePointAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/FisheyePointAssistant.cc
@@ -26,8 +26,9 @@
 #include <QLinearGradient>
 #include <QTransform>

-#include "kis_coordinates_converter.h"
-#include "kis_algebra_2d.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>
+#include <kis_algebra_2d.h>

 #include <math.h>
 #include <limits>

--- a/krita/plugins/assistants/RulerAssistant/InfiniteRulerAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/InfiniteRulerAssistant.cc
@@ -26,8 +26,9 @@
 #include <QLinearGradient>
 #include <QTransform>

-#include "kis_coordinates_converter.h"
-#include "kis_algebra_2d.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>
+#include <kis_algebra_2d.h>

 #include <math.h>


--- a/krita/plugins/assistants/RulerAssistant/ParallelRulerAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/ParallelRulerAssistant.cc
@@ -26,8 +26,9 @@
 #include <QLinearGradient>
 #include <QTransform>

-#include "kis_coordinates_converter.h"
-#include "kis_algebra_2d.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>
+#include <kis_algebra_2d.h>

 #include <math.h>


--- a/krita/plugins/assistants/RulerAssistant/PerspectiveAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/PerspectiveAssistant.cc
@@ -25,8 +25,9 @@
 #include <QLinearGradient>
 #include <QTransform>

-#include "kis_coordinates_converter.h"
-#include "kis_algebra_2d.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>
+#include <kis_algebra_2d.h>

 #include <math.h>
 #include <limits>

--- a/krita/plugins/assistants/RulerAssistant/RulerAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/RulerAssistant.cc
@@ -24,7 +24,8 @@
 #include <QLinearGradient>
 #include <QTransform>

-#include "kis_coordinates_converter.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>

 #include <math.h>


--- a/krita/plugins/assistants/RulerAssistant/SplineAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/SplineAssistant.cc
@@ -24,7 +24,8 @@
 #include <QLinearGradient>
 #include <QTransform>

-#include "kis_coordinates_converter.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>
 #include "kis_debug.h"

 #include <math.h>

--- a/krita/plugins/assistants/RulerAssistant/VanishingPointAssistant.cc
+++ b/krita/plugins/assistants/RulerAssistant/VanishingPointAssistant.cc
@@ -26,8 +26,9 @@
 #include <QLinearGradient>
 #include <QTransform>

-#include "kis_coordinates_converter.h"
-#include "kis_algebra_2d.h"
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>
+#include <kis_algebra_2d.h>

 #include <math.h>


--- a/krita/plugins/assistants/RulerAssistant/ruler_assistant_tool.cc
+++ b/krita/plugins/assistants/RulerAssistant/ruler_assistant_tool.cc
@@ -18,7 +18,9 @@
 #include "kis_ruler_assistant_tool.h"

 #include <kpluginfactory.h>
-
+#include <kis_canvas2.h>
+#include <kis_coordinates_converter.h>
+#include <kis_algebra_2d.h>
 #include <KoToolRegistry.h>
 #include "RulerAssistant.h"
 #include "EllipseAssistant.h"

--- a/krita/plugins/tools/selectiontools/kis_tool_select_outline.h
+++ b/krita/plugins/tools/selectiontools/kis_tool_select_outline.h
@@ -26,7 +26,7 @@

 #include <QPoint>