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

diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index c92e4ec26..3aa9dd2c6 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -210,8 +210,8 @@ View::~View()
     kdDebug() << "View::~View(): leaving" << endl;
 }
 
-View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name)
- : TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager)
+View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
+ : TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
 {
     m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
     m_deleteNodeVisitor = new DeleteNodeVisitor(this);
@@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc)
     return true;
 }
 
-bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
+bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
 {
     FeedList* feedList = new FeedList();
     bool parsed = feedList->readFromXML(doc);
@@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
     }
     m_feedListView->setUpdatesEnabled(false);
     m_tagNodeListView->setUpdatesEnabled(false);
-    if (!tqparent)
+    if (!parent)
     {
         TagSet* tagSet = Kernel::self()->tagSet();
 
@@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
         }
     }
     else
-        m_feedList->append(feedList, tqparent);
+        m_feedList->append(feedList, parent);
 
     m_feedListView->setUpdatesEnabled(true);
     m_feedListView->triggerUpdate();
@@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp()
     if (!current)
         return;
     TreeNode* prev = current->prevSibling();
-    Folder* tqparent = current->tqparent();
+    Folder* parent = current->parent();
 
-    if (!prev || !tqparent)
+    if (!prev || !parent)
         return;
 
-    tqparent->removeChild(prev);
-    tqparent->insertChild(prev, current);
+    parent->removeChild(prev);
+    parent->insertChild(prev, current);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
@@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown()
     if (!current)
         return;
     TreeNode* next = current->nextSibling();
-    Folder* tqparent = current->tqparent();
+    Folder* parent = current->parent();
 
-    if (!next || !tqparent)
+    if (!next || !parent)
         return;
 
-    tqparent->removeChild(current);
-    tqparent->insertChild(current, next);
+    parent->removeChild(current);
+    parent->insertChild(current, next);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
 void View::slotMoveCurrentNodeLeft()
 {
     TreeNode* current = m_listTabWidget->activeView()->selectedNode();
-    if (!current || !current->tqparent() || !current->tqparent()->tqparent())
+    if (!current || !current->parent() || !current->parent()->parent())
         return;
 
-    Folder* tqparent = current->tqparent();
-    Folder* grandtqparent = current->tqparent()->tqparent();
+    Folder* parent = current->parent();
+    Folder* grandparent = current->parent()->parent();
 
-    tqparent->removeChild(current);
-    grandtqparent->insertChild(current, tqparent);
+    parent->removeChild(current);
+    grandparent->insertChild(current, parent);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
 void View::slotMoveCurrentNodeRight()
 {
     TreeNode* current = m_listTabWidget->activeView()->selectedNode();
-    if (!current || !current->tqparent())
+    if (!current || !current->parent())
         return;
     TreeNode* prev = current->prevSibling();
 
     if ( prev && prev->isGroup() )
     {
         Folder* fg = static_cast<Folder*>(prev);
-        current->tqparent()->removeChild(current);
+        current->parent()->removeChild(current);
         fg->appendChild(current);
         m_listTabWidget->activeView()->ensureNodeVisible(current);
     }
@@ -880,7 +880,7 @@ void View::slotFeedAdd()
         if ( m_feedListView->selectedNode()->isGroup())
             group = static_cast<Folder*>(m_feedListView->selectedNode());
         else
-            group= m_feedListView->selectedNode()->tqparent();
+            group= m_feedListView->selectedNode()->parent();
 
     }
 
@@ -889,7 +889,7 @@ void View::slotFeedAdd()
     addFeed(TQString(), lastChild, group, false);
 }
 
-void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec)
+void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec)
 {
 
     AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" );
@@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool
             return;
         }
 
-    if (!tqparent)
-        tqparent = m_feedList->rootNode();
+    if (!parent)
+        parent = m_feedList->rootNode();
 
-    tqparent->insertChild(feed, after);
+    parent->insertChild(feed, after);
 
     m_feedListView->ensureNodeVisible(feed);
 
@@ -947,7 +947,7 @@ void View::slotFeedAddGroup()
     if (!node->isGroup())
     {
         after = node;
-        node = node->tqparent();
+        node = node->parent();
     }
 
     Folder* currentGroup = static_cast<Folder*> (node);
@@ -1272,12 +1272,12 @@ void View::slotCopyLinkAddress()
     }
 }
 
-void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent)
+void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent)
 {
     KURL::List::iterator it;
     for ( it = urls.begin(); it != urls.end(); ++it )
     {
-        addFeed((*it).prettyURL(), after, tqparent, false);
+        addFeed((*it).prettyURL(), after, parent, false);
     }
 }