summaryrefslogtreecommitdiffstats
path: root/akregator/src/article.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /akregator/src/article.cpp
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'akregator/src/article.cpp')
-rw-r--r--akregator/src/article.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp
index 75d3f7872..09f631a0a 100644
--- a/akregator/src/article.cpp
+++ b/akregator/src/article.cpp
@@ -102,14 +102,14 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
d->guid = article.guid();
- if (!d->archive->contains(d->guid))
+ if (!d->archive->tqcontains(d->guid))
{
d->archive->addEntry(d->guid);
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->setStatus(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::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;
- setStatus(statusInt);
+ seStatus(statusInt);
}
setKeep(article.meta("keep") == "true");
}
@@ -210,9 +210,9 @@ void Article::setDeleted()
if (isDeleted())
return;
- setStatus(Read);
+ seStatus(Read);
d->status = Private::Deleted | Private::Read;
- d->archive->setStatus(d->guid, d->status);
+ d->archive->seStatus(d->guid, d->status);
d->archive->setDeleted(d->guid);
if (d->feed)
@@ -299,7 +299,7 @@ int Article::status() const
return Unread;
}
-void Article::setStatus(int stat)
+void Article::seStatus(int stat)
{
// use status() rather than statusBits() here to filter out status flags that we are not
// interested in
@@ -319,7 +319,7 @@ void Article::setStatus(int stat)
d->status = ( d->status | Private::New) & ~Private::Read;
break;
}
- d->archive->setStatus(d->guid, d->status);
+ d->archive->seStatus(d->guid, d->status);
if (d->feed)
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->setStatus(d->guid, d->status);
+ d->archive->seStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this);
}
@@ -425,7 +425,7 @@ void Article::removeTag(const TQString& tag)
bool Article::hasTag(const TQString& tag) const
{
- return d->archive->tags(d->guid).contains(tag);
+ return d->archive->tags(d->guid).tqcontains(tag);
}
TQStringList Article::tags() const
@@ -457,7 +457,7 @@ TQString Article::buildTitle(const TQString& description)
if (i != -1)
s = s.left(i+1);
TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
- TQString tagName, toReplace, replaceWith;
+ TQString tagName, toReplace, tqreplaceWith;
while (rx.search(s) != -1 )
{
tagName=rx.cap(2);
@@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description)
else if (tagName.startsWith("br") || tagName.startsWith("BR"))
{
toReplace=rx.cap(1);
- replaceWith=" ";
+ tqreplaceWith=" ";
}
else
toReplace=rx.cap(1); // strip just tag
- s=s.replace(s.find(toReplace),toReplace.length(),replaceWith); // do the deed
+ s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed
}
if (s.length()> 90)
s=s.left(90)+"...";