Commit f2dc3841 authored by Dmitry Kazakov's avatar Dmitry Kazakov

Removed 'image' parameter from the createConfigurationWidget() method of filters

parent eb83bcd2
......@@ -105,7 +105,7 @@ KisFilterConfiguration * KisBaseProcessor::defaultConfiguration(const KisPaintDe
return fc;
}
KisConfigWidget * KisBaseProcessor::createConfigurationWidget(QWidget *, const KisPaintDeviceSP, const KisImageWSP) const
KisConfigWidget * KisBaseProcessor::createConfigurationWidget(QWidget *, const KisPaintDeviceSP) const
{
return 0;
}
......
......@@ -111,7 +111,7 @@ public:
* @param parent the Qt owner widget of this widget
* @param dev the paintdevice this filter will act on
*/
virtual KisConfigWidget * createConfigurationWidget(QWidget * parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget * parent, const KisPaintDeviceSP dev) const;
// "Support" functions
public:
/**
......
......@@ -48,10 +48,9 @@ ShivaFilter::~ShivaFilter()
{
}
KisConfigWidget* ShivaFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget* ShivaFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
Q_UNUSED(dev);
Q_UNUSED(image);
return new ShivaGeneratorConfigWidget(m_source, parent);
}
......
......@@ -39,7 +39,7 @@ public:
KoUpdater* progressUpdater
) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
private:
OpenShiva::Source* m_source;
};
......
......@@ -49,10 +49,9 @@ ShivaGenerator::ShivaGenerator(OpenShiva::Source* kernel) : KisGenerator(KoID(ke
setSupportsIncrementalPainting(false);
}
KisConfigWidget * ShivaGenerator::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * ShivaGenerator::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
Q_UNUSED(dev);
Q_UNUSED(image);
return new ShivaGeneratorConfigWidget(m_source, parent);
}
......
......@@ -41,7 +41,7 @@ public:
const KisFilterConfiguration* config,
KoUpdater* progressUpdater
) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
private:
OpenShiva::Source* m_source;
......
......@@ -43,9 +43,8 @@ KisBlurFilter::KisBlurFilter() : KisFilter(id(), categoryBlur(), i18n("&Blur..."
setColorSpaceIndependence(FULLY_INDEPENDENT);
}
KisConfigWidget * KisBlurFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP image) const
KisConfigWidget * KisBlurFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
Q_UNUSED(image)
return new KisWdgBlur(parent);
}
......
......@@ -41,7 +41,7 @@ public:
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
public:
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
QRect neededRect(const QRect & rect, const KisFilterConfiguration*) const;
QRect changedRect(const QRect & rect, const KisFilterConfiguration*) const;
};
......
......@@ -48,9 +48,8 @@ KisGaussianBlurFilter::KisGaussianBlurFilter() : KisFilter(id(), categoryBlur(),
setColorSpaceIndependence(FULLY_INDEPENDENT);
}
KisConfigWidget * KisGaussianBlurFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP image) const
KisConfigWidget * KisGaussianBlurFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
Q_UNUSED(image)
return new KisWdgGaussianBlur(parent);
}
......
......@@ -46,7 +46,7 @@ public:
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
public:
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
QRect neededRect(const QRect & rect, const KisFilterConfiguration*) const;
QRect changedRect(const QRect & rect, const KisFilterConfiguration*) const;
};
......
......@@ -50,9 +50,8 @@ KisLensBlurFilter::KisLensBlurFilter() : KisFilter(id(), categoryBlur(), i18n("&
setColorSpaceIndependence(FULLY_INDEPENDENT);
}
KisConfigWidget * KisLensBlurFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP image) const
KisConfigWidget * KisLensBlurFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
Q_UNUSED(image)
return new KisWdgLensBlur(parent);
}
......
......@@ -47,7 +47,7 @@ public:
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
public:
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
};
#endif
......@@ -50,9 +50,8 @@ KisMotionBlurFilter::KisMotionBlurFilter() : KisFilter(id(), categoryBlur(), i18
setColorSpaceIndependence(FULLY_INDEPENDENT);
}
KisConfigWidget * KisMotionBlurFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP image) const
KisConfigWidget * KisMotionBlurFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
Q_UNUSED(image)
return new KisWdgMotionBlur(parent);
}
......
......@@ -47,7 +47,7 @@ public:
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
public:
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
QRect neededRect(const QRect & rect, const KisFilterConfiguration*) const;
QRect changedRect(const QRect & rect, const KisFilterConfiguration*) const;
};
......
......@@ -46,9 +46,8 @@ KisFilterColorToAlpha::KisFilterColorToAlpha() : KisFilter(id(), categoryColors(
setColorSpaceIndependence(FULLY_INDEPENDENT);
}
KisConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP image) const
KisConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
Q_UNUSED(image);
return new KisWdgColorToAlpha(parent);
}
......
......@@ -44,7 +44,7 @@ public:
public:
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP dev) const;
};
......
......@@ -145,9 +145,9 @@ KisBrightnessContrastFilter::KisBrightnessContrastFilter()
setColorSpaceIndependence(TO_LAB16);
}
KisConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev) const
{
return new KisBrightnessContrastConfigWidget(parent, dev, image ? image->bounds() : QRect());
return new KisBrightnessContrastConfigWidget(parent, dev);
}
KisFilterConfiguration* KisBrightnessContrastFilter::factoryConfiguration(const KisPaintDeviceSP)
......@@ -171,7 +171,7 @@ KoColorTransformation* KisBrightnessContrastFilter::createTransformation(const K
return adjustment;
}
KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const QRect &bounds, Qt::WFlags f)
KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, Qt::WFlags f)
: KisConfigWidget(parent, f)
{
int i;
......@@ -213,7 +213,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * p
m_page->vgradient->setPixmap(vgradientpix);
KoHistogramProducerSP producer = KoHistogramProducerSP(new KoGenericLabHistogramProducer());
KisHistogram histogram(dev, bounds, producer, LINEAR);
KisHistogram histogram(dev, dev->exactBounds(), producer, LINEAR);
QPixmap pix(256, height);
pix.fill();
QPainter p(&pix);
......
......@@ -88,7 +88,7 @@ public:
}
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
virtual bool workWith(const KoColorSpace* cs) const;
};
......@@ -98,7 +98,7 @@ class KisBrightnessContrastConfigWidget : public KisConfigWidget
{
public:
KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const QRect &bounds, Qt::WFlags f = 0);
KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, Qt::WFlags f = 0);
virtual ~KisBrightnessContrastConfigWidget() {}
virtual KisBrightnessContrastFilterConfiguration * configuration() const;
......
......@@ -35,10 +35,9 @@ KisHSVAdjustmentFilter::KisHSVAdjustmentFilter()
setSupportsIncrementalPainting(false);
}
KisConfigWidget * KisHSVAdjustmentFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisHSVAdjustmentFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
Q_UNUSED(dev);
Q_UNUSED(image);
return new KisHSVConfigWidget(parent);
}
......
......@@ -43,7 +43,7 @@ public:
public:
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
using KisFilter::process;
......
......@@ -50,7 +50,7 @@
KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const QRect &bounds, Qt::WFlags f)
KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, Qt::WFlags f)
: KisConfigWidget(parent, f), m_histogram(0)
{
Q_ASSERT(dev);
......@@ -92,7 +92,7 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintD
if(keys.size() > 0) {
KoHistogramProducerFactory *hpf;
hpf = KoHistogramProducerFactoryRegistry::instance()->get(keys.at(0));
m_histogram = new KisHistogram(m_dev, bounds, hpf->generate(), LINEAR);
m_histogram = new KisHistogram(m_dev, m_dev->exactBounds(), hpf->generate(), LINEAR);
}
connect(m_page->curveWidget, SIGNAL(modified()), this, SIGNAL(sigConfigurationItemChanged()));
......@@ -384,9 +384,9 @@ KisPerChannelFilter::KisPerChannelFilter() : KisColorTransformationFilter(id(),
setColorSpaceIndependence(TO_LAB16);
}
KisConfigWidget * KisPerChannelFilter::createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisPerChannelFilter::createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev) const
{
return new KisPerChannelConfigWidget(parent, dev, image->bounds());
return new KisPerChannelConfigWidget(parent, dev);
}
KisFilterConfiguration * KisPerChannelFilter::factoryConfiguration(const KisPaintDeviceSP) const
......
......@@ -76,7 +76,7 @@ class KisPerChannelFilter
public:
KisPerChannelFilter();
public:
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
virtual KisFilterConfiguration * factoryConfiguration(const KisPaintDeviceSP) const;
virtual KoColorTransformation* createTransformation(const KoColorSpace* cs, const KisFilterConfiguration* config) const;
......@@ -92,7 +92,7 @@ class KisPerChannelConfigWidget : public KisConfigWidget
Q_OBJECT
public:
KisPerChannelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const QRect &bounds, Qt::WFlags f = 0);
KisPerChannelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, Qt::WFlags f = 0);
virtual ~KisPerChannelConfigWidget();
virtual void setConfiguration(const KisPropertiesConfiguration* config);
......
......@@ -28,10 +28,9 @@ KisFilterDodgeBurn::KisFilterDodgeBurn(const QString& id, const QString& prefix,
setSupportsIncrementalPainting(false);
}
KisConfigWidget * KisFilterDodgeBurn::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisFilterDodgeBurn::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
Q_UNUSED(dev);
Q_UNUSED(image);
return new KisDodgeBurnConfigWidget(parent, id());
}
......
......@@ -34,7 +34,7 @@ public:
public:
virtual KoColorTransformation* createTransformation(const KoColorSpace* cs, const KisFilterConfiguration* config) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const;
KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
private:
QString m_prefix;
};
......
......@@ -154,10 +154,9 @@ int KisEmbossFilter::Lim_Max(int Now, int Up, int Max) const
return (Up);
}
KisConfigWidget * KisEmbossFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisEmbossFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
Q_UNUSED(dev);
Q_UNUSED(image);
vKisIntegerWidgetParam param;
param.push_back(KisIntegerWidgetParam(10, 300, 30, i18n("Depth"), "depth"));
......
......@@ -40,7 +40,7 @@ public:
}
public:
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
protected:
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
......
......@@ -66,10 +66,9 @@ KisFilterFastColorTransfer::KisFilterFastColorTransfer() : KisFilter(id(), categ
}
KisConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
Q_UNUSED(dev);
Q_UNUSED(image);
return new KisWdgFastColorTransfer(parent);
}
......
......@@ -48,7 +48,7 @@ public:
}
public:
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
};
......
......@@ -47,10 +47,9 @@ KisSimpleNoiseReducer::~KisSimpleNoiseReducer()
{
}
KisConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
Q_UNUSED(dev);
Q_UNUSED(image);
vKisIntegerWidgetParam param;
param.push_back(KisIntegerWidgetParam(0, 255, 15, i18n("Threshold"), "threshold"));
param.push_back(KisIntegerWidgetParam(0, 10, 1, i18n("Window size"), "windowsize"));
......
......@@ -36,7 +36,7 @@ public:
const KisFilterConfiguration* config,
KoUpdater* progressUpdater
) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
static inline KoID id() {
return KoID("gaussiannoisereducer", i18n("Gaussian Noise Reducer"));
......
......@@ -46,7 +46,7 @@ KisWaveletNoiseReduction::~KisWaveletNoiseReduction()
{
}
KisConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP) const
KisConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
vKisDoubleWidgetParam param;
param.push_back(KisDoubleWidgetParam(0.0, 256.0, BEST_WAVELET_THRESHOLD_VALUE, i18n("Threshold"), "threshold"));
......
......@@ -45,7 +45,7 @@ public:
const KisFilterConfiguration* config,
KoUpdater* progressUpdater
) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
static inline KoID id() {
return KoID("waveletnoisereducer", i18n("Wavelet Noise Reducer"));
......
......@@ -56,9 +56,9 @@ KisLevelFilter::~KisLevelFilter()
{
}
KisConfigWidget * KisLevelFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisLevelFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
return new KisLevelConfigWidget(parent, dev, image->bounds());
return new KisLevelConfigWidget(parent, dev);
}
bool KisLevelFilter::workWith(KoColorSpace* cs) const
......@@ -98,7 +98,7 @@ KoColorTransformation* KisLevelFilter::createTransformation(const KoColorSpace*
return cs->createBrightnessContrastAdjustment(transfer);
}
KisLevelConfigWidget::KisLevelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const QRect &bounds)
KisLevelConfigWidget::KisLevelConfigWidget(QWidget * parent, KisPaintDeviceSP dev)
: KisConfigWidget(parent)
{
m_page.setupUi(this);
......@@ -143,7 +143,7 @@ KisLevelConfigWidget::KisLevelConfigWidget(QWidget * parent, KisPaintDeviceSP de
connect((QObject*)(m_page.chkLogarithmic), SIGNAL(toggled(bool)), this, SLOT(slotDrawHistogram(bool)));
KoHistogramProducerSP producer = KoHistogramProducerSP(new KoGenericLabHistogramProducer());
histogram = new KisHistogram(dev, bounds, producer, LINEAR);
histogram = new KisHistogram(dev, dev->exactBounds(), producer, LINEAR);
m_histlog = false;
slotDrawHistogram();
......
......@@ -46,7 +46,7 @@ public:
public:
// virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
virtual KoColorTransformation* createTransformation(const KoColorSpace* cs, const KisFilterConfiguration* config) const;
......@@ -62,7 +62,7 @@ class KisLevelConfigWidget : public KisConfigWidget
{
Q_OBJECT
public:
KisLevelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const QRect &bounds);
KisLevelConfigWidget(QWidget * parent, KisPaintDeviceSP dev);
virtual ~KisLevelConfigWidget();
virtual KisPropertiesConfiguration* configuration() const;
......
......@@ -83,10 +83,9 @@ KisFilterConfiguration* KisFilterNoise::factoryConfiguration(const KisPaintDevic
return config;
}
KisConfigWidget * KisFilterNoise::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget * KisFilterNoise::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const
{
Q_UNUSED(dev);
Q_UNUSED(image);
return new KisWdgNoise((KisFilter*)this, (QWidget*)parent);
}
......
......@@ -52,7 +52,7 @@ public:
return KoID("noise", i18n("Noise"));
}
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
};
#endif
......@@ -206,7 +206,7 @@ void KisOilPaintFilter::MostFrequentColor(KisPaintDeviceSP src, quint8* dst, con
}
KisConfigWidget * KisOilPaintFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP) const
KisConfigWidget * KisOilPaintFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
vKisIntegerWidgetParam param;
param.push_back(KisIntegerWidgetParam(1, 5, 1, i18n("Brush size"), "brushSize"));
......
......@@ -42,7 +42,7 @@ public:
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
public:
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
private:
void OilPaint(const KisPaintDeviceSP src, KisPaintDeviceSP dst, const QPoint& srcTopLeft, const QPoint& dstTopLeft, int w, int h,
......
......@@ -22,10 +22,9 @@
#include "KoChannelInfo.h"
#include "KoColorSpace.h"
KisPhongBumpmapConfigWidget::KisPhongBumpmapConfigWidget(const KisPaintDeviceSP dev, const KisImageWSP image, QWidget *parent, Qt::WFlags f)
KisPhongBumpmapConfigWidget::KisPhongBumpmapConfigWidget(const KisPaintDeviceSP dev, QWidget *parent, Qt::WFlags f)
: KisConfigWidget(parent, f)
, m_device(dev)
, m_image(image)
{
Q_ASSERT(m_device);
m_page = new KisPhongBumpmapWidget(this);
......
......@@ -52,7 +52,7 @@ class KisPhongBumpmapConfigWidget : public KisConfigWidget
Q_OBJECT
public:
KisPhongBumpmapConfigWidget(const KisPaintDeviceSP dev, const KisImageWSP image, QWidget *parent, Qt::WFlags f = 0);
KisPhongBumpmapConfigWidget(const KisPaintDeviceSP dev, QWidget *parent, Qt::WFlags f = 0);
virtual ~KisPhongBumpmapConfigWidget() {}
void setConfiguration(const KisPropertiesConfiguration *config);
KisPropertiesConfiguration *configuration() const;
......@@ -60,7 +60,6 @@ public:
private:
KisPaintDeviceSP m_device;
KisImageWSP m_image;
};
#endif //KIS_PHONG_BUMPMAP_CONFIG_WIDGET_H
......@@ -198,9 +198,9 @@ QRect KisFilterPhongBumpmap::changedRect(const QRect &rect, const KisFilterConfi
return rect;
}
KisConfigWidget *KisFilterPhongBumpmap::createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev, const KisImageWSP image) const
KisConfigWidget *KisFilterPhongBumpmap::createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev) const
{
KisPhongBumpmapConfigWidget *w = new KisPhongBumpmapConfigWidget(dev, image, parent);
KisPhongBumpmapConfigWidget *w = new KisPhongBumpmapConfigWidget(dev, parent);
return w;
}
......
......@@ -46,7 +46,7 @@ public:
QRect neededRect(const QRect &rect, const KisFilterConfiguration *config) const;
QRect changedRect(const QRect &rect, const KisFilterConfiguration *config) const;
virtual KisConfigWidget *createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget *createConfigurationWidget(QWidget *parent, const KisPaintDeviceSP dev) const;
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
};
......
......@@ -129,7 +129,7 @@ void KisPixelizeFilter::process(KisPaintDeviceSP device,
}
}
KisConfigWidget * KisPixelizeFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP) const
KisConfigWidget * KisPixelizeFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
vKisIntegerWidgetParam param;
param.push_back(KisIntegerWidgetParam(2, 40, 10, i18n("Pixel width"), "pixelWidth"));
......
......@@ -42,7 +42,7 @@ public:
}
public:
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev, const KisImageWSP image = 0) const;
virtual KisConfigWidget * createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP dev) const;
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
};
......
......@@ -389,7 +389,7 @@ uchar KisRainDropsFilter::LimitValues(int ColorValue) const
return ((uchar) ColorValue);
}
KisConfigWidget * KisRainDropsFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP, const KisImageWSP) const
KisConfigWidget * KisRainDropsFilter::createConfigurationWidget(QWidget* parent, const KisPaintDeviceSP) const
{
vKisIntegerWidgetParam param;
param.push_back(KisIntegerWidgetParam(1, 200, 80, i18n("Drop size"), "dropsize"));
......
......@@ -43,7 +43,7 @@ public:
virtual KisFilterConfiguration* factoryConfiguration(const KisPaintDeviceSP) const;
public: