Commit 16e71d41 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Move krita/ui to libs/ui

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

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

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 )
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -26,7 +26,7 @@
#include <QPoint>
#include <KoToolFactoryBase.h>
#include "krita/ui/tool/kis_tool_select_base.h"
#include <kis_tool_select_base.h>
#include <kis_icon.h>
class QPainterPath;
......
......@@ -13,6 +13,7 @@ add_subdirectory( brush )
add_subdirectory( psd )
add_subdirectory( color )
add_subdirectory( image )
add_subdirectory( ui )
if (SHOULD_BUILD_LIB_KOVECTORIMAGE)
add_subdirectory( vectorimage )
......
......@@ -7,17 +7,36 @@ if (CMAKE_COMPILER_IS_GNUCXX)
endif ()
include_directories(
${CMAKE_SOURCE_DIR}/libs/pigment/colorprofiles
${CMAKE_SOURCE_DIR}/libs/widgetutils/xmlgui
${CMAKE_SOURCE_DIR}/libs/widgetutils/config
${CMAKE_SOURCE_DIR}/libs/flake/commands
${CMAKE_CURRENT_SOURCE_DIR}/flake
${CMAKE_CURRENT_SOURCE_DIR}/pigment/resources
${CMAKE_CURRENT_SOURCE_DIR}/widgets/resources
${CMAKE_CURRENT_SOURCE_DIR}/ora
${CMAKE_SOURCE_DIR}/krita/image/metadata
${CMAKE_SOURCE_DIR}/krita/ui/qtsingleapplication
${CMAKE_SOURCE_DIR}/krita/ui/qtlockedfile
${CMAKE_CURRENT_SOURCE_DIR}/qtsingleapplication
${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile
${CMAKE_CURRENT_SOURCE_DIR}/actions
${CMAKE_CURRENT_SOURCE_DIR}/canvas
${CMAKE_CURRENT_SOURCE_DIR}/dialogs
${CMAKE_CURRENT_SOURCE_DIR}/forms
${CMAKE_CURRENT_SOURCE_DIR}/input
${CMAKE_CURRENT_SOURCE_DIR}/input/config
${CMAKE_CURRENT_SOURCE_DIR}/input/wintab
${CMAKE_CURRENT_SOURCE_DIR}/kisexiv2
${CMAKE_CURRENT_SOURCE_DIR}/kra
${CMAKE_CURRENT_SOURCE_DIR}/layerstyles
${CMAKE_CURRENT_SOURCE_DIR}/opengl
${CMAKE_CURRENT_SOURCE_DIR}/operations
${CMAKE_CURRENT_SOURCE_DIR}/processing
${CMAKE_CURRENT_SOURCE_DIR}/recorder
${CMAKE_CURRENT_SOURCE_DIR}/resourcemanager
${CMAKE_CURRENT_SOURCE_DIR}/tool
${CMAKE_CURRENT_SOURCE_DIR}/tool/strokes
${CMAKE_CURRENT_SOURCE_DIR}/widgets
${EXIV2_INCLUDE_DIR}
${OCIO_INCLUDE_DIR})
${EIGEN3_INCLUDE_DIR}
${OCIO_INCLUDE_DIR}
)
add_subdirectory( tests )
......