1 files changed, 16 insertions, 16 deletions

diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index f1a98b62..ba531d03 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "feedlist.h"
@@ -92,7 +92,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 {
     tagNode->setId(KApplication::random());
     TQString id = tagNode->tag().id();
-    if (!tqcontainsTagId(id))
+    if (!containsTagId(id))
     {
         rootNode()->appendChild(tagNode); // TODO: maintain sorting
         d->tagIdToNodeMap[id] = tagNode;
@@ -105,7 +105,7 @@ bool TagNodeList::insert(TagNode* tagNode)
 bool TagNodeList::remove(TagNode* tagNode)
 {
     TQString id = tagNode->tag().id();
-    if (tqcontainsTagId(id))
+    if (containsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -118,9 +118,9 @@ bool TagNodeList::remove(TagNode* tagNode)
 void TagNodeList::slotNodeDestroyed(TreeNode* node)
 {
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
-    TQString id = tagNode ? tagNode->tag().id() : TQString::null;
+    TQString id = tagNode ? tagNode->tag().id() : TQString();
     
-    if (tagNode != 0 && tqcontainsTagId(id))
+    if (tagNode != 0 && containsTagId(id))
     {
         rootNode()->removeChild(tagNode);
         d->tagIdToNodeMap.remove(id);
@@ -133,30 +133,30 @@ void TagNodeList::slotNodeAdded(TreeNode* node)
     NodeList::slotNodeAdded(node);
 
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
-    TQString id = tagNode ? tagNode->tag().id() : TQString::null;
+    TQString id = tagNode ? tagNode->tag().id() : TQString();
     
-    if (tagNode != 0L && !tqcontainsTagId(id))
+    if (tagNode != 0L && !containsTagId(id))
     {
        d->tagIdToNodeMap[id] = tagNode;
        emit signalTagNodeAdded(tagNode);
     }
 }
 
-void TagNodeList::slotNodeRemoved(Folder* parent, TreeNode* node)
+void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node)
 {
-    NodeList::slotNodeRemoved(parent, node);
+    NodeList::slotNodeRemoved(tqparent, node);
 
     TagNode* tagNode = dynamic_cast<TagNode*>(node);
-    TQString id = tagNode ? tagNode->tag().id() : TQString::null;
+    TQString id = tagNode ? tagNode->tag().id() : TQString();
     
-    if (parent == rootNode() && tagNode != 0L && tqcontainsTagId(id))
+    if (tqparent == rootNode() && tagNode != 0L && containsTagId(id))
     {
         d->tagIdToNodeMap.remove(id);
         emit signalTagNodeRemoved(tagNode);
     }
 }
 
-bool TagNodeList::tqcontainsTagId(const TQString& tagId)
+bool TagNodeList::containsTagId(const TQString& tagId)
 {
     return d->tagIdToNodeMap.tqcontains(tagId);
 }
@@ -178,7 +178,7 @@ TQDomDocument TagNodeList::toXML() const
 
 void TagNodeList::slotTagAdded(const Tag& tag)
 {
-    if (!tqcontainsTagId(tag.id()))
+    if (!containsTagId(tag.id()))
     {
         insert(new TagNode(tag, d->feedList->rootNode()));
     }
@@ -186,14 +186,14 @@ void TagNodeList::slotTagAdded(const Tag& tag)
 
 void TagNodeList::slotTagUpdated(const Tag& tag)
 {
-    if (tqcontainsTagId(tag.id()))
+    if (containsTagId(tag.id()))
     {
         d->tagIdToNodeMap[tag.id()]->tagChanged();
     }
 }
 void TagNodeList::slotTagRemoved(const Tag& tag)
 {
-    if (tqcontainsTagId(tag.id()))
+    if (containsTagId(tag.id()))
     {
         delete d->tagIdToNodeMap[tag.id()];
         d->tagIdToNodeMap[tag.id()] = 0;