diff options
Diffstat (limited to 'plugins/rssfeed')
| -rw-r--r-- | plugins/rssfeed/rss/tools_p.cpp | 8 | ||||
| -rw-r--r-- | plugins/rssfeed/rssfeed.cpp | 4 | ||||
| -rw-r--r-- | plugins/rssfeed/rssfeedmanager.cpp | 10 | ||||
| -rw-r--r-- | plugins/rssfeed/rssfilter.cpp | 4 | ||||
| -rw-r--r-- | plugins/rssfeed/rsslinkdownloader.cpp | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/plugins/rssfeed/rss/tools_p.cpp b/plugins/rssfeed/rss/tools_p.cpp index 51fcbf5..fb161e8 100644 --- a/plugins/rssfeed/rss/tools_p.cpp +++ b/plugins/rssfeed/rss/tools_p.cpp @@ -20,7 +20,7 @@ time_t RSS::parseISO8601Date(const TQString &s) return 0; // error // FIXME: imho this is done in KRFCDate::parseDateISO8601() automatically, so we could omit it? -fo - if (s.tqfind('T') != -1) + if (s.find('T') != -1) return KRFCDate::parseDateISO8601(s); else return KRFCDate::parseDateISO8601(s + "T12:00:00"); @@ -35,10 +35,10 @@ TQString RSS::extractNode(const TQDomNode &tqparent, const TQString &elemName, b TQString result = node.toElement().text(); - bool hasPre = result.tqcontains("<pre>",false); - bool hasHtml = hasPre || result.tqcontains("<"); // FIXME: test if we have html, should be more clever -> regexp + bool hasPre = result.contains("<pre>",false); + bool hasHtml = hasPre || result.contains("<"); // FIXME: test if we have html, should be more clever -> regexp if(!isInlined && !hasHtml) // perform nl2br if not a inline elt and it has no html elts - result = result = result.tqreplace(TQChar('\n'), "<br />"); + result = result = result.replace(TQChar('\n'), "<br />"); if(!hasPre) // strip white spaces if no <pre> result = result.simplifyWhiteSpace(); diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp index f5b4c64..ef81495 100644 --- a/plugins/rssfeed/rssfeed.cpp +++ b/plugins/rssfeed/rssfeed.cpp @@ -182,7 +182,7 @@ namespace kt { TQDir directory; directory.mkdir(KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds"); - return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).tqreplace("/", "_").tqreplace(":", "_") + ".ktr"; + return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr"; } @@ -290,7 +290,7 @@ namespace kt for (int i=doc.articles().count()-1; i>=0; i--) { curArticle = doc.articles()[i]; - if (curArticle.pubDate().daysTo(TQDateTime::tqcurrentDateTime()) < m_articleAge && !m_articles.tqcontains(curArticle)) + if (curArticle.pubDate().daysTo(TQDateTime::tqcurrentDateTime()) < m_articleAge && !m_articles.contains(curArticle)) { m_articles.prepend(curArticle); emit scanRssArticle(curArticle); diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp index 6646f06..f9d0a2f 100644 --- a/plugins/rssfeed/rssfeedmanager.cpp +++ b/plugins/rssfeed/rssfeedmanager.cpp @@ -138,7 +138,7 @@ namespace kt void RssFeedManager::clearArticles() { - int pos = feeds.tqfind((RssFeed *)sender()); + int pos = feeds.find((RssFeed *)sender()); if (pos >= 0) { @@ -606,7 +606,7 @@ namespace kt if (item < 0) { //let's check which one sent the signal - if we can't figure it all then update them all - int pos = feeds.tqfind((RssFeed *)sender()); + int pos = feeds.find((RssFeed *)sender()); if (pos < 0) { @@ -639,7 +639,7 @@ namespace kt if (item < 0) { //let's check which one sent the signal - if we can't figure it all then update them all - int pos = acceptFilters.tqfind((RssFilter *)sender()); + int pos = acceptFilters.find((RssFilter *)sender()); if (pos < 0) { @@ -672,7 +672,7 @@ namespace kt if (item < 0) { //let's check which one sent the signal - if we can't figure it all then update them all - int pos = rejectFilters.tqfind((RssFilter *)sender()); + int pos = rejectFilters.find((RssFilter *)sender()); if (pos < 0) { @@ -1254,7 +1254,7 @@ namespace kt void RssFeedManager::rescanFilter() { - int pos = acceptFilters.tqfind((RssFilter *)sender()); + int pos = acceptFilters.find((RssFilter *)sender()); if (pos >= 0) { diff --git a/plugins/rssfeed/rssfilter.cpp b/plugins/rssfeed/rssfilter.cpp index e7c4925..8210bcc 100644 --- a/plugins/rssfeed/rssfilter.cpp +++ b/plugins/rssfeed/rssfilter.cpp @@ -276,14 +276,14 @@ namespace kt if (!invert) { - if (!article.title().tqcontains(regEx) && !article.link().prettyURL().tqcontains(regEx) && !article.description().tqcontains(regEx) ) + if (!article.title().contains(regEx) && !article.link().prettyURL().contains(regEx) && !article.description().contains(regEx) ) { return false; } } else { - if (article.title().tqcontains(regEx) || article.link().prettyURL().tqcontains(regEx) || article.description().tqcontains(regEx) ) + if (article.title().contains(regEx) || article.link().prettyURL().contains(regEx) || article.description().contains(regEx) ) { return false; } diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp index 467055e..dd754e5 100644 --- a/plugins/rssfeed/rsslinkdownloader.cpp +++ b/plugins/rssfeed/rsslinkdownloader.cpp @@ -83,7 +83,7 @@ namespace kt hrefTags.setMinimal(true); int matchPos = 0; - while (htmlline.tqfind(hrefTags, matchPos) >= 0) + while (htmlline.find(hrefTags, matchPos) >= 0) { matchPos += hrefTags.matchedLength(); //we're found an <a href tag - let's check it if contains download @@ -100,7 +100,7 @@ namespace kt hrefText = TQString("HREF=\"?([^\">< ]*)[\" ]"); hrefText.setCaseSensitive(false); - hrefTags.tqcapturedTexts()[0].tqfind(hrefText); + hrefTags.tqcapturedTexts()[0].find(hrefText); //lets get the captured TQString hrefLink = hrefText.capturedTexts()[1]; @@ -110,7 +110,7 @@ namespace kt } else if (!hrefLink.tqstartsWith("http://", false)) { - hrefLink = url.url().left(url.url().tqfindRev("/")+1) + hrefLink; + hrefLink = url.url().left(url.url().findRev("/")+1) + hrefLink; } subLinks.append(hrefLink); |