Rename a number of old tq methods that are no longer tq specific

1 files changed, 12 insertions, 12 deletions

diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp
index 3b7f321a9..36ba87d63 100644
--- a/akregator/src/article.cpp
+++ b/akregator/src/article.cpp
@@ -55,7 +55,7 @@ struct Article::Private : public Shared
         0001 0000 Keep
      */
 
-    enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
+    enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
 
     TQString guid;
     Backend::FeedStorage* archive;
@@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
         if (article.meta("deleted") == "true") 
         { // if article is in deleted state, we just add the status and omit the rest
             d->status = Private::Read | Private::Deleted;
-            d->archive->setqStatus(d->guid, d->status);
+            d->archive->seStatus(d->guid, d->status);
         }
         else
         { // article is not deleted, let's add it to the archive
@@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
             d->archive->setCommentsLink(d->guid, article.commentsLink().url());
             d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink());
             d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true");
-            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
+            d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
             d->archive->setPubDate(d->guid, d->pubDate.toTime_t());
             d->archive->setAuthor(d->guid, article.author());
                         
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
                 int statusInt = status.toInt();
                 if (statusInt == New)
                     statusInt = Unread;
-                setqStatus(statusInt);
+                seStatus(statusInt);
             }
             setKeep(article.meta("keep") == "true");
         }
@@ -210,9 +210,9 @@ void Article::setDeleted()
     if (isDeleted())
         return;
   
-    setqStatus(Read);
+    seStatus(Read);
     d->status = Private::Deleted | Private::Read;
-    d->archive->setqStatus(d->guid, d->status);
+    d->archive->seStatus(d->guid, d->status);
     d->archive->setDeleted(d->guid);
 
     if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
         return Unread;
 }
 
-void Article::setqStatus(int stat)
+void Article::seStatus(int stat)
 {
     // use status() rather than statusBits() here to filter out status flags that we are not
     // interested in
-    int oldtqStatus = status();
+    int oldStatus = status();
 
-    if (oldtqStatus != stat)
+    if (oldStatus != stat)
     {
         switch (stat)
         {
@@ -319,9 +319,9 @@ void Article::setqStatus(int stat)
                 d->status = ( d->status | Private::New) & ~Private::Read;
                 break;
         }
-        d->archive->setqStatus(d->guid, d->status);
+        d->archive->seStatus(d->guid, d->status);
         if (d->feed)
-            d->feed->setArticleChanged(*this, oldtqStatus);
+            d->feed->setArticleChanged(*this, oldStatus);
      }
 }
 
@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
 void Article::setKeep(bool keep)
 {
     d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
-    d->archive->setqStatus(d->guid, d->status);
+    d->archive->seStatus(d->guid, d->status);
     if (d->feed)
         d->feed->setArticleChanged(*this);
 }