[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/krita/plugins/paintops/defaultpaintops
From: Sven Langkamp <sven.langkamp () gmail ! com>
Date: 2010-03-01 12:17:20
Message-ID: 1267445840.457460.23493.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1097446 by langkamp:
cleanup in defaultpaintops
M +0 -4 CMakeLists.txt
M +2 -21 brush/kis_brushop.cpp
M +2 -6 brush/kis_brushop.h
D brush/kis_brushop_settings.cpp
D brush/kis_brushop_settings.h
M +2 -5 brush/kis_brushop_settings_widget.cpp
M +0 -1 brush/kis_brushop_settings_widget.h
M +6 -11 defaultpaintops_plugin.cc
M +2 -23 eraser/kis_eraseop.cpp
M +3 -13 eraser/kis_eraseop.h
D eraser/kis_eraseop_settings.cpp
D eraser/kis_eraseop_settings.h
M +2 -2 eraser/kis_eraseop_settings_widget.cpp
M +0 -1 eraser/kis_eraseop_settings_widget.h
M +2 -7 pen/kis_penop.cpp
M +2 -9 pen/kis_penop.h
D pen/kis_penop_settings.cpp
D pen/kis_penop_settings.h
M +2 -2 pen/kis_penop_settings_widget.cpp
M +0 -13 smudge/kis_smudgeop.cpp
M +1 -12 smudge/kis_smudgeop.h
D smudge/kis_smudgeop_settings.cpp
D smudge/kis_smudgeop_settings.h
M +2 -2 smudge/kis_smudgeop_settings_widget.cpp
M +0 -1 smudge/kis_smudgeop_settings_widget.h
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/CMakeLists.txt \
#1097445:1097446 @@ -12,7 +12,6 @@
airbrush/kis_airbrushop_settings.cpp
airbrush/kis_airbrushop_settings_widget.cpp
brush/kis_brushop.cpp
- brush/kis_brushop_settings.cpp
brush/kis_brushop_settings_widget.cpp
duplicate/kis_duplicateop.cpp
duplicate/kis_duplicateop_factory.cpp
@@ -20,13 +19,10 @@
duplicate/kis_duplicateop_settings_widget.cpp
duplicate/kis_duplicateop_option.cpp
eraser/kis_eraseop.cpp
- eraser/kis_eraseop_settings.cpp
eraser/kis_eraseop_settings_widget.cpp
pen/kis_penop.cpp
- pen/kis_penop_settings.cpp
pen/kis_penop_settings_widget.cpp
smudge/kis_smudgeop.cpp
- smudge/kis_smudgeop_settings.cpp
smudge/kis_smudgeop_settings_widget.cpp
)
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.cpp \
#1097445:1097446 @@ -22,42 +22,23 @@
#include "kis_brushop.h"
-#include <string.h>
-
#include <QRect>
-#include <QWidget>
-#include <QLayout>
-#include <QLabel>
-#include <QCheckBox>
-#include <QDomElement>
-#include <QHBoxLayout>
-#include <qtoolbutton.h>
#include <kis_image.h>
#include <kis_debug.h>
#include <KoColorTransformation.h>
#include <KoColor.h>
-#include <KoInputDevice.h>
#include <kis_brush.h>
-#include <kis_datamanager.h>
#include <kis_global.h>
#include <kis_paint_device.h>
#include <kis_painter.h>
-#include <kis_paintop.h>
-#include <kis_properties_configuration.h>
-#include <kis_selection.h>
-#include <kis_brush_option_widget.h>
-#include <kis_paintop_options_widget.h>
-
-#include <kis_brushop_settings.h>
-#include <kis_brushop_settings_widget.h>
+#include <kis_brush_based_paintop_settings.h>
#include <kis_color_source.h>
-KisBrushOp::KisBrushOp(const KisBrushOpSettings *settings, KisPainter *painter, \
KisImageWSP image) +KisBrushOp::KisBrushOp(const KisBrushBasedPaintOpSettings \
*settings, KisPainter *painter, KisImageWSP image) : KisBrushBasedPaintOp(settings, \
painter)
- , settings(settings)
{
Q_UNUSED(image);
Q_ASSERT(settings);
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h \
#1097445:1097446 @@ -27,13 +27,10 @@
#include <kis_pressure_darken_option.h>
#include <kis_pressure_opacity_option.h>
#include <kis_pressure_size_option.h>
-#include <kis_paint_action_type_option.h>
#include <kis_pressure_rotation_option.h>
#include <kis_pressure_mix_option.h>
-class KisBrushOptionWidget;
-class KisBrushOpSettings;
-class KisBrushOpSettingsWidget;
+class KisBrushBasedPaintOpSettings;
class QWidget;
class QPointF;
@@ -46,14 +43,13 @@
public:
- KisBrushOp(const KisBrushOpSettings *settings, KisPainter * painter, KisImageWSP \
image); + KisBrushOp(const KisBrushBasedPaintOpSettings *settings, KisPainter * \
painter, KisImageWSP image); virtual ~KisBrushOp();
double paintAt(const KisPaintInformation& info);
private:
KisColorSource* m_colorSource;
- const KisBrushOpSettings * settings;
KisPressureSizeOption m_sizeOption;
KisPressureOpacityOption m_opacityOption;
KisPressureDarkenOption m_darkenOption;
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp \
#1097445:1097446 @@ -21,10 +21,7 @@
*/
#include "kis_brushop_settings_widget.h"
-#include "kis_brushop_settings.h"
-#include <kis_properties_configuration.h>
-#include <kis_brush_option_widget.h>
-#include <kis_paintop_options_widget.h>
+#include <kis_brush_based_paintop_settings.h>
#include <kis_pressure_darken_option.h>
#include <kis_pressure_opacity_option.h>
#include <kis_pressure_size_option.h>
@@ -52,7 +49,7 @@
KisPropertiesConfiguration* KisBrushOpSettingsWidget::configuration() const
{
- KisBrushOpSettings *config = new KisBrushOpSettings();
+ KisBrushBasedPaintOpSettings *config = new KisBrushBasedPaintOpSettings();
config->setOptionsWidget(const_cast<KisBrushOpSettingsWidget*>(this));
config->setProperty("paintop", "paintbrush"); // XXX: make this a const id \
string writeConfiguration(config);
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.h \
#1097445:1097446 @@ -24,7 +24,6 @@
#define KIS_BRUSHOP_SETTINGS_WIDGET_H_
#include <kis_brush_based_paintop_options_widget.h>
-#include <kis_image.h>
class KisBrushOptionWidget;
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc \
#1097445:1097446 @@ -27,22 +27,18 @@
#include <kpluginfactory.h>
#include "kis_simple_paintop_factory.h"
-#include "kis_airbrushop.h"
-#include "kis_airbrushop_settings.h"
-#include "kis_airbrushop_settings_widget.h"
#include "kis_brushop.h"
-#include "kis_brushop_settings.h"
#include "kis_brushop_settings_widget.h"
#include "kis_duplicateop_factory.h"
#include "kis_eraseop.h"
-#include "kis_eraseop_settings.h"
+#include "kis_eraseop_settings_widget.h"
#include "kis_penop.h"
-#include "kis_penop_settings.h"
#include "kis_penop_settings_widget.h"
#include "kis_smudgeop.h"
-#include "kis_smudgeop_settings.h"
+#include "kis_smudgeop_settings_widget.h"
#include "kis_global.h"
#include "kis_paintop_registry.h"
+#include "kis_brush_based_paintop_settings.h"
K_PLUGIN_FACTORY(DefaultPaintOpsPluginFactory, \
registerPlugin<DefaultPaintOpsPlugin>();) \
K_EXPORT_PLUGIN(DefaultPaintOpsPluginFactory("krita")) @@ -54,11 +50,10 @@
//setComponentData(DefaultPaintOpsPluginFactory::componentData());
KisPaintOpRegistry *r = KisPaintOpRegistry::instance();
- r->add(new KisSimplePaintOpFactory<KisAirbrushOp, KisAirbrushOpSettings, \
KisAirbrushOpSettingsWidget>("airbrush", i18n("Pixel Airbrush"), \
"krita-airbrush.png"));
- r->add(new KisSimplePaintOpFactory<KisBrushOp, KisBrushOpSettings, \
KisBrushOpSettingsWidget>("paintbrush", i18n("Pixel Brush"), \
"krita-paintbrush.png")); + r->add(new KisSimplePaintOpFactory<KisBrushOp, \
KisBrushBasedPaintOpSettings, KisBrushOpSettingsWidget>("paintbrush", i18n("Pixel \
Brush"), "krita-paintbrush.png")); r->add(new KisDuplicateOpFactory);
- r->add(new KisSimplePaintOpFactory<KisEraseOp, KisEraseOpSettings, \
KisEraseOpSettingsWidget>("eraser", i18n("Pixel Eraser"), \
"krita-eraser.png"));
- r->add(new KisSimplePaintOpFactory<KisPenOp, KisPenOpSettings, \
KisPenOpSettingsWidget>("pencil", "Pixel Pencil", "krita-pencil.png")); + \
r->add(new KisSimplePaintOpFactory<KisEraseOp, KisBrushBasedPaintOpSettings, \
KisEraseOpSettingsWidget>("eraser", i18n("Pixel Eraser"), "krita-eraser.png")); + \
r->add(new KisSimplePaintOpFactory<KisPenOp, KisBrushBasedPaintOpSettings, \
KisPenOpSettingsWidget>("pencil", "Pixel Pencil", "krita-pencil.png")); r->add(new \
KisSimplePaintOpFactory<KisSmudgeOp, KisBrushBasedPaintOpSettings, \
KisSmudgeOpSettingsWidget>("smudge", i18n("Smudge Brush"), "krita-smudgebrush.png")); \
}
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/eraser/kis_eraseop.cpp \
#1097445:1097446 @@ -22,16 +22,7 @@
#include "kis_eraseop.h"
-#include <string.h>
-
#include <QRect>
-#include <QWidget>
-#include <QLayout>
-#include <QLabel>
-#include <QCheckBox>
-#include <QDomElement>
-#include <QHBoxLayout>
-#include <qtoolbutton.h>
#include <kis_image.h>
#include <kis_debug.h>
@@ -39,27 +30,15 @@
#include <KoColorTransformation.h>
#include <KoColor.h>
#include <KoCompositeOp.h>
-#include <KoInputDevice.h>
#include <kis_brush.h>
-#include <kis_datamanager.h>
#include <kis_global.h>
#include <kis_paint_device.h>
#include <kis_painter.h>
-#include <kis_paintop.h>
-#include <kis_properties_configuration.h>
-#include <kis_selection.h>
-#include <kis_brush_option_widget.h>
-#include <kis_paintop_options_widget.h>
-#include <kis_paint_action_type_option.h>
+#include <kis_brush_based_paintop_settings.h>
-#include <kis_eraseop_settings.h>
-#include <kis_eraseop_settings_widget.h>
-
-
-KisEraseOp::KisEraseOp(const KisEraseOpSettings *settings, KisPainter *painter, \
KisImageWSP image) +KisEraseOp::KisEraseOp(const KisBrushBasedPaintOpSettings \
*settings, KisPainter *painter, KisImageWSP image) : KisBrushBasedPaintOp(settings, \
painter)
- , settings(settings)
{
Q_UNUSED(image);
Q_ASSERT(settings);
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/eraser/kis_eraseop.h \
#1097445:1097446 @@ -23,21 +23,13 @@
#ifndef KIS_ERASEOP_H_
#define KIS_ERASEOP_H_
-#include "kis_brush_based_paintop.h"
-#include <klocale.h>
-#include <QDialog>
#include <KoColorSpace.h>
-#include <kis_paintop_factory.h>
-#include <kis_paintop_settings.h>
-#include <kis_paintop_options_widget.h>
+#include "kis_brush_based_paintop.h"
#include <kis_pressure_opacity_option.h>
#include <kis_pressure_size_option.h>
-class KisBrushOptionWidget;
-class KisPaintActionTypeOption;
-class KisEraseOpSettings;
-class KisEraseOpSettingsWidget;
+class KisBrushBasedPaintOpSettings;
class QWidget;
class QPointF;
@@ -49,14 +41,12 @@
public:
- KisEraseOp(const KisEraseOpSettings *settings, KisPainter * painter, KisImageWSP \
image); + KisEraseOp(const KisBrushBasedPaintOpSettings *settings, KisPainter * \
painter, KisImageWSP image); virtual ~KisEraseOp();
double paintAt(const KisPaintInformation& info);
private:
-
- const KisEraseOpSettings * settings;
KisPressureOpacityOption m_opacityOption;
KisPressureSizeOption m_sizeOption;
};
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/eraser/kis_eraseop_settings_widget.cpp \
#1097445:1097446 @@ -21,7 +21,7 @@
*/
#include "kis_eraseop_settings_widget.h"
-#include "kis_eraseop_settings.h"
+#include <kis_brush_based_paintop_settings.h>
#include <kis_properties_configuration.h>
#include <kis_pressure_opacity_option.h>
#include <kis_pressure_size_option.h>
@@ -43,7 +43,7 @@
KisPropertiesConfiguration* KisEraseOpSettingsWidget::configuration() const
{
- KisEraseOpSettings *config = new KisEraseOpSettings();
+ KisBrushBasedPaintOpSettings *config = new KisBrushBasedPaintOpSettings();
config->setOptionsWidget(const_cast<KisEraseOpSettingsWidget*>(this));
config->setProperty("paintop", "eraser"); // XXX: make this a const id string
writeConfiguration(config);
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/eraser/kis_eraseop_settings_widget.h \
#1097445:1097446 @@ -24,7 +24,6 @@
#define KIS_ERASEOP_SETTINGS_WIDGET_H_
#include <kis_brush_based_paintop_options_widget.h>
-#include <kis_image.h>
#include <kis_pressure_opacity_option.h>
#include <kis_pressure_size_option.h>
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/pen/kis_penop.cpp \
#1097445:1097446 @@ -33,15 +33,10 @@
#include <kis_global.h>
#include <kis_paint_device.h>
#include <kis_painter.h>
-#include <kis_paintop.h>
-#include <kis_selection.h>
-#include <kis_brush_option_widget.h>
+#include <kis_brush_based_paintop_settings.h>
-#include <kis_penop_settings.h>
-
-KisPenOp::KisPenOp(const KisPenOpSettings *settings, KisPainter *painter, \
KisImageWSP image) +KisPenOp::KisPenOp(const KisBrushBasedPaintOpSettings *settings, \
KisPainter *painter, KisImageWSP image) : KisBrushBasedPaintOp(settings, painter)
- , settings(settings)
{
Q_UNUSED(image);
Q_ASSERT(settings);
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/pen/kis_penop.h \
#1097445:1097446 @@ -24,30 +24,23 @@
#define KIS_PENOP_H_
#include "kis_brush_based_paintop.h"
-
-#include <kis_paintop_factory.h>
-#include <kis_paintop_settings.h>
#include <kis_pressure_darken_option.h>
#include <kis_pressure_opacity_option.h>
#include <kis_pressure_size_option.h>
-class KisBrushOptionWidget;
-class KisPenOpSettings;
+class KisBrushBasedPaintOpSettings;
-
class KisPenOp : public KisBrushBasedPaintOp
{
public:
- KisPenOp(const KisPenOpSettings *settings, KisPainter * painter, KisImageWSP \
image); + KisPenOp(const KisBrushBasedPaintOpSettings *settings, KisPainter * \
painter, KisImageWSP image); virtual ~KisPenOp();
double paintAt(const KisPaintInformation& info);
private:
-
- const KisPenOpSettings * settings;
KisPressureOpacityOption m_opacityOption;
KisPressureDarkenOption m_darkenOption;
KisPressureSizeOption m_sizeOption;
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/pen/kis_penop_settings_widget.cpp \
#1097445:1097446 @@ -21,7 +21,7 @@
*/
#include "kis_penop_settings_widget.h"
-#include "kis_penop_settings.h"
+#include "kis_brush_based_paintop_settings.h"
#include <kis_properties_configuration.h>
#include <kis_pressure_darken_option.h>
#include <kis_pressure_opacity_option.h>
@@ -47,7 +47,7 @@
KisPropertiesConfiguration* KisPenOpSettingsWidget::configuration() const
{
- KisPenOpSettings *config = new KisPenOpSettings();
+ KisBrushBasedPaintOpSettings *config = new KisBrushBasedPaintOpSettings();
config->setOptionsWidget(const_cast<KisPenOpSettingsWidget*>(this));
config->setProperty("paintop", "pencil"); // XXX: make this a const id string
writeConfiguration(config);
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/smudge/kis_smudgeop.cpp \
#1097445:1097446 @@ -22,16 +22,7 @@
#include "kis_smudgeop.h"
-#include <string.h>
-
#include <QRect>
-#include <QWidget>
-#include <QLayout>
-#include <QLabel>
-#include <QCheckBox>
-#include <QDomElement>
-#include <QHBoxLayout>
-#include <qtoolbutton.h>
#include <kis_debug.h>
@@ -39,20 +30,16 @@
#include <KoColorTransformation.h>
#include <KoColor.h>
#include <KoCompositeOp.h>
-#include <KoInputDevice.h>
#include <kis_brush.h>
#include <kis_global.h>
#include <kis_paint_device.h>
#include <kis_painter.h>
-#include <kis_paintop.h>
-#include <kis_properties_configuration.h>
#include <kis_selection.h>
#include <kis_brush_based_paintop_settings.h>
KisSmudgeOp::KisSmudgeOp(const KisBrushBasedPaintOpSettings *settings, KisPainter \
*painter, KisImageWSP image) : KisBrushBasedPaintOp(settings, painter)
- , settings(settings)
, m_firstRun(true)
, m_target(0)
, m_srcdev(0)
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/smudge/kis_smudgeop.h \
#1097445:1097446 @@ -23,28 +23,19 @@
#ifndef KIS_SMUDGEOP_H_
#define KIS_SMUDGEOP_H_
-#include "kis_brush_based_paintop.h"
-#include <klocale.h>
-#include <QDialog>
#include <KoColorSpace.h>
+#include "kis_brush_based_paintop.h"
#include <kis_types.h>
-
-#include <kis_paintop_factory.h>
-#include <kis_paintop_settings.h>
#include <kis_pressure_opacity_option.h>
#include <kis_pressure_size_option.h>
#include <kis_pressure_rate_option.h>
-class KisBrushOptionWidget;
-class KisPaintActionTypeOption;
class KisBrushBasedPaintOpSettings;
-class QWidget;
class QPointF;
class KisPainter;
-
class KisSmudgeOp : public KisBrushBasedPaintOp
{
@@ -56,8 +47,6 @@
double paintAt(const KisPaintInformation& info);
private:
-
- const KisBrushBasedPaintOpSettings * settings;
bool m_firstRun;
KisPaintDeviceSP m_source;
KisPaintDeviceSP m_target;
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/smudge/kis_smudgeop_settings_widget.cpp \
#1097445:1097446 @@ -21,7 +21,7 @@
*/
#include "kis_smudgeop_settings_widget.h"
-#include "kis_smudgeop_settings.h"
+#include "kis_brush_based_paintop_settings.h"
#include <kis_properties_configuration.h>
#include <kis_paintop_options_widget.h>
#include <kis_pressure_darken_option.h>
@@ -49,7 +49,7 @@
KisPropertiesConfiguration* KisSmudgeOpSettingsWidget::configuration() const
{
- KisSmudgeOpSettings *config = new KisSmudgeOpSettings();
+ KisBrushBasedPaintOpSettings *config = new KisBrushBasedPaintOpSettings();
config->setOptionsWidget(const_cast<KisSmudgeOpSettingsWidget*>(this));
config->setProperty("paintop", "smudge"); // XXX: make this a const id string
writeConfiguration(config);
--- trunk/koffice/krita/plugins/paintops/defaultpaintops/smudge/kis_smudgeop_settings_widget.h \
#1097445:1097446 @@ -24,7 +24,6 @@
#define KIS_SMUDGEOP_SETTINGS_WIDGET_H_
#include <kis_brush_based_paintop_options_widget.h>
-#include <kis_image.h>
class KisBrushOptionWidget;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic