1 files changed, 48 insertions, 48 deletions

diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 59457286a..0d9b56afd 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -20,8 +20,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 "actionmanagerimpl.h"
@@ -210,8 +210,8 @@ View::~View()
     kdDebug() << "View::~View(): leaving" << endl;
 }
 
-View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, const char *name)
- : TQWidget(parent, name), m_viewMode(NormalView), m_actionManager(actionManager)
+View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, const char *name)
+ : TQWidget(tqparent, name), m_viewMode(NormalView), m_actionManager(actionManager)
 {
     m_editNodePropertiesVisitor = new EditNodePropertiesVisitor(this);
     m_deleteNodeVisitor = new DeleteNodeVisitor(this);
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
 
     if (!Settings::resetQuickFilterOnNodeChange())
     {
-        m_searchBar->slotSeStatus(Settings::statusFilter());
+        m_searchBar->slotSetqStatus(Settings::statusFilter());
         m_searchBar->slotSetText(Settings::textFilter());
     }
 
@@ -533,7 +533,7 @@ bool View::importFeeds(const TQDomDocument& doc)
     return true;
 }
 
-bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
+bool View::loadFeeds(const TQDomDocument& doc, Folder* tqparent)
 {
     FeedList* feedList = new FeedList();
     bool parsed = feedList->readFromXML(doc);
@@ -546,7 +546,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
     }
     m_feedListView->setUpdatesEnabled(false);
     m_tagNodeListView->setUpdatesEnabled(false);
-    if (!parent)
+    if (!tqparent)
     {
         TagSet* tagSet = Kernel::self()->tagSet();
 
@@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
             // create a tag for every tag ID in the archive that is not part of the tagset
             // this is a fallback in case the tagset was corrupted,
             // so the tagging information from archive does not get lost.
-            if (!tagSet->tqcontainsID(*it))
+            if (!tagSet->containsID(*it))
             {
                 Tag tag(*it, *it);
                 tagSet->insert(tag);
@@ -578,7 +578,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
         }
     }
     else
-        m_feedList->append(feedList, parent);
+        m_feedList->append(feedList, tqparent);
 
     m_feedListView->setUpdatesEnabled(true);
     m_feedListView->triggerUpdate();
@@ -705,7 +705,7 @@ void View::slotFrameChanged(Frame *f)
             emit signalStarted(0);
             break;
         case Frame::Canceled:
-            emit signalCanceled(TQString::null);
+            emit signalCanceled(TQString());
             break;
         case Frame::Idle:
         case Frame::Completed:
@@ -725,13 +725,13 @@ void View::slotMoveCurrentNodeUp()
     if (!current)
         return;
     TreeNode* prev = current->prevSibling();
-    Folder* parent = current->parent();
+    Folder* tqparent = current->tqparent();
 
-    if (!prev || !parent)
+    if (!prev || !tqparent)
         return;
 
-    parent->removeChild(prev);
-    parent->insertChild(prev, current);
+    tqparent->removeChild(prev);
+    tqparent->insertChild(prev, current);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
@@ -741,41 +741,41 @@ void View::slotMoveCurrentNodeDown()
     if (!current)
         return;
     TreeNode* next = current->nextSibling();
-    Folder* parent = current->parent();
+    Folder* tqparent = current->tqparent();
 
-    if (!next || !parent)
+    if (!next || !tqparent)
         return;
 
-    parent->removeChild(current);
-    parent->insertChild(current, next);
+    tqparent->removeChild(current);
+    tqparent->insertChild(current, next);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
 void View::slotMoveCurrentNodeLeft()
 {
     TreeNode* current = m_listTabWidget->activeView()->selectedNode();
-    if (!current || !current->parent() || !current->parent()->parent())
+    if (!current || !current->tqparent() || !current->tqparent()->tqparent())
         return;
 
-    Folder* parent = current->parent();
-    Folder* grandparent = current->parent()->parent();
+    Folder* tqparent = current->tqparent();
+    Folder* grandtqparent = current->tqparent()->tqparent();
 
-    parent->removeChild(current);
-    grandparent->insertChild(current, parent);
+    tqparent->removeChild(current);
+    grandtqparent->insertChild(current, tqparent);
     m_listTabWidget->activeView()->ensureNodeVisible(current);
 }
 
 void View::slotMoveCurrentNodeRight()
 {
     TreeNode* current = m_listTabWidget->activeView()->selectedNode();
-    if (!current || !current->parent())
+    if (!current || !current->tqparent())
         return;
     TreeNode* prev = current->prevSibling();
 
     if ( prev && prev->isGroup() )
     {
         Folder* fg = static_cast<Folder*>(prev);
-        current->parent()->removeChild(current);
+        current->tqparent()->removeChild(current);
         fg->appendChild(current);
         m_listTabWidget->activeView()->ensureNodeVisible(current);
     }
@@ -880,16 +880,16 @@ void View::slotFeedAdd()
         if ( m_feedListView->selectedNode()->isGroup())
             group = static_cast<Folder*>(m_feedListView->selectedNode());
         else
-            group= m_feedListView->selectedNode()->parent();
+            group= m_feedListView->selectedNode()->tqparent();
 
     }
 
-    TreeNode* lastChild = group->children().last();
+    TreeNode* lastChild = group->tqchildren().last();
 
-    addFeed(TQString::null, lastChild, group, false);
+    addFeed(TQString(), lastChild, group, false);
 }
 
-void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool autoExec)
+void View::addFeed(const TQString& url, TreeNode *after, Folder* tqparent, bool autoExec)
 {
 
     AddFeedDialog *afd = new AddFeedDialog( 0, "add_feed" );
@@ -923,10 +923,10 @@ void View::addFeed(const TQString& url, TreeNode *after, Folder* parent, bool au
             return;
         }
 
-    if (!parent)
-        parent = m_feedList->rootNode();
+    if (!tqparent)
+        tqparent = m_feedList->rootNode();
 
-    parent->insertChild(feed, after);
+    tqparent->insertChild(feed, after);
 
     m_feedListView->ensureNodeVisible(feed);
 
@@ -947,7 +947,7 @@ void View::slotFeedAddGroup()
     if (!node->isGroup())
     {
         after = node;
-        node = node->parent();
+        node = node->tqparent();
     }
 
     Folder* currentGroup = static_cast<Folder*> (node);
@@ -1077,7 +1077,7 @@ void View::slotFetchingStopped()
 {
     m_mainFrame->setState(Frame::Completed);
     m_actionManager->action("feed_stop")->setEnabled(false);
-    m_mainFrame->seStatusText(TQString::null);
+    m_mainFrame->seStatusText(TQString());
 }
 
 void View::slotFeedFetched(Feed *feed)
@@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed)
 
 void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
 {
-    if (button == Qt::MidButton)
+    if (button == TQt::MidButton)
     {
         KURL link = article.link();
         switch (Settings::mMBBehaviour())
@@ -1152,7 +1152,7 @@ void View::slotNewTag()
 
 void View::slotTagCreated(const Tag& tag)
 {
-    if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id()))
+    if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id()))
     {
         TagNode* tagNode = new TagNode(tag, m_feedList->rootNode());
         m_tagNodeList->rootNode()->appendChild(tagNode);
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
             if (delay > 0)
                 m_markReadTimer->start( delay*1000, true );
             else
-                a.seStatus(Article::Read);
+                a.setqStatus(Article::Read);
         }
     }
 
@@ -1266,18 +1266,18 @@ void View::slotCopyLinkAddress()
             link = article.link().url();
         else
             link = article.guid();
-        QClipboard *cb = TQApplication::clipboard();
-        cb->setText(link, QClipboard::Clipboard);
-        cb->setText(link, QClipboard::Selection);
+        TQClipboard *cb = TQApplication::clipboard();
+        cb->setText(link, TQClipboard::Clipboard);
+        cb->setText(link, TQClipboard::Selection);
     }
 }
 
-void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* parent)
+void View::slotFeedURLDropped(KURL::List &urls, TreeNode* after, Folder* tqparent)
 {
     KURL::List::iterator it;
     for ( it = urls.begin(); it != urls.end(); ++it )
     {
-        addFeed((*it).prettyURL(), after, parent, false);
+        addFeed((*it).prettyURL(), after, tqparent, false);
     }
 }
 
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).seStatus(Article::Read);
+        (*it).setqStatus(Article::Read);
 }
 
 void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).seStatus(Article::Unread);
+        (*it).setqStatus(Article::Unread);
 }
 
 void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
         return;
 
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
-        (*it).seStatus(Article::New);
+        (*it).setqStatus(Article::New);
 }
 
 void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
     if (article.isNull())
         return;
 
-    article.seStatus(Article::Read);
+    article.setqStatus(Article::Read);
 }
 
 void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1441,7 +1441,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
     }
     else
     {
-        m_mainFrame->seStatusText(TQString::null);
+        m_mainFrame->seStatusText(TQString());
     }
 }
 
@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
         m_searchBar->slotSetText(config->readEntry("searchLine"));
         int statusfilter = config->readNumEntry("searchCombo", -1);
         if (statusfilter != -1)
-            m_searchBar->slotSeStatus(statusfilter);
+            m_searchBar->slotSetqStatus(statusfilter);
     }
 
     int selectedID = config->readNumEntry("selectedNodeID", -1);