Commit ea507d22 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Add 'krita' as prefix for all library names.

parent 8b42f2ad
......@@ -541,9 +541,6 @@ include(MacroCalligraAddTest)
#####################
####################
# WARNING: make sure that QT_INCLUDES is the first directory to be added to include_directory before
# any other include directory
# for config.h and <toplevel/foo.h> includes (if any?)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/interfaces )
......@@ -603,7 +600,6 @@ set(KOTEXT_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kotext
${CMAKE_SOURCE_DIR}/libs/kotext/changetracker
${CMAKE_SOURCE_DIR}/libs/kotext/styles
${CMAKE_SOURCE_DIR}/libs/kotext/opendocument
${SOPRANO_INCLUDE_DIR}
${FLAKE_INCLUDES}
${KOODF_INCLUDES})
......@@ -612,7 +608,7 @@ set(TEXTLAYOUT_INCLUDES ${KOTEXT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/textlayout
${CMAKE_BINARY_DIR}/libs/textlayout)
# Widgets depends on kotext and flake
# Widgets depends on kritatext and flake
set(KOWIDGETS_INCLUDES ${KOTEXT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/widgetutils
${CMAKE_BINARY_DIR}/libs/widgetutils
......@@ -622,6 +618,7 @@ set(KOWIDGETS_INCLUDES ${KOTEXT_INCLUDES}
# BasicFlakes depends on flake, widgets
set(BASICFLAKES_INCLUDES ${KOWIDGETS_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/basicflakes
${CMAKE_BINARY_DIR}/libs/basicflakes
${CMAKE_SOURCE_DIR}/libs/basicflakes/tools)
###################################################
......
......@@ -304,8 +304,8 @@ set(einspline_SRCS
add_library(kritaimage SHARED ${kritaimage_LIB_SRCS} ${einspline_SRCS})
generate_export_header(kritaimage BASE_NAME kritaimage)
target_link_libraries(kritaimage koversion kowidgets kritaglobal kritapsd koodf pigmentcms kundo2 kowidgetutils Qt5::Concurrent)
target_link_libraries(kritaimage LINK_INTERFACE_LIBRARIES koversion kritaglobal kritapsd koodf pigmentcms kundo2 kowidgetutils Qt5::Concurrent)
target_link_libraries(kritaimage kritaversion kritawidgets kritaglobal kritapsd kritaodf kritapigment kritaundo2 kritawidgetutils Qt5::Concurrent)
target_link_libraries(kritaimage LINK_INTERFACE_LIBRARIES kritaversion kritaglobal kritapsd kritaodf kritapigment kritaundo2 kritawidgetutils Qt5::Concurrent)
target_link_libraries(kritaimage ${Boost_SYSTEM_LIBRARY})
message("DEBUG_BOOST_LIBRARIES = " ${Boost_LIBRARIES})
......
......@@ -48,7 +48,7 @@ target_link_libraries(KisNodeFacadeTest kritaimage Qt5::Test)
set(kis_paint_device_test_SRCS kis_paint_device_test.cpp )
kde4_add_unit_test(KisPaintDeviceTest TESTNAME krita-image-KisPaintDeviceTest ${kis_paint_device_test_SRCS})
target_link_libraries(KisPaintDeviceTest kritaimage koodf Qt5::Test)
target_link_libraries(KisPaintDeviceTest kritaimage kritaodf Qt5::Test)
########### next target ###############
......
......@@ -17,7 +17,7 @@ set_tests_properties(krita-image-KisLowMemoryTests PROPERTIES TIMEOUT 180)
########### next target ###############
set(kis_tile_compressors_test_SRCS kis_tile_compressors_test.cpp )
kde4_add_unit_test(KisTileCompressorsTest TESTNAME krita-image-KisTileCompressorsTest ${kis_tile_compressors_test_SRCS})
target_link_libraries(KisTileCompressorsTest koodf kritaimage Qt5::Test)
target_link_libraries(KisTileCompressorsTest kritaodf kritaimage Qt5::Test)
########### next target ###############
set(kis_compression_tests_SRCS kis_compression_tests.cpp )
......
......@@ -24,9 +24,9 @@ add_library(kritalibbrush SHARED ${kritalibbrush_LIB_SRCS} )
generate_export_header(kritalibbrush BASE_NAME kritabrush EXPORT_MACRO_NAME BRUSH_EXPORT)
if (WIN32)
target_link_libraries(kritalibbrush kritaimage kowidgets Qt5::Svg ${WIN32_PLATFORM_NET_LIBS})
target_link_libraries(kritalibbrush kritaimage kritawidgets Qt5::Svg ${WIN32_PLATFORM_NET_LIBS})
else ()
target_link_libraries(kritalibbrush kritaimage kowidgets Qt5::Svg)
target_link_libraries(kritalibbrush kritaimage kritawidgets Qt5::Svg)
endif ()
......@@ -36,7 +36,7 @@ if(HAVE_VC)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
endif()
target_link_libraries(kritalibbrush LINK_INTERFACE_LIBRARIES kritaimage kowidgets Qt5::Svg)
target_link_libraries(kritalibbrush LINK_INTERFACE_LIBRARIES kritaimage kritawidgets Qt5::Svg)
set_target_properties(kritalibbrush PROPERTIES
VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
......
......@@ -13,8 +13,8 @@ set(kritaglobal_LIB_SRCS
kde4_add_library(kritaglobal SHARED ${kritaglobal_LIB_SRCS} )
generate_export_header(kritaglobal BASE_NAME kritaglobal)
target_link_libraries(kritaglobal kowidgets KF5::IconThemes Qt5::Concurrent Qt5::Core Qt5::Gui)
target_link_libraries(kritaglobal LINK_INTERFACE_LIBRARIES kowidgets KF5::IconThemes Qt5::Concurrent Qt5::Concurrent Qt5::Core Qt5::Gui)
target_link_libraries(kritaglobal kritawidgets KF5::IconThemes Qt5::Concurrent Qt5::Core Qt5::Gui)
target_link_libraries(kritaglobal LINK_INTERFACE_LIBRARIES kritawidgets KF5::IconThemes Qt5::Concurrent Qt5::Concurrent Qt5::Core Qt5::Gui)
set_target_properties(kritaglobal PROPERTIES
VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
......
......@@ -24,9 +24,9 @@ add_library(kritapsd SHARED ${kritapsd_LIB_SRCS} )
generate_export_header(kritapsd BASE_NAME kritapsd)
if (WIN32)
target_link_libraries(kritapsd pigmentcms kritaglobal KF5::I18n ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${WIN32_PLATFORM_NET_LIBS})
target_link_libraries(kritapsd kritapigment kritaglobal KF5::I18n ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${WIN32_PLATFORM_NET_LIBS})
else (WIN32)
target_link_libraries(kritapsd pigmentcms kritaglobal KF5::I18n ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
target_link_libraries(kritapsd kritapigment kritaglobal KF5::I18n ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
endif (WIN32)
target_link_libraries(kritapsd LINK_INTERFACE_LIBRARIES kritaglobal ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
......
......@@ -7,4 +7,4 @@ macro_add_unittest_definitions()
set(kis_asl_parser_test_SRCS kis_asl_parser_test.cpp )
kde4_add_unit_test(KisAslParserTest TESTNAME kritalibpsd-asl_parser_test ${kis_asl_parser_test_SRCS})
target_link_libraries(KisAslParserTest kritapsd pigmentcms kowidgetutils ${QT_QTXML_LIBRARY} Qt5::Test)
target_link_libraries(KisAslParserTest kritapsd kritapigment kritawidgetutils ${QT_QTXML_LIBRARY} Qt5::Test)
......@@ -20,7 +20,7 @@ ki18n_wrap_ui(kritarulerassistanttool_PART_SRCS AssistantsToolOptions.ui )
add_library(kritarulerassistanttool MODULE ${kritarulerassistanttool_PART_SRCS})
kcoreaddons_desktop_to_json(kritarulerassistanttool kritarulerassistanttool.desktop)
target_link_libraries(kritarulerassistanttool kritaui flake )
target_link_libraries(kritarulerassistanttool kritaui kritaflake )
install(TARGETS kritarulerassistanttool DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
......
......@@ -14,7 +14,7 @@ set( extensions_plugin_PART_SRCS
add_library(krita_colorspaces_extensions MODULE ${extensions_plugin_PART_SRCS} )
kcoreaddons_desktop_to_json(krita_colorspaces_extensions krita_colorspaces_extensions_plugin.desktop)
target_link_libraries(krita_colorspaces_extensions pigmentcms kritaglobal ${OPENEXR_LIBRARIES} KF5::I18n )
target_link_libraries(krita_colorspaces_extensions kritapigment kritaglobal ${OPENEXR_LIBRARIES} KF5::I18n )
install( TARGETS krita_colorspaces_extensions DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR} )
......
......@@ -16,7 +16,7 @@ ki18n_wrap_ui(kritaresourcemanager_PART_SRCS
add_library(kritaresourcemanager MODULE ${kritaresourcemanager_PART_SRCS})
kcoreaddons_desktop_to_json(kritaresourcemanager kritaresourcemanager.desktop)
target_link_libraries(kritaresourcemanager kowidgets kritaui kritalibpaintop)
target_link_libraries(kritaresourcemanager kritawidgets kritaui kritalibpaintop)
install(TARGETS kritaresourcemanager DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
......
......@@ -84,7 +84,7 @@ ki18n_wrap_ui(kritalibpaintop_LIB_SRCS
add_library(kritalibpaintop SHARED ${kritalibpaintop_LIB_SRCS} )
generate_export_header(kritalibpaintop BASE_NAME kritapaintop EXPORT_MACRO_NAME PAINTOP_EXPORT)
target_link_libraries(kritalibpaintop kritaui kritalibbrush kowidgetutils)
target_link_libraries(kritalibpaintop kritaui kritalibbrush kritawidgetutils)
target_link_libraries(kritalibpaintop LINK_INTERFACE_LIBRARIES kritaui kritalibbrush)
set_target_properties(kritalibpaintop PROPERTIES
......
......@@ -28,7 +28,7 @@ add_library(kritadefaulttools MODULE ${kritadefaulttools_PART_SRCS})
generate_export_header(kritadefaulttools BASE_NAME kritadefaulttools)
kcoreaddons_desktop_to_json(kritadefaulttools kritadefaulttools.desktop)
target_link_libraries(kritadefaulttools kritaui basicflakes)
target_link_libraries(kritadefaulttools kritaui kritabasicflakes)
target_link_libraries(kritadefaulttools ${Boost_SYSTEM_LIBRARY})
install(TARGETS kritadefaulttools DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
......
......@@ -7,4 +7,4 @@ macro_add_unittest_definitions()
set(move_stroke_test_SRCS move_stroke_test.cpp ${CMAKE_SOURCE_DIR}/krita/sdk/tests/stroke_testing_utils.cpp)
kde4_add_unit_test(MoveStrokeTest TESTNAME krita-ui-MoveStrokeTest ${move_stroke_test_SRCS})
target_link_libraries(MoveStrokeTest basicflakes kritadefaulttools kritaui kritaimage Qt5::Test)
target_link_libraries(MoveStrokeTest kritabasicflakes kritadefaulttools kritaui kritaimage Qt5::Test)
......@@ -14,7 +14,7 @@ set(kritaselectiontools_PART_SRCS
add_library(kritaselectiontools MODULE ${kritaselectiontools_PART_SRCS})
kcoreaddons_desktop_to_json(kritaselectiontools kritaselectiontools.desktop)
target_link_libraries(kritaselectiontools kritaui basicflakes)
target_link_libraries(kritaselectiontools kritaui kritabasicflakes)
install(TARGETS kritaselectiontools DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
......
......@@ -124,7 +124,7 @@ target_link_libraries(kritasketchlib
Qt5::Core
${QT_LIBRARIES}
kritaui
kowidgets
kritawidgets
)
......@@ -165,7 +165,7 @@ target_link_libraries(kritasketchplugin
Qt5::Core
${QT_LIBRARIES}
kritaui
kowidgets
kritawidgets
kritasketchlib
)
......
......@@ -457,9 +457,9 @@ if(APPLE)
endif ()
if(GHNS)
target_link_libraries(kritaui kritacolor kritaimage kritalibbrush kowidgets kowidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES} KF5::NewStuff)
target_link_libraries(kritaui kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES} KF5::NewStuff)
else()
target_link_libraries(kritaui kritacolor kritaimage kritalibbrush kowidgets kowidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES})
target_link_libraries(kritaui kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES})
endif ()
if(HAVE_OPENGL)
......@@ -477,7 +477,7 @@ if(X11_FOUND)
target_link_libraries(kritaui Qt5::X11Extras ${X11_LIBRARIES})
endif()
target_link_libraries(kritaui LINK_INTERFACE_LIBRARIES kritaimage kritalibbrush pigmentcms KF5::I18n ${GL_INTERFACE_LIBRARIES})
target_link_libraries(kritaui LINK_INTERFACE_LIBRARIES kritaimage kritalibbrush kritapigment KF5::I18n ${GL_INTERFACE_LIBRARIES})
set_target_properties(kritaui
PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
......
......@@ -201,4 +201,4 @@ target_link_libraries(KisFileLayerTest kritaui kritaimage Qt5::Test)
set(kis_asl_layer_style_serializer_test_SRCS kis_asl_layer_style_serializer_test.cpp )
kde4_add_unit_test(KisAslLayerStyleSerializerTest TESTNAME krita-ui-KisAslLayerStyleSerializerTest ${kis_asl_layer_style_serializer_test_SRCS})
target_link_libraries(KisAslLayerStyleSerializerTest kritaui kritaimage kowidgets ${QT_QTTEST_LIBRARY})
target_link_libraries(KisAslLayerStyleSerializerTest kritaui kritaimage kritawidgets ${QT_QTTEST_LIBRARY})
......@@ -6,22 +6,22 @@ include_directories(
${FLAKE_INCLUDES}
)
set(basicflakes_LIB_SRCS
set(kritabasicflakes_LIB_SRCS
tools/KoCreatePathTool.cpp
tools/KoPencilTool.cpp
)
ki18n_wrap_ui( basicflakes_LIB_SRCS
ki18n_wrap_ui( kritabasicflakes_LIB_SRCS
)
add_library(basicflakes SHARED ${basicflakes_LIB_SRCS})
generate_export_header(basicflakes)
add_library(kritabasicflakes SHARED ${kritabasicflakes_LIB_SRCS})
generate_export_header(kritabasicflakes)
target_link_libraries(basicflakes kowidgets flake pigmentcms)
target_link_libraries(kritabasicflakes kritawidgets kritaflake kritapigment)
set_target_properties(basicflakes PROPERTIES
set_target_properties(kritabasicflakes PROPERTIES
VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
)
install(TARGETS basicflakes ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kritabasicflakes ${INSTALL_TARGETS_DEFAULT_ARGS})
......@@ -5,7 +5,7 @@ include_directories( ${FLAKE_INCLUDES} ${BASICFLAKES_INCLUDES})
#add_subdirectory(pics)
########### Basicflakes plugin library ###############
########### Basickritaflakes plugin library ###############
set ( basicflakesplugin_SRCS
Plugin.cpp
......@@ -18,5 +18,5 @@ ki18n_wrap_ui(basicflakesplugin_SRCS
add_library(calligra_tool_basicflakes MODULE ${basicflakesplugin_SRCS})
kcoreaddons_desktop_to_json(calligra_tool_basicflakes calligra_tool_basicflakes.desktop)
target_link_libraries(calligra_tool_basicflakes flake basicflakes)
target_link_libraries(calligra_tool_basicflakes kritaflake kritabasicflakes)
install(TARGETS calligra_tool_basicflakes DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
......@@ -21,7 +21,7 @@
#ifndef KOCREATEPATHTOOL_H
#define KOCREATEPATHTOOL_H
#include "basicflakes_export.h"
#include "kritabasicflakes_export.h"
#include <KoToolBase.h>
......@@ -37,7 +37,7 @@ class KoCreatePathToolPrivate;
/**
* Tool for creating path shapes.
*/
class BASICFLAKES_EXPORT KoCreatePathTool : public KoToolBase
class KRITABASICFLAKES_EXPORT KoCreatePathTool : public KoToolBase
{
Q_OBJECT
public:
......
......@@ -27,9 +27,9 @@ class KoShapeStroke;
class KoPathPoint;
class KoStrokeConfigWidget;
#include "basicflakes_export.h"
#include "kritabasicflakes_export.h"
class BASICFLAKES_EXPORT KoPencilTool : public KoToolBase
class KRITABASICFLAKES_EXPORT KoPencilTool : public KoToolBase
{
Q_OBJECT
public:
......
project(flake)
project(kritaflake)
include_directories(${FLAKE_INCLUDES} )
......@@ -6,7 +6,7 @@ add_subdirectory(styles)
add_subdirectory(tests)
add_subdirectory(pics)
set(flake_SRCS
set(kritaflake_SRCS
KoGradientHelper.cpp
KoFlake.cpp
KoCanvasBase.cpp
......@@ -208,35 +208,35 @@ set(flake_SRCS
FlakeDebug.cpp
)
ki18n_wrap_ui(flake_SRCS
ki18n_wrap_ui(kritaflake_SRCS
tools/PathToolOptionWidgetBase.ui
KoConnectionShapeConfigWidget.ui
SnapGuideConfigWidget.ui
tools/KoZoomToolWidget.ui
)
add_library(flake SHARED ${flake_SRCS})
generate_export_header(flake BASE_NAME flake)
add_library(kritaflake SHARED ${kritaflake_SRCS})
generate_export_header(kritaflake BASE_NAME kritaflake)
target_link_libraries(flake pigmentcms kowidgetutils koodf kundo2 KF5::IconThemes Qt5::Svg)
target_link_libraries(flake LINK_INTERFACE_LIBRARIES pigmentcms kowidgetutils koodf kundo2)
target_link_libraries(kritaflake kritapigment kritawidgetutils kritaodf kritaundo2 KF5::IconThemes Qt5::Svg)
target_link_libraries(kritaflake LINK_INTERFACE_LIBRARIES kritapigment kritawidgetutils kritaodf kritaundo2)
if(HAVE_OPENGL)
target_link_libraries(flake ${OPENGL_LIBRARIES} Qt5::OpenGL)
target_link_libraries(kritaflake ${OPENGL_LIBRARIES} Qt5::OpenGL)
endif()
set_target_properties(flake PROPERTIES
set_target_properties(kritaflake PROPERTIES
VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
)
########### install files ###############
install(TARGETS flake ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS kritaflake ${INSTALL_TARGETS_DEFAULT_ARGS})
install( FILES
flake.desktop
flaketool.desktop
flakeshape.desktop
flakedevice.desktop
kritaflake.desktop
kritaflaketool.desktop
kritaflakeshape.desktop
kritaflakedevice.desktop
presentationeventaction.desktop
scripteventaction.desktop
filtereffect.desktop
......
......@@ -20,9 +20,9 @@
#include <QDebug>
#include <QLoggingCategory>
#include <flake_export.h>
#include <kritaflake_export.h>
extern const FLAKE_EXPORT QLoggingCategory &FLAKE_LOG();
extern const KRITAFLAKE_EXPORT QLoggingCategory &FLAKE_LOG();
#define debugFlake qCDebug(FLAKE_LOG)
#define warnFlake qCWarning(FLAKE_LOG)
......
......@@ -19,7 +19,7 @@
#ifndef KOANNOTATIONLAYOUTMANAGER_H
#define KOANNOTATIONLAYOUTMANAGER_H
#include "flake_export.h"
#include "kritaflake_export.h"
#include <QObject>
......@@ -31,7 +31,7 @@ class QPointF;
class KoShape;
class FLAKE_EXPORT KoAnnotationLayoutManager: public QObject
class KRITAFLAKE_EXPORT KoAnnotationLayoutManager: public QObject
{
Q_OBJECT
public:
......
......@@ -25,7 +25,7 @@
#include <QPoint>
#include "flake_export.h"
#include "kritaflake_export.h"
class QGraphicsObject;
class KUndo2Command;
......@@ -53,7 +53,7 @@ class QRectF;
* should implement. Flake tools know about the canvas, so they can
* do things like scroll, redraw, set a cursor etc.
*/
class FLAKE_EXPORT KoCanvasBase
class KRITAFLAKE_EXPORT KoCanvasBase
{
public:
......
......@@ -24,7 +24,7 @@
#ifndef KOCANVASCONTROLLER_H
#define KOCANVASCONTROLLER_H
#include "flake_export.h"
#include "kritaflake_export.h"
#include <QObject>
#include <QSize>
......@@ -66,7 +66,7 @@ class KoCanvasControllerProxyObject;
* In your canvas widget code, you can find the right place in your
* document in view coordinates (pixels) by adding the documentOffset
*/
class FLAKE_EXPORT KoCanvasController
class KRITAFLAKE_EXPORT KoCanvasController
{
public:
/// An enum to alter the positioning and size of the canvas inside the canvas controller
......@@ -324,7 +324,7 @@ private:
* a QObject directly. The interface of this class should be considered public interface
* for KoCanvasController.
*/
class FLAKE_EXPORT KoCanvasControllerProxyObject : public QObject
class KRITAFLAKE_EXPORT KoCanvasControllerProxyObject : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(KoCanvasControllerProxyObject)
......@@ -429,7 +429,7 @@ private:
KoCanvasController *m_canvasController;
};
class FLAKE_EXPORT KoDummyCanvasController : public KoCanvasController {
class KRITAFLAKE_EXPORT KoDummyCanvasController : public KoCanvasController {
public:
......
......@@ -24,7 +24,7 @@
#ifndef KOCANVASCONTROLLERWIDGET_H
#define KOCANVASCONTROLLERWIDGET_H
#include "flake_export.h"
#include "kritaflake_export.h"
#include <QAbstractScrollArea>
#include <QPointer>
......@@ -36,7 +36,7 @@ class KoCanvasBase;
/**
* KoCanvasController implementation for QWidget based canvases
*/
class FLAKE_EXPORT KoCanvasControllerWidget : public QAbstractScrollArea, public KoCanvasController
class KRITAFLAKE_EXPORT KoCanvasControllerWidget : public QAbstractScrollArea, public KoCanvasController
{
Q_OBJECT
public:
......
......@@ -23,7 +23,7 @@
class KoCanvasBase;
class KoCanvasObserverBasePrivate;
#include "flake_export.h"
#include "kritaflake_export.h"
#include <QString>
/**
......@@ -32,7 +32,7 @@ class KoCanvasObserverBasePrivate;
* should implement that interface so that the tool controller
* can give them the active canvas.
*/
class FLAKE_EXPORT KoCanvasObserverBase
class KRITAFLAKE_EXPORT KoCanvasObserverBase
{
public:
KoCanvasObserverBase();
......
......@@ -23,7 +23,7 @@
#include <QObject>
#include "flake_export.h"
#include "kritaflake_export.h"
class KoShape;
class KoShapeStroke;
......@@ -54,7 +54,7 @@ class QSizeF;
* document = static_cast<QTextDocument*>(var.value<void*>());
* @endcode
*/
class FLAKE_EXPORT KoCanvasResourceManager : public QObject
class KRITAFLAKE_EXPORT KoCanvasResourceManager : public QObject
{
Q_OBJECT
......
......@@ -22,7 +22,7 @@
#include <QList>
#include "flake_export.h"
#include "kritaflake_export.h"
class KoCanvasObserverBase;
......@@ -30,7 +30,7 @@ class KoCanvasObserverBase;
* KoCanvasSupervisor is an abstract class that can return a
* list of canvas observers, such as dock widgets.
*/
class FLAKE_EXPORT KoCanvasSupervisor
class KRITAFLAKE_EXPORT KoCanvasSupervisor
{
public:
KoCanvasSupervisor();
......
......@@ -20,7 +20,7 @@
#ifndef KOCLIPPATH_H
#define KOCLIPPATH_H