diff --git a/filters/libmsooxml/CMakeLists.txt b/filters/libmsooxml/CMakeLists.txt --- a/filters/libmsooxml/CMakeLists.txt +++ b/filters/libmsooxml/CMakeLists.txt @@ -40,21 +40,27 @@ ) add_library(komsooxml SHARED ${msooxml_LIB_SRCS}) +generate_export_header(komsooxml BASE_NAME komsooxml) target_link_libraries(komsooxml mso koodf2 koodf komain KF5::Archive) if(Qca-qt5_FOUND) target_link_libraries(komsooxml qca-qt5) endif() -set_target_properties(komsooxml PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} ) +set_target_properties(komsooxml PROPERTIES + VERSION ${GENERIC_CALLIGRA_LIB_VERSION} + SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL komsooxml_EXPORTS + ) + install(TARGETS komsooxml ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES msooxml-all.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) if (FALSE) # these headers are private for now install( FILES - komsooxml_export.h + ${CMAKE_CURRENT_BINARY_DIR}/komsooxml_export.h MsooXmlContentTypes.h MsooXmlReader.h MsooXmlReader_p.h diff --git a/filters/libmsooxml/komsooxml_export.h b/filters/libmsooxml/komsooxml_export.h deleted file mode 100644 --- a/filters/libmsooxml/komsooxml_export.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of Office 2007 Filters for Calligra - * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - * - * Contact: Suresh Chande suresh.chande@nokia.com - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#ifndef KOMSOOXML_EXPORT_H -#define KOMSOOXML_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -#ifndef KOMSOOXML_EXPORT -# if defined(MAKE_KOMSOOXML_LIB) -/* We are building this library */ -# define KOMSOOXML_EXPORT KDE_EXPORT -# else -/* We are using this library */ -# define KOMSOOXML_EXPORT KDE_IMPORT -# endif -#endif - -# ifndef KOMSOOXML_EXPORT_DEPRECATED -# define KOMSOOXML_EXPORT_DEPRECATED KDE_DEPRECATED KOMSOOXML_EXPORT -# endif - -#endif diff --git a/filters/libodf2/CMakeLists.txt b/filters/libodf2/CMakeLists.txt --- a/filters/libodf2/CMakeLists.txt +++ b/filters/libodf2/CMakeLists.txt @@ -51,18 +51,21 @@ ) add_library(koodf2 SHARED ${koodf2_LIB_SRCS}) +generate_export_headers(koodf2 BASE_NAME koodf2) target_link_libraries(koodf2 koodf mso KF5::KIOWidgets KF5::KDELibs4Support Qt5::Xml) target_link_libraries(koodf2 LINK_INTERFACE_LIBRARIES KF5::KIOWidgets) set_target_properties(koodf2 PROPERTIES - VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + VERSION ${GENERIC_CALLIGRA_LIB_VERSION} + SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL koodf2_EXPORTS ) install(TARGETS koodf2 ${INSTALL_TARGETS_DEFAULT_ARGS} ) install( FILES - koodf2_export.h + ${CMAKE_CURRENT_BINARY_DIR}/koodf2_export.h KoStyle.h KoTable.h diff --git a/filters/libodf2/koodf2_export.h b/filters/libodf2/koodf2_export.h deleted file mode 100644 --- a/filters/libodf2/koodf2_export.h +++ /dev/null @@ -1,40 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2007 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KOODF2_EXPORT_H -#define KOODF2_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -#ifndef KOODF2_EXPORT -# if defined(MAKE_KOODF2_LIB) -/* We are building this library */ -# define KOODF2_EXPORT KDE_EXPORT -# else -/* We are using this library */ -# define KOODF2_EXPORT KDE_IMPORT -# endif -#endif - -# ifndef KOODF2_EXPORT_DEPRECATED -# define KOODF2_EXPORT_DEPRECATED KDE_DEPRECATED KOODF2_EXPORT -# endif - -#endif diff --git a/kexi/kexiutils/CMakeLists.txt b/kexi/kexiutils/CMakeLists.txt --- a/kexi/kexiutils/CMakeLists.txt +++ b/kexi/kexiutils/CMakeLists.txt @@ -45,19 +45,22 @@ endif () add_library(kexiutils SHARED ${kexiutils_LIB_SRCS}) +generate_export_header(kexiutils BASE_NAME kexiutils) target_link_libraries(kexiutils Predicate KF5::KIOWidgets) target_link_libraries(kexiutils LINK_INTERFACE_LIBRARIES KF5::KIOWidgets) set_target_properties(kexiutils PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kexiutils_EXPORTS ) install(TARGETS kexiutils ${INSTALL_TARGETS_DEFAULT_ARGS}) if(FALSE) # TODO: install when we move to independent place - install( FILES tristate.h identifier.h validator.h utils.h kexiutils_export.h kexiutils_global.h - styleproxy.h longlongvalidator.h InternalPropertyMap.h + install( FILES tristate.h identifier.h validator.h utils.h + ${CMAKE_CURRENT_BINARY_DIR}/kexiutils_export.h + kexiutils_global.h styleproxy.h longlongvalidator.h InternalPropertyMap.h SmallToolButton.h FlowLayout.h kmessagewidget.h KexiContextMessage.h KexiTitleLabel.h KexiAssistantPage.h KexiAssistantWidget.h KexiAnimatedLayout.h diff --git a/krita/image/CMakeLists.txt b/krita/image/CMakeLists.txt --- a/krita/image/CMakeLists.txt +++ b/krita/image/CMakeLists.txt @@ -41,6 +41,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/krita/image/metadata + ${CMAKE_BINARY_DIR}/libs/widgets 3rdparty ) @@ -301,6 +302,7 @@ ) add_library(kritaimage SHARED ${kritaimage_LIB_SRCS} ${einspline_SRCS}) +generate_export_header(kritaimage BASE_NAME kritaimage) target_link_libraries(kritaimage kritaglobal kritapsd koodf pigmentcms kundo2 kowidgetutils Qt5::Concurrent) target_link_libraries(kritaimage LINK_INTERFACE_LIBRARIES kritaglobal kritapsd koodf pigmentcms kundo2 kowidgetutils Qt5::Concurrent) @@ -329,7 +331,9 @@ endif () set_target_properties(kritaimage PROPERTIES - VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + VERSION ${GENERIC_CALLIGRA_LIB_VERSION} + SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kritaimage_EXPORTS ) install(TARGETS kritaimage ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/krita/image/brushengine/kis_paint_information.h b/krita/image/brushengine/kis_paint_information.h --- a/krita/image/brushengine/kis_paint_information.h +++ b/krita/image/brushengine/kis_paint_information.h @@ -24,7 +24,7 @@ #include "kis_global.h" #include "kis_vec.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_distance_information.h" class QDomDocument; diff --git a/krita/image/brushengine/kis_paintop.h b/krita/image/brushengine/kis_paintop.h --- a/krita/image/brushengine/kis_paintop.h +++ b/krita/image/brushengine/kis_paintop.h @@ -28,7 +28,7 @@ #include "kis_types.h" #include "kis_paintop_settings.h" -#include +#include class QPointF; class KoColorSpace; diff --git a/krita/image/brushengine/kis_paintop_config_widget.h b/krita/image/brushengine/kis_paintop_config_widget.h --- a/krita/image/brushengine/kis_paintop_config_widget.h +++ b/krita/image/brushengine/kis_paintop_config_widget.h @@ -19,7 +19,7 @@ #ifndef KIS_PAINTOP_CONFIG_WIDGET_H_ #define KIS_PAINTOP_CONFIG_WIDGET_H_ -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_config_widget.h" #include "kis_image.h" diff --git a/krita/image/brushengine/kis_paintop_factory.h b/krita/image/brushengine/kis_paintop_factory.h --- a/krita/image/brushengine/kis_paintop_factory.h +++ b/krita/image/brushengine/kis_paintop_factory.h @@ -20,7 +20,7 @@ #define KIS_PAINTOP_FACTORY_H_ #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include #include #include diff --git a/krita/image/brushengine/kis_paintop_preset.h b/krita/image/brushengine/kis_paintop_preset.h --- a/krita/image/brushengine/kis_paintop_preset.h +++ b/krita/image/brushengine/kis_paintop_preset.h @@ -24,7 +24,7 @@ #include "kis_types.h" #include "kis_shared.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** diff --git a/krita/image/brushengine/kis_paintop_registry.h b/krita/image/brushengine/kis_paintop_registry.h --- a/krita/image/brushengine/kis_paintop_registry.h +++ b/krita/image/brushengine/kis_paintop_registry.h @@ -30,7 +30,7 @@ #include "kis_paintop_preset.h" #include -#include +#include class KisPaintOp; diff --git a/krita/image/brushengine/kis_paintop_settings.h b/krita/image/brushengine/kis_paintop_settings.h --- a/krita/image/brushengine/kis_paintop_settings.h +++ b/krita/image/brushengine/kis_paintop_settings.h @@ -20,7 +20,7 @@ #define KIS_PAINTOP_SETTINGS_H_ #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include #include diff --git a/krita/image/bsplines/kis_bspline_1d.h b/krita/image/bsplines/kis_bspline_1d.h --- a/krita/image/bsplines/kis_bspline_1d.h +++ b/krita/image/bsplines/kis_bspline_1d.h @@ -19,7 +19,7 @@ #ifndef __KIS_BSPLINE_1D_H #define __KIS_BSPLINE_1D_H -#include +#include #include #include diff --git a/krita/image/bsplines/kis_bspline_2d.h b/krita/image/bsplines/kis_bspline_2d.h --- a/krita/image/bsplines/kis_bspline_2d.h +++ b/krita/image/bsplines/kis_bspline_2d.h @@ -19,7 +19,7 @@ #ifndef __KIS_BSPLINE_2D_H #define __KIS_BSPLINE_2D_H -#include +#include #include #include diff --git a/krita/image/bsplines/kis_nu_bspline_2d.h b/krita/image/bsplines/kis_nu_bspline_2d.h --- a/krita/image/bsplines/kis_nu_bspline_2d.h +++ b/krita/image/bsplines/kis_nu_bspline_2d.h @@ -19,7 +19,7 @@ #ifndef __KIS_NU_BSPLINE_2D_H #define __KIS_NU_BSPLINE_2D_H -#include +#include #include #include diff --git a/krita/image/commands/kis_change_filter_command.h b/krita/image/commands/kis_change_filter_command.h --- a/krita/image/commands/kis_change_filter_command.h +++ b/krita/image/commands/kis_change_filter_command.h @@ -18,7 +18,7 @@ #ifndef KIS_CHANGE_FILTER_COMMAND_H #define KIS_CHANGE_FILTER_COMMAND_H -#include +// #include #include #include #include "kis_types.h" diff --git a/krita/image/commands/kis_deselect_global_selection_command.h b/krita/image/commands/kis_deselect_global_selection_command.h --- a/krita/image/commands/kis_deselect_global_selection_command.h +++ b/krita/image/commands/kis_deselect_global_selection_command.h @@ -18,7 +18,7 @@ #ifndef KIS_DESELECT_GLOBAL_SELECTION_COMMAND_H_ #define KIS_DESELECT_GLOBAL_SELECTION_COMMAND_H_ -#include +#include #include #include "kis_types.h" diff --git a/krita/image/commands/kis_image_change_layers_command.h b/krita/image/commands/kis_image_change_layers_command.h --- a/krita/image/commands/kis_image_change_layers_command.h +++ b/krita/image/commands/kis_image_change_layers_command.h @@ -20,7 +20,7 @@ #ifndef KIS_IMAGE_CHANGE_LAYERS_COMMAND_H_ #define KIS_IMAGE_CHANGE_LAYERS_COMMAND_H_ -#include +#include #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_command.h b/krita/image/commands/kis_image_command.h --- a/krita/image/commands/kis_image_command.h +++ b/krita/image/commands/kis_image_command.h @@ -20,7 +20,7 @@ #ifndef KIS_IMAGE_COMMAND_H_ #define KIS_IMAGE_COMMAND_H_ -#include +#include #include diff --git a/krita/image/commands/kis_image_layer_add_command.h b/krita/image/commands/kis_image_layer_add_command.h --- a/krita/image/commands/kis_image_layer_add_command.h +++ b/krita/image/commands/kis_image_layer_add_command.h @@ -20,7 +20,7 @@ #ifndef KIS_IMAGE_LAYER_ADD_COMMAND_H_ #define KIS_IMAGE_LAYER_ADD_COMMAND_H_ -#include +#include #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_layer_move_command.h b/krita/image/commands/kis_image_layer_move_command.h --- a/krita/image/commands/kis_image_layer_move_command.h +++ b/krita/image/commands/kis_image_layer_move_command.h @@ -20,7 +20,7 @@ #ifndef KIS_IMAGE_LAYER_MOVE_COMMAND_H_ #define KIS_IMAGE_LAYER_MOVE_COMMAND_H_ -#include +#include #include #include diff --git a/krita/image/commands/kis_image_layer_remove_command.h b/krita/image/commands/kis_image_layer_remove_command.h --- a/krita/image/commands/kis_image_layer_remove_command.h +++ b/krita/image/commands/kis_image_layer_remove_command.h @@ -19,7 +19,7 @@ #ifndef __KIS_IMAGE_LAYER_REMOVE_COMMAND_H #define __KIS_IMAGE_LAYER_REMOVE_COMMAND_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_layer_remove_command_impl.h b/krita/image/commands/kis_image_layer_remove_command_impl.h --- a/krita/image/commands/kis_image_layer_remove_command_impl.h +++ b/krita/image/commands/kis_image_layer_remove_command_impl.h @@ -22,7 +22,7 @@ #include -#include +#include #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_lock_command.h b/krita/image/commands/kis_image_lock_command.h --- a/krita/image/commands/kis_image_lock_command.h +++ b/krita/image/commands/kis_image_lock_command.h @@ -20,7 +20,7 @@ #ifndef KIS_IMAGE_LOCK_COMMAND_H_ #define KIS_IMAGE_LOCK_COMMAND_H_ -#include +#include #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_node_lower_command.h b/krita/image/commands/kis_image_node_lower_command.h --- a/krita/image/commands/kis_image_node_lower_command.h +++ b/krita/image/commands/kis_image_node_lower_command.h @@ -19,7 +19,7 @@ #ifndef KIS_IMAGE_NODE_LOWER_COMMAND_H_ #define KIS_IMAGE_NODE_LOWER_COMMAND_H_ -#include +#include #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_node_raise_command.h b/krita/image/commands/kis_image_node_raise_command.h --- a/krita/image/commands/kis_image_node_raise_command.h +++ b/krita/image/commands/kis_image_node_raise_command.h @@ -19,7 +19,7 @@ #ifndef KIS_IMAGE_NODE_RAISE_COMMAND_H_ #define KIS_IMAGE_NODE_RAISE_COMMAND_H_ -#include +#include #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_node_to_bottom_command.h b/krita/image/commands/kis_image_node_to_bottom_command.h --- a/krita/image/commands/kis_image_node_to_bottom_command.h +++ b/krita/image/commands/kis_image_node_to_bottom_command.h @@ -19,7 +19,7 @@ #ifndef KIS_IMAGE_NODE_TO_BOTTOM_COMMAND_H_ #define KIS_IMAGE_NODE_TO_BOTTOM_COMMAND_H_ -#include +#include #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_node_to_top_command.h b/krita/image/commands/kis_image_node_to_top_command.h --- a/krita/image/commands/kis_image_node_to_top_command.h +++ b/krita/image/commands/kis_image_node_to_top_command.h @@ -19,7 +19,7 @@ #ifndef KIS_IMAGE_NODE_TO_TOP_COMMAND_H_ #define KIS_IMAGE_NODE_TO_TOP_COMMAND_H_ -#include +#include #include "kis_types.h" #include "kis_image_command.h" diff --git a/krita/image/commands/kis_image_set_projection_color_space_command.h b/krita/image/commands/kis_image_set_projection_color_space_command.h --- a/krita/image/commands/kis_image_set_projection_color_space_command.h +++ b/krita/image/commands/kis_image_set_projection_color_space_command.h @@ -20,7 +20,7 @@ #ifndef KIS_IMAGE_SET_PROJECTION_COLOR_SPACE_COMMAND_H_ #define KIS_IMAGE_SET_PROJECTION_COLOR_SPACE_COMMAND_H_ -#include +#include #include "kis_image_command.h" class KoColorSpace; diff --git a/krita/image/commands/kis_layer_command.h b/krita/image/commands/kis_layer_command.h --- a/krita/image/commands/kis_layer_command.h +++ b/krita/image/commands/kis_layer_command.h @@ -20,7 +20,7 @@ #define KIS_LAYER_COMMAND_H_ #include -#include +#include #include "kis_types.h" class KisLayer; diff --git a/krita/image/commands/kis_layer_props_command.h b/krita/image/commands/kis_layer_props_command.h --- a/krita/image/commands/kis_layer_props_command.h +++ b/krita/image/commands/kis_layer_props_command.h @@ -20,7 +20,7 @@ #ifndef KIS_LAYER_PROPS_COMMAND_H #define KIS_LAYER_PROPS_COMMAND_H -#include +#include #include #include diff --git a/krita/image/commands/kis_node_command.h b/krita/image/commands/kis_node_command.h --- a/krita/image/commands/kis_node_command.h +++ b/krita/image/commands/kis_node_command.h @@ -19,7 +19,7 @@ #ifndef KIS_NODE_COMMAND_H_ #define KIS_NODE_COMMAND_H_ -#include +#include #include #include "kis_types.h" diff --git a/krita/image/commands/kis_paintdevice_convert_type_command.h b/krita/image/commands/kis_paintdevice_convert_type_command.h --- a/krita/image/commands/kis_paintdevice_convert_type_command.h +++ b/krita/image/commands/kis_paintdevice_convert_type_command.h @@ -19,7 +19,7 @@ #ifndef KIS_PAINTDEVICE_CONVERT_TYPE_COMMAND_H #define KIS_PAINTDEVICE_CONVERT_TYPE_COMMAND_H -#include +#include #include #include diff --git a/krita/image/commands/kis_reselect_global_selection_command.h b/krita/image/commands/kis_reselect_global_selection_command.h --- a/krita/image/commands/kis_reselect_global_selection_command.h +++ b/krita/image/commands/kis_reselect_global_selection_command.h @@ -18,7 +18,7 @@ #ifndef KIS_RESELECT_GLOBAL_SELECTION_COMMAND_H #define KIS_RESELECT_GLOBAL_SELECTION_COMMAND_H -#include +#include #include #include "kis_types.h" diff --git a/krita/image/commands/kis_set_global_selection_command.h b/krita/image/commands/kis_set_global_selection_command.h --- a/krita/image/commands/kis_set_global_selection_command.h +++ b/krita/image/commands/kis_set_global_selection_command.h @@ -18,7 +18,7 @@ #ifndef KIS_SET_GLOBAL_SELECTION_COMMAND_H #define KIS_SET_GLOBAL_SELECTION_COMMAND_H -#include +#include #include #include "kis_types.h" diff --git a/krita/image/commands_new/kis_image_resize_command.h b/krita/image/commands_new/kis_image_resize_command.h --- a/krita/image/commands_new/kis_image_resize_command.h +++ b/krita/image/commands_new/kis_image_resize_command.h @@ -20,7 +20,7 @@ #ifndef KIS_IMAGE_RESIZE_COMMAND_H_ #define KIS_IMAGE_RESIZE_COMMAND_H_ -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include diff --git a/krita/image/commands_new/kis_move_command_common.h b/krita/image/commands_new/kis_move_command_common.h --- a/krita/image/commands_new/kis_move_command_common.h +++ b/krita/image/commands_new/kis_move_command_common.h @@ -22,7 +22,7 @@ #include #include #include "kundo2command.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" /** diff --git a/krita/image/commands_new/kis_saved_commands.h b/krita/image/commands_new/kis_saved_commands.h --- a/krita/image/commands_new/kis_saved_commands.h +++ b/krita/image/commands_new/kis_saved_commands.h @@ -21,7 +21,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_stroke_job_strategy.h" class KisStrokesFacade; diff --git a/krita/image/commands_new/kis_set_layer_style_command.h b/krita/image/commands_new/kis_set_layer_style_command.h --- a/krita/image/commands_new/kis_set_layer_style_command.h +++ b/krita/image/commands_new/kis_set_layer_style_command.h @@ -21,7 +21,7 @@ #include #include "kundo2command.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" diff --git a/krita/image/commands_new/kis_update_command.h b/krita/image/commands_new/kis_update_command.h --- a/krita/image/commands_new/kis_update_command.h +++ b/krita/image/commands_new/kis_update_command.h @@ -21,7 +21,7 @@ #include "kundo2command.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" class KisUpdatesFacade; diff --git a/krita/image/filter/kis_color_transformation_configuration.h b/krita/image/filter/kis_color_transformation_configuration.h --- a/krita/image/filter/kis_color_transformation_configuration.h +++ b/krita/image/filter/kis_color_transformation_configuration.h @@ -19,7 +19,7 @@ #define _KIS_COLOR_TRANSFORMATION_CONFIGURATION_H_ #include "filter/kis_filter_configuration.h" -#include "krita_export.h" +#include "kritaimage_export.h" class KoColorSpace; class KisColorTransformationFilter; diff --git a/krita/image/filter/kis_color_transformation_filter.h b/krita/image/filter/kis_color_transformation_filter.h --- a/krita/image/filter/kis_color_transformation_filter.h +++ b/krita/image/filter/kis_color_transformation_filter.h @@ -21,7 +21,7 @@ #define _KIS_COLOR_TRANSFORMATION_FILTER_H_ #include "kis_filter.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** * This is a base class for filters that implement a filter for diff --git a/krita/image/filter/kis_filter.h b/krita/image/filter/kis_filter.h --- a/krita/image/filter/kis_filter.h +++ b/krita/image/filter/kis_filter.h @@ -30,7 +30,7 @@ #include "kis_types.h" #include "kis_base_processor.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** * Basic interface of a Krita filter. diff --git a/krita/image/filter/kis_filter_configuration.h b/krita/image/filter/kis_filter_configuration.h --- a/krita/image/filter/kis_filter_configuration.h +++ b/krita/image/filter/kis_filter_configuration.h @@ -23,7 +23,7 @@ #include "kis_properties_configuration.h" #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** * KisFilterConfiguration does inherit neither KisShared or QSharedData diff --git a/krita/image/filter/kis_filter_registry.h b/krita/image/filter/kis_filter_registry.h --- a/krita/image/filter/kis_filter_registry.h +++ b/krita/image/filter/kis_filter_registry.h @@ -25,7 +25,7 @@ #include "kis_types.h" #include "KoGenericRegistry.h" -#include +#include class QString; class KisFilterConfiguration; diff --git a/krita/image/floodfill/kis_fill_interval_map.h b/krita/image/floodfill/kis_fill_interval_map.h --- a/krita/image/floodfill/kis_fill_interval_map.h +++ b/krita/image/floodfill/kis_fill_interval_map.h @@ -22,7 +22,7 @@ #include #include #include -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_fill_interval.h" diff --git a/krita/image/floodfill/kis_scanline_fill.h b/krita/image/floodfill/kis_scanline_fill.h --- a/krita/image/floodfill/kis_scanline_fill.h +++ b/krita/image/floodfill/kis_scanline_fill.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include diff --git a/krita/image/generator/kis_generator.h b/krita/image/generator/kis_generator.h --- a/krita/image/generator/kis_generator.h +++ b/krita/image/generator/kis_generator.h @@ -27,7 +27,7 @@ #include "kis_types.h" #include "kis_base_processor.h" -#include "krita_export.h" +#include "kritaimage_export.h" class KisProcessingInformation; diff --git a/krita/image/generator/kis_generator_layer.h b/krita/image/generator/kis_generator_layer.h --- a/krita/image/generator/kis_generator_layer.h +++ b/krita/image/generator/kis_generator_layer.h @@ -19,7 +19,7 @@ #define KIS_GENERATOR_LAYER_H_ #include "kis_selection_based_layer.h" -#include +#include #include diff --git a/krita/image/generator/kis_generator_registry.h b/krita/image/generator/kis_generator_registry.h --- a/krita/image/generator/kis_generator_registry.h +++ b/krita/image/generator/kis_generator_registry.h @@ -24,7 +24,7 @@ #include "kis_types.h" #include "KoGenericRegistry.h" -#include +#include class QString; class KisFilterConfiguration; diff --git a/krita/image/kis_acyclic_signal_connector.h b/krita/image/kis_acyclic_signal_connector.h --- a/krita/image/kis_acyclic_signal_connector.h +++ b/krita/image/kis_acyclic_signal_connector.h @@ -20,7 +20,7 @@ #define __KIS_ACYCLIC_SIGNAL_CONNECTOR_H #include -#include "krita_export.h" +#include "kritaimage_export.h" /** diff --git a/krita/image/kis_adjustment_layer.h b/krita/image/kis_adjustment_layer.h --- a/krita/image/kis_adjustment_layer.h +++ b/krita/image/kis_adjustment_layer.h @@ -32,7 +32,7 @@ #define KIS_ADJUSTMENT_LAYER_H_ #include -#include +#include #include "kis_selection_based_layer.h" diff --git a/krita/image/kis_algebra_2d.h b/krita/image/kis_algebra_2d.h --- a/krita/image/kis_algebra_2d.h +++ b/krita/image/kis_algebra_2d.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include class QPainterPath; diff --git a/krita/image/kis_async_merger.h b/krita/image/kis_async_merger.h --- a/krita/image/kis_async_merger.h +++ b/krita/image/kis_async_merger.h @@ -19,7 +19,7 @@ #ifndef __KIS_ASYNC_MERGER_H #define __KIS_ASYNC_MERGER_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include "kis_paint_device.h" diff --git a/krita/image/kis_base_accessor.h b/krita/image/kis_base_accessor.h --- a/krita/image/kis_base_accessor.h +++ b/krita/image/kis_base_accessor.h @@ -19,7 +19,7 @@ #ifndef _KISBASEACCESSOR_H_ #define _KISBASEACCESSOR_H_ -#include +#include #include class KRITAIMAGE_EXPORT KisBaseConstAccessor : public KisShared diff --git a/krita/image/kis_base_node.h b/krita/image/kis_base_node.h --- a/krita/image/kis_base_node.h +++ b/krita/image/kis_base_node.h @@ -35,7 +35,7 @@ class KisNodeVisitor; class KisUndoAdapter; -#include "krita_export.h" +#include "kritaimage_export.h" /** * A KisBaseNode is the base class for all components of an image: diff --git a/krita/image/kis_base_processor.h b/krita/image/kis_base_processor.h --- a/krita/image/kis_base_processor.h +++ b/krita/image/kis_base_processor.h @@ -32,7 +32,7 @@ #include "kis_shared.h" #include "kis_image.h" -#include "krita_export.h" +#include "kritaimage_export.h" class QWidget; diff --git a/krita/image/kis_basic_math_toolbox.h b/krita/image/kis_basic_math_toolbox.h --- a/krita/image/kis_basic_math_toolbox.h +++ b/krita/image/kis_basic_math_toolbox.h @@ -22,7 +22,7 @@ #define KIS_BASIC_MATH_TOOLBOX_H #include "kis_math_toolbox.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** * This class implement KisMathToolbox for most colorspaces, only colorspaces with "angular" * channels need to reimplement the functions diff --git a/krita/image/kis_bookmarked_configuration_manager.h b/krita/image/kis_bookmarked_configuration_manager.h --- a/krita/image/kis_bookmarked_configuration_manager.h +++ b/krita/image/kis_bookmarked_configuration_manager.h @@ -26,7 +26,7 @@ class QString; class KLocalizedString; -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisBookmarkedConfigurationManager { diff --git a/krita/image/kis_cached_gradient_shape_strategy.h b/krita/image/kis_cached_gradient_shape_strategy.h --- a/krita/image/kis_cached_gradient_shape_strategy.h +++ b/krita/image/kis_cached_gradient_shape_strategy.h @@ -20,7 +20,7 @@ #define __KIS_CACHED_GRADIENT_SHAPE_STRATEGY_H #include "kis_gradient_shape_strategy.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include diff --git a/krita/image/kis_cage_transform_worker.h b/krita/image/kis_cage_transform_worker.h --- a/krita/image/kis_cage_transform_worker.h +++ b/krita/image/kis_cage_transform_worker.h @@ -20,7 +20,7 @@ #define __KIS_CAGE_TRANSFORM_WORKER_H #include -#include +#include #include class QImage; diff --git a/krita/image/kis_circle_mask_generator.h b/krita/image/kis_circle_mask_generator.h --- a/krita/image/kis_circle_mask_generator.h +++ b/krita/image/kis_circle_mask_generator.h @@ -19,7 +19,7 @@ #ifndef _KIS_CIRCLE_MASK_GENERATOR_H_ #define _KIS_CIRCLE_MASK_GENERATOR_H_ -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_mask_generator.h" diff --git a/krita/image/kis_clone_layer.h b/krita/image/kis_clone_layer.h --- a/krita/image/kis_clone_layer.h +++ b/krita/image/kis_clone_layer.h @@ -23,7 +23,7 @@ #include "kis_layer.h" #include "kis_indirect_painting_support.h" -#include +#include #include "kis_clone_info.h" class KisNodeVisitor; diff --git a/krita/image/kis_colorspace_convert_visitor.h b/krita/image/kis_colorspace_convert_visitor.h --- a/krita/image/kis_colorspace_convert_visitor.h +++ b/krita/image/kis_colorspace_convert_visitor.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "kis_global.h" #include "kis_types.h" #include "kis_node_visitor.h" diff --git a/krita/image/kis_composite_progress_proxy.h b/krita/image/kis_composite_progress_proxy.h --- a/krita/image/kis_composite_progress_proxy.h +++ b/krita/image/kis_composite_progress_proxy.h @@ -21,7 +21,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisCompositeProgressProxy : public KoProgressProxy diff --git a/krita/image/kis_config_widget.h b/krita/image/kis_config_widget.h --- a/krita/image/kis_config_widget.h +++ b/krita/image/kis_config_widget.h @@ -20,7 +20,7 @@ #define _KIS_CONFIG_WIDGET_H_ #include -#include +#include #include diff --git a/krita/image/kis_convolution_kernel.h b/krita/image/kis_convolution_kernel.h --- a/krita/image/kis_convolution_kernel.h +++ b/krita/image/kis_convolution_kernel.h @@ -22,7 +22,7 @@ #include #include #include "kis_shared.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" using namespace Eigen; diff --git a/krita/image/kis_convolution_painter.h b/krita/image/kis_convolution_painter.h --- a/krita/image/kis_convolution_painter.h +++ b/krita/image/kis_convolution_painter.h @@ -23,7 +23,7 @@ #include "kis_types.h" #include "kis_painter.h" #include "kis_image.h" -#include "krita_export.h" +#include "kritaimage_export.h" template class KisConvolutionWorker; diff --git a/krita/image/kis_count_visitor.h b/krita/image/kis_count_visitor.h --- a/krita/image/kis_count_visitor.h +++ b/krita/image/kis_count_visitor.h @@ -18,7 +18,7 @@ #ifndef KIS_COUNT_VISITOR #define KIS_COUNT_VISITOR -#include "krita_export.h" +#include "kritaimage_export.h" #include diff --git a/krita/image/kis_crop_saved_extra_data.h b/krita/image/kis_crop_saved_extra_data.h --- a/krita/image/kis_crop_saved_extra_data.h +++ b/krita/image/kis_crop_saved_extra_data.h @@ -23,7 +23,7 @@ #include "kundo2commandextradata.h" #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisCropSavedExtraData : public KUndo2CommandExtraData diff --git a/krita/image/kis_cubic_curve.h b/krita/image/kis_cubic_curve.h --- a/krita/image/kis_cubic_curve.h +++ b/krita/image/kis_cubic_curve.h @@ -23,7 +23,7 @@ #include #include -#include +#include class QPointF; diff --git a/krita/image/kis_debug.h b/krita/image/kis_debug.h --- a/krita/image/kis_debug.h +++ b/krita/image/kis_debug.h @@ -93,7 +93,7 @@ # endif -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" class QRect; class QString; diff --git a/krita/image/kis_distance_information.h b/krita/image/kis_distance_information.h --- a/krita/image/kis_distance_information.h +++ b/krita/image/kis_distance_information.h @@ -22,7 +22,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" class KisPaintInformation; diff --git a/krita/image/kis_dom_utils.h b/krita/image/kis_dom_utils.h --- a/krita/image/kis_dom_utils.h +++ b/krita/image/kis_dom_utils.h @@ -25,7 +25,7 @@ #include #include #include "klocale.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_debug.h" diff --git a/krita/image/kis_fill_painter.h b/krita/image/kis_fill_painter.h --- a/krita/image/kis_fill_painter.h +++ b/krita/image/kis_fill_painter.h @@ -28,7 +28,7 @@ #include "kis_types.h" #include "kis_selection.h" -#include +#include class KoPattern; class KisFilterConfiguration; diff --git a/krita/image/kis_filter_strategy.h b/krita/image/kis_filter_strategy.h --- a/krita/image/kis_filter_strategy.h +++ b/krita/image/kis_filter_strategy.h @@ -26,7 +26,7 @@ #include "kis_types.h" #include "KoGenericRegistry.h" #include "KoID.h" -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisFilterStrategy { diff --git a/krita/image/kis_fixed_paint_device.h b/krita/image/kis_fixed_paint_device.h --- a/krita/image/kis_fixed_paint_device.h +++ b/krita/image/kis_fixed_paint_device.h @@ -18,7 +18,7 @@ #ifndef KIS_FIXED_PAINT_DEVICE_H #define KIS_FIXED_PAINT_DEVICE_H -#include +#include #include #include "kis_global.h" #include "kis_shared.h" diff --git a/krita/image/kis_gaussian_kernel.h b/krita/image/kis_gaussian_kernel.h --- a/krita/image/kis_gaussian_kernel.h +++ b/krita/image/kis_gaussian_kernel.h @@ -19,7 +19,7 @@ #ifndef __KIS_GAUSSIAN_KERNEL_H #define __KIS_GAUSSIAN_KERNEL_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include diff --git a/krita/image/kis_gradient_painter.h b/krita/image/kis_gradient_painter.h --- a/krita/image/kis_gradient_painter.h +++ b/krita/image/kis_gradient_painter.h @@ -26,7 +26,7 @@ #include "kis_types.h" #include "kis_painter.h" -#include +#include /** diff --git a/krita/image/kis_green_coordinates_math.h b/krita/image/kis_green_coordinates_math.h --- a/krita/image/kis_green_coordinates_math.h +++ b/krita/image/kis_green_coordinates_math.h @@ -23,7 +23,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisGreenCoordinatesMath { diff --git a/krita/image/kis_image.h b/krita/image/kis_image.h --- a/krita/image/kis_image.h +++ b/krita/image/kis_image.h @@ -36,7 +36,7 @@ #include "kis_default_bounds.h" #include "kis_image_interfaces.h" -#include +#include class KisDocument; class KoColorSpace; diff --git a/krita/image/kis_image_config.h b/krita/image/kis_image_config.h --- a/krita/image/kis_image_config.h +++ b/krita/image/kis_image_config.h @@ -20,7 +20,7 @@ #define KIS_IMAGE_CONFIG_H_ #include -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisImageConfig diff --git a/krita/image/kis_image_interfaces.h b/krita/image/kis_image_interfaces.h --- a/krita/image/kis_image_interfaces.h +++ b/krita/image/kis_image_interfaces.h @@ -20,7 +20,7 @@ #define __KIS_IMAGE_INTERFACES_H #include "kis_types.h" -#include +#include class QRect; class KisStrokeStrategy; diff --git a/krita/image/kis_image_signal_router.h b/krita/image/kis_image_signal_router.h --- a/krita/image/kis_image_signal_router.h +++ b/krita/image/kis_image_signal_router.h @@ -21,7 +21,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include "kis_group_layer.h" diff --git a/krita/image/kis_indirect_painting_support.h b/krita/image/kis_indirect_painting_support.h --- a/krita/image/kis_indirect_painting_support.h +++ b/krita/image/kis_indirect_painting_support.h @@ -20,7 +20,7 @@ #ifndef KIS_INDIRECT_PAINTING_SUPPORT_H_ #define KIS_INDIRECT_PAINTING_SUPPORT_H_ -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include "kis_node.h" diff --git a/krita/image/kis_layer.h b/krita/image/kis_layer.h --- a/krita/image/kis_layer.h +++ b/krita/image/kis_layer.h @@ -26,7 +26,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" #include "KisDocumentSectionModel.h" diff --git a/krita/image/kis_layer_composition.h b/krita/image/kis_layer_composition.h --- a/krita/image/kis_layer_composition.h +++ b/krita/image/kis_layer_composition.h @@ -19,7 +19,7 @@ #ifndef _KIS_LAYERCOMPOSITION_H #define _KIS_LAYERCOMPOSITION_H -#include "krita_export.h" +#include "kritaimage_export.h" #include #include diff --git a/krita/image/kis_liquify_transform_worker.h b/krita/image/kis_liquify_transform_worker.h --- a/krita/image/kis_liquify_transform_worker.h +++ b/krita/image/kis_liquify_transform_worker.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include class QImage; diff --git a/krita/image/kis_mask.h b/krita/image/kis_mask.h --- a/krita/image/kis_mask.h +++ b/krita/image/kis_mask.h @@ -27,7 +27,7 @@ #include "kis_global.h" #include "kis_indirect_painting_support.h" -#include +#include /** KisMask is the base class for all single channel diff --git a/krita/image/kis_memory_leak_tracker.h b/krita/image/kis_memory_leak_tracker.h --- a/krita/image/kis_memory_leak_tracker.h +++ b/krita/image/kis_memory_leak_tracker.h @@ -20,7 +20,7 @@ #define _KIS_MEMORY_LEAK_TRACKER_H_ -#include +#include #include diff --git a/krita/image/kis_memory_statistics_server.h b/krita/image/kis_memory_statistics_server.h --- a/krita/image/kis_memory_statistics_server.h +++ b/krita/image/kis_memory_statistics_server.h @@ -23,7 +23,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" diff --git a/krita/image/kis_name_server.h b/krita/image/kis_name_server.h --- a/krita/image/kis_name_server.h +++ b/krita/image/kis_name_server.h @@ -19,7 +19,7 @@ #define KIS_NAMESERVER_H_ #include -#include +#include class KRITAIMAGE_EXPORT KisNameServer { diff --git a/krita/image/kis_node.h b/krita/image/kis_node.h --- a/krita/image/kis_node.h +++ b/krita/image/kis_node.h @@ -23,7 +23,7 @@ #include "kis_undo_adapter.h" #include "kis_base_node.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include diff --git a/krita/image/kis_node_facade.h b/krita/image/kis_node_facade.h --- a/krita/image/kis_node_facade.h +++ b/krita/image/kis_node_facade.h @@ -20,7 +20,7 @@ #include "kis_types.h" #include "kis_node.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** * KisNodeFacade is the public interface to adding and removing nodes. */ diff --git a/krita/image/kis_node_filter_interface.h b/krita/image/kis_node_filter_interface.h --- a/krita/image/kis_node_filter_interface.h +++ b/krita/image/kis_node_filter_interface.h @@ -19,7 +19,7 @@ #ifndef _KIS_NODE_FILTER_INTERFACE_H_ #define _KIS_NODE_FILTER_INTERFACE_H_ -#include +#include #include #include "filter/kis_filter_configuration.h" diff --git a/krita/image/kis_node_graph_listener.h b/krita/image/kis_node_graph_listener.h --- a/krita/image/kis_node_graph_listener.h +++ b/krita/image/kis_node_graph_listener.h @@ -18,7 +18,7 @@ #ifndef KIS_NODE_GRAPH_LISTENER_H_ #define KIS_NODE_GRAPH_LISTENER_H_ -#include "krita_export.h" +#include "kritaimage_export.h" class KisNode; class QRect; diff --git a/krita/image/kis_node_progress_proxy.h b/krita/image/kis_node_progress_proxy.h --- a/krita/image/kis_node_progress_proxy.h +++ b/krita/image/kis_node_progress_proxy.h @@ -24,7 +24,7 @@ #include -#include "krita_export.h" +#include "kritaimage_export.h" /** * This class implements \ref KoProgressProxy and allows node to report progress. diff --git a/krita/image/kis_node_visitor.h b/krita/image/kis_node_visitor.h --- a/krita/image/kis_node_visitor.h +++ b/krita/image/kis_node_visitor.h @@ -20,7 +20,7 @@ #define KIS_NODE_VISITOR_H_ #include "kis_node.h" -#include "krita_export.h" +#include "kritaimage_export.h" class KisPaintLayer; class KisGroupLayer; diff --git a/krita/image/kis_outline_generator.h b/krita/image/kis_outline_generator.h --- a/krita/image/kis_outline_generator.h +++ b/krita/image/kis_outline_generator.h @@ -26,7 +26,7 @@ #include -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include class KoColorSpace; diff --git a/krita/image/kis_paint_device.h b/krita/image/kis_paint_device.h --- a/krita/image/kis_paint_device.h +++ b/krita/image/kis_paint_device.h @@ -32,7 +32,7 @@ #include "kis_shared.h" #include "kis_default_bounds_base.h" -#include +#include class KUndo2Command; class QRect; diff --git a/krita/image/kis_paint_device_writer.h b/krita/image/kis_paint_device_writer.h --- a/krita/image/kis_paint_device_writer.h +++ b/krita/image/kis_paint_device_writer.h @@ -18,7 +18,7 @@ #ifndef KIS_PAINT_DEVICE_WRITER_H #define KIS_PAINT_DEVICE_WRITER_H -#include +#include class KRITAIMAGE_EXPORT KisPaintDeviceWriter { public: diff --git a/krita/image/kis_perspective_grid.h b/krita/image/kis_perspective_grid.h --- a/krita/image/kis_perspective_grid.h +++ b/krita/image/kis_perspective_grid.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include class KisPerspectiveGridNode; typedef KisSharedPtr KisPerspectiveGridNodeSP; diff --git a/krita/image/kis_perspective_math.h b/krita/image/kis_perspective_math.h --- a/krita/image/kis_perspective_math.h +++ b/krita/image/kis_perspective_math.h @@ -30,7 +30,7 @@ typedef Eigen::Matrix Vector9qreal; typedef Eigen::Hyperplane LineEquation; -#include +#include class QRect; diff --git a/krita/image/kis_perspectivetransform_worker.h b/krita/image/kis_perspectivetransform_worker.h --- a/krita/image/kis_perspectivetransform_worker.h +++ b/krita/image/kis_perspectivetransform_worker.h @@ -22,7 +22,7 @@ #define KIS_PERSPECTIVETRANSFORM_WORKER_H #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include #include diff --git a/krita/image/kis_pixel_selection.h b/krita/image/kis_pixel_selection.h --- a/krita/image/kis_pixel_selection.h +++ b/krita/image/kis_pixel_selection.h @@ -25,7 +25,7 @@ #include "kis_paint_device.h" #include "kis_selection_component.h" #include "kis_selection.h" -#include +#include /** diff --git a/krita/image/kis_polygonal_gradient_shape_strategy.h b/krita/image/kis_polygonal_gradient_shape_strategy.h --- a/krita/image/kis_polygonal_gradient_shape_strategy.h +++ b/krita/image/kis_polygonal_gradient_shape_strategy.h @@ -24,7 +24,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisPolygonalGradientShapeStrategy : public KisGradientShapeStrategy diff --git a/krita/image/kis_post_execution_undo_adapter.h b/krita/image/kis_post_execution_undo_adapter.h --- a/krita/image/kis_post_execution_undo_adapter.h +++ b/krita/image/kis_post_execution_undo_adapter.h @@ -19,7 +19,7 @@ #ifndef __KIS_POST_EXECUTION_UNDO_ADAPTER_H #define __KIS_POST_EXECUTION_UNDO_ADAPTER_H -#include +#include #include "kis_types.h" class KUndo2MagicString; diff --git a/krita/image/kis_processing_applicator.h b/krita/image/kis_processing_applicator.h --- a/krita/image/kis_processing_applicator.h +++ b/krita/image/kis_processing_applicator.h @@ -19,7 +19,7 @@ #ifndef __KIS_PROCESSING_APPLICATOR_H #define __KIS_PROCESSING_APPLICATOR_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include "kis_stroke_job_strategy.h" diff --git a/krita/image/kis_processing_information.h b/krita/image/kis_processing_information.h --- a/krita/image/kis_processing_information.h +++ b/krita/image/kis_processing_information.h @@ -21,7 +21,7 @@ #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** diff --git a/krita/image/kis_processing_visitor.h b/krita/image/kis_processing_visitor.h --- a/krita/image/kis_processing_visitor.h +++ b/krita/image/kis_processing_visitor.h @@ -19,7 +19,7 @@ #ifndef __KIS_PROCESSING_VISITOR_H #define __KIS_PROCESSING_VISITOR_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_shared.h" #include diff --git a/krita/image/kis_progress_interface.h b/krita/image/kis_progress_interface.h --- a/krita/image/kis_progress_interface.h +++ b/krita/image/kis_progress_interface.h @@ -20,7 +20,7 @@ #ifndef KIS_PROGRESS_INTERFACE_H #define KIS_PROGRESS_INTERFACE_H -#include +#include class KoProgressUpdater; diff --git a/krita/image/kis_progress_updater.h b/krita/image/kis_progress_updater.h --- a/krita/image/kis_progress_updater.h +++ b/krita/image/kis_progress_updater.h @@ -21,7 +21,7 @@ #define KIS_PROGRESS_UPDATER_H #include -#include +#include class KRITAIMAGE_EXPORT KisProgressInterface { diff --git a/krita/image/kis_projection_leaf.h b/krita/image/kis_projection_leaf.h --- a/krita/image/kis_projection_leaf.h +++ b/krita/image/kis_projection_leaf.h @@ -22,7 +22,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" class KisNodeVisitor; diff --git a/krita/image/kis_properties_configuration.h b/krita/image/kis_properties_configuration.h --- a/krita/image/kis_properties_configuration.h +++ b/krita/image/kis_properties_configuration.h @@ -29,7 +29,7 @@ class QDomDocument; #include "kis_serializable_configuration.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** diff --git a/krita/image/kis_psd_layer_style.h b/krita/image/kis_psd_layer_style.h --- a/krita/image/kis_psd_layer_style.h +++ b/krita/image/kis_psd_layer_style.h @@ -26,7 +26,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" /** diff --git a/krita/image/kis_queues_progress_updater.h b/krita/image/kis_queues_progress_updater.h --- a/krita/image/kis_queues_progress_updater.h +++ b/krita/image/kis_queues_progress_updater.h @@ -20,7 +20,7 @@ #define __KIS_QUEUES_PROGRESS_UPDATER_H #include -#include "krita_export.h" +#include "kritaimage_export.h" class KoProgressProxy; diff --git a/krita/image/kis_random_generator.h b/krita/image/kis_random_generator.h --- a/krita/image/kis_random_generator.h +++ b/krita/image/kis_random_generator.h @@ -21,7 +21,7 @@ #ifndef _KIS_RANDOM_GENERATOR_H_ #define _KIS_RANDOM_GENERATOR_H_ -#include +#include #include diff --git a/krita/image/kis_random_sub_accessor.h b/krita/image/kis_random_sub_accessor.h --- a/krita/image/kis_random_sub_accessor.h +++ b/krita/image/kis_random_sub_accessor.h @@ -24,7 +24,7 @@ #include "kis_random_accessor_ng.h" #include "kis_types.h" -#include +#include #include "kis_shared.h" /** diff --git a/krita/image/kis_rect_mask_generator.h b/krita/image/kis_rect_mask_generator.h --- a/krita/image/kis_rect_mask_generator.h +++ b/krita/image/kis_rect_mask_generator.h @@ -19,7 +19,7 @@ #ifndef _KIS_RECT_MASK_GENERATOR_H_ #define _KIS_RECT_MASK_GENERATOR_H_ -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_mask_generator.h" diff --git a/krita/image/kis_runnable.h b/krita/image/kis_runnable.h --- a/krita/image/kis_runnable.h +++ b/krita/image/kis_runnable.h @@ -19,7 +19,7 @@ #ifndef __KIS_RUNNABLE_H #define __KIS_RUNNABLE_H -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisRunnable { diff --git a/krita/image/kis_safe_transform.h b/krita/image/kis_safe_transform.h --- a/krita/image/kis_safe_transform.h +++ b/krita/image/kis_safe_transform.h @@ -21,7 +21,7 @@ #include -#include "krita_export.h" +#include "kritaimage_export.h" class QTransform; class QRect; diff --git a/krita/image/kis_selection.h b/krita/image/kis_selection.h --- a/krita/image/kis_selection.h +++ b/krita/image/kis_selection.h @@ -21,7 +21,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_paint_device.h" enum SelectionMode { diff --git a/krita/image/kis_selection_based_layer.h b/krita/image/kis_selection_based_layer.h --- a/krita/image/kis_selection_based_layer.h +++ b/krita/image/kis_selection_based_layer.h @@ -25,7 +25,7 @@ #include "kis_types.h" #include "kis_layer.h" #include "kis_indirect_painting_support.h" -#include +#include #include "kis_node_filter_interface.h" class KisFilterConfiguration; diff --git a/krita/image/kis_selection_component.h b/krita/image/kis_selection_component.h --- a/krita/image/kis_selection_component.h +++ b/krita/image/kis_selection_component.h @@ -18,7 +18,7 @@ #ifndef KIS_SELECTION_COMPONENT_H #define KIS_SELECTION_COMPONENT_H -#include +#include #include diff --git a/krita/image/kis_selection_filters.h b/krita/image/kis_selection_filters.h --- a/krita/image/kis_selection_filters.h +++ b/krita/image/kis_selection_filters.h @@ -22,7 +22,7 @@ #define KIS_SELECTION_FILTERS_H #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include #include diff --git a/krita/image/kis_serializable_configuration.h b/krita/image/kis_serializable_configuration.h --- a/krita/image/kis_serializable_configuration.h +++ b/krita/image/kis_serializable_configuration.h @@ -20,8 +20,9 @@ class QDomElement; class QDomDocument; +class QString; -#include "krita_export.h" +#include "kritaimage_export.h" /** * This is an interface for objects that are serializable and unserializable. diff --git a/krita/image/kis_shared.h b/krita/image/kis_shared.h --- a/krita/image/kis_shared.h +++ b/krita/image/kis_shared.h @@ -20,7 +20,7 @@ #define _KIS_SHARED_H_ #include -#include +#include class KRITAIMAGE_EXPORT KisShared { diff --git a/krita/image/kis_signal_compressor.h b/krita/image/kis_signal_compressor.h --- a/krita/image/kis_signal_compressor.h +++ b/krita/image/kis_signal_compressor.h @@ -20,7 +20,7 @@ #define __KIS_SIGNAL_COMPRESSOR_H #include -#include "krita_export.h" +#include "kritaimage_export.h" class QTimer; diff --git a/krita/image/kis_stroke.h b/krita/image/kis_stroke.h --- a/krita/image/kis_stroke.h +++ b/krita/image/kis_stroke.h @@ -21,7 +21,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_stroke_job.h" class KisStrokeStrategy; diff --git a/krita/image/kis_stroke_job_strategy.h b/krita/image/kis_stroke_job_strategy.h --- a/krita/image/kis_stroke_job_strategy.h +++ b/krita/image/kis_stroke_job_strategy.h @@ -19,7 +19,7 @@ #ifndef __KIS_STROKE_JOB_STRATEGY_H #define __KIS_STROKE_JOB_STRATEGY_H -#include "krita_export.h" +#include "kritaimage_export.h" class KRITAIMAGE_EXPORT KisStrokeJobData diff --git a/krita/image/kis_strokes_queue.h b/krita/image/kis_strokes_queue.h --- a/krita/image/kis_strokes_queue.h +++ b/krita/image/kis_strokes_queue.h @@ -19,7 +19,7 @@ #ifndef __KIS_STROKES_QUEUE_H #define __KIS_STROKES_QUEUE_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include "kis_stroke_job_strategy.h" #include "kis_stroke_strategy.h" diff --git a/krita/image/kis_thread_safe_signal_compressor.h b/krita/image/kis_thread_safe_signal_compressor.h --- a/krita/image/kis_thread_safe_signal_compressor.h +++ b/krita/image/kis_thread_safe_signal_compressor.h @@ -20,7 +20,7 @@ #define __KIS_THREAD_SAFE_SIGNAL_COMPRESSOR_H #include -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_signal_compressor.h" diff --git a/krita/image/kis_transaction.h b/krita/image/kis_transaction.h --- a/krita/image/kis_transaction.h +++ b/krita/image/kis_transaction.h @@ -22,7 +22,7 @@ #include #include "kis_types.h" -#include +#include #include "kis_transaction_data.h" #include "kis_paint_device.h" diff --git a/krita/image/kis_transaction_data.h b/krita/image/kis_transaction_data.h --- a/krita/image/kis_transaction_data.h +++ b/krita/image/kis_transaction_data.h @@ -21,7 +21,7 @@ #include #include "kis_types.h" -#include +#include /** diff --git a/krita/image/kis_transform_mask_params_factory_registry.h b/krita/image/kis_transform_mask_params_factory_registry.h --- a/krita/image/kis_transform_mask_params_factory_registry.h +++ b/krita/image/kis_transform_mask_params_factory_registry.h @@ -25,7 +25,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" class QDomElement; diff --git a/krita/image/kis_transform_mask_params_interface.h b/krita/image/kis_transform_mask_params_interface.h --- a/krita/image/kis_transform_mask_params_interface.h +++ b/krita/image/kis_transform_mask_params_interface.h @@ -19,7 +19,7 @@ #ifndef __KIS_TRANSFORM_MASK_PARAMS_INTERFACE_H #define __KIS_TRANSFORM_MASK_PARAMS_INTERFACE_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include diff --git a/krita/image/kis_transform_worker.h b/krita/image/kis_transform_worker.h --- a/krita/image/kis_transform_worker.h +++ b/krita/image/kis_transform_worker.h @@ -22,7 +22,7 @@ #define KIS_TRANSFORM_WORKER_H_ #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include #include diff --git a/krita/image/kis_undo_adapter.h b/krita/image/kis_undo_adapter.h --- a/krita/image/kis_undo_adapter.h +++ b/krita/image/kis_undo_adapter.h @@ -21,7 +21,7 @@ #include -#include +#include #include "kis_types.h" #include "kis_undo_store.h" diff --git a/krita/image/kis_undo_store.h b/krita/image/kis_undo_store.h --- a/krita/image/kis_undo_store.h +++ b/krita/image/kis_undo_store.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "kis_types.h" class KUndo2Command; diff --git a/krita/image/kis_update_scheduler.h b/krita/image/kis_update_scheduler.h --- a/krita/image/kis_update_scheduler.h +++ b/krita/image/kis_update_scheduler.h @@ -20,7 +20,7 @@ #define __KIS_UPDATE_SCHEDULER_H #include -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" #include "kis_image_interfaces.h" diff --git a/krita/image/kis_update_time_monitor.h b/krita/image/kis_update_time_monitor.h --- a/krita/image/kis_update_time_monitor.h +++ b/krita/image/kis_update_time_monitor.h @@ -19,7 +19,7 @@ #ifndef __KIS_UPDATE_TIME_MONITOR_H #define __KIS_UPDATE_TIME_MONITOR_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_types.h" diff --git a/krita/image/kis_warptransform_worker.h b/krita/image/kis_warptransform_worker.h --- a/krita/image/kis_warptransform_worker.h +++ b/krita/image/kis_warptransform_worker.h @@ -22,7 +22,7 @@ #define KIS_WARPTRANSFORM_WORKER_H #include "kis_types.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_paint_device.h" #include diff --git a/krita/image/krita_export.h b/krita/image/krita_export.h --- a/krita/image/krita_export.h +++ b/krita/image/krita_export.h @@ -27,45 +27,37 @@ /* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */ #if defined(_WIN32) || defined(_WIN64) -#ifndef KRITASKETCH_EXPORT -# ifdef MAKE_KRITASKETCHLIB_LIB -# define KRITASKETCH_EXPORT KDE_EXPORT -# else -# define KRITASKETCH_EXPORT KDE_IMPORT -# endif -#endif - -#ifndef KRITAUI_EXPORT -# ifdef MAKE_KRITAUI_LIB -# define KRITAUI_EXPORT KDE_EXPORT -# else -# define KRITAUI_EXPORT KDE_IMPORT -# endif -#endif - -#ifndef KRITAIMAGE_EXPORT -# ifdef MAKE_KRITAIMAGE_LIB -# define KRITAIMAGE_EXPORT KDE_EXPORT -# else -# define KRITAIMAGE_EXPORT KDE_IMPORT -# endif -#endif - -#ifndef PAINTOP_EXPORT -# ifdef MAKE_KRITALIBPAINTOP_LIB -# define PAINTOP_EXPORT KDE_EXPORT -# else -# define PAINTOP_EXPORT KDE_IMPORT -# endif -#endif - -#ifndef BRUSH_EXPORT -# ifdef MAKE_KRITALIBBRUSH_LIB -# define BRUSH_EXPORT KDE_EXPORT -# else -# define BRUSH_EXPORT KDE_IMPORT -# endif -#endif +// #ifndef KRITASKETCH_EXPORT +// # ifdef kritasketchlib_EXPORTS +// # define KRITASKETCH_EXPORT KDE_EXPORT +// # else +// # define KRITASKETCH_EXPORT KDE_IMPORT +// # endif +// #endif + +// #ifndef KRITAUI_EXPORT +// # ifdef kritaui_EXPORTS +// # define KRITAUI_EXPORT KDE_EXPORT +// # else +// # define KRITAUI_EXPORT KDE_IMPORT +// # endif +// #endif + +// #ifndef PAINTOP_EXPORT +// # ifdef kritalibpaintop_EXPORTS +// # define PAINTOP_EXPORT KDE_EXPORT +// # else +// # define PAINTOP_EXPORT KDE_IMPORT +// # endif +// #endif + +// #ifndef BRUSH_EXPORT +// # ifdef kritalibbrush_EXPORTS +// # define BRUSH_EXPORT KDE_EXPORT +// # else +// # define BRUSH_EXPORT KDE_IMPORT +// # endif +// #endif #else // not windows @@ -96,4 +88,4 @@ # define KRITAUI_TEST_EXPORT #endif -#endif /* KRITA_EXPORT_H */ +#endif /* kritaimage_export_H */ diff --git a/krita/image/krita_utils.h b/krita/image/krita_utils.h --- a/krita/image/krita_utils.h +++ b/krita/image/krita_utils.h @@ -27,7 +27,7 @@ class QPainterPath; class QBitArray; #include -#include "krita_export.h" +#include "kritaimage_export.h" namespace KritaUtils { diff --git a/krita/image/layerstyles/gimp_bump_map.h b/krita/image/layerstyles/gimp_bump_map.h --- a/krita/image/layerstyles/gimp_bump_map.h +++ b/krita/image/layerstyles/gimp_bump_map.h @@ -70,7 +70,7 @@ const bool tiled; }; -void KDE_EXPORT bumpmap (KisPixelSelectionSP device, +void KRITAIMAGE_EXPORT bumpmap (KisPixelSelectionSP device, const QRect &selectionRect, const bumpmap_vals_t &bmvals); diff --git a/krita/image/layerstyles/kis_layer_style_filter.h b/krita/image/layerstyles/kis_layer_style_filter.h --- a/krita/image/layerstyles/kis_layer_style_filter.h +++ b/krita/image/layerstyles/kis_layer_style_filter.h @@ -21,14 +21,15 @@ #include "kis_types.h" #include "kis_shared.h" +#include "kritaimage_export.h" #include class KisPSDLayerStyle; class KisLayerStyleFilterEnvironment; -class KDE_EXPORT KisLayerStyleFilter : public KisShared +class KRITAIMAGE_EXPORT KisLayerStyleFilter : public KisShared { public: KisLayerStyleFilter(const KoID &id); diff --git a/krita/image/layerstyles/kis_layer_style_filter_environment.h b/krita/image/layerstyles/kis_layer_style_filter_environment.h --- a/krita/image/layerstyles/kis_layer_style_filter_environment.h +++ b/krita/image/layerstyles/kis_layer_style_filter_environment.h @@ -22,15 +22,15 @@ #include #include -#include +#include class KisPainter; class KisLayer; class QPainterPath; class QBitArray; -class KDE_EXPORT KisLayerStyleFilterEnvironment +class KRITAIMAGE_EXPORT KisLayerStyleFilterEnvironment { public: KisLayerStyleFilterEnvironment(KisLayer *sourceLayer); diff --git a/krita/image/layerstyles/kis_layer_style_projection_plane.h b/krita/image/layerstyles/kis_layer_style_projection_plane.h --- a/krita/image/layerstyles/kis_layer_style_projection_plane.h +++ b/krita/image/layerstyles/kis_layer_style_projection_plane.h @@ -25,6 +25,7 @@ #include "kis_types.h" +#include class KRITAIMAGE_EXPORT KisLayerStyleProjectionPlane : public KisAbstractProjectionPlane diff --git a/krita/image/layerstyles/kis_ls_bevel_emboss_filter.h b/krita/image/layerstyles/kis_ls_bevel_emboss_filter.h --- a/krita/image/layerstyles/kis_ls_bevel_emboss_filter.h +++ b/krita/image/layerstyles/kis_ls_bevel_emboss_filter.h @@ -22,12 +22,13 @@ #include #include "kis_layer_style_filter.h" +#include struct psd_layer_effects_bevel_emboss; struct psd_layer_effects_context; -class KDE_EXPORT KisLsBevelEmbossFilter : public KisLayerStyleFilter +class KRITAIMAGE_EXPORT KisLsBevelEmbossFilter : public KisLayerStyleFilter { public: KisLsBevelEmbossFilter(); diff --git a/krita/image/layerstyles/kis_ls_drop_shadow_filter.h b/krita/image/layerstyles/kis_ls_drop_shadow_filter.h --- a/krita/image/layerstyles/kis_ls_drop_shadow_filter.h +++ b/krita/image/layerstyles/kis_ls_drop_shadow_filter.h @@ -22,11 +22,12 @@ #include #include "kis_layer_style_filter.h" +#include struct psd_layer_effects_shadow_base; -class KDE_EXPORT KisLsDropShadowFilter : public KisLayerStyleFilter +class KRITAIMAGE_EXPORT KisLsDropShadowFilter : public KisLayerStyleFilter { public: diff --git a/krita/image/layerstyles/kis_ls_overlay_filter.h b/krita/image/layerstyles/kis_ls_overlay_filter.h --- a/krita/image/layerstyles/kis_ls_overlay_filter.h +++ b/krita/image/layerstyles/kis_ls_overlay_filter.h @@ -22,12 +22,13 @@ #include #include "kis_layer_style_filter.h" +#include struct psd_layer_effects_overlay_base; struct psd_layer_effects_context; -class KDE_EXPORT KisLsOverlayFilter : public KisLayerStyleFilter +class KRITAIMAGE_EXPORT KisLsOverlayFilter : public KisLayerStyleFilter { public: enum Mode { diff --git a/krita/image/layerstyles/kis_ls_satin_filter.h b/krita/image/layerstyles/kis_ls_satin_filter.h --- a/krita/image/layerstyles/kis_ls_satin_filter.h +++ b/krita/image/layerstyles/kis_ls_satin_filter.h @@ -22,11 +22,12 @@ #include #include "kis_layer_style_filter.h" +#include struct psd_layer_effects_shadow_base; -class KDE_EXPORT KisLsSatinFilter : public KisLayerStyleFilter +class KRITAIMAGE_EXPORT KisLsSatinFilter : public KisLayerStyleFilter { public: KisLsSatinFilter(); diff --git a/krita/image/layerstyles/kis_ls_stroke_filter.h b/krita/image/layerstyles/kis_ls_stroke_filter.h --- a/krita/image/layerstyles/kis_ls_stroke_filter.h +++ b/krita/image/layerstyles/kis_ls_stroke_filter.h @@ -20,14 +20,15 @@ #define KIS_LS_STROKE_FILTER_H #include +#include #include "kis_layer_style_filter.h" struct psd_layer_effects_stroke; struct psd_layer_effects_context; -class KDE_EXPORT KisLsStrokeFilter : public KisLayerStyleFilter +class KRITAIMAGE_EXPORT KisLsStrokeFilter : public KisLayerStyleFilter { public: KisLsStrokeFilter(); diff --git a/krita/image/metadata/kis_meta_data_entry.h b/krita/image/metadata/kis_meta_data_entry.h --- a/krita/image/metadata/kis_meta_data_entry.h +++ b/krita/image/metadata/kis_meta_data_entry.h @@ -20,7 +20,8 @@ #ifndef _KIS_META_DATA_ENTRY_H_ #define _KIS_META_DATA_ENTRY_H_ -#include +#include +#include class QString; diff --git a/krita/image/metadata/kis_meta_data_filter.h b/krita/image/metadata/kis_meta_data_filter.h --- a/krita/image/metadata/kis_meta_data_filter.h +++ b/krita/image/metadata/kis_meta_data_filter.h @@ -19,7 +19,8 @@ #ifndef _KIS_META_DATA_FILTER_H_ #define _KIS_META_DATA_FILTER_H_ -#include +#include +class QString; namespace KisMetaData { diff --git a/krita/image/metadata/kis_meta_data_filter_registry.h b/krita/image/metadata/kis_meta_data_filter_registry.h --- a/krita/image/metadata/kis_meta_data_filter_registry.h +++ b/krita/image/metadata/kis_meta_data_filter_registry.h @@ -19,7 +19,7 @@ #ifndef _KIS_META_DATA_FILTER_REGISTRY_H_ #define _KIS_META_DATA_FILTER_REGISTRY_H_ -#include +#include #include "KoGenericRegistry.h" #include "kis_meta_data_filter.h" diff --git a/krita/image/metadata/kis_meta_data_io_backend.h b/krita/image/metadata/kis_meta_data_io_backend.h --- a/krita/image/metadata/kis_meta_data_io_backend.h +++ b/krita/image/metadata/kis_meta_data_io_backend.h @@ -19,7 +19,7 @@ #ifndef _KIS_META_DATA_IO_BACKEND_H_ #define _KIS_META_DATA_IO_BACKEND_H_ -#include +#include #include diff --git a/krita/image/metadata/kis_meta_data_merge_strategy.h b/krita/image/metadata/kis_meta_data_merge_strategy.h --- a/krita/image/metadata/kis_meta_data_merge_strategy.h +++ b/krita/image/metadata/kis_meta_data_merge_strategy.h @@ -21,7 +21,7 @@ #include -#include +#include class QString; diff --git a/krita/image/metadata/kis_meta_data_merge_strategy_registry.h b/krita/image/metadata/kis_meta_data_merge_strategy_registry.h --- a/krita/image/metadata/kis_meta_data_merge_strategy_registry.h +++ b/krita/image/metadata/kis_meta_data_merge_strategy_registry.h @@ -19,7 +19,7 @@ #ifndef _KIS_META_DATA_MERGE_STRATEGY_REGISTRY_H_ #define _KIS_META_DATA_MERGE_STRATEGY_REGISTRY_H_ -#include +#include #include "KoGenericRegistry.h" #include "kis_meta_data_merge_strategy.h" diff --git a/krita/image/metadata/kis_meta_data_parser.h b/krita/image/metadata/kis_meta_data_parser.h --- a/krita/image/metadata/kis_meta_data_parser.h +++ b/krita/image/metadata/kis_meta_data_parser.h @@ -19,7 +19,7 @@ #ifndef _KIS_META_DATA_PARSER_H_ #define _KIS_META_DATA_PARSER_H_ -#include +#include #include diff --git a/krita/image/metadata/kis_meta_data_schema.h b/krita/image/metadata/kis_meta_data_schema.h --- a/krita/image/metadata/kis_meta_data_schema.h +++ b/krita/image/metadata/kis_meta_data_schema.h @@ -19,7 +19,8 @@ #ifndef _KIS_META_DATA_SCHEMA_H_ #define _KIS_META_DATA_SCHEMA_H_ -#include +#include +#include class QString; diff --git a/krita/image/metadata/kis_meta_data_schema_registry.h b/krita/image/metadata/kis_meta_data_schema_registry.h --- a/krita/image/metadata/kis_meta_data_schema_registry.h +++ b/krita/image/metadata/kis_meta_data_schema_registry.h @@ -19,9 +19,10 @@ #ifndef _KIS_META_DATA_SCHEMA_REGISTRY_H_ #define _KIS_META_DATA_SCHEMA_REGISTRY_H_ -#include +#include class QString; +class QDebug; namespace KisMetaData { diff --git a/krita/image/metadata/kis_meta_data_store.h b/krita/image/metadata/kis_meta_data_store.h --- a/krita/image/metadata/kis_meta_data_store.h +++ b/krita/image/metadata/kis_meta_data_store.h @@ -20,7 +20,7 @@ #ifndef _KIS_META_DATA_STORE_H_ #define _KIS_META_DATA_STORE_H_ -#include +#include #include diff --git a/krita/image/metadata/kis_meta_data_type_info.h b/krita/image/metadata/kis_meta_data_type_info.h --- a/krita/image/metadata/kis_meta_data_type_info.h +++ b/krita/image/metadata/kis_meta_data_type_info.h @@ -21,7 +21,7 @@ #include #include -#include +#include namespace KisMetaData { diff --git a/krita/image/metadata/kis_meta_data_type_info_p.h b/krita/image/metadata/kis_meta_data_type_info_p.h --- a/krita/image/metadata/kis_meta_data_type_info_p.h +++ b/krita/image/metadata/kis_meta_data_type_info_p.h @@ -20,7 +20,7 @@ #include -struct KRITAIMAGE_TEST_EXPORT KisMetaData::TypeInfo::Private { +struct KRITAIMAGE_EXPORT KisMetaData::TypeInfo::Private { Private() : embeddedTypeInfo(0), structureSchema(0), parser(0) {} PropertyType propertyType; const TypeInfo* embeddedTypeInfo; diff --git a/krita/image/metadata/kis_meta_data_validator.h b/krita/image/metadata/kis_meta_data_validator.h --- a/krita/image/metadata/kis_meta_data_validator.h +++ b/krita/image/metadata/kis_meta_data_validator.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace KisMetaData { diff --git a/krita/image/metadata/kis_meta_data_value.h b/krita/image/metadata/kis_meta_data_value.h --- a/krita/image/metadata/kis_meta_data_value.h +++ b/krita/image/metadata/kis_meta_data_value.h @@ -21,7 +21,7 @@ #include #include -#include +#include class QVariant; diff --git a/krita/image/recorder/kis_action_recorder.h b/krita/image/recorder/kis_action_recorder.h --- a/krita/image/recorder/kis_action_recorder.h +++ b/krita/image/recorder/kis_action_recorder.h @@ -20,7 +20,7 @@ #define _KIS_ACTION_RECORDER_H_ #include -#include "krita_export.h" +#include "kritaimage_export.h" class KisRecordedAction; diff --git a/krita/image/recorder/kis_macro.h b/krita/image/recorder/kis_macro.h --- a/krita/image/recorder/kis_macro.h +++ b/krita/image/recorder/kis_macro.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "kis_serializable_configuration.h" #include "kis_types.h" diff --git a/krita/image/recorder/kis_macro_player.h b/krita/image/recorder/kis_macro_player.h --- a/krita/image/recorder/kis_macro_player.h +++ b/krita/image/recorder/kis_macro_player.h @@ -21,7 +21,7 @@ #include -#include +#include #include class KisMacro; diff --git a/krita/image/recorder/kis_node_query_path.h b/krita/image/recorder/kis_node_query_path.h --- a/krita/image/recorder/kis_node_query_path.h +++ b/krita/image/recorder/kis_node_query_path.h @@ -20,7 +20,7 @@ #define _KIS_NODE_QUERY_PATH_H_ #include -#include +#include /** * This class represent a path to access a node starting from an other node. diff --git a/krita/image/recorder/kis_play_info.h b/krita/image/recorder/kis_play_info.h --- a/krita/image/recorder/kis_play_info.h +++ b/krita/image/recorder/kis_play_info.h @@ -20,7 +20,7 @@ #define _KIS_PLAY_INFO_H_ #include -#include +#include class KisUndoAdapter; diff --git a/krita/image/recorder/kis_recorded_action.h b/krita/image/recorder/kis_recorded_action.h --- a/krita/image/recorder/kis_recorded_action.h +++ b/krita/image/recorder/kis_recorded_action.h @@ -29,7 +29,7 @@ class KisRecordedActionSaveContext; class KoUpdater; -#include +#include #include /** diff --git a/krita/image/recorder/kis_recorded_action_factory_registry.h b/krita/image/recorder/kis_recorded_action_factory_registry.h --- a/krita/image/recorder/kis_recorded_action_factory_registry.h +++ b/krita/image/recorder/kis_recorded_action_factory_registry.h @@ -23,7 +23,7 @@ class KisRecordedActionFactory; -#include +#include class KRITAIMAGE_EXPORT KisRecordedActionFactoryRegistry : public KoGenericRegistry { diff --git a/krita/image/recorder/kis_recorded_action_load_context.h b/krita/image/recorder/kis_recorded_action_load_context.h --- a/krita/image/recorder/kis_recorded_action_load_context.h +++ b/krita/image/recorder/kis_recorded_action_load_context.h @@ -19,7 +19,7 @@ #ifndef _KIS_RECORDED_ACTION_LOAD_CONTEXT_H_ #define _KIS_RECORDED_ACTION_LOAD_CONTEXT_H_ -#include "krita_export.h" +#include "kritaimage_export.h" class KoAbstractGradient; class KoPattern; diff --git a/krita/image/recorder/kis_recorded_action_save_context.h b/krita/image/recorder/kis_recorded_action_save_context.h --- a/krita/image/recorder/kis_recorded_action_save_context.h +++ b/krita/image/recorder/kis_recorded_action_save_context.h @@ -19,7 +19,7 @@ #ifndef _KIS_RECORDED_ACTION_SAVE_CONTEXT_H_ #define _KIS_RECORDED_ACTION_SAVE_CONTEXT_H_ -#include "krita_export.h" +#include "kritaimage_export.h" class KoAbstractGradient; class KoPattern; diff --git a/krita/image/recorder/kis_recorded_fill_paint_action.h b/krita/image/recorder/kis_recorded_fill_paint_action.h --- a/krita/image/recorder/kis_recorded_fill_paint_action.h +++ b/krita/image/recorder/kis_recorded_fill_paint_action.h @@ -23,7 +23,7 @@ #include "recorder/kis_recorded_paint_action.h" #include "kis_types.h" -#include +#include /** * This class will record the painting of a bezier curve. diff --git a/krita/image/recorder/kis_recorded_filter_action.h b/krita/image/recorder/kis_recorded_filter_action.h --- a/krita/image/recorder/kis_recorded_filter_action.h +++ b/krita/image/recorder/kis_recorded_filter_action.h @@ -21,7 +21,7 @@ #include "recorder/kis_recorded_node_action.h" -#include +#include class QString; class KisFilterConfiguration; diff --git a/krita/image/recorder/kis_recorded_paint_action.h b/krita/image/recorder/kis_recorded_paint_action.h --- a/krita/image/recorder/kis_recorded_paint_action.h +++ b/krita/image/recorder/kis_recorded_paint_action.h @@ -26,7 +26,7 @@ class KisPainter; class KoColor; -#include +#include /** * Base class for paint action. diff --git a/krita/image/recorder/kis_recorded_path_paint_action.h b/krita/image/recorder/kis_recorded_path_paint_action.h --- a/krita/image/recorder/kis_recorded_path_paint_action.h +++ b/krita/image/recorder/kis_recorded_path_paint_action.h @@ -26,7 +26,7 @@ class KisPaintInformation; class KisPainter; -#include +#include /** * This class will record the painting of a bezier curve. diff --git a/krita/image/recorder/kis_recorded_shape_paint_action.h b/krita/image/recorder/kis_recorded_shape_paint_action.h --- a/krita/image/recorder/kis_recorded_shape_paint_action.h +++ b/krita/image/recorder/kis_recorded_shape_paint_action.h @@ -23,7 +23,7 @@ #include "recorder/kis_recorded_paint_action.h" #include "kis_types.h" -#include +#include /** * This class will record the painting of a bezier curve. diff --git a/krita/image/tiles3/kis_tile_data_store.h b/krita/image/tiles3/kis_tile_data_store.h --- a/krita/image/tiles3/kis_tile_data_store.h +++ b/krita/image/tiles3/kis_tile_data_store.h @@ -18,7 +18,7 @@ #ifndef KIS_TILE_DATA_STORE_H_ #define KIS_TILE_DATA_STORE_H_ -#include "krita_export.h" +#include "kritaimage_export.h" #include #include "kis_tile_data_interface.h" diff --git a/krita/image/tiles3/kis_tiled_data_manager.h b/krita/image/tiles3/kis_tiled_data_manager.h --- a/krita/image/tiles3/kis_tiled_data_manager.h +++ b/krita/image/tiles3/kis_tiled_data_manager.h @@ -27,7 +27,7 @@ #include //#include "kis_debug.h" -#include "krita_export.h" +#include "kritaimage_export.h" #include "kis_tile_hash_table.h" #include "kis_memento_manager.h" diff --git a/krita/image/tiles3/swap/kis_abstract_compression.h b/krita/image/tiles3/swap/kis_abstract_compression.h --- a/krita/image/tiles3/swap/kis_abstract_compression.h +++ b/krita/image/tiles3/swap/kis_abstract_compression.h @@ -19,7 +19,8 @@ #ifndef __KIS_ABSTRACT_COMPRESSION_H #define __KIS_ABSTRACT_COMPRESSION_H -#include "krita_export.h" +#include "kritaimage_export.h" +#include /** * Base class for compression operations diff --git a/krita/image/tiles3/swap/kis_abstract_tile_compressor.h b/krita/image/tiles3/swap/kis_abstract_tile_compressor.h --- a/krita/image/tiles3/swap/kis_abstract_tile_compressor.h +++ b/krita/image/tiles3/swap/kis_abstract_tile_compressor.h @@ -19,7 +19,7 @@ #ifndef __KIS_ABSTRACT_TILE_COMPRESSOR_H #define __KIS_ABSTRACT_TILE_COMPRESSOR_H -#include "krita_export.h" +#include "kritaimage_export.h" #include "../kis_tile.h" #include "../kis_tiled_data_manager.h" diff --git a/krita/image/tiles3/swap/kis_chunk_allocator.h b/krita/image/tiles3/swap/kis_chunk_allocator.h --- a/krita/image/tiles3/swap/kis_chunk_allocator.h +++ b/krita/image/tiles3/swap/kis_chunk_allocator.h @@ -19,7 +19,7 @@ #ifndef __KIS_CHUNK_LIST_H #define __KIS_CHUNK_LIST_H -#include "krita_export.h" +#include "kritaimage_export.h" #include diff --git a/krita/image/tiles3/swap/kis_memory_window.h b/krita/image/tiles3/swap/kis_memory_window.h --- a/krita/image/tiles3/swap/kis_memory_window.h +++ b/krita/image/tiles3/swap/kis_memory_window.h @@ -19,7 +19,7 @@ #ifndef __KIS_MEMORY_WINDOW_H #define __KIS_MEMORY_WINDOW_H -#include "krita_export.h" +#include "kritaimage_export.h" #include diff --git a/krita/image/tiles3/swap/kis_swapped_data_store.h b/krita/image/tiles3/swap/kis_swapped_data_store.h --- a/krita/image/tiles3/swap/kis_swapped_data_store.h +++ b/krita/image/tiles3/swap/kis_swapped_data_store.h @@ -19,7 +19,7 @@ #ifndef __KIS_SWAPPED_DATA_STORE_H #define __KIS_SWAPPED_DATA_STORE_H -#include "krita_export.h" +#include "kritaimage_export.h" #include #include diff --git a/krita/image/tiles3/swap/kis_tile_data_swapper.h b/krita/image/tiles3/swap/kis_tile_data_swapper.h --- a/krita/image/tiles3/swap/kis_tile_data_swapper.h +++ b/krita/image/tiles3/swap/kis_tile_data_swapper.h @@ -21,7 +21,7 @@ #include #include -#include "krita_export.h" +#include "kritaimage_export.h" class KisTileDataStore; diff --git a/krita/libbrush/CMakeLists.txt b/krita/libbrush/CMakeLists.txt --- a/krita/libbrush/CMakeLists.txt +++ b/krita/libbrush/CMakeLists.txt @@ -21,6 +21,7 @@ ) add_library(kritalibbrush SHARED ${kritalibbrush_LIB_SRCS} ) +generate_export_header(kritalibbrush BASE_NAME libbrush EXPORT_MACRO_NAME BRUSH_EXPORT) if (WIN32) target_link_libraries(kritalibbrush kritaimage kowidgets Qt5::Svg ${WIN32_PLATFORM_NET_LIBS}) @@ -39,6 +40,7 @@ set_target_properties(kritalibbrush PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kritalibbrush_EXPORTS ) install(TARGETS kritalibbrush ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/krita/libbrush/kis_auto_brush.h b/krita/libbrush/kis_auto_brush.h --- a/krita/libbrush/kis_auto_brush.h +++ b/krita/libbrush/kis_auto_brush.h @@ -19,7 +19,7 @@ #ifndef _KIS_AUTOBRUSH_RESOURCE_H_ #define _KIS_AUTOBRUSH_RESOURCE_H_ -#include "krita_export.h" +#include "libbrush_export.h" #include "kis_brush.h" class KisMaskGenerator; diff --git a/krita/libbrush/kis_boundary.h b/krita/libbrush/kis_boundary.h --- a/krita/libbrush/kis_boundary.h +++ b/krita/libbrush/kis_boundary.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "kis_types.h" diff --git a/krita/libbrush/kis_brush.h b/krita/libbrush/kis_brush.h --- a/krita/libbrush/kis_brush.h +++ b/krita/libbrush/kis_brush.h @@ -26,7 +26,7 @@ #include #include -#include +#include class KisQImagemask; typedef KisSharedPtr KisQImagemaskSP; diff --git a/krita/libbrush/kis_brush_registry.h b/krita/libbrush/kis_brush_registry.h --- a/krita/libbrush/kis_brush_registry.h +++ b/krita/libbrush/kis_brush_registry.h @@ -24,7 +24,7 @@ #include "kis_types.h" #include "KoGenericRegistry.h" -#include +#include #include "kis_brush.h" #include "kis_brush_factory.h" diff --git a/krita/libbrush/kis_brush_server.h b/krita/libbrush/kis_brush_server.h --- a/krita/libbrush/kis_brush_server.h +++ b/krita/libbrush/kis_brush_server.h @@ -25,7 +25,7 @@ #include #include -#include "krita_export.h" +#include "libbrush_export.h" #include "kis_brush.h" class KoResource; diff --git a/krita/libbrush/kis_gbr_brush.h b/krita/libbrush/kis_gbr_brush.h --- a/krita/libbrush/kis_gbr_brush.h +++ b/krita/libbrush/kis_gbr_brush.h @@ -28,7 +28,7 @@ #include "kis_shared.h" #include "kis_paint_information.h" -#include "krita_export.h" +#include "libbrush_export.h" class KisQImagemask; typedef KisSharedPtr KisQImagemaskSP; diff --git a/krita/libbrush/kis_qimage_pyramid.h b/krita/libbrush/kis_qimage_pyramid.h --- a/krita/libbrush/kis_qimage_pyramid.h +++ b/krita/libbrush/kis_qimage_pyramid.h @@ -21,7 +21,7 @@ #include #include -#include +#include class BRUSH_EXPORT KisQImagePyramid diff --git a/krita/libcolor/CMakeLists.txt b/krita/libcolor/CMakeLists.txt --- a/krita/libcolor/CMakeLists.txt +++ b/krita/libcolor/CMakeLists.txt @@ -2,18 +2,22 @@ add_subdirectory(colord) set(kritacolor_LIB_SRCS kis_color_manager.h linux/kis_color_manager.cpp) set(kritacolor_EXTRA_LIBRARIES kritacolord) +elseif (MSVC) + set(kritacolor_LIB_SRCS kis_color_manager.h dummy/kis_color_manager.cpp ${CMAKE_CURRENT_BINARY_DIR}/kritacolor_export.h) else () set(kritacolor_LIB_SRCS dummy/kis_color_manager.cpp) endif () -kde4_add_library(kritacolor SHARED ${kritacolor_LIB_SRCS} ) +add_library(kritacolor SHARED ${kritacolor_LIB_SRCS} ) +generate_export_header(kritacolor BASE_NAME kritacolor) target_link_libraries(kritacolor ${QT_QTCORE_LIBRARY} ${kritacolor_EXTRA_LIBRARIES}) target_link_libraries(kritacolor LINK_INTERFACE_LIBRARIES ${QT_QTCORE_LIBRARY}) set_target_properties(kritacolor PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kritacolor_EXPORTS ) install(TARGETS kritacolor ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/krita/libcolor/kritalibcolor_export.h b/krita/libcolor/kritalibcolor_export.h deleted file mode 100644 --- a/krita/libcolor/kritalibcolor_export.h +++ /dev/null @@ -1,45 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2006 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KRITALIBCOLOR_EXPORT_H -#define KRITALIBCOLOR_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */ -#if defined _WIN32 || defined _WIN64 - -#ifndef KRITALIBCOLOR_EXPORT -# if defined(MAKE_KRITACOLOR_LIB) -/* We are building this library */ -# define KRITALIBCOLOR_EXPORT KDE_EXPORT -# else -/* We are using this library */ -# define KRITALIBCOLOR_EXPORT KDE_IMPORT -# endif -#endif - -#else /* UNIX */ - -#define KRITALIBCOLOR_EXPORT KDE_EXPORT - -#endif - -#endif diff --git a/krita/libglobal/kis_assert.h b/krita/libglobal/kis_assert.h --- a/krita/libglobal/kis_assert.h +++ b/krita/libglobal/kis_assert.h @@ -20,7 +20,7 @@ #define __KIS_ASSERT_H #include -#include +#include KRITAIMAGE_EXPORT void kis_assert_exception(const char *assertion, const char *file, int line); KRITAIMAGE_EXPORT void kis_assert_recoverable(const char *assertion, const char *file, int line); diff --git a/krita/libpsd/CMakeLists.txt b/krita/libpsd/CMakeLists.txt --- a/krita/libpsd/CMakeLists.txt +++ b/krita/libpsd/CMakeLists.txt @@ -19,7 +19,8 @@ asl/kis_asl_writer.cpp ) -kde4_add_library(kritapsd SHARED ${kritapsd_LIB_SRCS} ) +add_library(kritapsd SHARED ${kritapsd_LIB_SRCS} ) +generate_export_header(kritapsd BASE_NAME kritapsd) if (WIN32) target_link_libraries(kritapsd pigmentcms kritaglobal KF5::KDELibs4Support ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${WIN32_PLATFORM_NET_LIBS}) @@ -32,6 +33,7 @@ set_target_properties(kritapsd PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kritapsd_EXPORTS ) install(TARGETS kritapsd ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/krita/libpsd/asl/kis_asl_callback_object_catcher.h b/krita/libpsd/asl/kis_asl_callback_object_catcher.h --- a/krita/libpsd/asl/kis_asl_callback_object_catcher.h +++ b/krita/libpsd/asl/kis_asl_callback_object_catcher.h @@ -26,7 +26,7 @@ #include -#include "libkispsd_export.h" +#include "kritapsd_export.h" class KoPattern; diff --git a/krita/libpsd/asl/kis_asl_object_catcher.h b/krita/libpsd/asl/kis_asl_object_catcher.h --- a/krita/libpsd/asl/kis_asl_object_catcher.h +++ b/krita/libpsd/asl/kis_asl_object_catcher.h @@ -20,7 +20,7 @@ #define __KIS_ASL_OBJECT_CATCHER_H #include -#include "libkispsd_export.h" +#include "kritapsd_export.h" class QString; class QColor; diff --git a/krita/libpsd/asl/kis_asl_patterns_writer.h b/krita/libpsd/asl/kis_asl_patterns_writer.h --- a/krita/libpsd/asl/kis_asl_patterns_writer.h +++ b/krita/libpsd/asl/kis_asl_patterns_writer.h @@ -19,7 +19,7 @@ #ifndef __KIS_ASL_PATTERNS_WRITER_H #define __KIS_ASL_PATTERNS_WRITER_H -#include "libkispsd_export.h" +#include "kritapsd_export.h" class QDomDocument; class QIODevice; diff --git a/krita/libpsd/asl/kis_asl_reader.h b/krita/libpsd/asl/kis_asl_reader.h --- a/krita/libpsd/asl/kis_asl_reader.h +++ b/krita/libpsd/asl/kis_asl_reader.h @@ -19,7 +19,8 @@ #ifndef __KIS_ASL_READER_H #define __KIS_ASL_READER_H -#include "libkispsd_export.h" +#include "kritapsd_export.h" +#include class QDomDocument; class QIODevice; diff --git a/krita/libpsd/asl/kis_asl_writer.h b/krita/libpsd/asl/kis_asl_writer.h --- a/krita/libpsd/asl/kis_asl_writer.h +++ b/krita/libpsd/asl/kis_asl_writer.h @@ -19,7 +19,7 @@ #ifndef __KIS_ASL_WRITER_H #define __KIS_ASL_WRITER_H -#include "libkispsd_export.h" +#include "kritapsd_export.h" class QDomDocument; class QIODevice; diff --git a/krita/libpsd/asl/kis_asl_writer_utils.h b/krita/libpsd/asl/kis_asl_writer_utils.h --- a/krita/libpsd/asl/kis_asl_writer_utils.h +++ b/krita/libpsd/asl/kis_asl_writer_utils.h @@ -26,7 +26,7 @@ #include "psd_utils.h" #include "kis_debug.h" -#include "libkispsd_export.h" +#include "kritapsd_export.h" namespace KisAslWriterUtils { diff --git a/krita/libpsd/asl/kis_asl_xml_parser.h b/krita/libpsd/asl/kis_asl_xml_parser.h --- a/krita/libpsd/asl/kis_asl_xml_parser.h +++ b/krita/libpsd/asl/kis_asl_xml_parser.h @@ -19,7 +19,7 @@ #ifndef __KIS_ASL_XML_PARSER_H #define __KIS_ASL_XML_PARSER_H -#include "libkispsd_export.h" +#include "kritapsd_export.h" class QDomDocument; class QIODevice; diff --git a/krita/libpsd/asl/kis_asl_xml_writer.h b/krita/libpsd/asl/kis_asl_xml_writer.h --- a/krita/libpsd/asl/kis_asl_xml_writer.h +++ b/krita/libpsd/asl/kis_asl_xml_writer.h @@ -22,7 +22,7 @@ #include #include -#include "libkispsd_export.h" +#include "kritapsd_export.h" class QString; class QColor; diff --git a/krita/libpsd/compression.h b/krita/libpsd/compression.h --- a/krita/libpsd/compression.h +++ b/krita/libpsd/compression.h @@ -19,7 +19,7 @@ #define COMPRESSION_H #include -#include "libkispsd_export.h" +#include "kritapsd_export.h" class KRITAPSD_EXPORT Compression { diff --git a/krita/libpsd/libkispsd_export.h b/krita/libpsd/libkispsd_export.h deleted file mode 100644 --- a/krita/libpsd/libkispsd_export.h +++ /dev/null @@ -1,45 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2006 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef LIBKISPSD_EXPORT_H -#define LIBKISPSD_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */ -#if defined _WIN32 || defined _WIN64 - -#ifndef KRITAPSD_EXPORT -# if defined(MAKE_KRITAPSD_LIB) -/* We are building this library */ -# define KRITAPSD_EXPORT KDE_EXPORT -# else -/* We are using this library */ -# define KRITAPSD_EXPORT KDE_IMPORT -# endif -#endif - -#else /* UNIX */ - -#define KRITAPSD_EXPORT KDE_EXPORT - -#endif - -#endif diff --git a/krita/libpsd/psd.h b/krita/libpsd/psd.h --- a/krita/libpsd/psd.h +++ b/krita/libpsd/psd.h @@ -31,7 +31,7 @@ #include -#include "libkispsd_export.h" +#include "kritapsd_export.h" #include "kis_debug.h" diff --git a/krita/libpsd/psd_utils.h b/krita/libpsd/psd_utils.h --- a/krita/libpsd/psd_utils.h +++ b/krita/libpsd/psd_utils.h @@ -22,7 +22,7 @@ #include -#include "libkispsd_export.h" +#include "kritapsd_export.h" class QIODevice; diff --git a/krita/plugins/paintops/libpaintop/CMakeLists.txt b/krita/plugins/paintops/libpaintop/CMakeLists.txt --- a/krita/plugins/paintops/libpaintop/CMakeLists.txt +++ b/krita/plugins/paintops/libpaintop/CMakeLists.txt @@ -82,15 +82,16 @@ ) add_library(kritalibpaintop SHARED ${kritalibpaintop_LIB_SRCS} ) +generate_export_header(kritalibpaintop BASE_NAME paintop EXPORT_MACRO_NAME PAINTOP_EXPORT) target_link_libraries(kritalibpaintop kritaui kritalibbrush kowidgetutils) target_link_libraries(kritalibpaintop LINK_INTERFACE_LIBRARIES kritaui kritalibbrush) set_target_properties(kritalibpaintop PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kritalibpaintop_EXPORTS ) install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) - add_subdirectory(tests) diff --git a/krita/plugins/paintops/libpaintop/kis_airbrush_option.h b/krita/plugins/paintops/libpaintop/kis_airbrush_option.h --- a/krita/plugins/paintops/libpaintop/kis_airbrush_option.h +++ b/krita/plugins/paintops/libpaintop/kis_airbrush_option.h @@ -19,7 +19,7 @@ #define KIS_AIRBRUSH_OPTION_H #include -#include +#include const QString AIRBRUSH_ENABLED = "AirbrushOption/isAirbrushing"; const QString AIRBRUSH_RATE = "AirbrushOption/rate"; diff --git a/krita/plugins/paintops/libpaintop/kis_auto_brush_widget.h b/krita/plugins/paintops/libpaintop/kis_auto_brush_widget.h --- a/krita/plugins/paintops/libpaintop/kis_auto_brush_widget.h +++ b/krita/plugins/paintops/libpaintop/kis_auto_brush_widget.h @@ -21,7 +21,7 @@ #include #include -#include "krita_export.h" +#include "paintop_export.h" #include "ui_wdgautobrush.h" #include diff --git a/krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option.h b/krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option.h --- a/krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option.h +++ b/krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option.h @@ -23,6 +23,7 @@ #include "kis_paintop_option.h" #include +#include class KisPropertiesConfiguration; class KisPainter; diff --git a/krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option_widget.h b/krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option_widget.h --- a/krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option_widget.h +++ b/krita/plugins/paintops/libpaintop/kis_bidirectional_mixing_option_widget.h @@ -23,6 +23,7 @@ #include "kis_paintop_option.h" #include +#include class KisPropertiesConfiguration; class QLabel; diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h --- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h +++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h @@ -18,7 +18,7 @@ #ifndef KIS_BRUSH_BASED_PAINTOP_H #define KIS_BRUSH_BASED_PAINTOP_H -#include "krita_export.h" +#include "paintop_export.h" #include "kis_paintop.h" #include "kis_dab_cache.h" #include "kis_brush.h" diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h --- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h +++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.h @@ -22,7 +22,7 @@ #include "kis_paintop_settings_widget.h" #include "kis_types.h" #include "kis_brush.h" -#include +#include class KisBrushOptionWidget; diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h --- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h +++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h @@ -20,7 +20,7 @@ #define KIS_BRUSH_BASED_PAINTOP_SETTINGS_H #include -#include +#include #include diff --git a/krita/plugins/paintops/libpaintop/kis_brush_chooser.h b/krita/plugins/paintops/libpaintop/kis_brush_chooser.h --- a/krita/plugins/paintops/libpaintop/kis_brush_chooser.h +++ b/krita/plugins/paintops/libpaintop/kis_brush_chooser.h @@ -19,7 +19,7 @@ #define KIS_BRUSH_CHOOSER_H_ #include -#include +#include #include class KisDoubleSliderSpinBox; diff --git a/krita/plugins/paintops/libpaintop/kis_brush_option.h b/krita/plugins/paintops/libpaintop/kis_brush_option.h --- a/krita/plugins/paintops/libpaintop/kis_brush_option.h +++ b/krita/plugins/paintops/libpaintop/kis_brush_option.h @@ -23,6 +23,7 @@ #include "kis_brush.h" #include +#include class KisPropertiesConfiguration; diff --git a/krita/plugins/paintops/libpaintop/kis_brush_option_widget.h b/krita/plugins/paintops/libpaintop/kis_brush_option_widget.h --- a/krita/plugins/paintops/libpaintop/kis_brush_option_widget.h +++ b/krita/plugins/paintops/libpaintop/kis_brush_option_widget.h @@ -22,7 +22,7 @@ #include "kis_paintop_option.h" #include "kis_brush_option.h" -#include +#include #include "kis_brush.h" class KisBrushSelectionWidget; diff --git a/krita/plugins/paintops/libpaintop/kis_brush_size_option.h b/krita/plugins/paintops/libpaintop/kis_brush_size_option.h --- a/krita/plugins/paintops/libpaintop/kis_brush_size_option.h +++ b/krita/plugins/paintops/libpaintop/kis_brush_size_option.h @@ -22,7 +22,7 @@ #include #include -#include +#include class KisBrushSizeOptionsWidget; diff --git a/krita/plugins/paintops/libpaintop/kis_color_option.h b/krita/plugins/paintops/libpaintop/kis_color_option.h --- a/krita/plugins/paintops/libpaintop/kis_color_option.h +++ b/krita/plugins/paintops/libpaintop/kis_color_option.h @@ -20,7 +20,7 @@ #define KIS_COLOR_OPTION_H #include -#include +#include const QString COLOROP_HUE = "ColorOption/hue"; const QString COLOROP_SATURATION = "ColorOption/saturation"; diff --git a/krita/plugins/paintops/libpaintop/kis_color_source.h b/krita/plugins/paintops/libpaintop/kis_color_source.h --- a/krita/plugins/paintops/libpaintop/kis_color_source.h +++ b/krita/plugins/paintops/libpaintop/kis_color_source.h @@ -25,6 +25,7 @@ #include #include +#include class KoAbstractGradient; class KoColorTransformation; diff --git a/krita/plugins/paintops/libpaintop/kis_color_source_option.h b/krita/plugins/paintops/libpaintop/kis_color_source_option.h --- a/krita/plugins/paintops/libpaintop/kis_color_source_option.h +++ b/krita/plugins/paintops/libpaintop/kis_color_source_option.h @@ -20,7 +20,7 @@ #ifndef _KIS_COLOR_SOURCE_OPTION_H #define _KIS_COLOR_SOURCE_OPTION_H -#include +#include #include class KisColorSource; diff --git a/krita/plugins/paintops/libpaintop/kis_color_source_option_widget.h b/krita/plugins/paintops/libpaintop/kis_color_source_option_widget.h --- a/krita/plugins/paintops/libpaintop/kis_color_source_option_widget.h +++ b/krita/plugins/paintops/libpaintop/kis_color_source_option_widget.h @@ -21,6 +21,7 @@ #define KIS_COLOR_SOURCE_OPTION_WIDGET_H #include "kis_paintop_option.h" +#include /** * The brush option allows the user to select a particular brush diff --git a/krita/plugins/paintops/libpaintop/kis_compositeop_option.h b/krita/plugins/paintops/libpaintop/kis_compositeop_option.h --- a/krita/plugins/paintops/libpaintop/kis_compositeop_option.h +++ b/krita/plugins/paintops/libpaintop/kis_compositeop_option.h @@ -19,7 +19,7 @@ #define KIS_COMPOSITEOP_OPTION_H #include -#include +#include #include // const QString AIRBRUSH_ENABLED = "AirbrushOption/isAirbrushing"; diff --git a/krita/plugins/paintops/libpaintop/kis_current_outline_fetcher.h b/krita/plugins/paintops/libpaintop/kis_current_outline_fetcher.h --- a/krita/plugins/paintops/libpaintop/kis_current_outline_fetcher.h +++ b/krita/plugins/paintops/libpaintop/kis_current_outline_fetcher.h @@ -19,7 +19,7 @@ #ifndef __KIS_CURRENT_OUTLINE_FETCHER_H #define __KIS_CURRENT_OUTLINE_FETCHER_H -#include +#include #include #include diff --git a/krita/plugins/paintops/libpaintop/kis_curve_label.h b/krita/plugins/paintops/libpaintop/kis_curve_label.h --- a/krita/plugins/paintops/libpaintop/kis_curve_label.h +++ b/krita/plugins/paintops/libpaintop/kis_curve_label.h @@ -18,7 +18,7 @@ #ifndef _KIS_CURVE_LABEL_H_ #define _KIS_CURVE_LABEL_H_ -#include +#include class QString; class QImage; diff --git a/krita/plugins/paintops/libpaintop/kis_curve_option.h b/krita/plugins/paintops/libpaintop/kis_curve_option.h --- a/krita/plugins/paintops/libpaintop/kis_curve_option.h +++ b/krita/plugins/paintops/libpaintop/kis_curve_option.h @@ -28,7 +28,7 @@ #include "kis_global.h" #include "kis_paintop_option.h" #include "kis_paint_information.h" -#include "krita_export.h" +#include "paintop_export.h" #include "kis_dynamic_sensor.h" class KisDynamicSensor; diff --git a/krita/plugins/paintops/libpaintop/kis_dab_cache.h b/krita/plugins/paintops/libpaintop/kis_dab_cache.h --- a/krita/plugins/paintops/libpaintop/kis_dab_cache.h +++ b/krita/plugins/paintops/libpaintop/kis_dab_cache.h @@ -19,7 +19,7 @@ #ifndef __KIS_DAB_CACHE_H #define __KIS_DAB_CACHE_H -#include "krita_export.h" +#include "paintop_export.h" #include "kis_brush.h" class KisColorSource; diff --git a/krita/plugins/paintops/libpaintop/kis_dynamic_sensor.h b/krita/plugins/paintops/libpaintop/kis_dynamic_sensor.h --- a/krita/plugins/paintops/libpaintop/kis_dynamic_sensor.h +++ b/krita/plugins/paintops/libpaintop/kis_dynamic_sensor.h @@ -19,7 +19,7 @@ #ifndef _KIS_DYNAMIC_SENSOR_H_ #define _KIS_DYNAMIC_SENSOR_H_ -#include +#include #include diff --git a/krita/plugins/paintops/libpaintop/kis_embedded_pattern_manager.h b/krita/plugins/paintops/libpaintop/kis_embedded_pattern_manager.h --- a/krita/plugins/paintops/libpaintop/kis_embedded_pattern_manager.h +++ b/krita/plugins/paintops/libpaintop/kis_embedded_pattern_manager.h @@ -19,7 +19,7 @@ #ifndef __KIS_EMBEDDED_PATTERN_MANAGER_H #define __KIS_EMBEDDED_PATTERN_MANAGER_H -#include +#include class KoPattern; class KoAbstractGradient; diff --git a/krita/plugins/paintops/libpaintop/kis_filter_option.h b/krita/plugins/paintops/libpaintop/kis_filter_option.h --- a/krita/plugins/paintops/libpaintop/kis_filter_option.h +++ b/krita/plugins/paintops/libpaintop/kis_filter_option.h @@ -22,7 +22,7 @@ #include "kis_paintop_option.h" #include -#include +#include class QGridLayout; class KoID; diff --git a/krita/plugins/paintops/libpaintop/kis_paint_action_type_option.h b/krita/plugins/paintops/libpaintop/kis_paint_action_type_option.h --- a/krita/plugins/paintops/libpaintop/kis_paint_action_type_option.h +++ b/krita/plugins/paintops/libpaintop/kis_paint_action_type_option.h @@ -19,7 +19,7 @@ #define KIS_PAINT_ACTION_TYPE_OPTION_H #include -#include +#include class KisPaintActionWidget; diff --git a/krita/plugins/paintops/libpaintop/kis_precision_option.h b/krita/plugins/paintops/libpaintop/kis_precision_option.h --- a/krita/plugins/paintops/libpaintop/kis_precision_option.h +++ b/krita/plugins/paintops/libpaintop/kis_precision_option.h @@ -21,7 +21,7 @@ #define __KIS_PRECISION_OPTION_H #include -#include +#include class KisPropertiesConfiguration; const QString PRECISION_LEVEL = "KisPrecisionOption/precisionLevel"; diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_darken_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_darken_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_darken_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_darken_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include #include class KisPainter; diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.h @@ -21,7 +21,7 @@ #define KIS_PRESSURE_FLOW_OPACITY_OPTION_H #include "kis_curve_option.h" -#include +#include #include #include diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_gradient_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_gradient_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_gradient_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_gradient_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include class KoColor; class KoAbstractGradient; diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_hsv_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_hsv_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_hsv_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_hsv_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include #include class KoColorTransformation; diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_mirror_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_mirror_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_mirror_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_mirror_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include #include diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_mix_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_mix_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_mix_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_mix_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include /** * The pressure opacity option defines a curve that is used to diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_opacity_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_opacity_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_opacity_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_opacity_option.h @@ -21,7 +21,7 @@ #define KIS_PRESSURE_OPACITY_OPTION #include "kis_curve_option.h" -#include +#include class KisPainter; /** diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_rotation_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_rotation_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_rotation_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_rotation_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include /** * The pressure opacity option defines a curve that is used to diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_scatter_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_scatter_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_scatter_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_scatter_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include #include diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_sharpness_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_sharpness_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_sharpness_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_sharpness_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include #include diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_size_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_size_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_size_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_size_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include /** * The pressure opacity option defines a curve that is used to diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_spacing_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_spacing_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_spacing_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_spacing_option.h @@ -22,7 +22,7 @@ #include "kis_curve_option.h" #include -#include +#include /** * The pressure spacing option defines a curve that is used to diff --git a/krita/plugins/paintops/libpaintop/kis_pressure_texture_strength_option.h b/krita/plugins/paintops/libpaintop/kis_pressure_texture_strength_option.h --- a/krita/plugins/paintops/libpaintop/kis_pressure_texture_strength_option.h +++ b/krita/plugins/paintops/libpaintop/kis_pressure_texture_strength_option.h @@ -21,7 +21,7 @@ #include "kis_curve_option.h" #include -#include +#include /** * This curve defines how deep the ink (or a pointer) of a brush diff --git a/krita/plugins/paintops/libpaintop/kis_texture_option.h b/krita/plugins/paintops/libpaintop/kis_texture_option.h --- a/krita/plugins/paintops/libpaintop/kis_texture_option.h +++ b/krita/plugins/paintops/libpaintop/kis_texture_option.h @@ -20,7 +20,7 @@ #ifndef KIS_TEXTURE_OPTION_H #define KIS_TEXTURE_OPTION_H -#include +#include #include #include diff --git a/krita/plugins/tools/defaulttools/CMakeLists.txt b/krita/plugins/tools/defaulttools/CMakeLists.txt --- a/krita/plugins/tools/defaulttools/CMakeLists.txt +++ b/krita/plugins/tools/defaulttools/CMakeLists.txt @@ -25,10 +25,12 @@ ki18n_wrap_ui(kritadefaulttools_PART_SRCS wdgcolorpicker.ui wdgmovetool.ui) 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 ${Boost_SYSTEM_LIBRARY}) +set_target_properties(kritadefaulttools PROPERTIES DEFINE_SYMBOL kritadefaulttools_EXPORTS) install(TARGETS kritadefaulttools DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR}) diff --git a/krita/plugins/tools/defaulttools/strokes/move_stroke_strategy.h b/krita/plugins/tools/defaulttools/strokes/move_stroke_strategy.h --- a/krita/plugins/tools/defaulttools/strokes/move_stroke_strategy.h +++ b/krita/plugins/tools/defaulttools/strokes/move_stroke_strategy.h @@ -21,15 +21,16 @@ #include "kis_stroke_strategy_undo_command_based.h" #include "kis_types.h" +#include "kritadefaulttools_export.h" class KisUpdatesFacade; class KisPostExecutionUndoAdapter; -class KDE_EXPORT MoveStrokeStrategy : public KisStrokeStrategyUndoCommandBased +class KRITADEFAULTTOOLS_EXPORT MoveStrokeStrategy : public KisStrokeStrategyUndoCommandBased { public: - class KDE_EXPORT Data : public KisStrokeJobData { + class KRITADEFAULTTOOLS_EXPORT Data : public KisStrokeJobData { public: Data(QPoint _offset) : KisStrokeJobData(SEQUENTIAL, EXCLUSIVE), diff --git a/krita/plugins/tools/tool_transform2/CMakeLists.txt b/krita/plugins/tools/tool_transform2/CMakeLists.txt --- a/krita/plugins/tools/tool_transform2/CMakeLists.txt +++ b/krita/plugins/tools/tool_transform2/CMakeLists.txt @@ -26,6 +26,8 @@ ki18n_wrap_ui(kritatooltransform_PART_SRCS wdg_tool_transform.ui) add_library(kritatooltransform MODULE ${kritatooltransform_PART_SRCS}) +generate_export_header(kritatooltransform BASE_NAME kritatooltransform) + kcoreaddons_desktop_to_json(kritatooltransform kritatooltransform.desktop) if (NOT GSL_FOUND) @@ -35,6 +37,8 @@ target_link_libraries(kritatooltransform kritaui ${GSL_LIBRARIES} ${GSL_CBLAS_LIBRARIES}) endif () +set_target_properties(kritatooltransform PROPERTIES DEFINE_SYMBOL kritatooltransform_EXPORTS) + install(TARGETS kritatooltransform DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR}) diff --git a/krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h b/krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h --- a/krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h +++ b/krita/plugins/tools/tool_transform2/strokes/transform_stroke_strategy.h @@ -25,16 +25,17 @@ #include #include "tool_transform_args.h" #include +#include class KisPostExecutionUndoAdapter; -class KDE_EXPORT TransformStrokeStrategy : public KisStrokeStrategyUndoCommandBased +class KRITATOOLTRANSFORM_EXPORT TransformStrokeStrategy : public KisStrokeStrategyUndoCommandBased { public: - class KDE_EXPORT TransformData : public KisStrokeJobData { + class KRITATOOLTRANSFORM_EXPORT TransformData : public KisStrokeJobData { public: enum Destination { PAINT_DEVICE, @@ -55,7 +56,7 @@ KisNodeSP node; }; - class KDE_EXPORT ClearSelectionData : public KisStrokeJobData { + class KRITATOOLTRANSFORM_EXPORT ClearSelectionData : public KisStrokeJobData { public: ClearSelectionData(KisNodeSP _node) : KisStrokeJobData(SEQUENTIAL, NORMAL), diff --git a/krita/plugins/tools/tool_transform2/tests/CMakeLists.txt b/krita/plugins/tools/tool_transform2/tests/CMakeLists.txt --- a/krita/plugins/tools/tool_transform2/tests/CMakeLists.txt +++ b/krita/plugins/tools/tool_transform2/tests/CMakeLists.txt @@ -7,4 +7,4 @@ set(test_save_load_transform_args_SRCS test_save_load_transform_args.cpp ) kde4_add_unit_test(TestSaveLoadTransformArgs TESTNAME krita-ui-TestSaveLoadTransformArgs ${test_save_load_transform_args_SRCS}) -target_link_libraries(TestSaveLoadTransformArgs ${KDE4_KDEUI_LIBS} kritatooltransform kritaui kritaimage Qt5::Test) +target_link_libraries(TestSaveLoadTransformArgs ${KDE4_KDEUI_LIBS} kritatooltransform kritaui kritaimage Qt5::Test) diff --git a/krita/plugins/tools/tool_transform2/tool_transform_args.h b/krita/plugins/tools/tool_transform2/tool_transform_args.h --- a/krita/plugins/tools/tool_transform2/tool_transform_args.h +++ b/krita/plugins/tools/tool_transform2/tool_transform_args.h @@ -26,6 +26,7 @@ #include #include #include "kis_liquify_properties.h" +#include #include @@ -39,7 +40,7 @@ * memory. */ -class KDE_EXPORT ToolTransformArgs +class KRITATOOLTRANSFORM_EXPORT ToolTransformArgs { public: enum TransformMode {FREE_TRANSFORM = 0, diff --git a/krita/sketch/CMakeLists.txt b/krita/sketch/CMakeLists.txt --- a/krita/sketch/CMakeLists.txt +++ b/krita/sketch/CMakeLists.txt @@ -112,8 +112,11 @@ # ============================================================================= add_library(kritasketchlib SHARED ${kritasketchlib_SRCS}) -set_target_properties(kritasketchlib - PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} DEFINE_SYMBOL MAKE_KRITA_SKETCH_LIB +generate_export_headers(kritasketchlib BASE_NAME kritasketch) +set_target_properties(kritasketchlib PROPERTIES + VERSION ${GENERIC_CALLIGRA_LIB_VERSION} + SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kritasketchlib_EXPORTS ) diff --git a/krita/sketch/krita_sketch_export.h b/krita/sketch/krita_sketch_export.h deleted file mode 100644 --- a/krita/sketch/krita_sketch_export.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - This file is part of krita - Copyright (c) 2008 Boudewijn Rempt - Copyright (c) 2008 Thomas Zander - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. -*/ - -#ifndef KRITA_SKETCH_EXPORT_H -#define KRITA_SKETCH_EXPORT_H - -#include - -#ifndef KRITA_SKETCH_EXPORT -# ifdef MAKE_KRITA_SKETCH_LIB -# define KRITA_SKETCH_EXPORT KDE_EXPORT -# else -# define KRITA_SKETCH_EXPORT KDE_IMPORT -# endif -#endif - -#endif /* KRITA_SKETCH_EXPORT_H */ diff --git a/krita/ui/CMakeLists.txt b/krita/ui/CMakeLists.txt --- a/krita/ui/CMakeLists.txt +++ b/krita/ui/CMakeLists.txt @@ -446,6 +446,7 @@ QT5_WRAP_CPP(kritaui_HEADERS_MOC KisDocumentSectionPropertyAction_p.h) add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} ) +generate_export_header(kritaui BASE_NAME kritaui) target_link_libraries(kritaui ${X11_X11_LIB} ${X11_Xinput_LIB} @@ -480,6 +481,7 @@ set_target_properties(kritaui PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kritaui_EXPORTS ) install(TARGETS kritaui ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/krita/ui/KisApplication.h b/krita/ui/KisApplication.h --- a/krita/ui/KisApplication.h +++ b/krita/ui/KisApplication.h @@ -21,7 +21,7 @@ #define KIS_APPLICATION_H #include -#include "krita_export.h" +#include "kritaui_export.h" class KisMainWindow; class KisApplicationPrivate; diff --git a/krita/ui/KisDocument.h b/krita/ui/KisDocument.h --- a/krita/ui/KisDocument.h +++ b/krita/ui/KisDocument.h @@ -41,7 +41,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" class QString; diff --git a/krita/ui/KisDocumentEntry.h b/krita/ui/KisDocumentEntry.h --- a/krita/ui/KisDocumentEntry.h +++ b/krita/ui/KisDocumentEntry.h @@ -23,7 +23,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" class QStringList; class KisDocument; diff --git a/krita/ui/KisFilterChain.h b/krita/ui/KisFilterChain.h --- a/krita/ui/KisFilterChain.h +++ b/krita/ui/KisFilterChain.h @@ -27,7 +27,7 @@ #include "KisImportExportFilter.h" #include "KisFilterEntry.h" #include -#include "krita_export.h" +#include "kritaui_export.h" #include "KisFilterChainLinkList.h" class KTemporaryFile; diff --git a/krita/ui/KisFilterEntry.h b/krita/ui/KisFilterEntry.h --- a/krita/ui/KisFilterEntry.h +++ b/krita/ui/KisFilterEntry.h @@ -24,7 +24,7 @@ #include #include #include -#include "krita_export.h" +#include "kritaui_export.h" class QObject; class QPluginLoader; diff --git a/krita/ui/KisFilterGraph.h b/krita/ui/KisFilterGraph.h --- a/krita/ui/KisFilterGraph.h +++ b/krita/ui/KisFilterGraph.h @@ -19,7 +19,7 @@ #ifndef KIS_FILTERGRAPH_H #define KIS_FILTERGRAPH_H -#include "krita_export.h" +#include "kritaui_export.h" #include "KisFilterChain.h" #include "KisFilterVertex.h" #include diff --git a/krita/ui/KisImportExportFilter.h b/krita/ui/KisImportExportFilter.h --- a/krita/ui/KisImportExportFilter.h +++ b/krita/ui/KisImportExportFilter.h @@ -25,7 +25,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" class KisFilterChain; class KoUpdater; diff --git a/krita/ui/KisImportExportManager.h b/krita/ui/KisImportExportManager.h --- a/krita/ui/KisImportExportManager.h +++ b/krita/ui/KisImportExportManager.h @@ -29,7 +29,7 @@ #include "KisFilterChain.h" #include "KisFilterGraph.h" -#include "krita_export.h" +#include "kritaui_export.h" class KisDocument; class KoProgressUpdater; diff --git a/krita/ui/KisMainWindow.h b/krita/ui/KisMainWindow.h --- a/krita/ui/KisMainWindow.h +++ b/krita/ui/KisMainWindow.h @@ -21,7 +21,7 @@ #ifndef KIS_MAIN_WINDOW_H #define KIS_MAIN_WINDOW_H -#include "krita_export.h" +#include "kritaui_export.h" #include #include diff --git a/krita/ui/KisPageWidgetItem.h b/krita/ui/KisPageWidgetItem.h --- a/krita/ui/KisPageWidgetItem.h +++ b/krita/ui/KisPageWidgetItem.h @@ -21,7 +21,7 @@ #ifndef KISPAGEWIDGETITEM_H #define KISPAGEWIDGETITEM_H -#include "krita_export.h" +#include "kritaui_export.h" class QWidget; class QString; diff --git a/krita/ui/KisPart.h b/krita/ui/KisPart.h --- a/krita/ui/KisPart.h +++ b/krita/ui/KisPart.h @@ -30,7 +30,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include diff --git a/krita/ui/KisPrintJob.h b/krita/ui/KisPrintJob.h --- a/krita/ui/KisPrintJob.h +++ b/krita/ui/KisPrintJob.h @@ -25,7 +25,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include diff --git a/krita/ui/KisTemplateCreateDia.h b/krita/ui/KisTemplateCreateDia.h --- a/krita/ui/KisTemplateCreateDia.h +++ b/krita/ui/KisTemplateCreateDia.h @@ -23,7 +23,7 @@ #define KIS_TEMPLATE_CREATE_DIA_H #include -#include "krita_export.h" +#include "kritaui_export.h" class QString; class QPixmap; diff --git a/krita/ui/KisTemplateGroup.h b/krita/ui/KisTemplateGroup.h --- a/krita/ui/KisTemplateGroup.h +++ b/krita/ui/KisTemplateGroup.h @@ -24,7 +24,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" class KisTemplate; diff --git a/krita/ui/KisTemplateTree.h b/krita/ui/KisTemplateTree.h --- a/krita/ui/KisTemplateTree.h +++ b/krita/ui/KisTemplateTree.h @@ -23,7 +23,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" class KisTemplate; class KisTemplateGroup; diff --git a/krita/ui/KisView.h b/krita/ui/KisView.h --- a/krita/ui/KisView.h +++ b/krita/ui/KisView.h @@ -27,7 +27,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include "widgets/kis_floating_message.h" diff --git a/krita/ui/KisViewManager.h b/krita/ui/KisViewManager.h --- a/krita/ui/KisViewManager.h +++ b/krita/ui/KisViewManager.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "kis_floating_message.h" diff --git a/krita/ui/canvas/kis_canvas2.h b/krita/ui/canvas/kis_canvas2.h --- a/krita/ui/canvas/kis_canvas2.h +++ b/krita/ui/canvas/kis_canvas2.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/krita/ui/canvas/kis_canvas_controller.h b/krita/ui/canvas/kis_canvas_controller.h --- a/krita/ui/canvas/kis_canvas_controller.h +++ b/krita/ui/canvas/kis_canvas_controller.h @@ -21,7 +21,7 @@ #include -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_types.h" class KisView; diff --git a/krita/ui/canvas/kis_canvas_decoration.h b/krita/ui/canvas/kis_canvas_decoration.h --- a/krita/ui/canvas/kis_canvas_decoration.h +++ b/krita/ui/canvas/kis_canvas_decoration.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/krita/ui/canvas/kis_canvas_widget_base.h b/krita/ui/canvas/kis_canvas_widget_base.h --- a/krita/ui/canvas/kis_canvas_widget_base.h +++ b/krita/ui/canvas/kis_canvas_widget_base.h @@ -32,7 +32,7 @@ class KisCoordinatesConverter; class KisDisplayFilter; -#include "krita_export.h" +#include "kritaui_export.h" class KRITAUI_EXPORT KisCanvasWidgetBase : public KisAbstractCanvasWidget { diff --git a/krita/ui/canvas/kis_coordinates_converter.h b/krita/ui/canvas/kis_coordinates_converter.h --- a/krita/ui/canvas/kis_coordinates_converter.h +++ b/krita/ui/canvas/kis_coordinates_converter.h @@ -23,7 +23,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_types.h" #define EPSILON 1e-6 diff --git a/krita/ui/canvas/kis_display_filter.h b/krita/ui/canvas/kis_display_filter.h --- a/krita/ui/canvas/kis_display_filter.h +++ b/krita/ui/canvas/kis_display_filter.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "kis_exposure_gamma_correction_interface.h" diff --git a/krita/ui/canvas/kis_exposure_gamma_correction_interface.h b/krita/ui/canvas/kis_exposure_gamma_correction_interface.h --- a/krita/ui/canvas/kis_exposure_gamma_correction_interface.h +++ b/krita/ui/canvas/kis_exposure_gamma_correction_interface.h @@ -20,7 +20,7 @@ #define __KIS_EXPOSURE_GAMMA_CORRECTION_INTERFACE_H #include -#include +#include /** * A special interface for OCIO filter providing functionality for the diff --git a/krita/ui/canvas/kis_grid_manager.h b/krita/ui/canvas/kis_grid_manager.h --- a/krita/ui/canvas/kis_grid_manager.h +++ b/krita/ui/canvas/kis_grid_manager.h @@ -25,7 +25,7 @@ #include #include "kis_types.h" -#include +#include #include "kis_action_manager.h" #include "kis_action.h" diff --git a/krita/ui/canvas/kis_perspective_grid_decoration.h b/krita/ui/canvas/kis_perspective_grid_decoration.h --- a/krita/ui/canvas/kis_perspective_grid_decoration.h +++ b/krita/ui/canvas/kis_perspective_grid_decoration.h @@ -24,7 +24,7 @@ #define KIS_PERSPECTIVE_GRID_DECORATION_H #include "kis_canvas_decoration.h" -#include +#include class KisView; diff --git a/krita/ui/canvas/kis_perspective_grid_manager.h b/krita/ui/canvas/kis_perspective_grid_manager.h --- a/krita/ui/canvas/kis_perspective_grid_manager.h +++ b/krita/ui/canvas/kis_perspective_grid_manager.h @@ -24,7 +24,7 @@ #include "kis_canvas_decoration.h" #include -#include +#include class KisPerspectiveGridDecoration; class KAction; diff --git a/krita/ui/canvas/kis_prescaled_projection.h b/krita/ui/canvas/kis_prescaled_projection.h --- a/krita/ui/canvas/kis_prescaled_projection.h +++ b/krita/ui/canvas/kis_prescaled_projection.h @@ -20,7 +20,7 @@ #include -#include +#include #include #include "kis_update_info.h" diff --git a/krita/ui/dialogs/kis_dlg_layer_style.h b/krita/ui/dialogs/kis_dlg_layer_style.h --- a/krita/ui/dialogs/kis_dlg_layer_style.h +++ b/krita/ui/dialogs/kis_dlg_layer_style.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2014 Boudewijn Rempt * * This program is free software; you can redistribute it and/or modify diff --git a/krita/ui/flake/kis_dummies_facade_base.h b/krita/ui/flake/kis_dummies_facade_base.h --- a/krita/ui/flake/kis_dummies_facade_base.h +++ b/krita/ui/flake/kis_dummies_facade_base.h @@ -22,7 +22,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaui_export.h" class KisNodeDummy; diff --git a/krita/ui/flake/kis_node_dummies_graph.h b/krita/ui/flake/kis_node_dummies_graph.h --- a/krita/ui/flake/kis_node_dummies_graph.h +++ b/krita/ui/flake/kis_node_dummies_graph.h @@ -22,7 +22,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_types.h" #include "kis_node.h" diff --git a/krita/ui/flake/kis_node_shape.h b/krita/ui/flake/kis_node_shape.h --- a/krita/ui/flake/kis_node_shape.h +++ b/krita/ui/flake/kis_node_shape.h @@ -23,7 +23,7 @@ #include -#include +#include #include class KoViewConverter; diff --git a/krita/ui/flake/kis_shape_layer.h b/krita/ui/flake/kis_shape_layer.h --- a/krita/ui/flake/kis_shape_layer.h +++ b/krita/ui/flake/kis_shape_layer.h @@ -24,7 +24,7 @@ #include #include -#include +#include class QRect; class QIcon; diff --git a/krita/ui/flake/kis_shape_selection.h b/krita/ui/flake/kis_shape_selection.h --- a/krita/ui/flake/kis_shape_selection.h +++ b/krita/ui/flake/kis_shape_selection.h @@ -26,7 +26,7 @@ #include #include -#include +#include class KoStore; class KoShapeManager; diff --git a/krita/ui/flake/kis_take_all_shapes_command.h b/krita/ui/flake/kis_take_all_shapes_command.h --- a/krita/ui/flake/kis_take_all_shapes_command.h +++ b/krita/ui/flake/kis_take_all_shapes_command.h @@ -23,7 +23,7 @@ #include "kundo2command.h" -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_types.h" class KoShape; diff --git a/krita/ui/input/kis_abstract_input_action.h b/krita/ui/input/kis_abstract_input_action.h --- a/krita/ui/input/kis_abstract_input_action.h +++ b/krita/ui/input/kis_abstract_input_action.h @@ -20,7 +20,7 @@ #define KIS_ABSTRACT_INPUT_ACTION_H #include -#include "krita_export.h" +#include "kritaui_export.h" class QPointF; class QEvent; diff --git a/krita/ui/input/kis_abstract_shortcut.h b/krita/ui/input/kis_abstract_shortcut.h --- a/krita/ui/input/kis_abstract_shortcut.h +++ b/krita/ui/input/kis_abstract_shortcut.h @@ -22,7 +22,7 @@ #include #include -#include +#include class KisAbstractInputAction; diff --git a/krita/ui/input/kis_input_manager.h b/krita/ui/input/kis_input_manager.h --- a/krita/ui/input/kis_input_manager.h +++ b/krita/ui/input/kis_input_manager.h @@ -20,7 +20,7 @@ #define KIS_INPUTMANAGER_H #include -#include +#include class QPointF; class QTabletEvent; diff --git a/krita/ui/input/kis_input_profile_manager.h b/krita/ui/input/kis_input_profile_manager.h --- a/krita/ui/input/kis_input_profile_manager.h +++ b/krita/ui/input/kis_input_profile_manager.h @@ -22,7 +22,7 @@ #include -#include "krita_export.h" +#include "kritaui_export.h" class KisAbstractInputAction; class KisInputProfile; diff --git a/krita/ui/input/wintab/kis_tablet_support_win.h b/krita/ui/input/wintab/kis_tablet_support_win.h --- a/krita/ui/input/wintab/kis_tablet_support_win.h +++ b/krita/ui/input/wintab/kis_tablet_support_win.h @@ -22,7 +22,7 @@ #define KIS_TABLET_SUPPORT_WIN_H #include -#include +#include #include diff --git a/krita/ui/kis_abstract_perspective_grid.h b/krita/ui/kis_abstract_perspective_grid.h --- a/krita/ui/kis_abstract_perspective_grid.h +++ b/krita/ui/kis_abstract_perspective_grid.h @@ -24,7 +24,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" class KRITAUI_EXPORT KisAbstractPerspectiveGrid : public QObject { diff --git a/krita/ui/kis_action.h b/krita/ui/kis_action.h --- a/krita/ui/kis_action.h +++ b/krita/ui/kis_action.h @@ -20,7 +20,7 @@ #define KIS_ACTION_H #include -#include +#include #include #include class KisActionManager; diff --git a/krita/ui/kis_action_manager.h b/krita/ui/kis_action_manager.h --- a/krita/ui/kis_action_manager.h +++ b/krita/ui/kis_action_manager.h @@ -20,7 +20,7 @@ #ifndef KIS_ACTION_MANAGER_H #define KIS_ACTION_MANAGER_H -#include +#include #include diff --git a/krita/ui/kis_asl_layer_style_serializer.h b/krita/ui/kis_asl_layer_style_serializer.h --- a/krita/ui/kis_asl_layer_style_serializer.h +++ b/krita/ui/kis_asl_layer_style_serializer.h @@ -19,7 +19,7 @@ #ifndef __KIS_ASL_LAYER_STYLE_SERIALIZER_H #define __KIS_ASL_LAYER_STYLE_SERIALIZER_H -#include "krita_export.h" +#include "kritaui_export.h" class QIODevice; class KoPattern; diff --git a/krita/ui/kis_bookmarked_configurations_editor.h b/krita/ui/kis_bookmarked_configurations_editor.h --- a/krita/ui/kis_bookmarked_configurations_editor.h +++ b/krita/ui/kis_bookmarked_configurations_editor.h @@ -20,7 +20,7 @@ #define _KIS_BOOKMARKED_CONFIGURATIONS_EDITOR_H_ #include -#include +#include class KisBookmarkedConfigurationsModel; class KisSerializableConfiguration; diff --git a/krita/ui/kis_bookmarked_configurations_model.h b/krita/ui/kis_bookmarked_configurations_model.h --- a/krita/ui/kis_bookmarked_configurations_model.h +++ b/krita/ui/kis_bookmarked_configurations_model.h @@ -21,7 +21,7 @@ #include -#include +#include class KLocalizedString; diff --git a/krita/ui/kis_canvas_controls_manager.h b/krita/ui/kis_canvas_controls_manager.h --- a/krita/ui/kis_canvas_controls_manager.h +++ b/krita/ui/kis_canvas_controls_manager.h @@ -23,7 +23,7 @@ #include #include -#include +#include class KisViewManager; class KisActionManager; diff --git a/krita/ui/kis_canvas_resource_provider.h b/krita/ui/kis_canvas_resource_provider.h --- a/krita/ui/kis_canvas_resource_provider.h +++ b/krita/ui/kis_canvas_resource_provider.h @@ -26,7 +26,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaui_export.h" class KisWorkspaceResource; class KoColorProfile; diff --git a/krita/ui/kis_categories_mapper.h b/krita/ui/kis_categories_mapper.h --- a/krita/ui/kis_categories_mapper.h +++ b/krita/ui/kis_categories_mapper.h @@ -21,7 +21,7 @@ #include #include -#include +#include /** diff --git a/krita/ui/kis_categorized_item_delegate.h b/krita/ui/kis_categorized_item_delegate.h --- a/krita/ui/kis_categorized_item_delegate.h +++ b/krita/ui/kis_categorized_item_delegate.h @@ -21,7 +21,7 @@ #ifndef _KIS_CATEGORIZED_ITEM_DELEGATE_H_ #define _KIS_CATEGORIZED_ITEM_DELEGATE_H_ -#include +#include #include #include diff --git a/krita/ui/kis_clipboard.h b/krita/ui/kis_clipboard.h --- a/krita/ui/kis_clipboard.h +++ b/krita/ui/kis_clipboard.h @@ -23,7 +23,7 @@ #include #include #include "kis_types.h" -#include +#include class QImage; class QRect; diff --git a/krita/ui/kis_config.h b/krita/ui/kis_config.h --- a/krita/ui/kis_config.h +++ b/krita/ui/kis_config.h @@ -28,7 +28,7 @@ #include "kis_global.h" #include "kis_properties_configuration.h" -#include "krita_export.h" +#include "kritaui_export.h" class KoColorProfile; class KoColorSpace; diff --git a/krita/ui/kis_config_notifier.h b/krita/ui/kis_config_notifier.h --- a/krita/ui/kis_config_notifier.h +++ b/krita/ui/kis_config_notifier.h @@ -20,7 +20,7 @@ #include -#include "krita_export.h" +#include "kritaui_export.h" /** * An object that emits a signal to inform interested parties that the diff --git a/krita/ui/kis_cursor.h b/krita/ui/kis_cursor.h --- a/krita/ui/kis_cursor.h +++ b/krita/ui/kis_cursor.h @@ -22,7 +22,7 @@ #ifndef __kis_cursor_h__ #define __kis_cursor_h__ -#include +#include #include diff --git a/krita/ui/kis_document_undo_store.h b/krita/ui/kis_document_undo_store.h --- a/krita/ui/kis_document_undo_store.h +++ b/krita/ui/kis_document_undo_store.h @@ -20,6 +20,7 @@ #define __KIS_DOCUMENT_UNDO_STORE_H #include "kis_undo_store.h" +#include "kritaui_export.h" class KisDocument; diff --git a/krita/ui/kis_factory2.h b/krita/ui/kis_factory2.h --- a/krita/ui/kis_factory2.h +++ b/krita/ui/kis_factory2.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/krita/ui/kis_file_layer.h b/krita/ui/kis_file_layer.h --- a/krita/ui/kis_file_layer.h +++ b/krita/ui/kis_file_layer.h @@ -18,7 +18,7 @@ #ifndef KIS_FILE_LAYER_H #define KIS_FILE_LAYER_H -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_external_layer_iface.h" #include "kis_safe_document_loader.h" diff --git a/krita/ui/kis_filter_manager.h b/krita/ui/kis_filter_manager.h --- a/krita/ui/kis_filter_manager.h +++ b/krita/ui/kis_filter_manager.h @@ -21,7 +21,7 @@ #define _KIS_FILTER_MANAGER_ #include -#include +#include #include class KisViewManager; diff --git a/krita/ui/kis_histogram_view.h b/krita/ui/kis_histogram_view.h --- a/krita/ui/kis_histogram_view.h +++ b/krita/ui/kis_histogram_view.h @@ -29,7 +29,7 @@ #include "KoHistogramProducer.h" #include "kis_histogram.h" -#include +#include class KoChannelInfo; diff --git a/krita/ui/kis_image_manager.h b/krita/ui/kis_image_manager.h --- a/krita/ui/kis_image_manager.h +++ b/krita/ui/kis_image_manager.h @@ -22,7 +22,7 @@ #include #include -#include +#include class KisViewManager; class KisFilterStrategy; diff --git a/krita/ui/kis_image_view_converter.h b/krita/ui/kis_image_view_converter.h --- a/krita/ui/kis_image_view_converter.h +++ b/krita/ui/kis_image_view_converter.h @@ -19,7 +19,7 @@ #ifndef KIS_IMAGE_VIEW_CONVERTER_H #define KIS_IMAGE_VIEW_CONVERTER_H -#include +#include #include "kis_image.h" #include "kis_types.h" diff --git a/krita/ui/kis_mainwindow_observer.h b/krita/ui/kis_mainwindow_observer.h --- a/krita/ui/kis_mainwindow_observer.h +++ b/krita/ui/kis_mainwindow_observer.h @@ -2,7 +2,7 @@ #define KIS_MAINWINDOW_OBSERVER_H #include -#include +#include class KisViewManager; diff --git a/krita/ui/kis_mimedata.h b/krita/ui/kis_mimedata.h --- a/krita/ui/kis_mimedata.h +++ b/krita/ui/kis_mimedata.h @@ -23,7 +23,7 @@ #include #include -#include +#include class KisShapeController; diff --git a/krita/ui/kis_model_index_converter_base.h b/krita/ui/kis_model_index_converter_base.h --- a/krita/ui/kis_model_index_converter_base.h +++ b/krita/ui/kis_model_index_converter_base.h @@ -21,7 +21,7 @@ #include -#include "krita_export.h" +#include "kritaui_export.h" class KisNodeDummy; /** diff --git a/krita/ui/kis_node_commands_adapter.h b/krita/ui/kis_node_commands_adapter.h --- a/krita/ui/kis_node_commands_adapter.h +++ b/krita/ui/kis_node_commands_adapter.h @@ -24,7 +24,7 @@ class KUndo2MagicString; #include -#include +#include #include diff --git a/krita/ui/kis_node_manager.h b/krita/ui/kis_node_manager.h --- a/krita/ui/kis_node_manager.h +++ b/krita/ui/kis_node_manager.h @@ -22,7 +22,7 @@ #include #include "kis_types.h" -#include +#include class KActionCollection; diff --git a/krita/ui/kis_node_model.h b/krita/ui/kis_node_model.h --- a/krita/ui/kis_node_model.h +++ b/krita/ui/kis_node_model.h @@ -19,7 +19,7 @@ #define KIS_NODE_MODEL #include -#include "krita_export.h" +#include "kritaui_export.h" #include class KisDummiesFacadeBase; diff --git a/krita/ui/kis_paint_ops_model.h b/krita/ui/kis_paint_ops_model.h --- a/krita/ui/kis_paint_ops_model.h +++ b/krita/ui/kis_paint_ops_model.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include "kis_categorized_list_model.h" #include "kis_paintop_factory.h" diff --git a/krita/ui/kis_painting_assistant.h b/krita/ui/kis_painting_assistant.h --- a/krita/ui/kis_painting_assistant.h +++ b/krita/ui/kis_painting_assistant.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/krita/ui/kis_painting_assistants_decoration.h b/krita/ui/kis_painting_assistants_decoration.h --- a/krita/ui/kis_painting_assistants_decoration.h +++ b/krita/ui/kis_painting_assistants_decoration.h @@ -24,7 +24,7 @@ #include "canvas/kis_canvas_decoration.h" #include "kis_painting_assistant.h" -#include +#include class KisView; diff --git a/krita/ui/kis_paintop_box.h b/krita/ui/kis_paintop_box.h --- a/krita/ui/kis_paintop_box.h +++ b/krita/ui/kis_paintop_box.h @@ -37,7 +37,7 @@ #include "kis_locked_properties_server.h" #include "kis_locked_properties.h" #include "kis_config.h" -#include "krita_export.h" +#include "kritaui_export.h" class QToolButton; diff --git a/krita/ui/kis_paintop_option.h b/krita/ui/kis_paintop_option.h --- a/krita/ui/kis_paintop_option.h +++ b/krita/ui/kis_paintop_option.h @@ -21,7 +21,7 @@ #define KIS_PAINTOP_OPTION_H #include -#include +#include #include #include diff --git a/krita/ui/kis_paintop_options_model.h b/krita/ui/kis_paintop_options_model.h --- a/krita/ui/kis_paintop_options_model.h +++ b/krita/ui/kis_paintop_options_model.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/krita/ui/kis_paintop_settings_widget.h b/krita/ui/kis_paintop_settings_widget.h --- a/krita/ui/kis_paintop_settings_widget.h +++ b/krita/ui/kis_paintop_settings_widget.h @@ -19,7 +19,7 @@ #ifndef KIS_PAINTOP_SETTINGS_WIDGET_H #define KIS_PAINTOP_SETTINGS_WIDGET_H -#include +#include #include class KisPaintOpOption; diff --git a/krita/ui/kis_png_converter.h b/krita/ui/kis_png_converter.h --- a/krita/ui/kis_png_converter.h +++ b/krita/ui/kis_png_converter.h @@ -30,7 +30,7 @@ #include "kis_types.h" #include "kis_global.h" #include "kis_annotation.h" -#include +#include class KoStore; class KisDocument; diff --git a/krita/ui/kis_preference_set_registry.h b/krita/ui/kis_preference_set_registry.h --- a/krita/ui/kis_preference_set_registry.h +++ b/krita/ui/kis_preference_set_registry.h @@ -27,7 +27,7 @@ #include "kis_types.h" -#include +#include class KIcon; diff --git a/krita/ui/kis_psd_layer_style_resource.h b/krita/ui/kis_psd_layer_style_resource.h --- a/krita/ui/kis_psd_layer_style_resource.h +++ b/krita/ui/kis_psd_layer_style_resource.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2014 Boudewijn Rempt * * This program is free software; you can redistribute it and/or modify @@ -21,7 +21,7 @@ #include #include -#include +#include #include "kis_psd_layer_style.h" /** diff --git a/krita/ui/kis_resource_server_provider.h b/krita/ui/kis_resource_server_provider.h --- a/krita/ui/kis_resource_server_provider.h +++ b/krita/ui/kis_resource_server_provider.h @@ -28,7 +28,7 @@ #include -#include +#include "kritaui_export.h" class KoResourceLoaderThread; class KisWorkspaceResource; diff --git a/krita/ui/kis_selection_manager.h b/krita/ui/kis_selection_manager.h --- a/krita/ui/kis_selection_manager.h +++ b/krita/ui/kis_selection_manager.h @@ -25,7 +25,7 @@ # #include "KisDocument.h" -#include +#include class KisActionManager; class KisAction; diff --git a/krita/ui/kis_splash_screen.h b/krita/ui/kis_splash_screen.h --- a/krita/ui/kis_splash_screen.h +++ b/krita/ui/kis_splash_screen.h @@ -24,7 +24,7 @@ class QPixmap; -#include "krita_export.h" +#include "kritaui_export.h" class KRITAUI_EXPORT KisSplashScreen : public QWidget, public Ui::WdgSplash { diff --git a/krita/ui/kis_statusbar.h b/krita/ui/kis_statusbar.h --- a/krita/ui/kis_statusbar.h +++ b/krita/ui/kis_statusbar.h @@ -33,7 +33,7 @@ class KisViewManager; class KisProgressWidget; -#include "krita_export.h" +#include "kritaui_export.h" class KRITAUI_EXPORT KisStatusBar : public QObject { diff --git a/krita/ui/kis_transaction_based_command.h b/krita/ui/kis_transaction_based_command.h --- a/krita/ui/kis_transaction_based_command.h +++ b/krita/ui/kis_transaction_based_command.h @@ -19,7 +19,7 @@ #ifndef KIS_TRANSACTION_BASED_COMMAND_H #define KIS_TRANSACTION_BASED_COMMAND_H -#include +#include #include class KRITAUI_EXPORT KisTransactionBasedCommand : public KUndo2Command diff --git a/krita/ui/kis_view_plugin.h b/krita/ui/kis_view_plugin.h --- a/krita/ui/kis_view_plugin.h +++ b/krita/ui/kis_view_plugin.h @@ -20,7 +20,7 @@ #ifndef KIS_VIEW_PLUGIN_H #define KIS_VIEW_PLUGIN_H -#include +#include #include "operations/kis_operation_ui_factory.h" class KisOperation; diff --git a/krita/ui/kis_workspace_resource.h b/krita/ui/kis_workspace_resource.h --- a/krita/ui/kis_workspace_resource.h +++ b/krita/ui/kis_workspace_resource.h @@ -22,7 +22,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" /// Resource for storing of workspaces class KRITAUI_EXPORT KisWorkspaceResource : public KoResource , public KisPropertiesConfiguration diff --git a/krita/ui/kisexiv2/kis_exiv2.h b/krita/ui/kisexiv2/kis_exiv2.h --- a/krita/ui/kisexiv2/kis_exiv2.h +++ b/krita/ui/kisexiv2/kis_exiv2.h @@ -22,7 +22,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" /// Convert an exiv value to a KisMetaData value KisMetaData::Value exivValueToKMDValue(const Exiv2::Value::AutoPtr value, bool forceSeq, KisMetaData::Value::ValueType arrayType = KisMetaData::Value::UnorderedArray); diff --git a/krita/ui/kra/kis_kra_loader.h b/krita/ui/kra/kis_kra_loader.h --- a/krita/ui/kra/kis_kra_loader.h +++ b/krita/ui/kra/kis_kra_loader.h @@ -31,7 +31,7 @@ class KisPaintingAssistant; #include -#include +#include /** * Load old-style 1.x .kra files. Updated for 2.0, let's try to stay * compatible. But 2.0 won't be able to save 1.x .kra files unless we diff --git a/krita/ui/kra/kis_kra_savexml_visitor.h b/krita/ui/kra/kis_kra_savexml_visitor.h --- a/krita/ui/kra/kis_kra_savexml_visitor.h +++ b/krita/ui/kra/kis_kra_savexml_visitor.h @@ -25,7 +25,7 @@ #include "kis_node_visitor.h" #include "kis_types.h" -#include "krita_export.h" +#include "kritaui_export.h" class KRITAUI_EXPORT KisSaveXmlVisitor : public KisNodeVisitor { diff --git a/krita/ui/opengl/kis_opengl.h b/krita/ui/opengl/kis_opengl.h --- a/krita/ui/opengl/kis_opengl.h +++ b/krita/ui/opengl/kis_opengl.h @@ -29,7 +29,7 @@ #include class QOpenGLContext; -#include "krita_export.h" +#include "kritaui_export.h" /** diff --git a/krita/ui/opengl/kis_opengl_canvas2.h b/krita/ui/opengl/kis_opengl_canvas2.h --- a/krita/ui/opengl/kis_opengl_canvas2.h +++ b/krita/ui/opengl/kis_opengl_canvas2.h @@ -31,7 +31,7 @@ #include "canvas/kis_canvas_widget_base.h" #include "opengl/kis_opengl_image_textures.h" -#include "krita_export.h" +#include "kritaui_export.h" class QWidget; class QPaintEvent; diff --git a/krita/ui/opengl/kis_opengl_image_textures.h b/krita/ui/opengl/kis_opengl_image_textures.h --- a/krita/ui/opengl/kis_opengl_image_textures.h +++ b/krita/ui/opengl/kis_opengl_image_textures.h @@ -26,7 +26,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_shared.h" diff --git a/krita/ui/operations/kis_filter_selection_operation.h b/krita/ui/operations/kis_filter_selection_operation.h --- a/krita/ui/operations/kis_filter_selection_operation.h +++ b/krita/ui/operations/kis_filter_selection_operation.h @@ -20,7 +20,7 @@ #ifndef KIS_FILTER_SELECTION_OPERATION_H #define KIS_FILTER_SELECTION_OPERATION_H -#include +#include #include "kis_operation.h" class KisSelectionFilter; diff --git a/krita/ui/operations/kis_operation.h b/krita/ui/operations/kis_operation.h --- a/krita/ui/operations/kis_operation.h +++ b/krita/ui/operations/kis_operation.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "kis_properties_configuration.h" #include "operations/kis_operation_configuration.h" diff --git a/krita/ui/operations/kis_operation_configuration.h b/krita/ui/operations/kis_operation_configuration.h --- a/krita/ui/operations/kis_operation_configuration.h +++ b/krita/ui/operations/kis_operation_configuration.h @@ -20,7 +20,7 @@ #define __KIS_OPERATION_CONFIGURATION_H #include -#include +#include #include "kis_properties_configuration.h" diff --git a/krita/ui/operations/kis_operation_registry.h b/krita/ui/operations/kis_operation_registry.h --- a/krita/ui/operations/kis_operation_registry.h +++ b/krita/ui/operations/kis_operation_registry.h @@ -19,7 +19,7 @@ #ifndef __KIS_OPERATION_REGISTRY_H #define __KIS_OPERATION_REGISTRY_H -#include +#include #include #include "kis_operation.h" diff --git a/krita/ui/operations/kis_operation_ui_widget.h b/krita/ui/operations/kis_operation_ui_widget.h --- a/krita/ui/operations/kis_operation_ui_widget.h +++ b/krita/ui/operations/kis_operation_ui_widget.h @@ -21,7 +21,7 @@ #define KIS_OPERATION_UI_WIDGET_H #include -#include +#include class KisOperationConfiguration; diff --git a/krita/ui/ora/kis_open_raster_stack_load_visitor.h b/krita/ui/ora/kis_open_raster_stack_load_visitor.h --- a/krita/ui/ora/kis_open_raster_stack_load_visitor.h +++ b/krita/ui/ora/kis_open_raster_stack_load_visitor.h @@ -21,7 +21,7 @@ #include "kis_global.h" #include "kis_types.h" -#include +#include class QDomElement; diff --git a/krita/ui/ora/kis_open_raster_stack_save_visitor.h b/krita/ui/ora/kis_open_raster_stack_save_visitor.h --- a/krita/ui/ora/kis_open_raster_stack_save_visitor.h +++ b/krita/ui/ora/kis_open_raster_stack_save_visitor.h @@ -25,7 +25,7 @@ #include "kis_node_visitor.h" #include "kis_layer.h" -#include +#include class KisOpenRasterSaveContext; diff --git a/krita/ui/ora/ora_load_context.h b/krita/ui/ora/ora_load_context.h --- a/krita/ui/ora/ora_load_context.h +++ b/krita/ui/ora/ora_load_context.h @@ -19,7 +19,7 @@ #define _ORA_LOAD_CONTEXT_H_ #include -#include +#include class KoStore; diff --git a/krita/ui/ora/ora_save_context.h b/krita/ui/ora/ora_save_context.h --- a/krita/ui/ora/ora_save_context.h +++ b/krita/ui/ora/ora_save_context.h @@ -22,7 +22,7 @@ #include #include "kis_open_raster_save_context.h" -#include +#include class KRITAUI_EXPORT OraSaveContext : public KisOpenRasterSaveContext { diff --git a/krita/ui/processing/fill_processing_visitor.h b/krita/ui/processing/fill_processing_visitor.h --- a/krita/ui/processing/fill_processing_visitor.h +++ b/krita/ui/processing/fill_processing_visitor.h @@ -24,9 +24,10 @@ #include #include #include +#include -class KDE_EXPORT FillProcessingVisitor : public KisSimpleProcessingVisitor +class KRITAUI_EXPORT FillProcessingVisitor : public KisSimpleProcessingVisitor { public: FillProcessingVisitor(const QPoint &startPoint, diff --git a/krita/ui/qtsingleapplication/qtsingleapplication.h b/krita/ui/qtsingleapplication/qtsingleapplication.h --- a/krita/ui/qtsingleapplication/qtsingleapplication.h +++ b/krita/ui/qtsingleapplication/qtsingleapplication.h @@ -39,7 +39,7 @@ class QtLocalPeer; -#include +#include class KRITAUI_EXPORT QtSingleApplication : public KApplication { diff --git a/krita/ui/recorder/kis_recorded_action_creator_factory.h b/krita/ui/recorder/kis_recorded_action_creator_factory.h --- a/krita/ui/recorder/kis_recorded_action_creator_factory.h +++ b/krita/ui/recorder/kis_recorded_action_creator_factory.h @@ -19,7 +19,7 @@ #ifndef _KIS_RECORDED_ACTION_CREATOR_FACTORY_H_ #define _KIS_RECORDED_ACTION_CREATOR_FACTORY_H_ -#include +#include class KisRecordedAction; class KisRecordedActionCreator; diff --git a/krita/ui/recorder/kis_recorded_action_creator_factory_registry.h b/krita/ui/recorder/kis_recorded_action_creator_factory_registry.h --- a/krita/ui/recorder/kis_recorded_action_creator_factory_registry.h +++ b/krita/ui/recorder/kis_recorded_action_creator_factory_registry.h @@ -19,7 +19,7 @@ #ifndef _KIS_RECORDED_ACTION_CREATOR_FACTORY_REGISTRY_H_ #define _KIS_RECORDED_ACTION_CREATOR_FACTORY_REGISTRY_H_ -#include +#include #include class KisRecordedAction; diff --git a/krita/ui/recorder/kis_recorded_action_editor_factory.h b/krita/ui/recorder/kis_recorded_action_editor_factory.h --- a/krita/ui/recorder/kis_recorded_action_editor_factory.h +++ b/krita/ui/recorder/kis_recorded_action_editor_factory.h @@ -19,7 +19,7 @@ #ifndef _KIS_RECORDED_ACTION_EDITOR_FACTORY_H_ #define _KIS_RECORDED_ACTION_EDITOR_FACTORY_H_ -#include +#include class QWidget; class KisRecordedAction; diff --git a/krita/ui/recorder/kis_recorded_action_editor_factory_registry.h b/krita/ui/recorder/kis_recorded_action_editor_factory_registry.h --- a/krita/ui/recorder/kis_recorded_action_editor_factory_registry.h +++ b/krita/ui/recorder/kis_recorded_action_editor_factory_registry.h @@ -19,7 +19,7 @@ #ifndef _KIS_RECORDED_ACTION_EDITOR_FACTORY_REGISTRY_H_ #define _KIS_RECORDED_ACTION_EDITOR_FACTORY_REGISTRY_H_ -#include +#include class QWidget; class KisRecordedAction; diff --git a/krita/ui/tool/kis_delegated_tool_policies.h b/krita/ui/tool/kis_delegated_tool_policies.h --- a/krita/ui/tool/kis_delegated_tool_policies.h +++ b/krita/ui/tool/kis_delegated_tool_policies.h @@ -21,7 +21,7 @@ #include -#include "krita_export.h" +#include "kritaui_export.h" class KoCanvasBase; diff --git a/krita/ui/tool/kis_figure_painting_tool_helper.h b/krita/ui/tool/kis_figure_painting_tool_helper.h --- a/krita/ui/tool/kis_figure_painting_tool_helper.h +++ b/krita/ui/tool/kis_figure_painting_tool_helper.h @@ -20,7 +20,7 @@ #define __KIS_FIGURE_PAINTING_TOOL_HELPER_H #include "kis_types.h" -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_paint_information.h" #include "strokes/freehand_stroke.h" diff --git a/krita/ui/tool/kis_painting_information_builder.h b/krita/ui/tool/kis_painting_information_builder.h --- a/krita/ui/tool/kis_painting_information_builder.h +++ b/krita/ui/tool/kis_painting_information_builder.h @@ -23,7 +23,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_paint_information.h" class KoPointerEvent; diff --git a/krita/ui/tool/kis_resources_snapshot.h b/krita/ui/tool/kis_resources_snapshot.h --- a/krita/ui/tool/kis_resources_snapshot.h +++ b/krita/ui/tool/kis_resources_snapshot.h @@ -22,7 +22,7 @@ #include "kis_shared.h" #include "kis_shared_ptr.h" #include "kis_types.h" -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_painter.h" #include "kis_default_bounds.h" diff --git a/krita/ui/tool/kis_selection_tool_config_widget_helper.h b/krita/ui/tool/kis_selection_tool_config_widget_helper.h --- a/krita/ui/tool/kis_selection_tool_config_widget_helper.h +++ b/krita/ui/tool/kis_selection_tool_config_widget_helper.h @@ -21,7 +21,7 @@ #include -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_selection.h" class QKeyEvent; diff --git a/krita/ui/tool/kis_selection_tool_helper.h b/krita/ui/tool/kis_selection_tool_helper.h --- a/krita/ui/tool/kis_selection_tool_helper.h +++ b/krita/ui/tool/kis_selection_tool_helper.h @@ -18,7 +18,7 @@ #ifndef KIS_SELECTION_TOOL_HELPER_H #define KIS_SELECTION_TOOL_HELPER_H -#include +#include #include "kundo2magicstring.h" #include "kis_layer.h" diff --git a/krita/ui/tool/kis_shape_tool_helper.h b/krita/ui/tool/kis_shape_tool_helper.h --- a/krita/ui/tool/kis_shape_tool_helper.h +++ b/krita/ui/tool/kis_shape_tool_helper.h @@ -18,7 +18,7 @@ #ifndef KIS_SHAPE_TOOL_HELPER_H #define KIS_SHAPE_TOOL_HELPER_H -#include +#include #include diff --git a/krita/ui/tool/kis_smoothing_options.h b/krita/ui/tool/kis_smoothing_options.h --- a/krita/ui/tool/kis_smoothing_options.h +++ b/krita/ui/tool/kis_smoothing_options.h @@ -20,7 +20,7 @@ #include #include -#include +#include diff --git a/krita/ui/tool/kis_tool.h b/krita/ui/tool/kis_tool.h --- a/krita/ui/tool/kis_tool.h +++ b/krita/ui/tool/kis_tool.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/krita/ui/tool/kis_tool_freehand.h b/krita/ui/tool/kis_tool_freehand.h --- a/krita/ui/tool/kis_tool_freehand.h +++ b/krita/ui/tool/kis_tool_freehand.h @@ -27,7 +27,7 @@ #include "kis_distance_information.h" #include "kis_smoothing_options.h" -#include "krita_export.h" +#include "kritaui_export.h" class KoPointerEvent; class KoCanvasBase; diff --git a/krita/ui/tool/kis_tool_freehand_helper.h b/krita/ui/tool/kis_tool_freehand_helper.h --- a/krita/ui/tool/kis_tool_freehand_helper.h +++ b/krita/ui/tool/kis_tool_freehand_helper.h @@ -22,7 +22,7 @@ #include #include "kis_types.h" -#include "krita_export.h" +#include "kritaui_export.h" #include "kis_paint_information.h" #include "strokes/freehand_stroke.h" #include "kis_default_bounds.h" diff --git a/krita/ui/tool/kis_tool_paint.h b/krita/ui/tool/kis_tool_paint.h --- a/krita/ui/tool/kis_tool_paint.h +++ b/krita/ui/tool/kis_tool_paint.h @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/krita/ui/tool/kis_tool_shape.h b/krita/ui/tool/kis_tool_shape.h --- a/krita/ui/tool/kis_tool_shape.h +++ b/krita/ui/tool/kis_tool_shape.h @@ -20,7 +20,7 @@ #define KIS_TOOL_SHAPE_H_ -#include +#include #include #include diff --git a/krita/ui/tool/kis_tool_utils.h b/krita/ui/tool/kis_tool_utils.h --- a/krita/ui/tool/kis_tool_utils.h +++ b/krita/ui/tool/kis_tool_utils.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace KisToolUtils { diff --git a/krita/ui/widgets/kis_categorized_list_view.h b/krita/ui/widgets/kis_categorized_list_view.h --- a/krita/ui/widgets/kis_categorized_list_view.h +++ b/krita/ui/widgets/kis_categorized_list_view.h @@ -19,7 +19,7 @@ #ifndef KIS_CATEGORIZED_LIST_VIEW_H_ #define KIS_CATEGORIZED_LIST_VIEW_H_ -#include +#include #include #include diff --git a/krita/ui/widgets/kis_channelflags_widget.h b/krita/ui/widgets/kis_channelflags_widget.h --- a/krita/ui/widgets/kis_channelflags_widget.h +++ b/krita/ui/widgets/kis_channelflags_widget.h @@ -20,7 +20,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include #include diff --git a/krita/ui/widgets/kis_cmb_composite.h b/krita/ui/widgets/kis_cmb_composite.h --- a/krita/ui/widgets/kis_cmb_composite.h +++ b/krita/ui/widgets/kis_cmb_composite.h @@ -23,7 +23,7 @@ #define KIS_COMPOSITEOP_WIDGETS_H_ #include -#include +#include #include "kis_categorized_list_view.h" class KAction; diff --git a/krita/ui/widgets/kis_cmb_idlist.h b/krita/ui/widgets/kis_cmb_idlist.h --- a/krita/ui/widgets/kis_cmb_idlist.h +++ b/krita/ui/widgets/kis_cmb_idlist.h @@ -24,7 +24,7 @@ #include #include -#include +#include /** * A combobox that is associated with a list of KoID's. The diff --git a/krita/ui/widgets/kis_color_space_selector.h b/krita/ui/widgets/kis_color_space_selector.h --- a/krita/ui/widgets/kis_color_space_selector.h +++ b/krita/ui/widgets/kis_color_space_selector.h @@ -21,7 +21,7 @@ #define _KIS_COLOR_SPACE_SELECTOR_H_ #include -#include +#include class KoID; class KoColorSpace; diff --git a/krita/ui/widgets/kis_curve_widget.h b/krita/ui/widgets/kis_curve_widget.h --- a/krita/ui/widgets/kis_curve_widget.h +++ b/krita/ui/widgets/kis_curve_widget.h @@ -31,7 +31,7 @@ #include #include -#include +#include class QSpinBox; class KisCubicCurve; diff --git a/krita/ui/widgets/kis_double_widget.h b/krita/ui/widgets/kis_double_widget.h --- a/krita/ui/widgets/kis_double_widget.h +++ b/krita/ui/widgets/kis_double_widget.h @@ -24,7 +24,7 @@ #include #include -#include +#include class QHBoxLayout; class QDoubleSpinBox; diff --git a/krita/ui/widgets/kis_floating_message.h b/krita/ui/widgets/kis_floating_message.h --- a/krita/ui/widgets/kis_floating_message.h +++ b/krita/ui/widgets/kis_floating_message.h @@ -31,7 +31,7 @@ #include #include -#include +#include /** * @brief The KisFloatingMessage class shows the given message in a semi-transparent diff --git a/krita/ui/widgets/kis_gradient_slider.h b/krita/ui/widgets/kis_gradient_slider.h --- a/krita/ui/widgets/kis_gradient_slider.h +++ b/krita/ui/widgets/kis_gradient_slider.h @@ -28,7 +28,7 @@ #include #include -#include +#include class KRITAUI_EXPORT KisGradientSlider : public QWidget { diff --git a/krita/ui/widgets/kis_multi_bool_filter_widget.h b/krita/ui/widgets/kis_multi_bool_filter_widget.h --- a/krita/ui/widgets/kis_multi_bool_filter_widget.h +++ b/krita/ui/widgets/kis_multi_bool_filter_widget.h @@ -24,7 +24,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include class KisPropertiesConfiguration; diff --git a/krita/ui/widgets/kis_multi_double_filter_widget.h b/krita/ui/widgets/kis_multi_double_filter_widget.h --- a/krita/ui/widgets/kis_multi_double_filter_widget.h +++ b/krita/ui/widgets/kis_multi_double_filter_widget.h @@ -22,7 +22,7 @@ #include #include #include -#include "krita_export.h" +#include "kritaui_export.h" class KisDelayedActionDoubleInput : public KDoubleNumInput { diff --git a/krita/ui/widgets/kis_multi_integer_filter_widget.h b/krita/ui/widgets/kis_multi_integer_filter_widget.h --- a/krita/ui/widgets/kis_multi_integer_filter_widget.h +++ b/krita/ui/widgets/kis_multi_integer_filter_widget.h @@ -21,7 +21,7 @@ #include #include -#include "krita_export.h" +#include "kritaui_export.h" #include #include diff --git a/krita/ui/widgets/kis_multipliers_double_slider_spinbox.h b/krita/ui/widgets/kis_multipliers_double_slider_spinbox.h --- a/krita/ui/widgets/kis_multipliers_double_slider_spinbox.h +++ b/krita/ui/widgets/kis_multipliers_double_slider_spinbox.h @@ -22,7 +22,7 @@ #include -#include +#include class KisDoubleSliderSpinBox; diff --git a/krita/ui/widgets/kis_paintop_list_widget.h b/krita/ui/widgets/kis_paintop_list_widget.h --- a/krita/ui/widgets/kis_paintop_list_widget.h +++ b/krita/ui/widgets/kis_paintop_list_widget.h @@ -21,7 +21,7 @@ #ifndef KIS_PAINTOP_LIST_WIDGET_H_ #define KIS_PAINTOP_LIST_WIDGET_H_ -#include +#include #include "kis_categorized_list_view.h" class KisPaintOpFactory; diff --git a/krita/ui/widgets/kis_paintop_presets_chooser_popup.h b/krita/ui/widgets/kis_paintop_presets_chooser_popup.h --- a/krita/ui/widgets/kis_paintop_presets_chooser_popup.h +++ b/krita/ui/widgets/kis_paintop_presets_chooser_popup.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include "kis_paintop_preset.h" class KoResource; diff --git a/krita/ui/widgets/kis_pattern_chooser.h b/krita/ui/widgets/kis_pattern_chooser.h --- a/krita/ui/widgets/kis_pattern_chooser.h +++ b/krita/ui/widgets/kis_pattern_chooser.h @@ -19,7 +19,7 @@ #define KIS_PATTERN_CHOOSER_H_ #include -#include +#include class QLabel; class KoResourceItemChooser; diff --git a/krita/ui/widgets/kis_popup_button.h b/krita/ui/widgets/kis_popup_button.h --- a/krita/ui/widgets/kis_popup_button.h +++ b/krita/ui/widgets/kis_popup_button.h @@ -22,7 +22,7 @@ #include -#include +#include /** * This class is a convenience class for a button that diff --git a/krita/ui/widgets/kis_progress_widget.h b/krita/ui/widgets/kis_progress_widget.h --- a/krita/ui/widgets/kis_progress_widget.h +++ b/krita/ui/widgets/kis_progress_widget.h @@ -26,7 +26,7 @@ #include -#include "krita_export.h" +#include "kritaui_export.h" class KoProgressUpdater; class QToolButton; diff --git a/krita/ui/widgets/kis_scratch_pad.h b/krita/ui/widgets/kis_scratch_pad.h --- a/krita/ui/widgets/kis_scratch_pad.h +++ b/krita/ui/widgets/kis_scratch_pad.h @@ -29,7 +29,7 @@ #include #include -#include +#include class QColor; diff --git a/krita/ui/widgets/kis_selection_options.h b/krita/ui/widgets/kis_selection_options.h --- a/krita/ui/widgets/kis_selection_options.h +++ b/krita/ui/widgets/kis_selection_options.h @@ -21,7 +21,7 @@ #include -#include "krita_export.h" +#include "kritaui_export.h" #include "ui_wdgselectionoptions.h" diff --git a/krita/ui/widgets/kis_slider_spin_box.h b/krita/ui/widgets/kis_slider_spin_box.h --- a/krita/ui/widgets/kis_slider_spin_box.h +++ b/krita/ui/widgets/kis_slider_spin_box.h @@ -23,7 +23,7 @@ #include #include -#include +#include class KisAbstractSliderSpinBoxPrivate; class KisSliderSpinBoxPrivate; diff --git a/krita/ui/widgets/kis_tool_button.h b/krita/ui/widgets/kis_tool_button.h --- a/krita/ui/widgets/kis_tool_button.h +++ b/krita/ui/widgets/kis_tool_button.h @@ -20,7 +20,7 @@ #define KIS_TOOL_BUTTON_H #include -#include +#include /** This class exists to work around a bug in QToolButton when in * MenuPopupButton mode. The correct (mouse) behavior is to display diff --git a/krita/ui/widgets/kis_url_requester.h b/krita/ui/widgets/kis_url_requester.h --- a/krita/ui/widgets/kis_url_requester.h +++ b/krita/ui/widgets/kis_url_requester.h @@ -19,7 +19,7 @@ #ifndef KIS_URL_REQUESTER_H #define KIS_URL_REQUESTER_H -#include "krita_export.h" +#include "kritaui_export.h" #include #include diff --git a/krita/ui/widgets/kis_widget_chooser.h b/krita/ui/widgets/kis_widget_chooser.h --- a/krita/ui/widgets/kis_widget_chooser.h +++ b/krita/ui/widgets/kis_widget_chooser.h @@ -19,7 +19,7 @@ #ifndef H_KIS_WIDGET_CHOOSER_H_ #define H_KIS_WIDGET_CHOOSER_H_ -#include +#include #include #include #include diff --git a/krita/ui/widgets/squeezedcombobox.h b/krita/ui/widgets/squeezedcombobox.h --- a/krita/ui/widgets/squeezedcombobox.h +++ b/krita/ui/widgets/squeezedcombobox.h @@ -31,7 +31,7 @@ #include #include -#include +#include class SqueezedComboBox; diff --git a/libs/basicflakes/CMakeLists.txt b/libs/basicflakes/CMakeLists.txt --- a/libs/basicflakes/CMakeLists.txt +++ b/libs/basicflakes/CMakeLists.txt @@ -16,19 +16,21 @@ add_library(basicflakes SHARED ${basicflakes_LIB_SRCS}) +generate_export_header(basicflakes) target_link_libraries(basicflakes kowidgets flake pigmentcms) set_target_properties(basicflakes PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL basicflakes_EXPORTS ) install(TARGETS basicflakes ${INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES tools/KoCreatePathTool.h tools/KoPencilTool.h - basicflakes_export.h + ${CMAKE_CURRENT_BINARY_DIR}/basicflakes_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/calligra diff --git a/libs/basicflakes/basicflakes_export.h b/libs/basicflakes/basicflakes_export.h deleted file mode 100644 --- a/libs/basicflakes/basicflakes_export.h +++ /dev/null @@ -1,38 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2006 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef BASICFLAKES_EXPORT_H -#define BASICFLAKES_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -#ifndef BASICFLAKES_EXPORT -# if defined(MAKE_BASICFLAKES_LIB) -/* We are building this library */ -# define BASICFLAKES_EXPORT KDE_EXPORT -# define BASICFLAKES_TEST_EXPORT KDE_EXPORT -# else -/* We are using this library */ -# define BASICFLAKES_EXPORT KDE_IMPORT -# define BASICFLAKES_TEST_EXPORT KDE_IMPORT -# endif -#endif - -#endif diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt --- a/libs/flake/CMakeLists.txt +++ b/libs/flake/CMakeLists.txt @@ -218,6 +218,7 @@ ) add_library(flake SHARED ${flake_SRCS}) +generate_export_header(flake BASE_NAME flake) target_link_libraries(flake pigmentcms kowidgetutils koodf Qt5::Svg) target_link_libraries(flake LINK_INTERFACE_LIBRARIES pigmentcms kowidgetutils koodf) @@ -230,6 +231,7 @@ set_target_properties(flake PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL flake_EXPORTS ) ########### install files ############### @@ -247,7 +249,7 @@ install( FILES - flake_export.h + ${CMAKE_CURRENT_BINARY_DIR}/flake_export.h KoCanvasBase.h KoCanvasController.h KoCanvasControllerWidget.h diff --git a/libs/flake/KoDragOdfSaveHelper.h b/libs/flake/KoDragOdfSaveHelper.h --- a/libs/flake/KoDragOdfSaveHelper.h +++ b/libs/flake/KoDragOdfSaveHelper.h @@ -21,6 +21,7 @@ #define KODRAGODFSAVEHELPER_H #include "flake_export.h" +#include class KoShapeSavingContext; class KoXmlWriter; diff --git a/libs/flake/KoEventAction.h b/libs/flake/KoEventAction.h --- a/libs/flake/KoEventAction.h +++ b/libs/flake/KoEventAction.h @@ -24,6 +24,7 @@ #include "KoXmlReaderForward.h" class KoShapeLoadingContext; class KoShapeSavingContext; +class QString; /** * This is the base class for actions that are executed on events. diff --git a/libs/flake/KoFilterEffectFactoryBase.h b/libs/flake/KoFilterEffectFactoryBase.h --- a/libs/flake/KoFilterEffectFactoryBase.h +++ b/libs/flake/KoFilterEffectFactoryBase.h @@ -24,6 +24,7 @@ class KoFilterEffect; class KoFilterEffectConfigWidgetBase; +class QString; /// API docs go here class FLAKE_EXPORT KoFilterEffectFactoryBase diff --git a/libs/flake/KoFilterEffectLoadingContext.h b/libs/flake/KoFilterEffectLoadingContext.h --- a/libs/flake/KoFilterEffectLoadingContext.h +++ b/libs/flake/KoFilterEffectLoadingContext.h @@ -21,6 +21,7 @@ #define KOFILTEREFFECTLOADINGCONTEXT_H #include "flake_export.h" +#include class QRectF; class QString; diff --git a/libs/flake/KoFilterEffectRenderContext.h b/libs/flake/KoFilterEffectRenderContext.h --- a/libs/flake/KoFilterEffectRenderContext.h +++ b/libs/flake/KoFilterEffectRenderContext.h @@ -21,6 +21,7 @@ #define KOFILTEREFFECTRENDERCONTEXT_H #include "flake_export.h" +#include class QRectF; class QPointF; diff --git a/libs/flake/KoPathPoint.h b/libs/flake/KoPathPoint.h --- a/libs/flake/KoPathPoint.h +++ b/libs/flake/KoPathPoint.h @@ -23,6 +23,7 @@ #define KOPATHPOINT_H #include "flake_export.h" +#include class KoPathShape; class QPointF; diff --git a/libs/flake/KoPathShapeFactory.h b/libs/flake/KoPathShapeFactory.h --- a/libs/flake/KoPathShapeFactory.h +++ b/libs/flake/KoPathShapeFactory.h @@ -28,7 +28,7 @@ class KoShape; /// Factory for path shapes. -class FLAKE_TEST_EXPORT KoPathShapeFactory : public KoShapeFactoryBase +class FLAKE_EXPORT KoPathShapeFactory : public KoShapeFactoryBase { public: /// constructor diff --git a/libs/flake/KoShapeAnchor.h b/libs/flake/KoShapeAnchor.h --- a/libs/flake/KoShapeAnchor.h +++ b/libs/flake/KoShapeAnchor.h @@ -30,6 +30,7 @@ class KoShapeAnchorPrivate; class QTextDocument; class QPointF; +class QString; /** diff --git a/libs/flake/KoShapeBackground.h b/libs/flake/KoShapeBackground.h --- a/libs/flake/KoShapeBackground.h +++ b/libs/flake/KoShapeBackground.h @@ -21,6 +21,7 @@ #define KOSHAPEBACKGROUND_H #include "flake_export.h" +#include class QSizeF; class QPainter; diff --git a/libs/flake/KoShapeShadow.h b/libs/flake/KoShapeShadow.h --- a/libs/flake/KoShapeShadow.h +++ b/libs/flake/KoShapeShadow.h @@ -22,6 +22,7 @@ #define KOSHAPESHADOW_H #include "flake_export.h" +#include class KoShape; class KoGenStyle; diff --git a/libs/flake/KoSnapData.h b/libs/flake/KoSnapData.h --- a/libs/flake/KoSnapData.h +++ b/libs/flake/KoSnapData.h @@ -21,6 +21,7 @@ #define KOSNAPDATA_H #include +#include /** * This class is used to provide additional data to the snap guide. @@ -33,7 +34,7 @@ * So the shape can put that data in form of points or segments into * that class which the snap guide can retrieve and use accordingly. */ -class FLAKE_TEST_EXPORT KoSnapData +class FLAKE_EXPORT KoSnapData { public: KoSnapData(); diff --git a/libs/flake/KoSnapProxy.h b/libs/flake/KoSnapProxy.h --- a/libs/flake/KoSnapProxy.h +++ b/libs/flake/KoSnapProxy.h @@ -32,7 +32,7 @@ /** * This class provides access to different shape related snap targets to snap strategies. */ -class FLAKE_TEST_EXPORT KoSnapProxy +class FLAKE_EXPORT KoSnapProxy { public: KoSnapProxy(KoSnapGuide *snapGuide); diff --git a/libs/flake/KoSnapStrategy.h b/libs/flake/KoSnapStrategy.h --- a/libs/flake/KoSnapStrategy.h +++ b/libs/flake/KoSnapStrategy.h @@ -32,7 +32,7 @@ class QTransform; class QPainterPath; -class FLAKE_TEST_EXPORT KoSnapStrategy +class FLAKE_EXPORT KoSnapStrategy { public: KoSnapStrategy(KoSnapGuide::Strategy type); @@ -62,7 +62,7 @@ }; /// snaps to x- or y-coordinates of path points -class FLAKE_TEST_EXPORT OrthogonalSnapStrategy : public KoSnapStrategy +class FLAKE_EXPORT OrthogonalSnapStrategy : public KoSnapStrategy { public: OrthogonalSnapStrategy(); @@ -74,16 +74,16 @@ }; /// snaps to path points -class FLAKE_TEST_EXPORT NodeSnapStrategy : public KoSnapStrategy +class FLAKE_EXPORT NodeSnapStrategy : public KoSnapStrategy { public: NodeSnapStrategy(); virtual bool snap(const QPointF &mousePosition, KoSnapProxy * proxy, qreal maxSnapDistance); virtual QPainterPath decoration(const KoViewConverter &converter) const; }; /// snaps extension lines of path shapes -class FLAKE_TEST_EXPORT ExtensionSnapStrategy : public KoSnapStrategy +class FLAKE_EXPORT ExtensionSnapStrategy : public KoSnapStrategy { friend class TestSnapStrategy; public: @@ -98,25 +98,25 @@ }; /// snaps to intersections of shapes -class FLAKE_TEST_EXPORT IntersectionSnapStrategy : public KoSnapStrategy +class FLAKE_EXPORT IntersectionSnapStrategy : public KoSnapStrategy { public: IntersectionSnapStrategy(); virtual bool snap(const QPointF &mousePosition, KoSnapProxy * proxy, qreal maxSnapDistance); virtual QPainterPath decoration(const KoViewConverter &converter) const; }; /// snaps to the canvas grid -class FLAKE_TEST_EXPORT GridSnapStrategy : public KoSnapStrategy +class FLAKE_EXPORT GridSnapStrategy : public KoSnapStrategy { public: GridSnapStrategy(); virtual bool snap(const QPointF &mousePosition, KoSnapProxy * proxy, qreal maxSnapDistance); virtual QPainterPath decoration(const KoViewConverter &converter) const; }; /// snaps to shape bounding boxes -class FLAKE_TEST_EXPORT BoundingBoxSnapStrategy : public KoSnapStrategy +class FLAKE_EXPORT BoundingBoxSnapStrategy : public KoSnapStrategy { friend class TestSnapStrategy; public: @@ -129,7 +129,7 @@ }; /// snaps to line guides -class FLAKE_TEST_EXPORT LineGuideSnapStrategy : public KoSnapStrategy +class FLAKE_EXPORT LineGuideSnapStrategy : public KoSnapStrategy { public: LineGuideSnapStrategy(); diff --git a/libs/flake/KoViewConverter.h b/libs/flake/KoViewConverter.h --- a/libs/flake/KoViewConverter.h +++ b/libs/flake/KoViewConverter.h @@ -21,6 +21,7 @@ #define KOVIEWCONVERTER_H #include "flake_export.h" +#include class QPointF; class QRectF; diff --git a/libs/flake/commands/KoPathControlPointMoveCommand.h b/libs/flake/commands/KoPathControlPointMoveCommand.h --- a/libs/flake/commands/KoPathControlPointMoveCommand.h +++ b/libs/flake/commands/KoPathControlPointMoveCommand.h @@ -29,7 +29,7 @@ /// The undo / redo command for path point moving. -class FLAKE_TEST_EXPORT KoPathControlPointMoveCommand : public KUndo2Command +class FLAKE_EXPORT KoPathControlPointMoveCommand : public KUndo2Command { public: /** diff --git a/libs/flake/commands/KoPathPointRemoveCommand.h b/libs/flake/commands/KoPathPointRemoveCommand.h --- a/libs/flake/commands/KoPathPointRemoveCommand.h +++ b/libs/flake/commands/KoPathPointRemoveCommand.h @@ -30,7 +30,7 @@ class KoPathPointRemoveCommandPrivate; /// The undo / redo command for removing path points. -class FLAKE_TEST_EXPORT KoPathPointRemoveCommand : public KUndo2Command +class FLAKE_EXPORT KoPathPointRemoveCommand : public KUndo2Command { public: /** diff --git a/libs/flake/commands/KoPathPointTypeCommand.h b/libs/flake/commands/KoPathPointTypeCommand.h --- a/libs/flake/commands/KoPathPointTypeCommand.h +++ b/libs/flake/commands/KoPathPointTypeCommand.h @@ -30,7 +30,7 @@ #include "flake_export.h" /// The undo / redo command for changing the path point type. -class FLAKE_TEST_EXPORT KoPathPointTypeCommand : public KoPathBaseCommand +class FLAKE_EXPORT KoPathPointTypeCommand : public KoPathBaseCommand { public: /// The type of the point diff --git a/libs/flake/commands/KoPathSegmentTypeCommand.h b/libs/flake/commands/KoPathSegmentTypeCommand.h --- a/libs/flake/commands/KoPathSegmentTypeCommand.h +++ b/libs/flake/commands/KoPathSegmentTypeCommand.h @@ -29,7 +29,7 @@ #include "flake_export.h" /// The undo / redo command for changing segments to curves/lines -class FLAKE_TEST_EXPORT KoPathSegmentTypeCommand : public KUndo2Command +class FLAKE_EXPORT KoPathSegmentTypeCommand : public KUndo2Command { public: /// Segment Types diff --git a/libs/flake/commands/KoSubpathRemoveCommand.h b/libs/flake/commands/KoSubpathRemoveCommand.h --- a/libs/flake/commands/KoSubpathRemoveCommand.h +++ b/libs/flake/commands/KoSubpathRemoveCommand.h @@ -26,7 +26,7 @@ #include "KoPathShape.h" /// The undo / redo command for removing a subpath -class FLAKE_TEST_EXPORT KoSubpathRemoveCommand : public KUndo2Command +class FLAKE_EXPORT KoSubpathRemoveCommand : public KUndo2Command { public: /** diff --git a/libs/flake/flake_export.h b/libs/flake/flake_export.h deleted file mode 100644 --- a/libs/flake/flake_export.h +++ /dev/null @@ -1,38 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2006 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef FLAKE_EXPORT_H -#define FLAKE_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -#ifndef FLAKE_EXPORT -# if defined(MAKE_FLAKE_LIB) -/* We are building this library */ -# define FLAKE_EXPORT KDE_EXPORT -# define FLAKE_TEST_EXPORT KDE_EXPORT -# else -/* We are using this library */ -# define FLAKE_EXPORT KDE_IMPORT -# define FLAKE_TEST_EXPORT KDE_IMPORT -# endif -#endif - -#endif diff --git a/libs/flake/tools/KoPathTool.h b/libs/flake/tools/KoPathTool.h --- a/libs/flake/tools/KoPathTool.h +++ b/libs/flake/tools/KoPathTool.h @@ -38,7 +38,7 @@ class QAction; /// The tool for editing a KoPathShape or a KoParameterShape -class FLAKE_TEST_EXPORT KoPathTool : public KoToolBase +class FLAKE_EXPORT KoPathTool : public KoToolBase { Q_OBJECT public: diff --git a/libs/flake/tools/KoPathToolSelection.h b/libs/flake/tools/KoPathToolSelection.h --- a/libs/flake/tools/KoPathToolSelection.h +++ b/libs/flake/tools/KoPathToolSelection.h @@ -38,7 +38,7 @@ * This class handles the selection of points. It makes sure * the canvas is repainted when the selection changes. */ -class FLAKE_TEST_EXPORT KoPathToolSelection : public KoToolSelection +class FLAKE_EXPORT KoPathToolSelection : public KoToolSelection { Q_OBJECT diff --git a/libs/kokross/CMakeLists.txt b/libs/kokross/CMakeLists.txt --- a/libs/kokross/CMakeLists.txt +++ b/libs/kokross/CMakeLists.txt @@ -27,5 +27,6 @@ set_target_properties(kokross PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL MAKE_KOKROSS_LIB ) install(TARGETS kokross ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/libs/kopageapp/CMakeLists.txt b/libs/kopageapp/CMakeLists.txt --- a/libs/kopageapp/CMakeLists.txt +++ b/libs/kopageapp/CMakeLists.txt @@ -70,7 +70,7 @@ install(TARGETS kopageapp ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES - kopageapp_export.h + ${CMAKE_CURRENT_BINARY_DIR}/kopageapp_export.h KoPACanvas.h KoPACanvasItem.h KoPACanvasBase.h diff --git a/libs/kotext/CMakeLists.txt b/libs/kotext/CMakeLists.txt --- a/libs/kotext/CMakeLists.txt +++ b/libs/kotext/CMakeLists.txt @@ -132,6 +132,7 @@ endif() add_library(kotext SHARED ${kotext_LIB_SRCS}) +generate_export_header(kotext BASE_NAME kotext) target_link_libraries(kotext flake) if( SHOULD_BUILD_FEATURE_RDF ) @@ -150,6 +151,7 @@ set_target_properties(kotext PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kotext_EXPORTS ) install(TARGETS kotext ${INSTALL_TARGETS_DEFAULT_ARGS}) @@ -159,7 +161,7 @@ install( FILES - kotext_export.h + ${CMAKE_CURRENT_BINARY_DIR}/kotext_export.h KoDocumentRdfBase.h KoInlineObject.h KoTextEditor.h diff --git a/libs/kotext/KoTextDebug.h b/libs/kotext/KoTextDebug.h --- a/libs/kotext/KoTextDebug.h +++ b/libs/kotext/KoTextDebug.h @@ -89,7 +89,7 @@ * * @sa dumpDocument(), dumpFrame(), dumpBlock() */ -class KOTEXT_TEST_EXPORT KoTextDebug +class KOTEXT_EXPORT KoTextDebug { public: /** diff --git a/libs/kotext/kotext_export.h b/libs/kotext/kotext_export.h deleted file mode 100644 --- a/libs/kotext/kotext_export.h +++ /dev/null @@ -1,61 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2006 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KOTEXT_EXPORT_H -#define KOTEXT_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */ -#if defined _WIN32 || defined _WIN64 - -#ifndef KOTEXT_EXPORT -# if defined(MAKE_KOTEXT_LIB) -/* We are building this library */ -# define KOTEXT_EXPORT KDE_EXPORT -# else -/* We are using this library */ -# define KOTEXT_EXPORT KDE_IMPORT -# endif -#endif - -#else /* UNIX */ - -#define KOTEXT_EXPORT KDE_EXPORT - -#endif - -/* Now the same for KOTEXT_TEST_EXPORT, if compiling with unit tests enabled */ - -#ifdef COMPILING_TESTS -#if defined _WIN32 || defined _WIN64 -# if defined(MAKE_KOTEXT_LIB) -# define KOTEXT_TEST_EXPORT KDE_EXPORT -# else -# define KOTEXT_TEST_EXPORT KDE_IMPORT -# endif -# else /* not windows */ -# define KOTEXT_TEST_EXPORT KDE_EXPORT -# endif -#else /* not compiling tests */ -# define KOTEXT_TEST_EXPORT -#endif - -#endif diff --git a/libs/kotext/opendocument/KoTextWriter.h b/libs/kotext/opendocument/KoTextWriter.h --- a/libs/kotext/opendocument/KoTextWriter.h +++ b/libs/kotext/opendocument/KoTextWriter.h @@ -28,6 +28,7 @@ class QTextBlock; class QTextBlockFormat; class QTextCharFormat; +class QString; class KoDocumentRdfBase; diff --git a/libs/main/CMakeLists.txt b/libs/main/CMakeLists.txt --- a/libs/main/CMakeLists.txt +++ b/libs/main/CMakeLists.txt @@ -108,6 +108,7 @@ set_target_properties(komain PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL MAKE_KOMAIN_LIB ) install(TARGETS komain ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt --- a/libs/pigment/CMakeLists.txt +++ b/libs/pigment/CMakeLists.txt @@ -151,6 +151,7 @@ set_target_properties(pigmentcms PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL pigmentcms_EXPORTS ) install(TARGETS pigmentcms ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/libs/textlayout/CMakeLists.txt b/libs/textlayout/CMakeLists.txt --- a/libs/textlayout/CMakeLists.txt +++ b/libs/textlayout/CMakeLists.txt @@ -32,12 +32,14 @@ add_library(kotextlayout SHARED ${textlayout_LIB_SRCS}) +generate_export_header(kotextlayout BASE_NAME kotextlayout) target_link_libraries(kotextlayout kotext) target_link_libraries(kotextlayout LINK_INTERFACE_LIBRARIES kotext) set_target_properties(kotextlayout PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kotextlayout_EXPORTS ) install(TARGETS kotextlayout ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/libs/vectorimage/CMakeLists.txt b/libs/vectorimage/CMakeLists.txt --- a/libs/vectorimage/CMakeLists.txt +++ b/libs/vectorimage/CMakeLists.txt @@ -32,5 +32,6 @@ set_target_properties(kovectorimage PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kovectorimage_EXPORTS ) install(TARGETS kovectorimage ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/libs/vectorimage/kovectorimage_export.h b/libs/vectorimage/kovectorimage_export.h deleted file mode 100644 --- a/libs/vectorimage/kovectorimage_export.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - visibility management for some symbols - - Copyright 2008 Brad Hards - Copyright 2009 Inge Wallin - - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Library General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) any - later version. - - This library is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU Library General Public License for more - details. - - You should have received a copy of the GNU Library General Public License along - with this library; see the file COPYING.LIB. If not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#ifndef KOVECTORIMAGE_EXPORT_H -#define KOVECTORIMAGE_EXPORT_H - -#include - -/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */ -#if defined _WIN32 || defined _WIN64 - -# ifndef KOVECTORIMAGE_EXPORT -# if defined(KDELIBS_STATIC_LIBS) - /* No export/import for static libraries */ -# define KOVECTORIMAGE_EXPORT -# elif defined(MAKE_KOVECTORIMAGE_LIB) -# define KOVECTORIMAGE_EXPORT KDE_EXPORT -# else -# define KOVECTORIMAGE_EXPORT KDE_IMPORT -# endif -# endif -#else /* UNIX */ - -#define KOVECTORIMAGE_EXPORT KDE_EXPORT - -#endif - -#endif diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt --- a/libs/widgets/CMakeLists.txt +++ b/libs/widgets/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories(${KOTEXT_INCLUDES} ${KOODF_INCLUDES} ${PIGMENT_INCLUDES}) include_directories(${CMAKE_SOURCE_DIR}/libs/widgetutils) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) if (LIBATTICA_FOUND) include_directories(${LIBATTICA_INCLUDE_DIR}) endif () @@ -98,6 +99,7 @@ add_library(kowidgets SHARED ${kowidgets_LIB_SRCS}) +generate_export_header(kowidgets BASE_NAME kowidgets) target_link_libraries(kowidgets kotext pigmentcms kowidgetutils) @@ -114,6 +116,7 @@ set_target_properties(kowidgets PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL kowidgets_EXPORTS ) install(TARGETS kowidgets ${INSTALL_TARGETS_DEFAULT_ARGS}) @@ -126,7 +129,7 @@ KoPageLayoutWidget.h KoPagePreviewWidget.h KoPositionSelector.h - kowidgets_export.h + ${CMAKE_CURRENT_BINARY_DIR}/kowidgets_export.h KoZoomAction.h KoZoomController.h KoZoomInput.h diff --git a/libs/widgets/KoTriangleColorSelector.h b/libs/widgets/KoTriangleColorSelector.h --- a/libs/widgets/KoTriangleColorSelector.h +++ b/libs/widgets/KoTriangleColorSelector.h @@ -22,6 +22,7 @@ #include #include "kowidgets_export.h" +#include class KoColor; class KoColorDisplayRendererInterface; diff --git a/libs/widgets/KoZoomMode.h b/libs/widgets/KoZoomMode.h --- a/libs/widgets/KoZoomMode.h +++ b/libs/widgets/KoZoomMode.h @@ -23,7 +23,7 @@ #include #include -#include "kowidgets_export.h" +#include /** * The ZoomMode container diff --git a/libs/widgets/kowidgets_export.h b/libs/widgets/kowidgets_export.h deleted file mode 100644 --- a/libs/widgets/kowidgets_export.h +++ /dev/null @@ -1,45 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2006 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KOWIDGETS_EXPORT_H -#define KOWIDGETS_EXPORT_H - -/* needed for KDE_EXPORT and KDE_IMPORT macros */ -#include - -/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */ -#if defined _WIN32 || defined _WIN64 - -#ifndef KOWIDGETS_EXPORT -# if defined(MAKE_KOWIDGETS_LIB) -/* We are building this library */ -# define KOWIDGETS_EXPORT KDE_EXPORT -# else -/* We are using this library */ -# define KOWIDGETS_EXPORT KDE_IMPORT -# endif -#endif - -#else /* UNIX */ - -#define KOWIDGETS_EXPORT KDE_EXPORT - -#endif - -#endif diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt --- a/sheets/CMakeLists.txt +++ b/sheets/CMakeLists.txt @@ -291,17 +291,20 @@ add_library(calligrasheetsodf SHARED ${calligrasheetsodf_LIB_SRCS}) +generate_export_header(calligrasheetsodf BASE_NAME calligrasheetsodf) target_link_libraries(calligrasheetsodf komain) target_link_libraries(calligrasheetsodf LINK_INTERFACE_LIBRARIES komain) set_target_properties(calligrasheetsodf PROPERTIES - VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL calligrasheedsodf_EXPORTS ) install(TARGETS calligrasheetsodf ${INSTALL_TARGETS_DEFAULT_ARGS}) add_library(calligrasheetscommon SHARED ${calligrasheetscommon_LIB_SRCS}) +generate_export_header(calligrasheetscommon BASE_NAME calligrasheetscommon) target_link_libraries(calligrasheetscommon komain @@ -317,18 +320,22 @@ target_link_libraries(calligrasheetscommon LINK_INTERFACE_LIBRARIES komain calligrasheetsodf ) set_target_properties(calligrasheetscommon PROPERTIES - VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} + DEFINE_SYMBOL calligrasheetscommon_EXPORTS ) install(TARGETS calligrasheetscommon ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### set (calligrasheetspart_PART_SRCS part/Factory_init.cpp ) add_library(calligrasheetspart MODULE ${calligrasheetspart_PART_SRCS}) +generate_export_header(calligrasheetspart BASE_NAME calligrasheetspart) + kcoreaddons_desktop_to_json(calligrasheetspart sheetspart.desktop) target_link_libraries(calligrasheetspart calligrasheetscommon ) +set_target_properties(calligrasheetspart PROPERTIES DEFINE_SYMBOL calligrasheetspart_EXPORTS) install(TARGETS calligrasheetspart DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR}) ########### install files ############### @@ -342,7 +349,7 @@ install( FILES - calligra_sheets_export.h + ${CMAKE_CURRENT_BINARY_DIR}/calligra_sheets_export.h calligra_sheets_limits.h Cell.h