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

1 files changed, 21 insertions, 21 deletions

diff --git a/chalk/core/kis_paint_layer.cc b/chalk/core/kis_paint_layer.cc
index 63663067..2df12e01 100644
--- a/chalk/core/kis_paint_layer.cc
+++ b/chalk/core/kis_paint_layer.cc
@@ -40,7 +40,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
     Q_ASSERT(dev);
     m_paintdev = dev;
     m_tqmask = 0;
-    m_tqmaskAsSelection = 0;
+    m_maskAsSelection = 0;
     m_paintdev->setParentLayer(this);
     m_renderMask = false;
     m_editMask = true;
@@ -53,7 +53,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
     Q_ASSERT(img);
     m_paintdev = new KisPaintDevice(this, img->colorSpace(), name.latin1());
     m_tqmask = 0;
-    m_tqmaskAsSelection = 0;
+    m_maskAsSelection = 0;
     m_renderMask = false;
     m_editMask = true;
 }
@@ -65,7 +65,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
     Q_ASSERT(colorSpace);
     m_paintdev = new KisPaintDevice(this, colorSpace,  name.latin1());
     m_tqmask = 0;
-    m_tqmaskAsSelection = 0;
+    m_maskAsSelection = 0;
     m_renderMask = false;
     m_editMask = true;
 }
@@ -193,7 +193,7 @@ void KisPaintLayer::removeMask() {
 
     m_tqmask->setParentLayer(0);
     m_tqmask = 0;
-    m_tqmaskAsSelection = 0;
+    m_maskAsSelection = 0;
     setDirty();
 
     emit sigMaskInfoChanged();
@@ -210,7 +210,7 @@ void KisPaintLayer::applyMask() {
     // A bit slow; but it works
     KisPaintDeviceSP temp = new KisPaintDevice(m_paintdev->colorSpace());
     KisPainter gc(temp);
-    gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_tqmaskAsSelection, OPACITY_OPAQUE, x, y, w, h);
+    gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_maskAsSelection, OPACITY_OPAQUE, x, y, w, h);
     gc.end();
     gc.begin(m_paintdev);
     gc.bitBlt(x, y, COMPOSITE_COPY, temp, OPACITY_OPAQUE, x, y, w, h);
@@ -252,7 +252,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) {
             ->getColorSpace(KisID("GRAYA"), 0));
     m_tqmask->setParentLayer(this);
 
-    m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough
+    m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
 
     // Default pixel is opaque white == don't tqmask?
     TQ_UINT8 const defPixel[] = { 255, 255 };
@@ -292,7 +292,7 @@ KisPaintDeviceSP KisPaintLayer::getMask() {
 KisSelectionSP KisPaintLayer::getMaskAsSelection() {
     createMask();
     kdDebug() << k_funcinfo << endl;
-    return m_tqmaskAsSelection;
+    return m_maskAsSelection;
 }
 
 void KisPaintLayer::setEditMask(bool b) {
@@ -312,7 +312,7 @@ void KisPaintLayer::setRenderMask(bool b) {
 void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
     KisRectIteratorPixel srcIt = m_tqmask->createRectIterator(r.x(), r.y(),
             r.width(), r.height(), false);
-    KisRectIteratorPixel dstIt = m_tqmaskAsSelection->createRectIterator(r.x(), r.y(),
+    KisRectIteratorPixel dstIt = m_maskAsSelection->createRectIterator(r.x(), r.y(),
             r.width(), r.height(), true);
 
     while(!dstIt.isDone()) {
@@ -328,7 +328,7 @@ void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
 void KisPaintLayer::genericMaskCreationHelper() {
     m_tqmask->setParentLayer(this);
 
-    m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough
+    m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
 
     // Default pixel is opaque white == don't tqmask?
     TQ_UINT8 const defPixel[] = { 255, 255 };
@@ -374,35 +374,35 @@ namespace {
     class KisMaskFromSelectionCommand : public KNamedCommand {
         typedef KNamedCommand super;
         KisPaintLayerSP m_layer;
-        KisPaintDeviceSP m_tqmaskBefore;
-        KisPaintDeviceSP m_tqmaskAfter;
+        KisPaintDeviceSP m_maskBefore;
+        KisPaintDeviceSP m_maskAfter;
         KisSelectionSP m_selection;
     public:
         KisMaskFromSelectionCommand(const TQString& name, KisPaintLayer* layer)
             : super(name), m_layer(layer) {
             if (m_layer->hasMask())
-                m_tqmaskBefore = m_layer->getMask();
+                m_maskBefore = m_layer->getMask();
             else
-                m_tqmaskBefore = 0;
-            m_tqmaskAfter = 0;
+                m_maskBefore = 0;
+            m_maskAfter = 0;
             if (m_layer->paintDevice()->hasSelection())
                 m_selection = m_layer->paintDevice()->selection();
             else
                 m_selection = 0;
         }
         virtual void execute() {
-            if (!m_tqmaskAfter) {
+            if (!m_maskAfter) {
                 m_layer->createMaskFromSelection(m_selection);
-                m_tqmaskAfter = m_layer->getMask();
+                m_maskAfter = m_layer->getMask();
             } else {
                 m_layer->paintDevice()->deselect();
-                m_layer->createMaskFromPaintDevice(m_tqmaskAfter);
+                m_layer->createMaskFromPaintDevice(m_maskAfter);
             }
         }
         virtual void unexecute() {
             m_layer->paintDevice()->setSelection(m_selection);
-            if (m_tqmaskBefore)
-                m_layer->createMaskFromPaintDevice(m_tqmaskBefore);
+            if (m_maskBefore)
+                m_layer->createMaskFromPaintDevice(m_maskBefore);
             else
                 m_layer->removeMask();
         }
@@ -488,11 +488,11 @@ KNamedCommand* KisPaintLayer::createMaskCommand() {
     return new KisCreateMaskCommand(i18n("Create Layer Mask"), this);
 }
 
-KNamedCommand* KisPaintLayer::tqmaskFromSelectionCommand() {
+KNamedCommand* KisPaintLayer::maskFromSelectionCommand() {
     return new KisMaskFromSelectionCommand(i18n("Mask From Selection"), this);
 }
 
-KNamedCommand* KisPaintLayer::tqmaskToSelectionCommand() {
+KNamedCommand* KisPaintLayer::maskToSelectionCommand() {
     return new KisMaskToSelectionCommand(i18n("Mask to Selection"), this);
 }