Commit 8a9da79c authored by Boudewijn Rempt's avatar Boudewijn Rempt

remove the kocolorwidgets library now that pigmentcms is de-lmcsified.

svn path=/trunk/koffice/; revision=1069462
parent 17360a52
......@@ -35,7 +35,6 @@ IF (TINY)
set(SHOULD_BUILD_KWORD TRUE)
set(SHOULD_BUILD_KPRESENTER TRUE)
set(SHOULD_BUILD_KSPREAD TRUE)
set(SHOULD_BUILD_PIGMENT FALSE)
set(SHOULD_BUILD_KARBON FALSE)
set(SHOULD_BUILD_KRITA FALSE)
set(SHOULD_BUILD_KEXI FALSE)
......@@ -50,7 +49,6 @@ ELSE(TINY)
set(SHOULD_BUILD_KWORD TRUE)
set(SHOULD_BUILD_KPRESENTER TRUE)
set(SHOULD_BUILD_KSPREAD TRUE)
set(SHOULD_BUILD_PIGMENT TRUE)
set(SHOULD_BUILD_KARBON TRUE)
set(SHOULD_BUILD_KRITA TRUE)
set(SHOULD_BUILD_KEXI TRUE)
......@@ -103,39 +101,16 @@ endif (APPLE)
################################
#################################
## Check wich pigment to build ##
## Check for OpenEXR ##
#################################
################################
IF(SHOULD_BUILD_PIGMENT)
SET(NO_PIGMENT FALSE)
macro_optional_find_package(OpenEXR)
macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
configure_file(config-openexr.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-openexr.h )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config-openexr.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
macro_optional_find_package(OpenEXR)
macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
configure_file(config-openexr.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-openexr.h )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config-openexr.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
include_directories(${CMAKE_SOURCE_DIR}/libs/pigment)
find_package(LCMS REQUIRED)
set(REQUIRED_LCMS_VERSION 118)
if(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
# FULL_PIGMENT is the most desirable state, we can compile Krita!
set(HAVE_REQUIRED_LCMS_VERSION TRUE)
set(BUILD_pigment TRUE)
set(HAVE_LCMS TRUE)
else(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
message( FATAL_ERROR "Old LCMS version found, upgrade to 1.18.")
set(BUILD_pigment FALSE)
set(HAVE_LCMS FALSE)
endif(LCMS_FOUND AND NOT LCMS_VERSION LESS ${REQUIRED_LCMS_VERSION})
macro_log_feature(HAVE_REQUIRED_LCMS_VERSION "LittleCMS" "Color management engine" "http://www.littlecms.com" FALSE "1.18" "Required by for color management and for Krita")
ELSE(SHOULD_BUILD_PIGMENT)
SET(NO_PIGMENT TRUE)
add_definitions("-DNO_PIGMENT")
ENDIF(SHOULD_BUILD_PIGMENT)
###########################
############################
......@@ -277,28 +252,24 @@ set(KOODF_INCLUDES ${CMAKE_SOURCE_DIR}/libs/odf
${KOBASE_INCLUDES}
${KOSTORE_INCLUDES})
# flake depends on koodf
set(FLAKE_INCLUDES ${CMAKE_SOURCE_DIR}/libs/flake
${KOODF_INCLUDES}
${KOPLUGIN_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/flake/commands
${CMAKE_SOURCE_DIR}/libs/flake/tools
${CMAKE_BINARY_DIR}/libs/flake)
if (NOT NO_PIGMENT)
# pigment depends on koplugin and lcms
set(PIGMENT_INCLUDES ${KOPLUGIN_INCLUDES}
set(PIGMENT_INCLUDES ${KOPLUGIN_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/pigment
${CMAKE_SOURCE_DIR}/libs/pigment/compositeops
${CMAKE_SOURCE_DIR}/libs/pigment/resources
${QT_INCLUDES}
${KDE4_INCLUDES}
${LCMS_INCLUDE_DIR} )
endif (NOT NO_PIGMENT)
if(BUILD_pigment)
set(FLAKE_INCLUDES ${FLAKE_INCLUDES} ${PIGMENT_INCLUDES})
endif(BUILD_pigment)
# flake depends on koodf and pigment
set(FLAKE_INCLUDES ${CMAKE_SOURCE_DIR}/libs/flake
${KOODF_INCLUDES}
${KOPLUGIN_INCLUDES}
${PIGMENT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/flake/commands
${CMAKE_SOURCE_DIR}/libs/flake/tools
${CMAKE_BINARY_DIR}/libs/flake)
# KoText depends on koplugin, odf
set(KOTEXT_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kotext
......@@ -313,7 +284,6 @@ set(KOTEXT_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kotext
set(KOMAIN_INCLUDES ${KDE4_INCLUDES}
${KOTEXT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/widgets
${CMAKE_SOURCE_DIR}/libs/kocolorwidgets
${CMAKE_SOURCE_DIR}/libs/main
${CMAKE_SOURCE_DIR}/libs/main/config)
......@@ -337,9 +307,7 @@ set(KOPAGEAPP_INCLUDES ${CMAKE_SOURCE_DIR}/libs/kopageapp ${CMAKE_SOURCE_DIR}/li
#
### Karbon: pigment
if (NOT BUILD_pigment)
set(SHOULD_BUILD_KARBON FALSE)
endif (NOT BUILD_pigment)
set(SHOULD_BUILD_KARBON FALSE)
### KSpread: eigen2
if(NOT EIGEN2_FOUND)
......@@ -357,9 +325,9 @@ if(NOT BZIP2_EXECUTABLE )
endif(NOT BZIP2_EXECUTABLE )
### Krita: pigment, blitz, eigen2, exiv2
if(NOT BUILD_pigment OR NOT BLITZ_FOUND OR NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT KDE4_3_0)
if(NOT BLITZ_FOUND OR NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT KDE4_3_0)
set(SHOULD_BUILD_KRITA FALSE)
endif(NOT BUILD_pigment OR NOT BLITZ_FOUND OR NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT KDE4_3_0)
endif(NOT BLITZ_FOUND OR NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT KDE4_3_0)
### KPlato: kdepimlibs
if(NOT KdepimLibs_FOUND)
......
......@@ -199,7 +199,7 @@ kde4_add_ui_files(kritaui_LIB_SRCS
kde4_add_library(kritaui SHARED ${kritaui_LIB_SRCS} )
target_link_libraries(kritaui ${KDE4_KDE3SUPPORT_LIBS} ${BLITZ_LIBRARIES} ${KDE4_THREADWEAVER_LIBRARIES} kritaimage komain kocolorwidgets ${PNG_LIBRARIES} ${EXIV2_LIBRARIES})
target_link_libraries(kritaui ${KDE4_KDE3SUPPORT_LIBS} ${BLITZ_LIBRARIES} ${KDE4_THREADWEAVER_LIBRARIES} kritaimage komain kowidgets ${PNG_LIBRARIES} ${EXIV2_LIBRARIES})
if(HAVE_OPENGL)
target_link_libraries(kritaui ${OPENGL_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENEXR_LIBRARIES})
......
......@@ -5,10 +5,7 @@ add_subdirectory( koplugin )
add_subdirectory( odf )
add_subdirectory( kotext )
add_subdirectory( flake )
if (NOT NO_PIGMENT)
add_subdirectory( pigment )
add_subdirectory( kocolorwidgets )
endif (NOT NO_PIGMENT)
add_subdirectory( pigment )
add_subdirectory( main )
if (SHOULD_BUILD_SCRIPTING)
add_subdirectory( kokross )
......
......@@ -178,15 +178,9 @@ kde4_add_ui_files(flake_SRCS
kde4_add_library(flake SHARED ${flake_SRCS})
if(NOT NO_PIGMENT)
set(EXTRA_LIBS pigmentcms)
else(NOT NO_PIGMENT)
set(EXTRA_LIBS koplugin)
endif(NOT NO_PIGMENT)
target_link_libraries(flake ${KDE4_KDEUI_LIBS} pigmentcms koodf)
target_link_libraries(flake ${KDE4_KDEUI_LIBS} ${EXTRA_LIBS} koodf)
target_link_libraries(flake LINK_INTERFACE_LIBRARIES ${EXTRA_LIBS} koodf)
target_link_libraries(flake LINK_INTERFACE_LIBRARIES pigmentcms koodf)
if(HAVE_OPENGL)
target_link_libraries(flake ${OPENGL_LIBRARIES} ${QT_QTOPENGL_LIBRARY})
......
/* This file is part of the KDE project
* Copyright (C) 2009 Boudewijn Rempt <boud@valdyas.org>
*
* 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_COLOR_H
#define FLAKE_COLOR_H
// XXX: or do the #ifdef everywhere, as in Qt?
#ifdef NO_PIGMENT
#include <QColor>
class KoColor : public QColor {
public:
QColor toQColor() { return *this; }
QColor toQColor() const { return *this; }
};
Q_DECLARE_METATYPE(KoColor)
#else
# include <KoColor.h>
#endif
#endif
......@@ -29,7 +29,7 @@
#include <KoID.h>
#include "flake_export.h"
#include "FlakeColor.h" // For KoColor
#include <KoColor.h>
class KoShape;
class KoLineBorder;
......
include_directories( ${PIGMENT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/widgets
${CMAKE_SOURCE_DIR}/libs/pigment/resources
${CMAKE_SOURCE_DIR}/libs/kobase
)
set(kocolorwidgets_LIB_SRCS
KoColorPatch.cpp
KoColorPopupAction.cpp
KoColorSetWidget.cpp
KoColorSlider.cpp
KoDualColorButton.cpp
KoEditColorSetDialog.cpp
KoTriangleColorSelector.cpp
KoUniColorChooser.cpp
KoUniColorDialog.cpp
KoXYColorSelector.cpp
KoShadowConfigWidget.cpp
KoIconToolTip.cpp
KoResourceItemChooser.cpp
KoResourceSelector.cpp
KoResourceModel.cpp
KoResourceItemDelegate.cpp
KoResourceItemView.cpp
KoItemToolTip.cpp
KoCheckerBoardPainter.cpp
KoResourceServerAdapter.cpp
KoResourceServerProvider.cpp
)
kde4_add_ui_files( kocolorwidgets_LIB_SRCS
KoEditColorSet.ui
KoShadowConfigWidget.ui
)
kde4_add_library(kocolorwidgets SHARED ${kocolorwidgets_LIB_SRCS})
target_link_libraries(kocolorwidgets pigmentcms kowidgets ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
target_link_libraries(kocolorwidgets LINK_INTERFACE_LIBRARIES pigmentcms kowidgets ${KDE4_KDEUI_LIBS})
set_target_properties(kocolorwidgets PROPERTIES
VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION}
)
install(TARGETS kocolorwidgets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(
FILES
KoColorPatch.h
KoShadowConfigWidget.h
KoColorPopupAction.h
KoColorSetWidget.h
KoColorSlider.h
KoDualColorButton.h
KoEditColorSetDialog.h
KoTriangleColorSelector.h
KoUniColorChooser.h
KoUniColorDialog.h
KoXYColorSelector.h
KoResourceItemChooser.h
KoResourceSelector.h
DESTINATION
${INCLUDE_INSTALL_DIR}
COMPONENT Devel)
/* This file is part of the KDE project
Copyright (C) 2006 David Faure <faure@kde.org>
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 KOCOLORWIDGETS_EXPORT_H
#define KOCOLORWIDGETS_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
#ifndef KOCOLORWIDGETS_EXPORT
# if defined(MAKE_KOCOLORWIDGETS_LIB)
/* We are building this library */
# define KOCOLORWIDGETS_EXPORT KDE_EXPORT
# define KOCOLORWIDGETS_TEST_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KOCOLORWIDGETS_EXPORT KDE_IMPORT
# define KOCOLORWIDGETS_TEST_EXPORT KDE_IMPORT
# endif
#endif
#endif
......@@ -76,18 +76,20 @@ void KoColorSpaceRegistry::init()
d->colorConversionSystem = new KoColorConversionSystem;
d->colorConversionCache = new KoColorConversionCache;
// Create the built-in colorspaces
add(new KoLabColorSpaceFactory());
KoHistogramProducerFactoryRegistry::instance()->add(
new KoBasicHistogramProducerFactory<KoBasicU16HistogramProducer>
(KoID("LABAHISTO", i18n("L*a*b* Histogram")), KoLabColorSpace::colorSpaceId()));
add(new KoRgbU16ColorSpaceFactory());
add(new KoRgbU8ColorSpaceFactory());
KoHistogramProducerFactoryRegistry::instance()->add(
new KoBasicHistogramProducerFactory<KoBasicU8HistogramProducer>
(KoID("RGB8HISTO", i18n("RGB8 Histogram")), KoRgbU8ColorSpace::colorSpaceId()));
// Create the built-in colorspaces
d->alphaCs = new KoAlphaColorSpace();
d->alphaCs->d->deletability = OwnedByRegistryDoNotDelete;
......@@ -112,7 +114,6 @@ KoColorSpaceRegistry::KoColorSpaceRegistry() : d(new Private())
KoColorSpaceRegistry::~KoColorSpaceRegistry()
{
delete d->colorConversionSystem;
foreach(KoColorProfile* profile, d->profileMap) {
delete profile;
......
add_subdirectory( tests )
add_subdirectory( pics )
include_directories(${KOTEXT_INCLUDES})
include_directories(${KOTEXT_INCLUDES} ${PIGMENT_INCLUDES})
set(kowidgets_LIB_SRCS
KoAspectButton.cpp
......@@ -20,16 +20,43 @@ set(kowidgets_LIB_SRCS
KoZoomHandler.cpp
KoZoomMode.cpp
KoDpi.cpp
KoColorPatch.cpp
KoColorPopupAction.cpp
KoColorSetWidget.cpp
KoColorSlider.cpp
KoDualColorButton.cpp
KoEditColorSetDialog.cpp
KoTriangleColorSelector.cpp
KoUniColorChooser.cpp
KoUniColorDialog.cpp
KoXYColorSelector.cpp
KoShadowConfigWidget.cpp
KoIconToolTip.cpp
KoResourceItemChooser.cpp
KoResourceSelector.cpp
KoResourceModel.cpp
KoResourceItemDelegate.cpp
KoResourceItemView.cpp
KoItemToolTip.cpp
KoCheckerBoardPainter.cpp
KoResourceServerAdapter.cpp
KoResourceServerProvider.cpp
)
kde4_add_ui_files( kowidgets_LIB_SRCS
KoCsvImportDialog.ui
KoPageLayoutWidget.ui
KoEditColorSet.ui
KoShadowConfigWidget.ui
)
kde4_add_library(kowidgets SHARED ${kowidgets_LIB_SRCS})
target_link_libraries(kowidgets kotext)
target_link_libraries(kowidgets kotext pigmentcms)
target_link_libraries(kowidgets LINK_INTERFACE_LIBRARIES pigmentcms ${KDE4_KDEUI_LIBS})
set_target_properties(kowidgets PROPERTIES
VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION}
......@@ -51,6 +78,21 @@ install( FILES
KoDpi.h
KoZoomHandler.h
KoZoomMode.h
KoColorPatch.h
KoShadowConfigWidget.h
KoColorPopupAction.h
KoColorSetWidget.h
KoColorSlider.h
KoDualColorButton.h
KoEditColorSetDialog.h
KoTriangleColorSelector.h
KoUniColorChooser.h
KoUniColorDialog.h
KoXYColorSelector.h
KoResourceItemChooser.h
KoResourceSelector.h
DESTINATION
${INCLUDE_INSTALL_DIR}
COMPONENT Devel)
......@@ -22,11 +22,11 @@
#include <QtGui/QPixmap>
#include <QtGui/QColor>
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
class QPainter;
class KOCOLORWIDGETS_EXPORT KoCheckerBoardPainter
class KOWIDGETS_EXPORT KoCheckerBoardPainter
{
public:
KoCheckerBoardPainter( int checkerSize );
......
......@@ -22,12 +22,12 @@
#include <QFrame>
#include <KoColor.h>
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
/**
* The small widget showing the selected color
*/
class KOCOLORWIDGETS_EXPORT KoColorPatch : public QFrame
class KOWIDGETS_EXPORT KoColorPatch : public QFrame
{
Q_OBJECT
public:
......
......@@ -23,7 +23,7 @@
#include <KAction>
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
class KoColor;
......@@ -32,7 +32,7 @@ class KoColor;
* @see KoColorPopupAction
*/
class KOCOLORWIDGETS_EXPORT KoColorPopupAction : public KAction
class KOWIDGETS_EXPORT KoColorPopupAction : public KAction
{
Q_OBJECT
......
......@@ -24,7 +24,7 @@
#include <QWidgetAction>
#include <QFrame>
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
class KoColor;
class KoColorSet;
......@@ -36,7 +36,7 @@ class KoColorSet;
* set plus optionally a checkbox to filter away bad matching colors.
* Some ways to add and remove plus choose another colorset will be added in the future.
*/
class KOCOLORWIDGETS_EXPORT KoColorSetWidget : public QFrame
class KOWIDGETS_EXPORT KoColorSetWidget : public QFrame
{
Q_OBJECT
......
......@@ -21,11 +21,11 @@
#define KO_COLORSLIDER_H
#include <kselector.h>
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
#include <KoColor.h>
class KOCOLORWIDGETS_EXPORT KoColorSlider : public KSelector
class KOWIDGETS_EXPORT KoColorSlider : public KSelector
{
Q_OBJECT
public:
......
......@@ -21,7 +21,7 @@
#ifndef KODUALCOLORBUTTON_H
#define KODUALCOLORBUTTON_H
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
#include <QtGui/QWidget>
......@@ -45,7 +45,7 @@ class KoColor;
*
* @author Daniel M. Duley <mosfet@kde.org>
*/
class KOCOLORWIDGETS_EXPORT KoDualColorButton : public QWidget
class KOWIDGETS_EXPORT KoDualColorButton : public QWidget
{
Q_OBJECT
Q_ENUMS( Selection )
......
......@@ -24,7 +24,7 @@
#include <KDialog>
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
class QGridLayout;
class QScrollArea;
......@@ -72,7 +72,7 @@ private:
* - Save changes to the file
* @see KoColorSetWidget
*/
class KOCOLORWIDGETS_EXPORT KoEditColorSetDialog : public KDialog
class KOWIDGETS_EXPORT KoEditColorSetDialog : public KDialog
{
Q_OBJECT
......
......@@ -25,7 +25,7 @@
#include <QWidget>
#include <QModelIndex>
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
class QButtonGroup;
class QAbstractItemDelegate;
......@@ -37,7 +37,7 @@ class KoResource;
* A widget that contains a KoResourceChooser as well
* as an import/export button
*/
class KOCOLORWIDGETS_EXPORT KoResourceItemChooser : public QWidget
class KOWIDGETS_EXPORT KoResourceItemChooser : public QWidget
{
Q_OBJECT
public:
......
......@@ -20,7 +20,7 @@
#ifndef KORESOURCESELECTOR_H
#define KORESOURCESELECTOR_H
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
#include <QtGui/QComboBox>
class QMouseEvent;
......@@ -30,7 +30,7 @@ class KoResource;
/**
* A custom combobox widget for selecting resource items like gradients or patterns.
*/
class KOCOLORWIDGETS_EXPORT KoResourceSelector : public QComboBox
class KOWIDGETS_EXPORT KoResourceSelector : public QComboBox
{
Q_OBJECT
public:
......
......@@ -37,7 +37,7 @@
#include "KoResource.h"
#include "KoResourceServerObserver.h"
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
#include <KDebug>
......@@ -46,7 +46,7 @@ class KoResource;
/**
* KoResourceServerBase is the base class of all resource servers
*/
class KOCOLORWIDGETS_EXPORT KoResourceServerBase {
class KOWIDGETS_EXPORT KoResourceServerBase {
public:
/**
......
......@@ -23,10 +23,10 @@
#include "KoResourceServer.h"
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
/// The resource server adapter provides a adapter pattern for a templated resource server
class KOCOLORWIDGETS_EXPORT KoAbstractResourceServerAdapter : public QObject
class KOWIDGETS_EXPORT KoAbstractResourceServerAdapter : public QObject
{
Q_OBJECT
public:
......
......@@ -20,7 +20,7 @@
#ifndef KORESOURCESERVEROBSERVER_H
#define KORESOURCESERVEROBSERVER_H
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"
/**
* The KoResourceServerObserver class provides a interface to observe a KoResourceServer.
......
......@@ -22,7 +22,7 @@
#ifndef KORESOURCESERVERPROVIDER_H
#define KORESOURCESERVERPROVIDER_H
#include <kocolorwidgets_export.h>
#include <kowidgets_export.h>
#include <QtCore/QThread>
......@@ -36,7 +36,7 @@
/**
* KoResourceLoaderThread allows threaded loading of the resources of a resource server
*/
class KOCOLORWIDGETS_EXPORT KoResourceLoaderThread : public QThread {
class KOWIDGETS_EXPORT KoResourceLoaderThread : public QThread {
public:
......@@ -60,7 +60,7 @@ private:
/**
* Provides default resource servers for gradients, patterns and palettes
*/
class KOCOLORWIDGETS_EXPORT KoResourceServerProvider : public QObject
class KOWIDGETS_EXPORT KoResourceServerProvider : public QObject
{
Q_OBJECT
......
......@@ -20,14 +20,14 @@
#ifndef SHADOWCONFIGWIDGET_H
#define SHADOWCONFIGWIDGET_H
#include "kocolorwidgets_export.h"
#include "kowidgets_export.h"