summaryrefslogtreecommitdiffstats
path: root/akregator/src/article.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'akregator/src/article.cpp')
-rw-r--r--akregator/src/article.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp
index 36ba87d63..3b7f321a9 100644
--- a/akregator/src/article.cpp
+++ b/akregator/src/article.cpp
@@ -55,7 +55,7 @@ struct Article::Private : public Shared
0001 0000 Keep
*/
- enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
+ enum tqStatus {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->seStatus(d->guid, d->status);
+ d->archive->setqStatus(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::currentDateTime();
+ d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
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;
- seStatus(statusInt);
+ setqStatus(statusInt);
}
setKeep(article.meta("keep") == "true");
}
@@ -210,9 +210,9 @@ void Article::setDeleted()
if (isDeleted())
return;
- seStatus(Read);
+ setqStatus(Read);
d->status = Private::Deleted | Private::Read;
- d->archive->seStatus(d->guid, d->status);
+ d->archive->setqStatus(d->guid, d->status);
d->archive->setDeleted(d->guid);
if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
return Unread;
}
-void Article::seStatus(int stat)
+void Article::setqStatus(int stat)
{
// use status() rather than statusBits() here to filter out status flags that we are not
// interested in
- int oldStatus = status();
+ int oldtqStatus = status();
- if (oldStatus != stat)
+ if (oldtqStatus != stat)
{
switch (stat)
{
@@ -319,9 +319,9 @@ void Article::seStatus(int stat)
d->status = ( d->status | Private::New) & ~Private::Read;
break;
}
- d->archive->seStatus(d->guid, d->status);
+ d->archive->setqStatus(d->guid, d->status);
if (d->feed)
- d->feed->setArticleChanged(*this, oldStatus);
+ d->feed->setArticleChanged(*this, oldtqStatus);
}
}
@@ -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->seStatus(d->guid, d->status);
+ d->archive->setqStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this);
}