rename the following methods:

tqparent parent
tqmask mask


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

10 files changed, 60 insertions, 60 deletions

diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp
index 4203765..8951451 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.cpp
+++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp
@@ -23,26 +23,26 @@
 
 #include <kglobalsettings.h>
 
-DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent )
-  : TQListViewItem( tqparent ), m_node(node)
+DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent )
+  : TQListViewItem( parent ), m_node(node)
 {
   init();
 }
 
-DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent, TQListViewItem *after)
-  : TQListViewItem( tqparent, after ), m_node(node)
+DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent, TQListViewItem *after)
+  : TQListViewItem( parent, after ), m_node(node)
 {
   init();
 }
 
-DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent )
-  : TQListViewItem( tqparent ), m_node(node)
+DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent )
+  : TQListViewItem( parent ), m_node(node)
 {
   init();
 }
 
-DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent, TQListViewItem *after)
-  : TQListViewItem( tqparent, after ), m_node(node)
+DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent, TQListViewItem *after)
+  : TQListViewItem( parent, after ), m_node(node)
 {
   init();
 }
diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h
index 14cf5ec..3ba7378 100644
--- a/konq-plugins/domtreeviewer/domlistviewitem.h
+++ b/konq-plugins/domtreeviewer/domlistviewitem.h
@@ -26,10 +26,10 @@ class DOMListViewItem : public TQListViewItem
 {
 
  public:
-   DOMListViewItem( const DOM::Node &, TQListView *tqparent );
-   DOMListViewItem( const DOM::Node &, TQListView *tqparent, TQListViewItem *after ); 
-   DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent );
-   DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent, TQListViewItem *after );
+   DOMListViewItem( const DOM::Node &, TQListView *parent );
+   DOMListViewItem( const DOM::Node &, TQListView *parent, TQListViewItem *after ); 
+   DOMListViewItem( const DOM::Node &, TQListViewItem *parent );
+   DOMListViewItem( const DOM::Node &, TQListViewItem *parent, TQListViewItem *after );
    virtual ~DOMListViewItem();
  
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index 7eef49d..a072409 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -423,8 +423,8 @@ TQString ChangeCDataCommand::name() const
  
 // == ManipulateNodeCommand ===========================================
  
-ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after)
-: _node(node), _parent(tqparent), _after(after)
+ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after)
+: _node(node), _parent(parent), _after(after)
 {
 }
 
@@ -457,8 +457,8 @@ void ManipulateNodeCommand::remove()
 
 // == InsertNodeCommand ===========================================
  
-InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after)
-: ManipulateNodeCommand(node, tqparent, after)
+InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after)
+: ManipulateNodeCommand(node, parent, after)
 {
 }
 
@@ -485,8 +485,8 @@ TQString InsertNodeCommand::name() const
  
 // == RemoveNodeCommand ===========================================
  
-RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after)
-: ManipulateNodeCommand(node, tqparent, after)
+RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after)
+: ManipulateNodeCommand(node, parent, after)
 {
 }
 
@@ -513,8 +513,8 @@ TQString RemoveNodeCommand::name() const
  
 // == MoveNodeCommand ===========================================
  
-MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after)
-: _node(node), new_parent(tqparent), new_after(after)
+MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after)
+: _node(node), new_parent(parent), new_after(after)
 {
   old_parent = node.parentNode();
   old_after = node.nextSibling();
diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h
index 43af96b..6361fd7 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.h
+++ b/konq-plugins/domtreeviewer/domtreecommands.h
@@ -277,10 +277,10 @@ class ManipulateNodeCommand : public ManipulationCommand
 {
 public:
   /**
-   * Prepare command, where \c node is to be contained in \c tqparent, just 
+   * Prepare command, where \c node is to be contained in \c parent, just 
    * before \c after. If \c after is 0, it is appended at the end.
    */
-  ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after);
+  ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~ManipulateNodeCommand();
 
 protected:
@@ -304,10 +304,10 @@ class InsertNodeCommand : public ManipulateNodeCommand
 {
 public:
   /**
-   * Prepare insertion command, inserting \c node into \c tqparent, just 
+   * Prepare insertion command, inserting \c node into \c parent, just 
    * before \c after. If \c after is 0, append it to the list of tqchildren.
    */
-  InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after);
+  InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~InsertNodeCommand();
 
   virtual TQString name() const;
@@ -330,10 +330,10 @@ class RemoveNodeCommand : public ManipulateNodeCommand
 {
 public:
   /**
-   * Prepare insertion command, inserting \c node into \c tqparent, just 
+   * Prepare insertion command, inserting \c node into \c parent, just 
    * before \c after. If \c after is 0, append it to the list of tqchildren.
    */
-  RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after);
+  RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~RemoveNodeCommand();
 
   virtual TQString name() const;
@@ -353,10 +353,10 @@ class MoveNodeCommand : public ManipulationCommand
 {
 public:
   /**
-   * Move \c node from current position into \c tqparent, just before \c after.
+   * Move \c node from current position into \c parent, just before \c after.
    * Appends if \c after is 0.
    */
-  MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after);
+  MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after);
   virtual ~MoveNodeCommand();
 
   virtual TQString name() const;
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 84f78ac..615f056 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -64,8 +64,8 @@
 
 using namespace domtreeviewer;
 
-DOMTreeView::DOMTreeView(TQWidget *tqparent, const char* name, bool /*allowSaving*/)
-  : DOMTreeViewBase(tqparent, name), m_expansionDepth(5), m_maxDepth(0),
+DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*/)
+  : DOMTreeViewBase(parent, name), m_expansionDepth(5), m_maxDepth(0),
     m_bPure(true), m_bShowAttributes(true), m_bHighlightHTML(true),
     m_findDialog(0), focused_child(0)
 {
@@ -318,13 +318,13 @@ void DOMTreeView::addElement ( const DOM::Node &node,  DOMListViewItem *cur_item
 	m_itemdict.insert(node.handle(), cur_item);
       }
 
-      DOMListViewItem *tqparent;
-      if (cur_item->tqparent()) {
-	tqparent = static_cast<DOMListViewItem *>(cur_item->tqparent());
+      DOMListViewItem *parent;
+      if (cur_item->parent()) {
+	parent = static_cast<DOMListViewItem *>(cur_item->parent());
       } else {
-	tqparent = cur_item;
+	parent = cur_item;
       }
-      cur_item = new DOMListViewItem(node, tqparent, cur_item);
+      cur_item = new DOMListViewItem(node, parent, cur_item);
     }
     // This is one is too much
     DOMListViewItem *notLastItem = static_cast<DOMListViewItem *>(cur_item->itemAbove());
@@ -469,13 +469,13 @@ void DOMTreeView::slotMovedItems(TQPtrList<TQListViewItem> &items, TQPtrList<TQL
   for (; it != items.end(); ++it, ++anit) {
     DOMListViewItem *item = static_cast<DOMListViewItem *>(*it);
     DOMListViewItem *anitem = static_cast<DOMListViewItem *>(*anit);
-    DOM::Node tqparent = static_cast<DOMListViewItem *>(item->tqparent())->node();
-    Q_ASSERT(!tqparent.isNull());
+    DOM::Node parent = static_cast<DOMListViewItem *>(item->parent())->node();
+    Q_ASSERT(!parent.isNull());
 
 // kdDebug(90180) << " afternow " << anitem << " node " << (anitem ? anitem->node().nodeName().string() : TQString()) << "=" << (anitem ? anitem->node().nodeValue().string() : TQString()) << endl;
 
-    cmd->addCommand(new MoveNodeCommand(item->node(), tqparent,
-      anitem ? anitem->node().nextSibling() : tqparent.firstChild())
+    cmd->addCommand(new MoveNodeCommand(item->node(), parent,
+      anitem ? anitem->node().nextSibling() : parent.firstChild())
     );
   }
 
@@ -720,8 +720,8 @@ void DOMTreeView::hideMessageLine()
 void DOMTreeView::moveToParent()
 {
   // This is a hypersmart algorithm.
-  // If infoNode is defined, go to the tqparent of infoNode, otherwise, go
-  // to the tqparent of the tree view's current item.
+  // If infoNode is defined, go to the parent of infoNode, otherwise, go
+  // to the parent of the tree view's current item.
   // Hope this isn't too smart.
 
   DOM::Node cur = infoNode;
@@ -773,15 +773,15 @@ void DOMTreeView::deleteNodes()
     // don't regard node more than once
     if (item->node() == last) continue;
 
-    // check for selected tqparent
+    // check for selected parent
     bool has_selected_parent = false;
-    for (TQListViewItem *p = item->tqparent(); p; p = p->tqparent()) {
+    for (TQListViewItem *p = item->parent(); p; p = p->parent()) {
       if (p->isSelected()) { has_selected_parent = true; break; }
     }
     if (has_selected_parent) continue;
 
 //     kdDebug(90180) << " item->node " << item->node().nodeName().string() << ": schedule for removal" << endl;
-    // remove this node if it isn't already recursively removed by its tqparent
+    // remove this node if it isn't already recursively removed by its parent
     cmd->addCommand(new RemoveNodeCommand(item->node(), item->node().parentNode(), item->node().nextSibling()));
     last = item->node();
   }
@@ -885,13 +885,13 @@ void DOMTreeView::slotAddElementDlg()
   DOM::Node curNode = item->node();
 
   try {
-    DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode;
+    DOM::Node parent = addBefore() ? curNode.parentNode() : curNode;
     DOM::Node after = addBefore() ? curNode : 0;
 
     // ### take namespace into account
     DOM::Node newNode = curNode.ownerDocument().createElement(qname);
 
-    ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after);
+    ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after);
     mainWindow()->executeAndAddCommand(cmd);
 
     if (cmd->isValid()) activateNode(newNode);
@@ -921,12 +921,12 @@ void DOMTreeView::slotAddTextDlg()
   DOM::Node curNode = item->node();
 
   try {
-    DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode;
+    DOM::Node parent = addBefore() ? curNode.parentNode() : curNode;
     DOM::Node after = addBefore() ? curNode : 0;
 
     DOM::Node newNode = curNode.ownerDocument().createTextNode(text);
 
-    ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after);
+    ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after);
     mainWindow()->executeAndAddCommand(cmd);
 
     if (cmd->isValid()) activateNode(newNode);
@@ -950,14 +950,14 @@ class AttributeListItem : public TQListViewItem
   bool _new;
 
 public:
-  AttributeListItem(TQListView *tqparent, TQListViewItem *prev)
-  : super(tqparent, prev), _new(true)
+  AttributeListItem(TQListView *parent, TQListViewItem *prev)
+  : super(parent, prev), _new(true)
   {
   }
 
   AttributeListItem(const TQString &attrName, const TQString &attrValue,
-		TQListView *tqparent, TQListViewItem *prev)
-  : super(tqparent, prev), _new(false)
+		TQListView *parent, TQListViewItem *prev)
+  : super(parent, prev), _new(false)
   {
     setText(0, attrName);
     setText(1, attrValue);
diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h
index 499a545..6ff1634 100644
--- a/konq-plugins/domtreeviewer/domtreeview.h
+++ b/konq-plugins/domtreeviewer/domtreeview.h
@@ -50,7 +50,7 @@ class DOMTreeView : public DOMTreeViewBase
   TQ_OBJECT
 
     public:
-	DOMTreeView(TQWidget *tqparent, const char* name, bool allowSaving = true);
+	DOMTreeView(TQWidget *parent, const char* name, bool allowSaving = true);
 	~DOMTreeView();
 
         KHTMLPart *htmlPart() const { return part; }
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index 2615263..bf3afa7 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -15,9 +15,9 @@
 typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory;
 K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) )
 
-PluginDomtreeviewer::PluginDomtreeviewer( TQObject* tqparent, const char* name,
+PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name,
 	                                  const TQStringList & )
-  : Plugin( tqparent, name ), m_dialog( 0 )
+  : Plugin( parent, name ), m_dialog( 0 )
 {
   (void) new KAction( i18n("Show &DOM Tree"),
                       "domtreeviewer", 0,
@@ -38,7 +38,7 @@ void PluginDomtreeviewer::slotShowDOMTree()
     delete m_dialog;
     Q_ASSERT((DOMTreeWindow *)m_dialog == (DOMTreeWindow *)0);
   }
-  if (KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(tqparent()))
+  if (KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(parent()))
   {
     m_dialog = new DOMTreeWindow(this);
     connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
index 75ec607..e450555 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h
@@ -14,7 +14,7 @@ class PluginDomtreeviewer : public KParts::Plugin
   Q_OBJECT
   TQ_OBJECT
 public:
-  PluginDomtreeviewer( TQObject* tqparent, const char* name,
+  PluginDomtreeviewer( TQObject* parent, const char* name,
 	               const TQStringList & );
   virtual ~PluginDomtreeviewer();
 
diff --git a/konq-plugins/domtreeviewer/signalreceiver.cpp b/konq-plugins/domtreeviewer/signalreceiver.cpp
index fb67abf..a0c0b1b 100644
--- a/konq-plugins/domtreeviewer/signalreceiver.cpp
+++ b/konq-plugins/domtreeviewer/signalreceiver.cpp
@@ -20,8 +20,8 @@
 
 #include "signalreceiver.h"
 
-SignalReceiver::SignalReceiver(TQObject *tqparent, const char *name)
-: TQObject(tqparent, name), rcvd(false)
+SignalReceiver::SignalReceiver(TQObject *parent, const char *name)
+: TQObject(parent, name), rcvd(false)
 {
 }
 
diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h
index 9652310..8ff35cd 100644
--- a/konq-plugins/domtreeviewer/signalreceiver.h
+++ b/konq-plugins/domtreeviewer/signalreceiver.h
@@ -48,7 +48,7 @@ class SignalReceiver : public TQObject
   TQ_OBJECT
 
 public:  
-  SignalReceiver(TQObject *tqparent = 0, const char *name = 0);
+  SignalReceiver(TQObject *parent = 0, const char *name = 0);
   virtual ~SignalReceiver();
   
   /** returns true if any signal has been received */