rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 6 insertions, 6 deletions

diff --git a/chalk/ui/kis_import_catcher.cc b/chalk/ui/kis_import_catcher.cc
index b2d04cab..26040309 100644
--- a/chalk/ui/kis_import_catcher.cc
+++ b/chalk/ui/kis_import_catcher.cc
@@ -54,23 +54,23 @@ void KisImportCatcher::slotLoadingFinished()
                 // Don't import the root if this is not a layered image (1 group layer
                 // plus 1 other).
                 importedImageLayer = importedImageLayer->firstChild();
-                importedImageLayer->tqparent()->removeLayer(importedImageLayer);
+                importedImageLayer->parent()->removeLayer(importedImageLayer);
             }
 
             importedImageLayer->setName(m_url.prettyURL());
 
-            KisGroupLayerSP tqparent = 0;
+            KisGroupLayerSP parent = 0;
             KisLayerSP currentActiveLayer = m_image->activeLayer();
 
             if (currentActiveLayer) {
-                tqparent = currentActiveLayer->tqparent();
+                parent = currentActiveLayer->parent();
             }
 
-            if (tqparent == 0) {
-                tqparent = m_image->rootLayer();
+            if (parent == 0) {
+                parent = m_image->rootLayer();
             }
 
-            m_image->addLayer(importedImageLayer.data(), tqparent, currentActiveLayer);
+            m_image->addLayer(importedImageLayer.data(), parent, currentActiveLayer);
         }
     }
     m_doc->deleteLater();