rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 34 insertions, 34 deletions

diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index fa33b89da..aa6101ded 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -65,7 +65,7 @@ class NodeListView::NodeListViewPrivate
     bool showTagFolders;
 
     // Drag and Drop variables
-    TQListViewItem *tqparent;
+    TQListViewItem *parent;
     TQListViewItem *afterme;
     TQTimer autoopentimer;
     ConnectNodeVisitor* connectNodeVisitor;
@@ -179,7 +179,7 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
         
         virtual bool visitFolder(Folder* node)
         {
-            // delete child items recursively before deleting tqparent
+            // delete child items recursively before deleting parent
             TQValueList<TreeNode*> tqchildren = node->tqchildren();
             for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
                 visit(*it);
@@ -212,7 +212,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
             
             TagNodeItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
             if (parentItem)
             {
                 if (prev)
@@ -246,7 +246,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
          
             TagFolderItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
             if (parentItem)
             {
                 if (prev)
@@ -284,7 +284,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
                      
             FolderItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
             if (parentItem)
             {
                 if (prev)
@@ -321,7 +321,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
          
             FeedItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->parent()));
             
             if (parentItem)
             {
@@ -352,8 +352,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
         NodeListView* m_view;
 };
 
-NodeListView::NodeListView( TQWidget *tqparent, const char *name)
-        : KListView(tqparent, name), d(new NodeListViewPrivate)
+NodeListView::NodeListView( TQWidget *parent, const char *name)
+        : KListView(parent, name), d(new NodeListViewPrivate)
 {
     d->showTagFolders = true;
     d->connectNodeVisitor = new ConnectNodeVisitor(this),
@@ -510,7 +510,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
 
         if (KURLDrag::canDecode(e))
         {
-            FolderItem* tqparent = dynamic_cast<FolderItem*> (d->tqparent);
+            FolderItem* parent = dynamic_cast<FolderItem*> (d->parent);
             TreeNodeItem* afterMe = 0;
             
             if(d->afterme)
@@ -519,7 +519,7 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
             KURL::List urls;
             KURLDrag::decode( e, urls );
             e->accept();
-            emit signalDropped( urls, afterMe ? afterMe->node() : 0, tqparent ? tqparent->node() : 0);
+            emit signalDropped( urls, afterMe ? afterMe->node() : 0, parent ? parent->node() : 0);
         }
     }
     else
@@ -527,23 +527,23 @@ void NodeListView::slotDropped( TQDropEvent *e, TQListViewItem*
     }
 }
 
-void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem* /*afterme*/)
+void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* /*afterme*/)
 {
 	d->autoopentimer.stop();
-    if (d->tqparent)
+    if (d->parent)
     {    
         openFolder();
 
-        Folder* parentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node();
+        Folder* parentNode = (dynamic_cast<FolderItem*> (d->parent))->node();
         TreeNode* afterMeNode = 0; 
         TreeNode* current = selectedNode();
 
         if (d->afterme)
             afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node();
 
-        current->tqparent()->removeChild(current);
+        current->parent()->removeChild(current);
         parentNode->insertChild(current, afterMeNode);
-        KListView::movableDropEvent(d->tqparent, d->afterme);
+        KListView::movableDropEvent(d->parent, d->afterme);
     }    
 }
 
@@ -557,13 +557,13 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
     TQPoint vp = contentsToViewport(event->pos());
     TQListViewItem *i = itemAt(vp);
 
-    TQListViewItem *qitqparent;
+    TQListViewItem *qiparent;
     TQListViewItem *qiafterme;
-    findDrop( event->pos(), qitqparent, qiafterme );
+    findDrop( event->pos(), qiparent, qiafterme );
 
     if (event->source() == viewport()) {
         // disable any drops where the result would be top level nodes 
-        if (i && !i->tqparent())
+        if (i && !i->parent())
         {
             event->ignore();
             d->autoopentimer.stop();
@@ -572,12 +572,12 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
 
         // prevent dragging nodes from All Feeds to My Tags or vice versa
         TQListViewItem* root1 = i;
-        while (root1 && root1->tqparent())
-            root1 = root1->tqparent();
+        while (root1 && root1->parent())
+            root1 = root1->parent();
 
         TQListViewItem* root2 = selectedItem();
-        while (root2 && root2->tqparent())
-            root2 = root2->tqparent();
+        while (root2 && root2->parent())
+            root2 = root2->parent();
 
         if (root1 != root2)
         {
@@ -587,7 +587,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
         }
 
         // don't drop node into own subtree
-        TQListViewItem* p = qitqparent;
+        TQListViewItem* p = qiparent;
         while (p)
             if (p == selectedItem())
             {
@@ -597,7 +597,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
             }
             else
             {
-                p = p->tqparent();
+                p = p->parent();
             }
 
         // disable drags onto the item itself
@@ -615,7 +615,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
     //            event->pos().x() < header()->cellPos(header()->mapToIndex(0)))
     //   {} else
  
-    // do we want to move inside the old tqparent or do we want to move to a new tqparent
+    // do we want to move inside the old parent or do we want to move to a new parent
     if (i && (itemAt(vp - TQPoint(0,5)) == i && itemAt(vp + TQPoint(0,5)) == i))
     {
         setDropVisualizer(false);
@@ -625,10 +625,10 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
         TreeNode *iNode = (dynamic_cast<TreeNodeItem*> (i))->node();
         if (iNode->isGroup())
         {
-            if (i != d->tqparent)
+            if (i != d->parent)
                 d->autoopentimer.start(750);
 
-            d->tqparent = i;
+            d->parent = i;
             d->afterme = 0;
         }
         else
@@ -644,7 +644,7 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
         setDropVisualizer(true);
         setDropHighlighter(false);
         cleanItemHighlighter();
-        d->tqparent = qitqparent;
+        d->parent = qiparent;
         d->afterme = qiafterme;
         d->autoopentimer.stop();
     }
@@ -665,7 +665,7 @@ bool NodeListView::acceptDrag(TQDropEvent *e) const
     else
     {
         // disable dragging of top-level nodes (All Feeds, My Tags)
-        if (selectedItem() && !selectedItem()->tqparent())
+        if (selectedItem() && !selectedItem()->parent())
             return false;
         else
             return true;
@@ -719,8 +719,8 @@ void NodeListView::slotItemLeft()
         sel->setOpen(false);
     else
     {
-        if (sel->tqparent())
-            setSelected( sel->tqparent(), true );
+        if (sel->parent())
+            setSelected( sel->parent(), true );
     }
         
     ensureItemVisible( selectedItem() );    
@@ -927,7 +927,7 @@ void NodeListView::slotNodeAdded(TreeNode* node)
         d->createItemVisitor->visit(node);
 }
 
-void NodeListView::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
+void NodeListView::slotNodeRemoved(Folder* /*parent*/, TreeNode* node)
 {
     if (node)
         d->deleteItemVisitor->deleteItem(node, false);
@@ -1012,9 +1012,9 @@ TQDragObject *NodeListView::dragObject()
 
 void NodeListView::openFolder() {
     d->autoopentimer.stop();
-    if (d->tqparent && !d->tqparent->isOpen())
+    if (d->parent && !d->parent->isOpen())
     {
-        d->tqparent->setOpen(true);
+        d->parent->setOpen(true);
     }
 }