summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/paintops
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/plugins/paintops')
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc2
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_brushop.cc4
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui2
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc2
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc8
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_penop.cc2
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc4
7 files changed, 12 insertions, 12 deletions
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
index 85bef3f6..1977d58b 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
@@ -122,7 +122,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
m_painter->setDab(dab); // Cache dab for future paints in the painter.
m_painter->setPressure(info.pressure); // Cache pressure in the current painter.
- TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
+ TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
index 360fa66e..ffa51114 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
@@ -251,8 +251,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
m_painter->setPressure(adjustedInfo.pressure);
- TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo),
- brush->tqmaskHeight(adjustedInfo));
+ TQRect dabRect = TQRect(0, 0, brush->maskWidth(adjustedInfo),
+ brush->maskHeight(adjustedInfo));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
index f6021ecc..89207a50 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
+++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
@@ -262,7 +262,7 @@
<slot>reject()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcurve.h</includehint>
<includehint>kcurve.h</includehint>
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
index 139ed51d..7ad4a4da 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
@@ -312,7 +312,7 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf
OPACITY_OPAQUE, 0, 0, sw, sh);
copyPainter.end();
- TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
+ TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
index 13045139..794923a4 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
@@ -99,19 +99,19 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab");
Q_CHECK_PTR(dab);
- TQ_INT32 tqmaskWidth = tqmask->width();
- TQ_INT32 tqmaskHeight = tqmask->height();
+ TQ_INT32 maskWidth = tqmask->width();
+ TQ_INT32 maskHeight = tqmask->height();
TQRect dstRect;
- KisRectIteratorPixel it = dab->createRectIterator(0, 0, tqmaskWidth, tqmaskHeight, true);
+ 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);
++it;
}
- TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight);
+ TQRect dabRect = TQRect(0, 0, maskWidth, maskHeight);
dstRect = TQRect(destX, destY, dabRect.width(), dabRect.height());
KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
index 0fcbca02..e8780100 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
@@ -85,7 +85,7 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
}
m_painter->setPressure(info.pressure);
- TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
+ TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
index 2e50bebb..a493f132 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
@@ -263,8 +263,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
m_painter->setPressure(adjustedInfo.pressure);
- TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo),
- brush->tqmaskHeight(adjustedInfo));
+ TQRect dabRect = TQRect(0, 0, brush->maskWidth(adjustedInfo),
+ brush->maskHeight(adjustedInfo));
TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
KisImage * image = device->image();