rename the following methods:

tqparent parent
tqmask mask


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

2 files changed, 7 insertions, 7 deletions

diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index fb4f97ea8..f784a9ca2 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -58,7 +58,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
         // this is part of the kiosk support in kicker, allowing
         // one to block users from adding new containers
         ContainerArea* area = 0;
-        TQObject* findTheArea = parent ? parent->tqparent() : 0;
+        TQObject* findTheArea = parent ? parent->parent() : 0;
         while (findTheArea)
         {
             area = dynamic_cast<ContainerArea*>(findTheArea);
@@ -68,7 +68,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
                 break;
             }
 
-            findTheArea = findTheArea->tqparent();
+            findTheArea = findTheArea->parent();
         }
 
         if  (!area || area->canAddContainers())
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 3a2978261..36a7bef7d 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -761,7 +761,7 @@ void ItemView::slotMoveContent()
     int item_height = 0;
     TQListViewItemIterator it( this );
     while ( it.current() ) {
-        if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() )  {
+        if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() )  {
             it.current()->invalidateHeight();
             item_height += it.current()->totalHeight();
         }
@@ -1022,14 +1022,14 @@ TQDragObject * ItemView::dragObject()
 
       TQBitmap mask;
 
-      if (pix.tqmask())
-          mask = *pix.tqmask();
+      if (pix.mask())
+          mask = *pix.mask();
       else {
 	  mask.resize(pix.size());
 	  mask.fill(Qt::color1);
       }
 
-      bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.tqmask(), 0, 0, add.width(), add.height(), OrROP );
+      bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP );
       pix.setMask( mask );
       o->setPixmap(pix);
 
@@ -1070,7 +1070,7 @@ int ItemView::goodHeight()
     int item_height = 0;
     TQListViewItemIterator it( this );
     while ( it.current() ) {
-        if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() )  {
+        if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() )  {
             item_height += it.current()->height();
         }
         ++it;