Commit 6dd65b07 authored by Cyrille Berger's avatar Cyrille Berger

some headers cleanup

svn path=/trunk/koffice/; revision=621649
parent 7c4c45aa
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "KoBasicHistogramProducers.h"
#include <QString> #include <QString>
#include <klocale.h> #include <klocale.h>
...@@ -25,7 +27,6 @@ ...@@ -25,7 +27,6 @@
#endif #endif
// #include "Ko_global.h" // #include "Ko_global.h"
#include "KoBasicHistogramProducers.h"
#include "KoIntegerMaths.h" #include "KoIntegerMaths.h"
#include "KoChannelInfo.h" #include "KoChannelInfo.h"
#include "KoColorSpace.h" #include "KoColorSpace.h"
......
...@@ -213,3 +213,8 @@ void KoColor::fromKoColor(const KoColor& src) ...@@ -213,3 +213,8 @@ void KoColor::fromKoColor(const KoColor& src)
{ {
src.colorSpace()->convertPixelsTo(src.m_data, m_data, colorSpace(), 1); src.colorSpace()->convertPixelsTo(src.m_data, m_data, colorSpace(), 1);
} }
KoColorProfile * KoColor::profile() const
{
return m_colorSpace->profile();
}
...@@ -24,9 +24,8 @@ ...@@ -24,9 +24,8 @@
#include <koffice_export.h> #include <koffice_export.h>
#include "KoColorProfile.h" class KoColorProfile;
#include "KoColorSpace.h" class KoColorSpace;
/** /**
* A KoColor describes a color in a certain colorspace. * A KoColor describes a color in a certain colorspace.
...@@ -67,7 +66,7 @@ public: ...@@ -67,7 +66,7 @@ public:
KoColorSpace * colorSpace() const { return m_colorSpace; } KoColorSpace * colorSpace() const { return m_colorSpace; }
KoColorProfile * profile() const { return m_colorSpace->profile(); } KoColorProfile * profile() const;
/// Convert this KoColor to the specified colorspace. If the specified colorspace is the /// Convert this KoColor to the specified colorspace. If the specified colorspace is the
/// same as the original colorspace, do nothing. Returns the converted KoColor. /// same as the original colorspace, do nothing. Returns the converted KoColor.
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <kdebug.h> #include <kdebug.h>
#include "KoCompositeOp.h" #include "KoCompositeOp.h"
#include "KoColorTransformation.h"
KoColorSpace::KoColorSpace(const QString &id, const QString &name, KoColorSpaceRegistry * parent) KoColorSpace::KoColorSpace(const QString &id, const QString &name, KoColorSpaceRegistry * parent)
: m_id(id) : m_id(id)
......
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
#include <q3valuevector.h> #include <q3valuevector.h>
#include <q3valuelist.h> #include <q3valuelist.h>
#include <KoColorTransformation.h>
#include <KoCompositeOp.h>
#include <KoChannelInfo.h> #include <KoChannelInfo.h>
#include <KoID.h> #include <KoID.h>
#include <koffice_export.h>
class KoCompositeOp;
class KoColorProfile; class KoColorProfile;
class KoColorSpaceRegistry; class KoColorSpaceRegistry;
class KoColorTransformation;
class KisMathToolbox; class KisMathToolbox;
class KisFilter; class KisFilter;
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include <KoColorSpace.h> #include <KoColorSpace.h>
#include <KoColorSpaceMaths.h> #include <KoColorSpaceMaths.h>
#include <KoIntegerMaths.h> #include <KoIntegerMaths.h>
#include "KoCompositeOp.h"
#include "KoColorTransformation.h"
namespace { namespace {
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "KoColorSpaceRegistry.h"
#include <QStringList> #include <QStringList>
#include <QDir> #include <QDir>
...@@ -34,7 +36,6 @@ ...@@ -34,7 +36,6 @@
#include <KoPluginLoader.h> #include <KoPluginLoader.h>
#include "KoColorSpace.h" #include "KoColorSpace.h"
#include "KoColorProfile.h" #include "KoColorProfile.h"
#include "KoColorSpaceRegistry.h"
#include "colorspaces/KoAlphaColorSpace.h" #include "colorspaces/KoAlphaColorSpace.h"
#include "colorspaces/KoLabColorSpace.h" #include "colorspaces/KoLabColorSpace.h"
#include "colorspaces/KoRgbU16ColorSpace.h" #include "colorspaces/KoRgbU16ColorSpace.h"
......
...@@ -28,10 +28,12 @@ ...@@ -28,10 +28,12 @@
#include <koffice_export.h> #include <koffice_export.h>
#include <KoGenericRegistry.h> #include <KoGenericRegistry.h>
#include "KoColorSpace.h"
class QStringList; class QStringList;
class KisPaintDeviceAction; class KisPaintDeviceAction;
class KoColorSpace;
class KoColorSpaceFactory;
class KoColorProfile;
/** /**
* *
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
//Added by qt3to4: //Added by qt3to4:
#include <Q3ValueList> #include <Q3ValueList>
#include "KoColorSpace.h"
KoHistogramProducerFactoryRegistry* KoHistogramProducerFactoryRegistry::m_singleton = 0; KoHistogramProducerFactoryRegistry* KoHistogramProducerFactoryRegistry::m_singleton = 0;
KoHistogramProducerFactoryRegistry::KoHistogramProducerFactoryRegistry() { KoHistogramProducerFactoryRegistry::KoHistogramProducerFactoryRegistry() {
......
...@@ -20,16 +20,16 @@ ...@@ -20,16 +20,16 @@
#define _KIS_HISTOGRAM_PRODUCER_ #define _KIS_HISTOGRAM_PRODUCER_
#include <qglobal.h> #include <qglobal.h>
#include <Q3ValueVector>
#include <ksharedptr.h> #include <ksharedptr.h>
#include <koffice_export.h> #include <koffice_export.h>
#include <KoColorSpace.h>
#include "KoGenericRegistry.h" #include "KoGenericRegistry.h"
class QString; class QString;
class KoChannelInfo; class KoChannelInfo;
class KoColorSpace;
/** /**
* This class is an interface used in the generation of a histogram. It is a container of * This class is an interface used in the generation of a histogram. It is a container of
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment