1 files changed, 19 insertions, 19 deletions

diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index edf1a7909..8e0c4c90c 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -19,8 +19,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 <tqtimer.h>
@@ -365,7 +365,7 @@ bool Feed::fetchErrorOccurred() { return d->fetchError; }
 bool Feed::isArticlesLoaded() const { return d->articlesLoaded; }
 
 
-TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const
+TQDomElement Feed::toOPML( TQDomElement tqparent, TQDomDocument document ) const
 {
     TQDomElement el = document.createElement( "outline" );
     el.setAttribute( "text", title() );
@@ -388,7 +388,7 @@ TQDomElement Feed::toOPML( TQDomElement parent, TQDomDocument document ) const
     el.setAttribute( "maxArticleNumber", d->maxArticleNumber );
     el.setAttribute( "type", "rss" ); // despite some additional fields, its still "rss" OPML
     el.setAttribute( "version", "RSS" );
-    parent.appendChild( el );
+    tqparent.appendChild( el );
     return el;
 }
 
@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
         TQValueList<Article>::Iterator en = tarticles.end();
 
         for (it = tarticles.begin(); it != en; ++it)
-            (*it).seStatus(Article::Read);
+            (*it).setqStatus(Article::Read);
         setNotificationMode(true, true);
     }
 }
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
             d->addedArticlesNotify.append(mya);
             
             if (!mya.isDeleted() && !markImmediatelyAsRead())
-                mya.seStatus(Article::New);
+                mya.setqStatus(Article::New);
             else
-                mya.seStatus(Article::Read);
+                mya.setqStatus(Article::Read);
                 
             changed = true;
         }
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
             {
                 mya.setKeep(old.keep());
                 int oldstatus = old.status();
-                old.seStatus(Article::Read);
+                old.setqStatus(Article::Read);
 
                 d->articles.remove(old.guid());
                 appendArticle(mya);
 
-                mya.seStatus(oldstatus);
+                mya.setqStatus(oldstatus);
 
                 d->updatedArticlesNotify.append(mya);
                 changed = true;
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
     {
         if ((*it).status() == Article::New)
         {
-            (*it).seStatus(Article::Unread);
+            (*it).setqStatus(Article::Unread);
         }
     }
 
@@ -579,7 +579,7 @@ void Feed::tryFetch()
 {
     d->fetchError = false;
 
-    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
+    d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
     //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
     d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
 }
@@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
     nodeModified();
 }
 
-void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
+void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
 {
     // Note that loader instances delete themselves
     d->loader = 0;
@@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
     articlesModified();
 }
 
-void Feed::setArticleChanged(Article& a, int oldStatus)
+void Feed::setArticleChanged(Article& a, int oldtqStatus)
 {
-    if (oldStatus != -1)
+    if (oldtqStatus != -1)
     {
-        int newStatus = a.status();
-        if (oldStatus == Article::Read && newStatus != Article::Read)
+        int newtqStatus = a.status();
+        if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
             setUnread(unread()+1);
-        else if (oldStatus != Article::Read && newStatus == Article::Read)
+        else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
             setUnread(unread()-1);
     }
     d->updatedArticlesNotify.append(a);
@@ -759,13 +759,13 @@ TreeNode* Feed::next()
     if ( nextSibling() )
         return nextSibling();
 
-    Folder* p = parent();
+    Folder* p = tqparent();
     while (p)
     {
         if ( p->nextSibling() )
             return p->nextSibling();
         else
-            p = p->parent();
+            p = p->tqparent();
     }
     return 0;
 }