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

diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 562d74ed..e4ef5ee2 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -50,10 +50,10 @@
 #include "tagaction.h"
 #include "toolbartabwidget.h"
 
-ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* tqparent, const char* name, bool modal, WFlags fl, const TQString& defaultAction )
-    :ActionConfigDialogS( tqparent, name, modal, fl )
+ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction )
+    :ActionConfigDialogS( parent, name, modal, fl )
 {
-  m_mainWindow = tqparent;
+  m_mainWindow = parent;
   m_toolbarList = toolbarList;
   buttonOk->setIconSet(SmallIconSet("button_ok"));
   buttonCancel->setIconSet(SmallIconSet("button_cancel"));
@@ -171,8 +171,8 @@ void ActionConfigDialog::slotAddToolbar()
     if (!actionTreeView->findItem(toolbarName, 0))
     {
       item = actionTreeView->lastItem();
-      if (item->tqparent())
-        item = item->tqparent();
+      if (item->parent())
+        item = item->parent();
       new KListViewItem(actionTreeView, item, i18n(toolbarName.utf8()));
       break;
     }
@@ -183,9 +183,9 @@ void ActionConfigDialog::slotRemoveToolbar()
 {
   TQListViewItem *item = actionTreeView->currentItem();
   TQString s = item->text(0);
-  if (item->tqparent())
+  if (item->parent())
   {
-    item = item->tqparent();
+    item = item->parent();
     s = item->text(0);
   }
   if (s != i18n("All"))
@@ -213,8 +213,8 @@ void ActionConfigDialog::slotEditToolbar()
   TQString toolbarId;
   TQListViewItem *oldItem;
   TQListViewItem *item = actionTreeView->currentItem();
-  if (item->tqparent())
-     item = item->tqparent();
+  if (item->parent())
+     item = item->parent();
   toolbarName = item->text(0);
   if ( toolbarName != i18n("All"))
   {
@@ -344,7 +344,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
                 node.toElement().attribute("name") == el.attribute("name"))
             {
               toolbarListBox->insertItem(toolbarName);
-              if (item->tqparent()->text(0) == toolbarName)
+              if (item->parent()->text(0) == toolbarName)
                 current = count;
               count++;
             }
@@ -635,7 +635,7 @@ void ActionConfigDialog::saveCurrentAction()
             while (iter.current())
             {
               listItem = iter.current();
-              if (listItem->depth() > 0 && listItem->tqparent()->text(0) == toolbarName
+              if (listItem->depth() > 0 && listItem->parent()->text(0) == toolbarName
                   && listItem->text(2) == el.attribute("name"))
               {
                 delete listItem;
@@ -811,12 +811,12 @@ void ActionConfigDialog::slotNewAction()
   item->setText(0, actionText);
   item->setPixmap(0, SmallIcon("ball"));
   allActionsItem->sortChildItems(0, true);
-  if (currentItem->tqparent() && currentItem->tqparent() == allActionsItem)
+  if (currentItem->parent() && currentItem->parent() == allActionsItem)
   {
      actionTreeView->setCurrentItem(item);
   } else
   {
-    TQListViewItem *parentItem = currentItem->tqparent();
+    TQListViewItem *parentItem = currentItem->parent();
     if (!parentItem)
       parentItem = currentItem;