Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

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 85bef3f6f..1977d58b0 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 360fa66ef..ffa51114e 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 f6021ecc4..89207a506 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 139ed51db..7ad4a4da8 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 130451397..794923a4e 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 0fcbca023..e8780100f 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 2e50bebb1..a493f132f 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();