Commit 9f593072 authored by Adrian Page's avatar Adrian Page

q3--


svn path=/trunk/koffice/; revision=651849
parent 0b7d321f
......@@ -66,7 +66,7 @@ void KisMathToolbox::transformToFR(KisPaintDeviceSP src, KisFloatRepresentation*
{
qint32 depth = src->colorSpace()->colorChannelCount();
Q3MemArray<PtrToDouble> f(depth);
Q3ValueVector<KoChannelInfo *> cis = src->colorSpace()->channels();
QList<KoChannelInfo *> cis = src->colorSpace()->channels();
for(qint32 k = 0; k < depth; k++)
{
switch( cis[k]->channelValueType() )
......@@ -120,7 +120,7 @@ void KisMathToolbox::transformFromFR(KisPaintDeviceSP dst, KisFloatRepresentatio
{
qint32 depth = dst->colorSpace()->colorChannelCount();
Q3MemArray<PtrFromDouble> f(depth);
Q3ValueVector<KoChannelInfo *> cis = dst->colorSpace()->channels();
QList<KoChannelInfo *> cis = dst->colorSpace()->channels();
for(qint32 k = 0; k < depth; k++)
{
switch( cis[k]->channelValueType() )
......
......@@ -271,7 +271,7 @@ void KisFilterBumpmap::process(const KisPaintDeviceSP src, const QPoint& srcTopL
// ---------------------- Load initial three bumpmap scanlines
KoColorSpace * srcCs = src->colorSpace();
Q3ValueVector<KoChannelInfo *> channels = srcCs->channels();
QList<KoChannelInfo *> channels = srcCs->channels();
// One byte per pixel, converted from the bumpmap layer.
quint8 * bm_row1 = new quint8[bm_w];
......
......@@ -322,7 +322,7 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintD
connect(m_page->kCurve, SIGNAL(modified()), SIGNAL(sigPleaseUpdatePreview()));
// Fill in the channel chooser
Q3ValueVector<KoChannelInfo *> channels = dev->colorSpace()->channels();
QList<KoChannelInfo *> channels = dev->colorSpace()->channels();
for(unsigned int val=0; val < dev->colorSpace()->colorChannelCount(); val++)
m_page->cmbChannel->addItem(channels.at(val)->name());
connect( m_page->cmbChannel, SIGNAL(activated(int)), this, SLOT(setActiveChannel(int)));
......
......@@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor()
{
if (m_pickedColor.data() && m_optionsWidget) {
Q3ValueVector<KoChannelInfo *> channels = m_pickedColor.colorSpace()->channels();
QList<KoChannelInfo *> channels = m_pickedColor.colorSpace()->channels();
m_optionsWidget->listViewChannels->clear();
for (int i = 0; i < channels.count(); ++i) {
......
......@@ -71,7 +71,7 @@ void KisAccumulatingHistogramProducer::ThreadedProducer::run() {
uint count = m_source->m_source->count(); // Talk about bad naming schemes...
KisCachedHistogramObserver::Producers* source = m_source->m_source;
Q3ValueVector<vBins>& bins = m_source->m_bins;
QVector<vBins>& bins = m_source->m_bins;
int channels = m_source->m_channels;
int nrOfBins = m_source->m_nrOfBins;
......
......@@ -178,13 +178,13 @@ class Iterator : public IteratorBase
QVariant channel(uint channelnr)
{
Q3ValueVector<KoChannelInfo*> channels = m_layer->paintDevice()->colorSpace()->channels();
QList<KoChannelInfo*> channels = m_layer->paintDevice()->colorSpace()->channels();
return channelnr < uint(channels.count()) ? channelValue(channels[channelnr]) : QVariant();
}
void setChannel(uint channelnr, const QVariant& value)
{
Q3ValueVector<KoChannelInfo*> channels = m_layer->paintDevice()->colorSpace()->channels();
QList<KoChannelInfo*> channels = m_layer->paintDevice()->colorSpace()->channels();
if(channelnr < uint(channels.count()))
setChannelValue(channels[channelnr], value);
}
......@@ -197,18 +197,18 @@ class Iterator : public IteratorBase
QVariantList pixel()
{
QVariantList pixel;
Q3ValueVector<KoChannelInfo*> channels = m_layer->paintDevice()->colorSpace()->channels();
for(Q3ValueVector<KoChannelInfo*>::iterator itC = channels.begin(); itC != channels.end(); ++itC)
QList<KoChannelInfo*> channels = m_layer->paintDevice()->colorSpace()->channels();
for(QList<KoChannelInfo*>::iterator itC = channels.begin(); itC != channels.end(); ++itC)
pixel.push_back( channelValue(*itC) );
return pixel;
}
void setPixel(QVariantList pixel)
{
Q3ValueVector<KoChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels();
QList<KoChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels();
uint i = 0;
const uint size = pixel.size();
for(Q3ValueVector<KoChannelInfo *>::iterator itC = channels.begin(); itC != channels.end() && i < size; ++itC, ++i)
for(QList<KoChannelInfo *>::iterator itC = channels.begin(); itC != channels.end() && i < size; ++itC, ++i)
setChannelValue(*itC, pixel[i]);
}
......
......@@ -83,7 +83,7 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS
quint32 numberOfChannels = src->channelCount();
KoColorSpace * srcCs = src->colorSpace();
Q3ValueVector<KoChannelInfo *> channels = srcCs->channels();
QList<KoChannelInfo *> channels = srcCs->channels();
// Use the flattened image, if required
switch(sourceOps) {
......@@ -97,15 +97,15 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS
vKisPaintDeviceSP layers;
Q3ValueVector<KoChannelInfo *>::const_iterator begin = channels.begin();
Q3ValueVector<KoChannelInfo *>::const_iterator end = channels.end();
QList<KoChannelInfo *>::const_iterator begin = channels.begin();
QList<KoChannelInfo *>::const_iterator end = channels.end();
QRect rect = src->exactBounds();
int i = 0;
quint32 channelIndex = 0;
for (Q3ValueVector<KoChannelInfo *>::const_iterator it = begin; it != end; ++it, ++channelIndex)
for (QList<KoChannelInfo *>::const_iterator it = begin; it != end; ++it, ++channelIndex)
{
KoChannelInfo * ch = (*it);
......@@ -239,7 +239,7 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS
break;
}
for (Q3ValueVector<KoChannelInfo *>::const_iterator it = begin; it != end; ++it)
for (QList<KoChannelInfo *>::const_iterator it = begin; it != end; ++it)
{
KoChannelInfo * ch = (*it);
......
......@@ -148,7 +148,7 @@ void KisHistogramView::setCurrentChannels(KoHistogramProducerSP producer, Q3Valu
return;
}
Q3ValueVector<KoChannelInfo *> producerChannels = m_currentProducer->channels();
QList<KoChannelInfo *> producerChannels = m_currentProducer->channels();
for (int i = 0; i < channels.count(); i++) {
// Also makes sure the channel is actually in the producer's list
......@@ -202,7 +202,7 @@ void KisHistogramView::setActiveChannel(int channel)
m_histogram->setChannel(0); // Set a default channel, just being nice
} else {
m_color = false;
Q3ValueVector<KoChannelInfo *> channels = m_currentProducer->channels();
QList<KoChannelInfo *> channels = m_currentProducer->channels();
for (int i = 0; i < channels.count(); i++) {
KoChannelInfo* channel = channels.at(i);
if (channel->name() == info.channel->name()) {
......@@ -254,7 +254,7 @@ void KisHistogramView::addProducerChannels(KoHistogramProducerSP producer) {
info.isProducer = true;
info.producer = producer;
// channel not used for a producer
Q3ValueVector<KoChannelInfo *> channels = info.producer->channels();
QList<KoChannelInfo *> channels = info.producer->channels();
int count = channels.count();
m_comboInfo.append(info);
m_channelStrings.append(producer->id() . name());
......
......@@ -93,7 +93,7 @@ private:
KisHistogramSP m_histogram;
KoColorSpace* m_cs;
KoHistogramProducerSP m_currentProducer;
Q3ValueVector<KoChannelInfo *> m_channels;
QList<KoChannelInfo *> m_channels;
// Maps the channels in m_channels to a real channel offset in the producer->channels()
Q3ValueVector<qint32> m_channelToOffset;
QStringList m_channelStrings;
......
......@@ -51,7 +51,7 @@ KoBasicHistogramProducer::KoBasicHistogramProducer(const KoID& id, int channels,
{
m_bins.resize(m_channels);
for (int i = 0; i < m_channels; i++)
m_bins.at(i).resize(m_nrOfBins);
m_bins[i].resize(m_nrOfBins);
m_outLeft.resize(m_channels);
m_outRight.resize(m_channels);
m_count = 0;
......@@ -63,10 +63,10 @@ void KoBasicHistogramProducer::clear() {
m_count = 0;
for (int i = 0; i < m_channels; i++) {
for (int j = 0; j < m_nrOfBins; j++) {
m_bins.at(i).at(j) = 0;
m_bins[i][j] = 0;
}
m_outRight.at(i) = 0;
m_outLeft.at(i) = 0;
m_outRight[i] = 0;
m_outLeft[i] = 0;
}
}
......@@ -74,13 +74,13 @@ void KoBasicHistogramProducer::makeExternalToInternal() {
// This function assumes that the pixel is has no 'gaps'. That is to say: if we start
// at byte 0, we can get to the end of the pixel by adding consecutive size()s of
// the channels
Q3ValueVector<KoChannelInfo *> c = channels();
QList<KoChannelInfo *> c = channels();
uint count = c.count();
int currentPos = 0;
for (uint i = 0; i < count; i++) {
for (uint j = 0; j < count; j++) {
if (c.at(j)->pos() == currentPos) {
if (c[j]->pos() == currentPos) {
m_external.append(j);
break;
}
......@@ -109,7 +109,7 @@ void KoBasicU8HistogramProducer::addRegionToBin(const quint8 * pixels, const qui
if ( ! (m_skipUnselected && *selectionMask == 0) || (m_skipTransparent && cs->alpha(pixels) == OPACITY_TRANSPARENT) ) {
for (int i = 0; i < m_channels; i++) {
m_bins.at(i).at(pixels[i])++;
m_bins[i][pixels[i]]++;
}
m_count++;
......@@ -125,7 +125,7 @@ void KoBasicU8HistogramProducer::addRegionToBin(const quint8 * pixels, const qui
if ( ! (m_skipTransparent && cs->alpha(pixels) == OPACITY_TRANSPARENT) ) {
for (int i = 0; i < m_channels; i++) {
m_bins.at(i).at(pixels[i])++;
m_bins[i][pixels[i]]++;
}
m_count++;
......@@ -171,11 +171,11 @@ void KoBasicU16HistogramProducer::addRegionToBin(const quint8 * pixels, const qu
for (int i = 0; i < m_channels; i++) {
quint16 value = pixel[i];
if (value > to)
m_outRight.at(i)++;
m_outRight[i]++;
else if (value < from)
m_outLeft.at(i)++;
m_outLeft[i]++;
else
m_bins.at(i).at(static_cast<quint8>((value - from) * factor))++;
m_bins[i][static_cast<quint8>((value - from) * factor)]++;
}
m_count++;
}
......@@ -192,11 +192,11 @@ void KoBasicU16HistogramProducer::addRegionToBin(const quint8 * pixels, const qu
for (int i = 0; i < m_channels; i++) {
quint16 value = pixel[i];
if (value > to)
m_outRight.at(i)++;
m_outRight[i]++;
else if (value < from)
m_outLeft.at(i)++;
m_outLeft[i]++;
else
m_bins.at(i).at(static_cast<quint8>((value - from) * factor))++;
m_bins[i][static_cast<quint8>((value - from) * factor)]++;
}
m_count++;
}
......@@ -239,11 +239,11 @@ void KoBasicF32HistogramProducer::addRegionToBin(const quint8 * pixels, const qu
for (int i = 0; i < m_channels; i++) {
float value = pixel[i];
if (value > to)
m_outRight.at(i)++;
m_outRight[i]++;
else if (value < from)
m_outLeft.at(i)++;
m_outLeft[i]++;
else
m_bins.at(i).at(static_cast<quint8>((value - from) * factor))++;
m_bins[i][static_cast<quint8>((value - from) * factor)]++;
}
m_count++;
}
......@@ -262,11 +262,11 @@ void KoBasicF32HistogramProducer::addRegionToBin(const quint8 * pixels, const qu
for (int i = 0; i < m_channels; i++) {
float value = pixel[i];
if (value > to)
m_outRight.at(i)++;
m_outRight[i]++;
else if (value < from)
m_outLeft.at(i)++;
m_outLeft[i]++;
else
m_bins.at(i).at(static_cast<quint8>((value - from) * factor))++;
m_bins[i][static_cast<quint8>((value - from) * factor)]++;
}
m_count++;
}
......@@ -309,11 +309,11 @@ void KoBasicF16HalfHistogramProducer::addRegionToBin(const quint8 * pixels, cons
for (int i = 0; i < m_channels; i++) {
float value = pixel[i];
if (value > to)
m_outRight.at(i)++;
m_outRight[i]++;
else if (value < from)
m_outLeft.at(i)++;
m_outLeft[i]++;
else
m_bins.at(i).at(static_cast<quint8>((value - from) * factor))++;
m_bins[i][static_cast<quint8>((value - from) * factor)]++;
}
m_count++;
}
......@@ -329,11 +329,11 @@ void KoBasicF16HalfHistogramProducer::addRegionToBin(const quint8 * pixels, cons
for (int i = 0; i < m_channels; i++) {
float value = pixel[i];
if (value > to)
m_outRight.at(i)++;
m_outRight[i]++;
else if (value < from)
m_outLeft.at(i)++;
m_outLeft[i]++;
else
m_bins.at(i).at(static_cast<quint8>((value - from) * factor))++;
m_bins[i][static_cast<quint8>((value - from) * factor)]++;
}
m_count++;
}
......@@ -355,7 +355,7 @@ KoGenericRGBHistogramProducer::KoGenericRGBHistogramProducer()
m_channelsList.append(new KoChannelInfo(i18n("B"), 2, KoChannelInfo::COLOR, KoChannelInfo::UINT8, 1, QColor(0,0,255)));
}
Q3ValueVector<KoChannelInfo *> KoGenericRGBHistogramProducer::channels() {
QList<KoChannelInfo *> KoGenericRGBHistogramProducer::channels() {
return m_channelsList;
}
......@@ -371,8 +371,8 @@ double KoGenericRGBHistogramProducer::maximalZoom() const {
void KoGenericRGBHistogramProducer::addRegionToBin(const quint8 * pixels, const quint8 * selectionMask, quint32 nPixels, KoColorSpace *cs)
{
for (int i = 0; i < m_channels; i++) {
m_outRight.at(i) = 0;
m_outLeft.at(i) = 0;
m_outRight[i] = 0;
m_outLeft[i] = 0;
}
QColor c;
......@@ -381,9 +381,9 @@ void KoGenericRGBHistogramProducer::addRegionToBin(const quint8 * pixels, const
while (nPixels > 0) {
if ( !((m_skipUnselected && *selectionMask == 0) || (m_skipTransparent && cs->alpha(pixels) == OPACITY_TRANSPARENT)) ) {
cs->toQColor(pixels, &c);
m_bins.at(0).at(c.red())++;
m_bins.at(1).at(c.green())++;
m_bins.at(2).at(c.blue())++;
m_bins[0][c.red()]++;
m_bins[1][c.green()]++;
m_bins[2][c.blue()]++;
m_count++;
}
......@@ -398,9 +398,9 @@ void KoGenericRGBHistogramProducer::addRegionToBin(const quint8 * pixels, const
if ( !(m_skipTransparent && cs->alpha(pixels) == OPACITY_TRANSPARENT)) {
cs->toQColor(pixels, &c);
m_bins.at(0).at(c.red())++;
m_bins.at(1).at(c.green())++;
m_bins.at(2).at(c.blue())++;
m_bins[0][c.red()]++;
m_bins[1][c.green()]++;
m_bins[2][c.blue()]++;
m_count++;
}
......@@ -432,7 +432,7 @@ KoGenericLabHistogramProducer::~KoGenericLabHistogramProducer()
delete m_channelsList[2];
}
Q3ValueVector<KoChannelInfo *> KoGenericLabHistogramProducer::channels() {
QList<KoChannelInfo *> KoGenericLabHistogramProducer::channels() {
return m_channelsList;
}
......@@ -448,8 +448,8 @@ double KoGenericLabHistogramProducer::maximalZoom() const {
void KoGenericLabHistogramProducer::addRegionToBin(const quint8 * pixels, const quint8 * selectionMask, quint32 nPixels, KoColorSpace *cs)
{
for (int i = 0; i < m_channels; i++) {
m_outRight.at(i) = 0;
m_outLeft.at(i) = 0;
m_outRight[i] = 0;
m_outLeft[i] = 0;
}
quint8 dst[8];
......@@ -474,9 +474,9 @@ void KoGenericLabHistogramProducer::addRegionToBin(const quint8 * pixels, const
if ( !(m_skipTransparent && cs->alpha(pixels) == OPACITY_TRANSPARENT)) {
cs->convertPixelsTo(pixels, dst, m_colorSpace, 1);
m_bins.at(0).at(m_colorSpace->scaleToU8(dst, 0))++;
m_bins.at(1).at(m_colorSpace->scaleToU8(dst, 1))++;
m_bins.at(2).at(m_colorSpace->scaleToU8(dst, 2))++;
m_bins[0][m_colorSpace->scaleToU8(dst, 0)]++;
m_bins[1][m_colorSpace->scaleToU8(dst, 1)]++;
m_bins[2][m_colorSpace->scaleToU8(dst, 2)]++;
m_count++;
}
......
......@@ -21,7 +21,7 @@
#include "KoHistogramProducer.h"
#include <q3valuevector.h>
#include <QVector>
#include <klocale.h>
#include <config-openexr.h>
......@@ -42,7 +42,7 @@ public:
virtual void setView(double from, double size) { m_from = from; m_width = size; }
virtual const KoID& id() const { return m_id; }
virtual Q3ValueVector<KoChannelInfo *> channels() { return m_colorSpace->channels(); }
virtual QList<KoChannelInfo *> channels() { return m_colorSpace->channels(); }
virtual qint32 numberOfBins() { return m_nrOfBins; }
virtual double viewFrom() const { return m_from; }
virtual double viewWidth() const { return m_width; }
......@@ -73,15 +73,15 @@ protected:
}
// not virtual since that is useless: we call it from constructor
void makeExternalToInternal();
typedef Q3ValueVector<quint32> vBins;
Q3ValueVector<vBins> m_bins;
typedef QVector<quint32> vBins;
QVector<vBins> m_bins;
vBins m_outLeft, m_outRight;
double m_from, m_width;
qint32 m_count;
int m_channels, m_nrOfBins;
KoColorSpace *m_colorSpace;
KoID m_id;
Q3ValueVector<qint32> m_external;
QVector<qint32> m_external;
};
class PIGMENT_EXPORT KoBasicU8HistogramProducer : public KoBasicHistogramProducer {
......@@ -149,9 +149,9 @@ public:
virtual void addRegionToBin(const quint8 * pixels, const quint8 * selectionMask, quint32 nPixels, KoColorSpace *colorSpace);
virtual QString positionToString(double pos) const;
virtual double maximalZoom() const;
virtual Q3ValueVector<KoChannelInfo *> channels();
virtual QList<KoChannelInfo *> channels();
protected:
Q3ValueVector<KoChannelInfo *> m_channelsList;
QList<KoChannelInfo *> m_channelsList;
};
/** KoGenericRGBHistogramProducer his special Factory that isCompatibleWith everything. */
......@@ -178,9 +178,9 @@ class PIGMENT_EXPORT KoGenericLabHistogramProducer : public KoBasicHistogramPro
virtual void addRegionToBin(const quint8 * pixels, const quint8 * selectionMask, quint32 nPixels, KoColorSpace *colorSpace);
virtual QString positionToString(double pos) const;
virtual double maximalZoom() const;
virtual Q3ValueVector<KoChannelInfo *> channels();
virtual QList<KoChannelInfo *> channels();
protected:
Q3ValueVector<KoChannelInfo *> m_channelsList;
QList<KoChannelInfo *> m_channelsList;
private:
static KoLabColorSpace* m_labCs;
};
......
......@@ -196,12 +196,12 @@ void KoColor::fromQColor(const QColor& c, quint8 opacity) const
void KoColor::dump() const
{
//kDebug(DBG_AREA_CMS) << "KoColor (" << this << "), " << d->colorSpace->id().name() << "\n";
Q3ValueVector<KoChannelInfo *> channels = d->colorSpace->channels();
QList<KoChannelInfo *> channels = d->colorSpace->channels();
Q3ValueVector<KoChannelInfo *>::const_iterator begin = channels.begin();
Q3ValueVector<KoChannelInfo *>::const_iterator end = channels.end();
QList<KoChannelInfo *>::const_iterator begin = channels.begin();
QList<KoChannelInfo *>::const_iterator end = channels.end();
for (Q3ValueVector<KoChannelInfo *>::const_iterator it = begin; it != end; ++it)
for (QList<KoChannelInfo *>::const_iterator it = begin; it != end; ++it)
{
KoChannelInfo * ch = (*it);
// XXX: setNum always takes a byte.
......
......@@ -22,7 +22,6 @@
#include <QColor>
#include <QMetaType>
#include <q3valuevector.h>
#include <pigment_export.h>
class KoColorProfile;
......
......@@ -32,7 +32,7 @@ struct KoColorSpace::Private {
QString name;
QHash<QString, KoCompositeOp *> compositeOps;
KoColorSpaceRegistry * parent;
Q3ValueVector<KoChannelInfo *> channels;
QList<KoChannelInfo *> channels;
KoMixColorsOp* mixColorsOp;
KoConvolutionOp* convolutionOp;
QThreadStorage< QVector<quint8>* > conversionCache;
......@@ -72,7 +72,7 @@ QString KoColorSpace::name() const {return d->name;}
quint32 KoColorSpace::colorSpaceType() const { return d->cmType; }
icColorSpaceSignature KoColorSpace::colorSpaceSignature() const { return d->colorSpaceSignature; }
Q3ValueVector<KoChannelInfo *> KoColorSpace::channels() const
QList<KoChannelInfo *> KoColorSpace::channels() const
{
return d->channels;
}
......
......@@ -26,11 +26,9 @@
#include <QImage>
#include <QHash>
#include <QVector>
#include <QList>
#include <QBitArray>
#include <q3valuevector.h>
#include <q3valuelist.h>
#include "KoColorSpaceConstants.h"
#include <KoChannelInfo.h>
#include <KoID.h>
......@@ -147,8 +145,8 @@ public:
//========== Channels =====================================================//
/// Return a vector describing all the channels this color model has.
virtual Q3ValueVector<KoChannelInfo *> channels() const;
/// Return a list describing all the channels this color model has.
virtual QList<KoChannelInfo *> channels() const;
/**
* The total number of channels for a single pixel in this color model
......@@ -604,8 +602,8 @@ public:
* created paint device. XXX: Currently this uses times and not
* threads.
*/
virtual Q3ValueList<KisFilter*> createBackgroundFilters() const
{ return Q3ValueList<KisFilter*>(); };
virtual QList<KisFilter*> createBackgroundFilters() const
{ return QList<KisFilter*>(); };
protected:
/**
* Use this function in the constructor of your colorspace to add the information about a channel.
......
......@@ -16,10 +16,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <QList>
#include "KoHistogramProducer.h"
#include "KoBasicHistogramProducers.h"
//Added by qt3to4:
#include <Q3ValueList>
#include "KoColorSpace.h"
......@@ -45,7 +45,7 @@ QList<KoID> KoHistogramProducerFactoryRegistry::listKeysCompatibleWith(
KoColorSpace* colorSpace) const
{
QList<KoID> list;
Q3ValueList<float> preferredList;
QList<float> preferredList;
storageMap::const_iterator it = m_storage.begin();
storageMap::const_iterator endit = m_storage.end();
// O(n^2), can't this be done better? (But preferrably not by looking up the preferredness
......@@ -53,8 +53,8 @@ QList<KoID> KoHistogramProducerFactoryRegistry::listKeysCompatibleWith(
while( it != endit ) {
if (it->second->isCompatibleWith(colorSpace)) {
float preferred = it->second->preferrednessLevelWith(colorSpace);
Q3ValueList<float>::iterator pit = preferredList.begin();
Q3ValueList<float>::iterator pend = preferredList.end();
QList<float>::iterator pit = preferredList.begin();
QList<float>::iterator pend = preferredList.end();
QList<KoID>::iterator lit = list.begin();
while (pit != pend && preferred <= *pit) {
......
......@@ -20,7 +20,6 @@
#define _KIS_HISTOGRAM_PRODUCER_
#include <qglobal.h>
#include <Q3ValueVector>
#include <ksharedptr.h>
#include <pigment_export.h>
......@@ -77,7 +76,7 @@ public:
// Methods with general information about this specific producer
virtual const KoID& id() const = 0;
virtual Q3ValueVector<KoChannelInfo *> channels() = 0;
virtual QList<KoChannelInfo *> channels() = 0;
virtual qint32 numberOfBins() = 0;
virtual QString positionToString(double pos) const = 0;
virtual double viewFrom() const = 0;
......
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