1 files changed, 25 insertions, 25 deletions

diff --git a/chalk/core/kis_image.cc b/chalk/core/kis_image.cc
index 30f3ad36..1efeb715 100644
--- a/chalk/core/kis_image.cc
+++ b/chalk/core/kis_image.cc
@@ -258,12 +258,12 @@ namespace {
         typedef KisImageCommand super;
 
     public:
-        KisLayerPositionCommand(const TQString& name, KisImageSP image, KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis) : super(name, image)
+        KisLayerPositionCommand(const TQString& name, KisImageSP image, KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis) : super(name, image)
             {
                 m_layer = layer;
-                m_oldParent = layer->tqparent();
+                m_oldParent = layer->parent();
                 m_oldAboveThis = layer->nextSibling();
-                m_newParent = tqparent;
+                m_newParent = parent;
                 m_newAboveThis = aboveThis;
            }
 
@@ -300,7 +300,7 @@ namespace {
             {
                 m_img = img;
                 m_layer = layer;
-                m_parent = layer->tqparent();
+                m_parent = layer->parent();
                 m_aboveThis = layer->nextSibling();
             }
 
@@ -385,7 +385,7 @@ namespace {
                 m_layer = layer;
                 m_prevParent = wasParent;
                 m_prevAbove = wasAbove;
-                m_newParent = layer->tqparent();
+                m_newParent = layer->parent();
                 m_newAbove = layer->nextSibling();
             }
 
@@ -1048,7 +1048,7 @@ KisLayerSP KisImage::newLayer(const TQString& name, TQ_UINT8 opacity, const KisC
     layer->setVisible(true);
 
     if (m_activeLayer != 0) {
-        addLayer(layer, m_activeLayer->tqparent().data(), m_activeLayer->nextSibling());
+        addLayer(layer, m_activeLayer->parent().data(), m_activeLayer->nextSibling());
     }
     else {
         addLayer(layer, m_rootLayer, 0);
@@ -1116,17 +1116,17 @@ KisLayerSP KisImage::findLayer(int id) const
 }
 
 
-bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP tqparent)
+bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP parent)
 {
-    return addLayer(layer, tqparent, tqparent->firstChild());
+    return addLayer(layer, parent, parent->firstChild());
 }
 
-bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis)
+bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis)
 {
-    if (!tqparent)
+    if (!parent)
         return false;
 
-    const bool success = tqparent->addLayer(layer, aboveThis);
+    const bool success = parent->addLayer(layer, aboveThis);
     if (success)
     {
         KisPaintLayerSP player = dynamic_cast<KisPaintLayer*>(layer.data());
@@ -1163,7 +1163,7 @@ bool KisImage::removeLayer(KisLayerSP layer)
     if (!layer || layer->image() != this)
         return false;
 
-    if (KisGroupLayerSP tqparent = layer->tqparent()) {
+    if (KisGroupLayerSP parent = layer->parent()) {
         // Adjustment layers should mark the layers underneath them, whose rendering
         // they have cached, diryt on removal. Otherwise, the group won't be re-rendered.
         KisAdjustmentLayer * al = dynamic_cast<KisAdjustmentLayer*>(layer.data());
@@ -1196,21 +1196,21 @@ bool KisImage::removeLayer(KisLayerSP layer)
         const bool wasActive = layer == activeLayer();
         // sigLayerRemoved can set it to 0, we don't want that in the else of wasActive!
         KisLayerSP actLayer = activeLayer();
-        const bool success = tqparent->removeLayer(layer);
+        const bool success = parent->removeLayer(layer);
         if (success) {
             layer->setImage(0);
             if (!layer->temporary() && undo()) {
-                m_adapter->addCommand(new LayerRmCmd(m_adapter, this, layer, tqparent, wasAbove));
+                m_adapter->addCommand(new LayerRmCmd(m_adapter, this, layer, parent, wasAbove));
             }
             if (!layer->temporary()) {
-                emit sigLayerRemoved(layer, tqparent, wasAbove);
+                emit sigLayerRemoved(layer, parent, wasAbove);
                 if (wasActive) {
                     if (wasBelow)
                         activate(wasBelow);
                     else if (wasAbove)
                         activate(wasAbove);
-                    else if (tqparent != rootLayer())
-                        activate(tqparent.data());
+                    else if (parent != rootLayer())
+                        activate(parent.data());
                     else
                         activate(rootLayer()->firstChild());
                 } else {
@@ -1228,7 +1228,7 @@ bool KisImage::raiseLayer(KisLayerSP layer)
 {
     if (!layer)
         return false;
-    return moveLayer(layer, layer->tqparent().data(), layer->prevSibling());
+    return moveLayer(layer, layer->parent().data(), layer->prevSibling());
 }
 
 bool KisImage::lowerLayer(KisLayerSP layer)
@@ -1236,7 +1236,7 @@ bool KisImage::lowerLayer(KisLayerSP layer)
     if (!layer)
         return false;
     if (KisLayerSP next = layer->nextSibling())
-        return moveLayer(layer, layer->tqparent().data(), next->nextSibling());
+        return moveLayer(layer, layer->parent().data(), next->nextSibling());
     return false;
 }
 
@@ -1254,15 +1254,15 @@ bool KisImage::toBottom(KisLayerSP layer)
     return moveLayer(layer, rootLayer(), 0);
 }
 
-bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis)
+bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis)
 {
-    if (!tqparent)
+    if (!parent)
         return false;
 
-    KisGroupLayerSP wasParent = layer->tqparent();
+    KisGroupLayerSP wasParent = layer->parent();
     KisLayerSP wasAbove = layer->nextSibling();
 
-    if (wasParent.data() == tqparent.data() && wasAbove.data() == aboveThis.data())
+    if (wasParent.data() == parent.data() && wasAbove.data() == aboveThis.data())
         return false;
 
     lock();
@@ -1272,7 +1272,7 @@ bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP
         return false;
     }
 
-    const bool success = tqparent->addLayer(layer, aboveThis);
+    const bool success = parent->addLayer(layer, aboveThis);
 
     layer->setDirty();
 
@@ -1357,7 +1357,7 @@ void KisImage::mergeLayer(KisLayerSP layer)
     layer->accept(visitor);
 
     removeLayer(layer->nextSibling());
-    addLayer(player, layer->tqparent(), layer);
+    addLayer(player, layer->parent(), layer);
     removeLayer(layer);
 
     undoAdapter()->endMacro();