rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 12 insertions, 12 deletions

diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 8290fbda..601d98a8 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -631,7 +631,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
       if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") ||
            o->inherits("QDesignerToolBar") ||
            (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) &&
-           o->tqparent() && o->tqparent()->inherits("QDesignerToolBar"))) {
+           o->parent() && o->parent()->inherits("QDesignerToolBar"))) {
         TQWidget *w = (TQWidget*)o;
         if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator"))
           w = w->parentWidget();
@@ -719,7 +719,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::MouseButtonDblClick:
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) {
         if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() &&
-             o->tqparent() && o->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow())
+             o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow())
           formWindow()->setToolFixed();
         break;
       }
@@ -752,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::Move:
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))
         break;
-      if (WidgetFactory::layoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) {
+      if (WidgetFactory::layoutType((TQWidget*)o->parent()) != WidgetFactory::NoLayout) {
         ((FormWindow*)w)->updateSelection((TQWidget*)o);
         if (e->type() != TQEvent::Resize)
           ((FormWindow*)w)->updateChildSelections((TQWidget*)o);
@@ -808,12 +808,12 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
 
 TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const
 {
-  if (o->tqparent() && o->tqparent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
+  if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
     return 0;
   while (o) {
     if (o->inherits("FormWindow"))
       return (TQWidget*)o;
-    o = o->tqparent();
+    o = o->parent();
   }
   return 0;
 }
@@ -825,7 +825,7 @@ TQWidget *MainWindow::isAToolBarChild(TQObject *o) const
       return (TQWidget*)o;
     if (o->inherits("FormWindow"))
       return 0;
-    o = o->tqparent();
+    o = o->parent();
   }
   return 0;
 }
@@ -1541,9 +1541,9 @@ HierarchyView *MainWindow::objectHierarchy() const
   return hierarchyView;
 }
 
-TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *tqparent)
+TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *parent)
 {
-  TQPopupMenu *menu = new TQPopupMenu(tqparent);
+  TQPopupMenu *menu = new TQPopupMenu(parent);
 
   actionEditCut->plug(menu);
   actionEditCopy->plug(menu);
@@ -1553,12 +1553,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *tqparent)
   return menu;
 }
 
-TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu(TQWidget *tqparent, const char *addSlot, const char *removeSlot)
+TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu(TQWidget *parent, const char *addSlot, const char *removeSlot)
 {
-    TQPopupMenu *menu = new TQPopupMenu(tqparent);
+    TQPopupMenu *menu = new TQPopupMenu(parent);
 
-    menu->insertItem(i18n("Add Page"), tqparent, addSlot);
-    menu->insertItem(i18n("Delete Page"), tqparent, removeSlot);
+    menu->insertItem(i18n("Add Page"), parent, addSlot);
+    menu->insertItem(i18n("Delete Page"), parent, removeSlot);
     menu->insertSeparator();
     actionEditCut->plug(menu);
     actionEditCopy->plug(menu);