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

diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index e4e78fd3d..a202c910a 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -1200,10 +1200,10 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
             return;
         }
 
-        TQObject *parent = ev->source() ? ev->source()->tqparent() : 0;
+        TQObject *parent = ev->source() ? ev->source()->parent() : 0;
         while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this)))
         {
-            parent = parent->tqparent();
+            parent = parent->parent();
         }
 
         if (parent)
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index 776056647..e6b7e3d60 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -178,7 +178,7 @@ void MenuManager::kmenuAccelActivated()
 
         // let's unhide the panel while we're at it. traverse the widget
         // hierarchy until we find the panel, if any
-        TQObject* menuParent = button->tqparent();
+        TQObject* menuParent = button->parent();
         while (menuParent)
         {
             ExtensionContainer* ext = dynamic_cast<ExtensionContainer*>(menuParent);
@@ -192,7 +192,7 @@ void MenuManager::kmenuAccelActivated()
                 break;
             }
 
-            menuParent = menuParent->tqparent();
+            menuParent = menuParent->parent();
         }
         button->showMenu();
     }