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, 31 insertions, 31 deletions

diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 0b288da5..4455f17d 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -168,8 +168,8 @@
 // sent to a receiver if it does not accept the tablet event.
 #define MOUSE_CHANGE_EVENT_DELAY 100
 
-KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent, const char *name)
-    : super(doc, tqparent, name)
+KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const char *name)
+    : super(doc, parent, name)
     , KXMLGUIBuilder( shell() )
     , m_panning( false )
     , m_oldTool( 0 )
@@ -239,7 +239,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent, const
 
     Q_ASSERT(doc);
     Q_ASSERT(adapter);
-    Q_ASSERT(tqparent);
+    Q_ASSERT(parent);
 
     KisConfig cfg;
 
@@ -380,7 +380,7 @@ static TQt::Dock stringToDock( const TQString& attrPosition )
     return dock;
 }
 
-TQWidget * KisView::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id )
+TQWidget * KisView::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
 {
     if( element.attribute( "name" ) == "ToolBox" )
     {
@@ -394,11 +394,11 @@ TQWidget * KisView::createContainer( TQWidget *tqparent, int index, const TQDomE
         mainWindow()->moveDockWindow( m_toolBox, dock, false, 0, 0 );
     }
 
-    return KXMLGUIBuilder::createContainer( tqparent, index, element, id );
+    return KXMLGUIBuilder::createContainer( parent, index, element, id );
 
 }
 
-void KisView::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id )
+void KisView::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id )
 {
     Q_ASSERT(container);
 
@@ -408,7 +408,7 @@ void KisView::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomEle
         m_toolManager->youAintGotNoToolBox();
     }
     else {
-        KXMLGUIBuilder::removeContainer( container, tqparent, element, id );
+        KXMLGUIBuilder::removeContainer( container, parent, element, id );
     }
 }
 
@@ -645,20 +645,20 @@ void KisView::setupActions()
     (void)new KAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY");
 
     m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask");
+                               TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask");
     m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotMaskFromSelection()), actionCollection(),
                                       "mask_fromsel");
     m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
                                TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel");
     m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()),
-                              actionCollection(), "apply_tqmask");
+                              actionCollection(), "apply_mask");
     m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_tqmask");
+                               TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask");
     m_showMask = new KToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this),
-                                   TQT_SLOT(slotShowMask()), actionCollection(), "show_tqmask");
+                                   TQT_SLOT(slotShowMask()), actionCollection(), "show_mask");
     m_editMask = new KToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this),
-                                   TQT_SLOT(slotEditMask()), actionCollection(), "edit_tqmask");
+                                   TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask");
 
     // image actions
     m_imgFlatten = new KAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image");
@@ -2717,13 +2717,13 @@ void KisView::layerAdd()
 {
     KisImageSP img = currentImg();
     if (img && img->activeLayer()) {
-        addLayer(img->activeLayer()->tqparent(), img->activeLayer());
+        addLayer(img->activeLayer()->parent(), img->activeLayer());
     }
     else if (img)
         addLayer(static_cast<KisGroupLayer*>(img->rootLayer().data()), 0);
 }
 
-void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above)
+void KisView::addLayer(KisGroupLayerSP parent, KisLayerSP above)
 {
     KisImageSP img = currentImg();
     if (img) {
@@ -2739,7 +2739,7 @@ void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above)
             KisLayerSP layer = new KisPaintLayer(img, dlg.layerName(), dlg.opacity(), cs);
             if (layer) {
                 layer->setCompositeOp(dlg.compositeOp());
-                img->addLayer(layer, tqparent.data(), above);
+                img->addLayer(layer, parent.data(), above);
                 updateCanvas();
             } else {
                 KMessageBox::error(this, i18n("Could not add layer to image."), i18n("Layer Error"));
@@ -2751,7 +2751,7 @@ void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above)
     }
 }
 
-void KisView::addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above)
+void KisView::addGroupLayer(KisGroupLayerSP parent, KisLayerSP above)
 {
     KisImageSP img = currentImg();
     if (img) {
@@ -2766,7 +2766,7 @@ void KisView::addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above)
             KisLayerSP layer = new KisGroupLayer(img, dlg.layerName(), dlg.opacity());
             if (layer) {
                 layer->setCompositeOp(dlg.compositeOp());
-                img->addLayer(layer, tqparent.data(), above);
+                img->addLayer(layer, parent.data(), above);
                 updateCanvas();
             } else {
                 KMessageBox::error(this, i18n("Could not add layer to image."), i18n("Layer Error"));
@@ -2783,10 +2783,10 @@ void KisView::addPartLayer()
     addPartLayer(img->rootLayer(), img->rootLayer()->firstChild(), m_actionPartLayer->documentEntry());
 }
 
-void KisView::addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry)
+void KisView::addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry)
 {
     delete m_partHandler; // Only one at a time
-    m_partHandler = new KisPartLayerHandler(this, entry, tqparent, above);
+    m_partHandler = new KisPartLayerHandler(this, entry, parent, above);
 
     disconnect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, 0);
     disconnect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, 0);
@@ -2811,7 +2811,7 @@ void KisView::addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoD
 }
 
 void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry,
-                         KisGroupLayerSP tqparent, KisLayerSP above) {
+                         KisGroupLayerSP parent, KisLayerSP above) {
     KisImageSP img = currentImg();
     if (!img) return;
 
@@ -2828,7 +2828,7 @@ void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry,
 
     KisPartLayerImpl* partLayer = new KisPartLayerImpl(img, childDoc);
     partLayer->setDocType(entry.service()->genericName());
-    img->addLayer(partLayer, tqparent, above);
+    img->addLayer(partLayer, parent, above);
     m_doc->setModified(true);
 
     reconnectAfterPartInsert();
@@ -2853,12 +2853,12 @@ void KisView::addAdjustmentLayer()
     KisImageSP img = currentImg();
     if (!img) return;
 
-    addAdjustmentLayer( img->activeLayer()->tqparent(), img->activeLayer() );
+    addAdjustmentLayer( img->activeLayer()->parent(), img->activeLayer() );
 }
 
-void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above)
+void KisView::addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above)
 {
-    Q_ASSERT(tqparent);
+    Q_ASSERT(parent);
     Q_ASSERT(above);
 
     KisImageSP img = currentImg();
@@ -2898,15 +2898,15 @@ void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above)
         KisFilterConfiguration * filter = dlg.filterConfiguration();
         TQString name = dlg.layerName();
 
-        addAdjustmentLayer( tqparent, above, name, filter, selection);
+        addAdjustmentLayer( parent, above, name, filter, selection);
 
     }
 }
 
-void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, const TQString & name,
+void KisView::addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above, const TQString & name,
                                  KisFilterConfiguration * filter, KisSelectionSP selection)
 {
-    Q_ASSERT(tqparent);
+    Q_ASSERT(parent);
     Q_ASSERT(above);
     Q_ASSERT(filter);
 
@@ -2914,7 +2914,7 @@ void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, con
     if (!img) return;
 
     KisAdjustmentLayer * l = new KisAdjustmentLayer(img, name, filter, selection);
-    img->addLayer(l, tqparent, above);
+    img->addLayer(l, parent, above);
 }
 
 void KisView::slotChildActivated(bool a) {
@@ -2943,8 +2943,8 @@ void KisView::layerRemove()
 
             img->removeLayer(layer);
 
-            if (layer->tqparent())
-                layer->tqparent()->setDirty(layer->extent());
+            if (layer->parent())
+                layer->parent()->setDirty(layer->extent());
 
             updateCanvas();
             layerUpdateGUI(img->activeLayer() != 0);
@@ -2966,7 +2966,7 @@ void KisView::layerDuplicate()
 
     KisLayerSP dup = active->clone();
     dup->setName(i18n("Duplicate of '%1'").tqarg(active->name()));
-    img->addLayer(dup, active->tqparent().data(), active);
+    img->addLayer(dup, active->parent().data(), active);
     if (dup) {
         img->activate( dup );
         updateCanvas();