summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/paintops
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/plugins/paintops')
-rw-r--r--chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc8
-rw-r--r--chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h2
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc4
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_brushop.cc24
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_brushop.h4
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc4
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc8
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_penop.cc6
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc26
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h4
10 files changed, 45 insertions, 45 deletions
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
index 5a267f57..3b48e439 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
@@ -42,15 +42,15 @@ typedef KGenericFactory<DefaultPaintOpsPlugin> DefaultPaintOpsPluginFactory;
K_EXPORT_COMPONENT_FACTORY( chalkdefaultpaintops, DefaultPaintOpsPluginFactory( "chalkcore" ) )
-DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &)
- : KParts::Plugin(tqparent, name)
+DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &)
+ : KParts::Plugin(parent, name)
{
setInstance(DefaultPaintOpsPluginFactory::instance());
// This is not a gui plugin; only load it when the doc is created.
- if ( tqparent->inherits("KisPaintOpRegistry") )
+ if ( parent->inherits("KisPaintOpRegistry") )
{
- KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(tqparent);
+ KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(parent);
// Add hard-coded paint ops. Plugin paintops will add
// themselves in the plugin initialization code.
r->add ( new KisAirbrushOpFactory );
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
index d7afb9d0..7c037c9e 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
@@ -29,7 +29,7 @@ class DefaultPaintOpsPlugin : public KParts::Plugin
Q_OBJECT
TQ_OBJECT
public:
- DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+ DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &);
virtual ~DefaultPaintOpsPlugin();
};
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
index 1977d58b..c5f93864 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
@@ -115,8 +115,8 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
dab = brush->image(device->colorSpace(), info, xFraction, yFraction);
}
else {
- KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction);
- dab = computeDab(tqmask);
+ KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction);
+ dab = computeDab(mask);
}
m_painter->setDab(dab); // Cache dab for future paints in the painter.
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
index ffa51114..1ec16561 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
@@ -55,10 +55,10 @@ KisPaintOp * KisBrushOpFactory::createOp(const KisPaintOpSettings *settings, Kis
return op;
}
-KisBrushOpSettings::KisBrushOpSettings(TQWidget *tqparent)
- : super(tqparent)
+KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent)
+ : super(parent)
{
- m_optionsWidget = new TQWidget(tqparent, "brush option widget");
+ m_optionsWidget = new TQWidget(parent, "brush option widget");
TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget);
l->setAutoAdd(true);
m_pressureVariation = new TQLabel(i18n("Pressure variation: "), m_optionsWidget);
@@ -125,13 +125,13 @@ bool KisBrushOpSettings::varyDarken() const
return m_darken->isChecked();
}
-KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice)
+KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice)
{
if (inputDevice == KisInputDevice::mouse()) {
// No options for mouse, only tablet devices
return 0;
} else {
- return new KisBrushOpSettings(tqparent);
+ return new KisBrushOpSettings(parent);
}
}
@@ -180,13 +180,13 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
// Painting should be implemented according to the following algorithm:
// retrieve brush
- // if brush == tqmask
- // retrieve tqmask
+ // if brush == mask
+ // retrieve mask
// else if brush == image
// retrieve image
- // subsample (tqmask | image) for position -- pos should be double!
- // apply filters to tqmask (colour | gradient | pattern | etc.
- // composite filtered tqmask into temporary layer
+ // subsample (mask | image) for position -- pos should be double!
+ // apply filters to mask (colour | gradient | pattern | etc.
+ // composite filtered mask into temporary layer
// composite temporary layer into target layer
// @see: doc/brush.txt
@@ -245,8 +245,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
dab = brush->image(device->colorSpace(), adjustedInfo, xFraction, yFraction);
}
else {
- KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction);
- dab = computeDab(tqmask);
+ KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction);
+ dab = computeDab(mask);
}
m_painter->setPressure(adjustedInfo.pressure);
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h
index 6475b3d7..4782efbd 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h
@@ -42,7 +42,7 @@ public:
virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter);
virtual KisID id() { return KisID("paintbrush", i18n("Pixel Brush")); }
virtual TQString pixmap() { return "paintbrush.png"; }
- virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice);
+ virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice);
};
class KisBrushOpSettings : public TQObject, public KisPaintOpSettings {
@@ -50,7 +50,7 @@ class KisBrushOpSettings : public TQObject, public KisPaintOpSettings {
TQ_OBJECT
typedef KisPaintOpSettings super;
public:
- KisBrushOpSettings(TQWidget *tqparent);
+ KisBrushOpSettings(TQWidget *parent);
bool varySize() const;
bool varyOpacity() const;
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
index 7ad4a4da..3294d846 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
@@ -125,8 +125,8 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf
dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8());
}
else {
- KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction);
- dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
+ KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction);
+ dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
}
m_painter->setPressure(info.pressure);
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
index 794923a4..0bfc6fd2 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
@@ -94,20 +94,20 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
splitCoordinate(pt.x(), &destX, &xFraction);
splitCoordinate(pt.y(), &destY, &yFraction);
- KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction);
+ KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction);
KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab");
Q_CHECK_PTR(dab);
- TQ_INT32 maskWidth = tqmask->width();
- TQ_INT32 maskHeight = tqmask->height();
+ TQ_INT32 maskWidth = mask->width();
+ TQ_INT32 maskHeight = mask->height();
TQRect dstRect;
KisRectIteratorPixel it = dab->createRectIterator(0, 0, maskWidth, maskHeight, true);
KisColorSpace* cs = dab->colorSpace();
while (!it.isDone()) {
- cs->setAlpha(it.rawData(), TQ_UINT8_MAX - tqmask->alphaAt(it.x(), it.y()), 1);
+ cs->setAlpha(it.rawData(), TQ_UINT8_MAX - mask->alphaAt(it.x(), it.y()), 1);
++it;
}
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
index e8780100..41c2607e 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
@@ -79,9 +79,9 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
dab = brush->image(device->colorSpace(), info);
}
else {
- // Compute tqmask without sub-pixel positioning
- KisAlphaMaskSP tqmask = brush->tqmask(info);
- dab = computeDab(tqmask);
+ // Compute mask without sub-pixel positioning
+ KisAlphaMaskSP mask = brush->mask(info);
+ dab = computeDab(mask);
}
m_painter->setPressure(info.pressure);
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
index a493f132..c5f4e6eb 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
@@ -56,10 +56,10 @@ KisPaintOp * KisSmudgeOpFactory::createOp(const KisPaintOpSettings *settings, Ki
return op;
}
-KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet)
- : super(tqparent)
+KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet)
+ : super(parent)
{
- m_optionsWidget = new TQWidget(tqparent, "brush option widget");
+ m_optionsWidget = new TQWidget(parent, "brush option widget");
TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget);
l->setAutoAdd(true);
m_rateLabel = new TQLabel(i18n("Rate: "), m_optionsWidget);
@@ -145,13 +145,13 @@ bool KisSmudgeOpSettings::varyOpacity() const
return m_opacity ? m_opacity->isChecked() : false;
}
-KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice)
+KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice)
{
if (inputDevice == KisInputDevice::mouse()) {
// No options for mouse, only tablet devices
- return new KisSmudgeOpSettings(tqparent, false);
+ return new KisSmudgeOpSettings(parent, false);
} else {
- return new KisSmudgeOpSettings(tqparent, true);
+ return new KisSmudgeOpSettings(parent, true);
}
}
@@ -205,13 +205,13 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
// Painting should be implemented according to the following algorithm:
// retrieve brush
- // if brush == tqmask
- // retrieve tqmask
+ // if brush == mask
+ // retrieve mask
// else if brush == image
// retrieve image
- // subsample (tqmask | image) for position -- pos should be double!
- // apply filters to tqmask (colour | gradient | pattern | etc.
- // composite filtered tqmask into temporary layer
+ // subsample (mask | image) for position -- pos should be double!
+ // apply filters to mask (colour | gradient | pattern | etc.
+ // composite filtered mask into temporary layer
// composite temporary layer into target layer
// @see: doc/brush.txt
@@ -256,8 +256,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8());
}
else {
- KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction);
- dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
+ KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction);
+ dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8());
}
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
index d9c8872d..5fd732f5 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
@@ -40,7 +40,7 @@ public:
virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter);
virtual KisID id() { return KisID("smudge", i18n("Smudge Brush")); }
virtual TQString pixmap() { return "paintbrush.png"; }
- virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice);
+ virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice);
};
class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings {
@@ -48,7 +48,7 @@ class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings {
TQ_OBJECT
typedef KisPaintOpSettings super;
public:
- KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet);
+ KisSmudgeOpSettings(TQWidget *parent, bool isTablet);
int rate() const;
bool varyRate() const;
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-10 14:28:43 +0000