Commit e394b5a3 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Rename KisBaseOption to KisPaintopPropertiesBase

The original name was quite generic and didn't hint at
what it was meant to convey.
parent 8fba6ddf
......@@ -87,7 +87,7 @@ set(kritaui_LIB_SRCS
kis_bookmarked_configurations_editor.cc
kis_bookmarked_configurations_model.cc
kis_bookmarked_filter_configurations_model.cc
kis_base_option.cpp
KisPaintopPropertiesBase.cpp
kis_canvas_resource_provider.cpp
kis_derived_resources.cpp
kis_categories_mapper.cpp
......
......@@ -16,30 +16,30 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kis_base_option.h"
#include "KisPaintopPropertiesBase.h"
#include "kis_properties_configuration.h"
KisBaseOption::~KisBaseOption()
KisPaintopPropertiesBase::~KisPaintopPropertiesBase()
{
}
void KisBaseOption::readOptionSetting(KisPropertiesConfigurationSP settings)
void KisPaintopPropertiesBase::readOptionSetting(KisPropertiesConfigurationSP settings)
{
readOptionSettingImpl(settings.data());
}
void KisBaseOption::writeOptionSetting(KisPropertiesConfigurationSP settings) const
void KisPaintopPropertiesBase::writeOptionSetting(KisPropertiesConfigurationSP settings) const
{
writeOptionSettingImpl(settings.data());
}
void KisBaseOption::readOptionSetting(const KisPropertiesConfiguration *settings)
void KisPaintopPropertiesBase::readOptionSetting(const KisPropertiesConfiguration *settings)
{
readOptionSettingImpl(settings);
}
void KisBaseOption::writeOptionSetting(KisPropertiesConfiguration *settings) const
void KisPaintopPropertiesBase::writeOptionSetting(KisPropertiesConfiguration *settings) const
{
writeOptionSettingImpl(settings);
}
......
......@@ -37,10 +37,10 @@
* it atm, but we still can create a special interface for accepting raw pointers,
* which will be used automatically, when 'this' is passed.
*/
class KRITAUI_EXPORT KisBaseOption
class KRITAUI_EXPORT KisPaintopPropertiesBase
{
public:
virtual ~KisBaseOption();
virtual ~KisPaintopPropertiesBase();
void readOptionSetting(KisPropertiesConfigurationSP settings);
void writeOptionSetting(KisPropertiesConfigurationSP setting) const;
......
......@@ -24,7 +24,7 @@
#include <kritaui_export.h>
#include <kis_properties_configuration.h>
#include <brushengine/kis_locked_properties_proxy.h>
#include <kis_base_option.h>
#include <KisPaintopPropertiesBase.h>
class QWidget;
class QString;
......@@ -74,13 +74,13 @@ public:
void startReadOptionSetting(const KisPropertiesConfigurationSP setting);
void startWriteOptionSetting(KisPropertiesConfigurationSP setting) const;
QWidget* configurationPage() const;
QWidget *configurationPage() const;
virtual void lodLimitations(KisPaintopLodLimitations *l) const;
protected:
void setConfigurationPage(QWidget * page);
void setConfigurationPage(QWidget *page);
protected:
/**
......
......@@ -60,7 +60,7 @@ KisCurveOpOption::~KisCurveOpOption()
void KisCurveOpOption::writeOptionSetting(KisPropertiesConfigurationSP config) const
{
CurveOption op;
KisCurveOptionProperties op;
op.curve_paint_connection_line = m_options->connectionCHBox->isChecked();
op.curve_smoothing = m_options->smoothingCHBox->isChecked();
......@@ -73,7 +73,7 @@ void KisCurveOpOption::writeOptionSetting(KisPropertiesConfigurationSP config) c
void KisCurveOpOption::readOptionSetting(const KisPropertiesConfigurationSP config)
{
CurveOption op;
KisCurveOptionProperties op;
op.readOptionSetting(config);
m_options->connectionCHBox->setChecked(op.curve_paint_connection_line);
......
......@@ -43,7 +43,7 @@ private:
};
class CurveOption : public KisBaseOption
class KisCurveOptionProperties : public KisPaintopPropertiesBase
{
public:
bool curve_paint_connection_line;
......
......@@ -51,7 +51,7 @@ private:
KisPaintDeviceSP m_dab;
KisPaintDeviceSP m_dev;
CurveOption m_curveProperties;
KisCurveOptionProperties m_curveProperties;
KisPressureOpacityOption m_opacityOption;
KisLineWidthOption m_lineWidthOption;
KisCurvesOpacityOption m_curvesOpacityOption;
......
......@@ -35,7 +35,7 @@ KisCurvePaintOpSettings::~KisCurvePaintOpSettings()
void KisCurvePaintOpSettings::setPaintOpSize(qreal value)
{
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(this);
option.curve_line_width = value;
option.writeOptionSetting(this);
......@@ -43,7 +43,7 @@ void KisCurvePaintOpSettings::setPaintOpSize(qreal value)
qreal KisCurvePaintOpSettings::paintOpSize() const
{
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(this);
return option.curve_line_width;
}
......@@ -80,14 +80,14 @@ QList<KisUniformPaintOpPropertySP> KisCurvePaintOpSettings::uniformProperties(Ki
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(option.curve_line_width);
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.curve_line_width = prop->value().toInt();
option.writeOptionSetting(prop->settings().data());
......@@ -110,14 +110,14 @@ QList<KisUniformPaintOpPropertySP> KisCurvePaintOpSettings::uniformProperties(Ki
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(option.curve_stroke_history_size);
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.curve_stroke_history_size = prop->value().toInt();
option.writeOptionSetting(prop->settings().data());
......@@ -143,13 +143,13 @@ QList<KisUniformPaintOpPropertySP> KisCurvePaintOpSettings::uniformProperties(Ki
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(option.curve_curves_opacity * 100.0);
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.curve_curves_opacity = prop->value().toReal() / 100.0;
option.writeOptionSetting(prop->settings().data());
......@@ -170,14 +170,14 @@ QList<KisUniformPaintOpPropertySP> KisCurvePaintOpSettings::uniformProperties(Ki
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(option.curve_paint_connection_line);
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
CurveOption option;
KisCurveOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.curve_paint_connection_line = prop->value().toBool();
option.writeOptionSetting(prop->settings().data());
......
......@@ -104,7 +104,7 @@ void KisDuplicateOpOption::setCloneFromProjection(bool cloneFromProjection)
void KisDuplicateOpOption::writeOptionSetting(KisPropertiesConfigurationSP setting) const
{
DuplicateOption op;
KisDuplicateOptionProperties op;
op.duplicate_healing = healing();
op.duplicate_correct_perspective = correctPerspective();
......@@ -116,7 +116,7 @@ void KisDuplicateOpOption::writeOptionSetting(KisPropertiesConfigurationSP setti
void KisDuplicateOpOption::readOptionSetting(const KisPropertiesConfigurationSP setting)
{
DuplicateOption op;
KisDuplicateOptionProperties op;
op.readOptionSetting(setting);
m_optionWidget->cbHealing->setChecked(op.duplicate_healing);
......
......@@ -58,7 +58,7 @@ private:
};
struct DuplicateOption : public KisBaseOption
struct KisDuplicateOptionProperties : public KisPaintopPropertiesBase
{
bool duplicate_healing;
bool duplicate_correct_perspective;
......
......@@ -187,14 +187,14 @@ QList<KisUniformPaintOpPropertySP> KisDuplicateOpSettings::uniformProperties(Kis
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
DuplicateOption option;
KisDuplicateOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(option.duplicate_healing);
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
DuplicateOption option;
KisDuplicateOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.duplicate_healing = prop->value().toBool();
option.writeOptionSetting(prop->settings().data());
......@@ -214,14 +214,14 @@ QList<KisUniformPaintOpPropertySP> KisDuplicateOpSettings::uniformProperties(Kis
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
DuplicateOption option;
KisDuplicateOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(option.duplicate_move_source_point);
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
DuplicateOption option;
KisDuplicateOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.duplicate_move_source_point = prop->value().toBool();
option.writeOptionSetting(prop->settings().data());
......
......@@ -206,7 +206,7 @@ public:
qreal scale, qreal rotation, QPointF pos,
qreal subPixelX, qreal subPixelY, int dabX, int dabY);
void setSizeProperties(BrushSizeOption * properties) {
void setSizeProperties(KisBrushSizeOptionProperties * properties) {
m_sizeProperties = properties;
}
void setProperties(DeformOption * properties) {
......@@ -245,7 +245,7 @@ private:
DeformBase * m_deformAction;
DeformOption * m_properties;
BrushSizeOption * m_sizeProperties;
KisBrushSizeOptionProperties * m_sizeProperties;
};
......
......@@ -112,7 +112,7 @@ qreal KisBrushSizeOption::brushAspect() const
void KisBrushSizeOption::writeOptionSetting(KisPropertiesConfigurationSP setting) const
{
BrushSizeOption op;
KisBrushSizeOptionProperties op;
op.brush_diameter = m_options->diameter->value();
op.brush_aspect = m_options->aspectBox->value();
......@@ -128,7 +128,7 @@ void KisBrushSizeOption::writeOptionSetting(KisPropertiesConfigurationSP setting
void KisBrushSizeOption::readOptionSetting(const KisPropertiesConfigurationSP setting)
{
BrushSizeOption op;
KisBrushSizeOptionProperties op;
op.readOptionSetting(setting);
m_options->diameter->setValue(op.brush_diameter);
......
......@@ -56,7 +56,7 @@ private:
KisBrushSizeOptionsWidget * m_options;
};
class BrushSizeOption : public KisBaseOption
class KisBrushSizeOptionProperties : public KisPaintopPropertiesBase
{
public:
......
......@@ -56,7 +56,7 @@ private:
DeformBrush m_deformBrush;
DeformOption m_properties;
BrushSizeOption m_sizeProperties;
KisBrushSizeOptionProperties m_sizeProperties;
KisAirbrushOptionWidget m_airbrushOptionWidget;
......
......@@ -42,7 +42,7 @@ KisDeformPaintOpSettings::~KisDeformPaintOpSettings()
void KisDeformPaintOpSettings::setPaintOpSize(qreal value)
{
BrushSizeOption option;
KisBrushSizeOptionProperties option;
option.readOptionSetting(this);
option.brush_diameter = value;
option.writeOptionSetting(this);
......@@ -50,7 +50,7 @@ void KisDeformPaintOpSettings::setPaintOpSize(qreal value)
qreal KisDeformPaintOpSettings::paintOpSize() const
{
BrushSizeOption option;
KisBrushSizeOptionProperties option;
option.readOptionSetting(this);
return option.brush_diameter;
}
......@@ -201,14 +201,14 @@ QList<KisUniformPaintOpPropertySP> KisDeformPaintOpSettings::uniformProperties(K
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
BrushSizeOption option;
KisBrushSizeOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(int(option.brush_rotation));
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
BrushSizeOption option;
KisBrushSizeOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.brush_rotation = prop->value().toInt();
option.writeOptionSetting(prop->settings().data());
......
......@@ -38,7 +38,7 @@ KisGridPaintOpSettings::KisGridPaintOpSettings()
void KisGridPaintOpSettings::setPaintOpSize(qreal value)
{
GridOption option;
KisGridOpProperties option;
option.readOptionSetting(this);
option.grid_width = value;
option.grid_height = value;
......@@ -47,7 +47,7 @@ void KisGridPaintOpSettings::setPaintOpSize(qreal value)
qreal KisGridPaintOpSettings::paintOpSize() const
{
GridOption option;
KisGridOpProperties option;
option.readOptionSetting(this);
return option.grid_width;
......@@ -116,14 +116,14 @@ QList<KisUniformPaintOpPropertySP> KisGridPaintOpSettings::uniformProperties(Kis
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
GridOption option;
KisGridOpProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(int(option.grid_division_level));
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
GridOption option;
KisGridOpProperties option;
option.readOptionSetting(prop->settings().data());
option.grid_division_level = prop->value().toInt();
option.writeOptionSetting(prop->settings().data());
......
......@@ -145,7 +145,7 @@ qreal KisGridOpOption::scale() const
void KisGridOpOption::writeOptionSetting(KisPropertiesConfigurationSP setting) const
{
GridOption op;
KisGridOpProperties op;
op.grid_width = gridWidth();
op.grid_height = gridHeight();
......@@ -161,7 +161,7 @@ void KisGridOpOption::writeOptionSetting(KisPropertiesConfigurationSP setting) c
void KisGridOpOption::readOptionSetting(const KisPropertiesConfigurationSP setting)
{
GridOption op;
KisGridOpProperties op;
op.readOptionSetting(setting);
m_options->gridWidthSPBox->setValue(op.grid_width);
......
......@@ -62,7 +62,7 @@ private:
};
struct GridOption : public KisBaseOption
struct KisGridOpProperties : public KisPaintopPropertiesBase
{
int grid_width;
int grid_height;
......
......@@ -48,7 +48,7 @@ KisHairyPaintOp::KisHairyPaintOp(const KisPaintOpSettingsSP settings, KisPainter
m_dev = node ? node->paintDevice() : 0;
KisBrushOption brushOption;
KisBrushOptionProperties brushOption;
brushOption.readOptionSetting(settings);
KisBrushSP brush = brushOption.brush();
KisFixedPaintDeviceSP dab = cachedDab(painter->device()->compositionSourceColorSpace());
......
......@@ -48,7 +48,7 @@ void KisMaskingBrushOptionProperties::write(KisPropertiesConfiguration *setting,
KisPropertiesConfigurationSP embeddedConfig = new KisPropertiesConfiguration();
{
KisBrushOption option;
KisBrushOptionProperties option;
option.setBrush(brush);
option.writeOptionSetting(embeddedConfig);
}
......@@ -75,7 +75,7 @@ void KisMaskingBrushOptionProperties::read(const KisPropertiesConfiguration *set
KisPropertiesConfigurationSP embeddedConfig = new KisPropertiesConfiguration();
setting->getPrefixedProperties(KisPaintOpUtils::MaskingBrushPresetPrefix, embeddedConfig);
KisBrushOption option;
KisBrushOptionProperties option;
option.readOptionSetting(embeddedConfig);
brush = option.brush();
......
......@@ -63,4 +63,10 @@ private:
Private *const m_d;
};
//class KisAirbrushOptionProperties : public KisPaintopPropertiesBase
//{
//protected:
//};
#endif
......@@ -43,8 +43,8 @@ TextBrushInitializationWorkaround *TextBrushInitializationWorkaround::instance()
void TextBrushInitializationWorkaround::preinitialize(KisPropertiesConfigurationSP settings)
{
if (KisBrushOption::isTextBrush(settings.data())) {
KisBrushOption brushOption;
if (KisBrushOptionProperties::isTextBrush(settings.data())) {
KisBrushOptionProperties brushOption;
brushOption.readOptionSetting(settings);
m_brush = brushOption.brush();
m_settings = settings;
......@@ -89,7 +89,7 @@ KisBrushBasedPaintOp::KisBrushBasedPaintOp(const KisPropertiesConfigurationSP se
#endif /* HAVE_THREADED_TEXT_RENDERING_WORKAROUND */
if (!m_brush) {
KisBrushOption brushOption;
KisBrushOptionProperties brushOption;
brushOption.readOptionSetting(settings);
m_brush = brushOption.brush();
}
......
......@@ -40,7 +40,7 @@ struct BrushReader {
}
const KisBrushBasedPaintOpSettings *m_parent;
KisBrushOption m_option;
KisBrushOptionProperties m_option;
};
struct BrushWriter {
......@@ -59,7 +59,7 @@ struct BrushWriter {
}
KisBrushBasedPaintOpSettings *m_parent;
KisBrushOption m_option;
KisBrushOptionProperties m_option;
};
......
......@@ -26,7 +26,7 @@
#include "kis_properties_configuration.h"
#include <KisPaintopSettingsIds.h>
void KisBrushOption::writeOptionSettingImpl(KisPropertiesConfiguration *setting) const
void KisBrushOptionProperties::writeOptionSettingImpl(KisPropertiesConfiguration *setting) const
{
if (!m_brush)
return;
......@@ -68,7 +68,7 @@ QDomElement getBrushXMLElement(const KisPropertiesConfiguration *setting)
return element;
}
void KisBrushOption::readOptionSettingImpl(const KisPropertiesConfiguration *setting)
void KisBrushOptionProperties::readOptionSettingImpl(const KisPropertiesConfiguration *setting)
{
QDomElement element = getBrushXMLElement(setting);
......@@ -81,7 +81,7 @@ void KisBrushOption::readOptionSettingImpl(const KisPropertiesConfiguration *set
#include "kis_text_brush_factory.h"
bool KisBrushOption::isTextBrush(const KisPropertiesConfiguration *setting)
bool KisBrushOptionProperties::isTextBrush(const KisPropertiesConfiguration *setting)
{
static QString textBrushId = KisTextBrushFactory().id();
......@@ -93,12 +93,12 @@ bool KisBrushOption::isTextBrush(const KisPropertiesConfiguration *setting)
#endif /* HAVE_THREADED_TEXT_RENDERING_WORKAROUND */
KisBrushSP KisBrushOption::brush() const
KisBrushSP KisBrushOptionProperties::brush() const
{
return m_brush;
}
void KisBrushOption::setBrush(KisBrushSP brush)
void KisBrushOptionProperties::setBrush(KisBrushSP brush)
{
m_brush = brush;
}
......@@ -22,14 +22,14 @@
#define KIS_BRUSH_OPTION_H_
#include <kis_brush.h>
#include <kis_base_option.h>
#include <KisPaintopPropertiesBase.h>
#include <kis_properties_configuration.h>
#include <kis_threaded_text_rendering_workaround.h>
#include <kritapaintop_export.h>
class PAINTOP_EXPORT KisBrushOption : public KisBaseOption
class PAINTOP_EXPORT KisBrushOptionProperties : public KisPaintopPropertiesBase
{
public:
......
......@@ -67,7 +67,7 @@ private Q_SLOTS:
private:
KisBrushSelectionWidget * m_brushSelectionWidget;
KisBrushOption m_brushOption;
KisBrushOptionProperties m_brushOption;
};
......
......@@ -76,7 +76,7 @@ private:
KisOffsetScaleOption m_offsetScaleOption;
KisAirbrushOptionWidget m_airbrushOptionWidget;
KisBrushOption m_brushOption;
KisBrushOptionProperties m_brushOption;
SketchProperties m_sketchProperties;
QVector<QPointF> m_points;
......
......@@ -55,10 +55,10 @@ private:
private:
KisShapeProperties m_shapeProperties;
KisSprayProperties m_properties;
KisSprayOptionProperties m_properties;
KisShapeDynamicsProperties m_shapeDynamicsProperties;
KisColorProperties m_colorProperties;
KisBrushOption m_brushOption;
KisBrushOptionProperties m_brushOption;
KisPaintDeviceSP m_dab;
SprayBrush m_sprayBrush;
......
......@@ -45,7 +45,7 @@ KisSprayPaintOpSettings::~KisSprayPaintOpSettings()
void KisSprayPaintOpSettings::setPaintOpSize(qreal value)
{
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(this);
option.diameter = value;
option.writeOptionSetting(this);
......@@ -54,7 +54,7 @@ void KisSprayPaintOpSettings::setPaintOpSize(qreal value)
qreal KisSprayPaintOpSettings::paintOpSize() const
{
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(this);
return option.diameter;
......@@ -121,14 +121,14 @@ QList<KisUniformPaintOpPropertySP> KisSprayPaintOpSettings::uniformProperties(Ki
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(option.spacing);
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.spacing = prop->value().toReal();
option.writeOptionSetting(prop->settings().data());
......@@ -151,21 +151,21 @@ QList<KisUniformPaintOpPropertySP> KisSprayPaintOpSettings::uniformProperties(Ki
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(int(option.particleCount));
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.particleCount = prop->value().toInt();
option.writeOptionSetting(prop->settings().data());
});
prop->setIsVisibleCallback(
[](const KisUniformPaintOpProperty *prop) {
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(prop->settings().data());
return !option.useDensity;
});
......@@ -190,20 +190,20 @@ QList<KisUniformPaintOpPropertySP> KisSprayPaintOpSettings::uniformProperties(Ki
prop->setReadCallback(
[](KisUniformPaintOpProperty *prop) {
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(prop->settings().data());
prop->setValue(option.coverage);
});
prop->setWriteCallback(
[](KisUniformPaintOpProperty *prop) {
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(prop->settings().data());
option.coverage = prop->value().toReal();
option.writeOptionSetting(prop->settings().data());
});
prop->setIsVisibleCallback(
[](const KisUniformPaintOpProperty *prop) {
KisSprayProperties option;
KisSprayOptionProperties option;
option.readOptionSetting(prop->settings().data());
return option.useDensity;
});
......
......@@ -94,7 +94,7 @@ KisSprayOpOption::~KisSprayOpOption()
void KisSprayOpOption::writeOptionSetting(KisPropertiesConfigurationSP setting) const
{
KisSprayProperties op;
KisSprayOptionProperties op;
op.diameter = m_options->diameterSpinBox->value();
op.particleCount = m_options->particlesSpinBox->value();
......@@ -113,7 +113,7 @@ void KisSprayOpOption::writeOptionSetting(KisPropertiesConfigurationSP setting)
void KisSprayOpOption::readOptionSetting(const KisPropertiesConfigurationSP setting)
{
KisSprayProperties op;
KisSprayOptionProperties op;
op.readOptionSetting(setting);
m_options->diameterSpinBox->setValue(op.diameter);
......
......@@ -53,7 +53,7 @@ private:
};
class KisSprayProperties : public KisBaseOption
class KisSprayOptionProperties : public KisPaintopPropertiesBase
{
public:
quint16 diameter;
......
......@@ -60,7 +60,7 @@ SprayBrush::~SprayBrush()
delete m_transfo;
}