summaryrefslogtreecommitdiffstats
path: root/plugins/rssfeed
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:16 -0600
commit42a9872891eba166e81cf4f8c062261cc77398f8 (patch)
tree86b4f99b354b8d8eabeca2ffe1874b3c4c90d957 /plugins/rssfeed
parentf96f74ffa7040e64ae3352e08c810c383c8a0ba2 (diff)
downloadktorrent-42a9872891eba166e81cf4f8c062261cc77398f8.tar.gz
ktorrent-42a9872891eba166e81cf4f8c062261cc77398f8.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit f96f74ffa7040e64ae3352e08c810c383c8a0ba2.
Diffstat (limited to 'plugins/rssfeed')
-rw-r--r--plugins/rssfeed/rss/article.cpp42
-rw-r--r--plugins/rssfeed/rss/document.cpp300
-rw-r--r--plugins/rssfeed/rss/global.h2
-rw-r--r--plugins/rssfeed/rss/image.cpp12
-rw-r--r--plugins/rssfeed/rss/loader.cpp4
-rw-r--r--plugins/rssfeed/rss/loader.h10
-rw-r--r--plugins/rssfeed/rss/testlibrss.cpp6
-rw-r--r--plugins/rssfeed/rss/testlibrss.h4
-rw-r--r--plugins/rssfeed/rss/textinput.cpp8
-rw-r--r--plugins/rssfeed/rssfeed.cpp14
-rw-r--r--plugins/rssfeed/rssfeed.h2
-rw-r--r--plugins/rssfeed/rssfeedmanager.cpp2
-rw-r--r--plugins/rssfeed/rssfeedwidget.ui40
-rw-r--r--plugins/rssfeed/rssfilter.cpp12
-rw-r--r--plugins/rssfeed/rssfilter.h4
-rw-r--r--plugins/rssfeed/rsslinkdownloader.cpp14
-rw-r--r--plugins/rssfeed/rsslinkdownloader.h2
17 files changed, 239 insertions, 239 deletions
diff --git a/plugins/rssfeed/rss/article.cpp b/plugins/rssfeed/rss/article.cpp
index 47413b3..9e52589 100644
--- a/plugins/rssfeed/rss/article.cpp
+++ b/plugins/rssfeed/rss/article.cpp
@@ -54,7 +54,7 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
d->numComments=0;
- if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
d->title = elemText;
@@ -62,14 +62,14 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
bool foundTorrentEnclosure = false;
for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
- if ( (e.tagName()==TQString::fromLatin1("enclosure") ) )
+ if ( (e.tagName()==TQString::tqfromLatin1("enclosure") ) )
{
- TQString enclosureAttr = e.attribute(TQString::fromLatin1("type"));
+ TQString enclosureAttr = e.attribute(TQString::tqfromLatin1("type"));
if (!enclosureAttr.isNull() )
{
if (enclosureAttr == "application/x-bittorrent")
{
- enclosureAttr = e.attribute(TQString::fromLatin1("url"));
+ enclosureAttr = e.attribute(TQString::tqfromLatin1("url"));
if (!enclosureAttr.isNull() )
{
d->link=enclosureAttr;
@@ -88,41 +88,41 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
TQDomNode n;
for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
- if ( (e.tagName()==TQString::fromLatin1("link")) &&
- (e.attribute(TQString::fromLatin1("rel"))==TQString::fromLatin1("alternate")))
+ if ( (e.tagName()==TQString::tqfromLatin1("link")) &&
+ (e.attribute(TQString::tqfromLatin1("rel"))==TQString::tqfromLatin1("alternate")))
{
- d->link=n.toElement().attribute(TQString::fromLatin1("href"));
+ d->link=n.toElement().attribute(TQString::tqfromLatin1("href"));
break;
}
}
}
else
{
- if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
d->link = elemText;
}
}
// prefer content/content:encoded over summary/description for feeds that provide it
- TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
+ TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded");
if (!(elemText = extractNode(node, tagName, false)).isNull())
d->description = elemText;
if (d->description.isEmpty())
{
- if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull())
d->description = elemText;
if (d->description.isEmpty()) // 3rd try: see http://www.intertwingly.net/blog/1299.html
{
- if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
d->description = elemText;
}
}
- if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "created": "pubDate"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "created": "pubDate"))).isNull())
{
time_t _time;
if (format==AtomFeed)
@@ -134,7 +134,7 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
if (_time != 0)
d->pubDate.setTime_t(_time);
}
- if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull())
{
time_t _time = parseISO8601Date(elemText);
@@ -146,23 +146,23 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
//no luck so far - so let's set it to the current time
if (!d->pubDate.isValid())
{
- d->pubDate = TQDateTime::currentDateTime();
+ d->pubDate = TQDateTime::tqcurrentDateTime();
}
- if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) {
d->commentsLink = elemText;
}
- if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) {
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) {
d->numComments = elemText.toInt();
}
- tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
+ tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid");
n = node.namedItem(tagName);
if (!n.isNull()) {
d->guidIsPermaLink = (format==AtomFeed)? false : true;
- if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
+ if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
if (!(elemText = extractNode(node, tagName)).isNull())
d->guid = elemText;
@@ -176,14 +176,14 @@ Article::Article(const TQDomNode &node, Format format) : d(new Private)
md5Machine.update(d->title.utf8());
md5Machine.update(d->description.utf8());
d->guid = TQString(md5Machine.hexDigest().data());
- d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
+ d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true");
}
for (TQDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling())
{
- if (i.isElement() && i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
+ if (i.isElement() && i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta"))
{
- TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
+ TQString type = i.toElement().attribute(TQString::tqfromLatin1("type"));
d->meta[type] = i.toElement().text();
}
}
diff --git a/plugins/rssfeed/rss/document.cpp b/plugins/rssfeed/rss/document.cpp
index d820613..c65e263 100644
--- a/plugins/rssfeed/rss/document.cpp
+++ b/plugins/rssfeed/rss/document.cpp
@@ -79,42 +79,42 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
TQString attr;
// we should probably check that it ISN'T feed or rss, rather than check if it is xhtml
- if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
+ if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html"))
d->valid=false;
else
d->valid=true;
- attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString());
+ attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString());
if (!attr.isNull()) {
if (rootNode.toElement().tagName()=="feed")
{
d->format=AtomFeed;
- if (attr == TQString::fromLatin1("0.3"))
+ if (attr == TQString::tqfromLatin1("0.3"))
d->version = vAtom_0_3;
- else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
+ else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */
d->version = vAtom_0_2;
- else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */
+ else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */
d->version = vAtom_0_1;
}
else
{
d->format=RSSFeed;
- if (attr == TQString::fromLatin1("0.91"))
+ if (attr == TQString::tqfromLatin1("0.91"))
d->version = v0_91;
- else if (attr == TQString::fromLatin1("0.92"))
+ else if (attr == TQString::tqfromLatin1("0.92"))
d->version = v0_92;
- else if (attr == TQString::fromLatin1("0.93"))
+ else if (attr == TQString::tqfromLatin1("0.93"))
d->version = v0_93;
- else if (attr == TQString::fromLatin1("0.94"))
+ else if (attr == TQString::tqfromLatin1("0.94"))
d->version = v0_94;
- else if (attr.startsWith("2.0") || attr == TQString::fromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016)
+ else if (attr.startsWith("2.0") || attr == TQString::tqfromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016)
d->version = v2_0;
}
}
if (d->format==UnknownFormat)
{
- attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString());
+ attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString());
if (!attr.isNull()) {
/*
* Hardcoding these URLs is actually a bad idea, since the DTD doesn't
@@ -124,11 +124,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
* distinguish the RSS versions by analyzing the relationship between
* the nodes.
*/
- if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
+ if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
d->format=RSSFeed;
d->version = v0_90;
}
- else if (attr == TQString::fromLatin1("http://purl.org/rss/1.0/")) {
+ else if (attr == TQString::tqfromLatin1("http://purl.org/rss/1.0/")) {
d->format=RSSFeed;
d->version = v1_0;
}
@@ -140,13 +140,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
if (d->format == AtomFeed)
channelNode=rootNode;
else
- channelNode=rootNode.namedItem(TQString::fromLatin1("channel"));
+ channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel"));
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("title"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("title"))).isNull())
d->title = elemText;
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("description"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("description"))).isNull())
d->description = elemText;
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("link"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("link"))).isNull())
d->link = elemText;
@@ -159,27 +159,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
else
{
// following is a HACK for broken 0.91 feeds like xanga.com's
- if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull())
+ if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
parentNode = rootNode;
else
parentNode = channelNode;
}
// image and textinput aren't supported by Atom.. handle in case feed provides
- TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image"));
+ TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
if (!n.isNull())
d->image = new Image(n);
- n = parentNode.namedItem(TQString::fromLatin1("textinput"));
+ n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
if (!n.isNull())
d->textInput = new TextInput(n);
// Our (hopefully faster) version of elementsByTagName()
TQString tagName;
if (d->format == AtomFeed)
- tagName=TQString::fromLatin1("entry");
+ tagName=TQString::tqfromLatin1("entry");
else
- tagName=TQString::fromLatin1("item");
+ tagName=TQString::tqfromLatin1("item");
for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
@@ -187,212 +187,212 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->articles.append(Article(e, d->format));
}
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull())
d->copyright = elemText;
if (d->format == AtomFeed)
- elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString());
+ elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString());
else
- elemText = extractNode(channelNode, TQString::fromLatin1("language"));
+ elemText = extractNode(channelNode, TQString::tqfromLatin1("language"));
if (!elemText.isNull()){
- if (elemText == TQString::fromLatin1("af"))
+ if (elemText == TQString::tqfromLatin1("af"))
d->language = af;
- else if (elemText == TQString::fromLatin1("sq"))
+ else if (elemText == TQString::tqfromLatin1("sq"))
d->language = sq;
- else if (elemText == TQString::fromLatin1("eu"))
+ else if (elemText == TQString::tqfromLatin1("eu"))
d->language = eu;
- else if (elemText == TQString::fromLatin1("be"))
+ else if (elemText == TQString::tqfromLatin1("be"))
d->language = be;
- else if (elemText == TQString::fromLatin1("bg"))
+ else if (elemText == TQString::tqfromLatin1("bg"))
d->language = bg;
- else if (elemText == TQString::fromLatin1("ca"))
+ else if (elemText == TQString::tqfromLatin1("ca"))
d->language = ca;
- else if (elemText == TQString::fromLatin1("zh-cn"))
+ else if (elemText == TQString::tqfromLatin1("zh-cn"))
d->language = zh_cn;
- else if (elemText == TQString::fromLatin1("zh-tw"))
+ else if (elemText == TQString::tqfromLatin1("zh-tw"))
d->language = zh_tw;
- else if (elemText == TQString::fromLatin1("hr"))
+ else if (elemText == TQString::tqfromLatin1("hr"))
d->language = hr;
- else if (elemText == TQString::fromLatin1("cs"))
+ else if (elemText == TQString::tqfromLatin1("cs"))
d->language = cs;
- else if (elemText == TQString::fromLatin1("da"))
+ else if (elemText == TQString::tqfromLatin1("da"))
d->language = da;
- else if (elemText == TQString::fromLatin1("nl"))
+ else if (elemText == TQString::tqfromLatin1("nl"))
d->language = nl;
- else if (elemText == TQString::fromLatin1("nl-be"))
+ else if (elemText == TQString::tqfromLatin1("nl-be"))
d->language = nl_be;
- else if (elemText == TQString::fromLatin1("nl-nl"))
+ else if (elemText == TQString::tqfromLatin1("nl-nl"))
d->language = nl_nl;
- else if (elemText == TQString::fromLatin1("en"))
+ else if (elemText == TQString::tqfromLatin1("en"))
d->language = en;
- else if (elemText == TQString::fromLatin1("en-au"))
+ else if (elemText == TQString::tqfromLatin1("en-au"))
d->language = en_au;
- else if (elemText == TQString::fromLatin1("en-bz"))
+ else if (elemText == TQString::tqfromLatin1("en-bz"))
d->language = en_bz;
- else if (elemText == TQString::fromLatin1("en-ca"))
+ else if (elemText == TQString::tqfromLatin1("en-ca"))
d->language = en_ca;
- else if (elemText == TQString::fromLatin1("en-ie"))
+ else if (elemText == TQString::tqfromLatin1("en-ie"))
d->language = en_ie;
- else if (elemText == TQString::fromLatin1("en-jm"))
+ else if (elemText == TQString::tqfromLatin1("en-jm"))
d->language = en_jm;
- else if (elemText == TQString::fromLatin1("en-nz"))
+ else if (elemText == TQString::tqfromLatin1("en-nz"))
d->language = en_nz;
- else if (elemText == TQString::fromLatin1("en-ph"))
+ else if (elemText == TQString::tqfromLatin1("en-ph"))
d->language = en_ph;
- else if (elemText == TQString::fromLatin1("en-za"))
+ else if (elemText == TQString::tqfromLatin1("en-za"))
d->language = en_za;
- else if (elemText == TQString::fromLatin1("en-tt"))
+ else if (elemText == TQString::tqfromLatin1("en-tt"))
d->language = en_tt;
- else if (elemText == TQString::fromLatin1("en-gb"))
+ else if (elemText == TQString::tqfromLatin1("en-gb"))
d->language = en_gb;
- else if (elemText == TQString::fromLatin1("en-us"))
+ else if (elemText == TQString::tqfromLatin1("en-us"))
d->language = en_us;
- else if (elemText == TQString::fromLatin1("en-zw"))
+ else if (elemText == TQString::tqfromLatin1("en-zw"))
d->language = en_zw;
- else if (elemText == TQString::fromLatin1("fo"))
+ else if (elemText == TQString::tqfromLatin1("fo"))
d->language = fo;
- else if (elemText == TQString::fromLatin1("fi"))
+ else if (elemText == TQString::tqfromLatin1("fi"))
d->language = fi;
- else if (elemText == TQString::fromLatin1("fr"))
+ else if (elemText == TQString::tqfromLatin1("fr"))
d->language = fr;
- else if (elemText == TQString::fromLatin1("fr-be"))
+ else if (elemText == TQString::tqfromLatin1("fr-be"))
d->language = fr_be;
- else if (elemText == TQString::fromLatin1("fr-ca"))
+ else if (elemText == TQString::tqfromLatin1("fr-ca"))
d->language = fr_ca;
- else if (elemText == TQString::fromLatin1("fr-fr"))
+ else if (elemText == TQString::tqfromLatin1("fr-fr"))
d->language = fr_fr;
- else if (elemText == TQString::fromLatin1("fr-lu"))
+ else if (elemText == TQString::tqfromLatin1("fr-lu"))
d->language = fr_lu;
- else if (elemText == TQString::fromLatin1("fr-mc"))
+ else if (elemText == TQString::tqfromLatin1("fr-mc"))
d->language = fr_mc;
- else if (elemText == TQString::fromLatin1("fr-ch"))
+ else if (elemText == TQString::tqfromLatin1("fr-ch"))
d->language = fr_ch;
- else if (elemText == TQString::fromLatin1("gl"))
+ else if (elemText == TQString::tqfromLatin1("gl"))
d->language = gl;
- else if (elemText == TQString::fromLatin1("gd"))
+ else if (elemText == TQString::tqfromLatin1("gd"))
d->language = gd;
- else if (elemText == TQString::fromLatin1("de"))
+ else if (elemText == TQString::tqfromLatin1("de"))
d->language = de;
- else if (elemText == TQString::fromLatin1("de-at"))
+ else if (elemText == TQString::tqfromLatin1("de-at"))
d->language = de_at;
- else if (elemText == TQString::fromLatin1("de-de"))
+ else if (elemText == TQString::tqfromLatin1("de-de"))
d->language = de_de;
- else if (elemText == TQString::fromLatin1("de-li"))
+ else if (elemText == TQString::tqfromLatin1("de-li"))
d->language = de_li;
- else if (elemText == TQString::fromLatin1("de-lu"))
+ else if (elemText == TQString::tqfromLatin1("de-lu"))
d->language = de_lu;
- else if (elemText == TQString::fromLatin1("de-ch"))
+ else if (elemText == TQString::tqfromLatin1("de-ch"))
d->language = de_ch;
- else if (elemText == TQString::fromLatin1("el"))
+ else if (elemText == TQString::tqfromLatin1("el"))
d->language = el;
- else if (elemText == TQString::fromLatin1("hu"))
+ else if (elemText == TQString::tqfromLatin1("hu"))
d->language = hu;
- else if (elemText == TQString::fromLatin1("is"))
+ else if (elemText == TQString::tqfromLatin1("is"))
d->language = is;
- else if (elemText == TQString::fromLatin1("id"))
+ else if (elemText == TQString::tqfromLatin1("id"))
d->language = id;
- else if (elemText == TQString::fromLatin1("ga"))
+ else if (elemText == TQString::tqfromLatin1("ga"))
d->language = ga;
- else if (elemText == TQString::fromLatin1("it"))
+ else if (elemText == TQString::tqfromLatin1("it"))
d->language = it;
- else if (elemText == TQString::fromLatin1("it-it"))
+ else if (elemText == TQString::tqfromLatin1("it-it"))
d->language = it_it;
- else if (elemText == TQString::fromLatin1("it-ch"))
+ else if (elemText == TQString::tqfromLatin1("it-ch"))
d->language = it_ch;
- else if (elemText == TQString::fromLatin1("ja"))
+ else if (elemText == TQString::tqfromLatin1("ja"))
d->language = ja;
- else if (elemText == TQString::fromLatin1("ko"))
+ else if (elemText == TQString::tqfromLatin1("ko"))
d->language = ko;
- else if (elemText == TQString::fromLatin1("mk"))
+ else if (elemText == TQString::tqfromLatin1("mk"))
d->language = mk;
- else if (elemText == TQString::fromLatin1("no"))
+ else if (elemText == TQString::tqfromLatin1("no"))
d->language = no;
- else if (elemText == TQString::fromLatin1("pl"))
+ else if (elemText == TQString::tqfromLatin1("pl"))
d->language = pl;
- else if (elemText == TQString::fromLatin1("pt"))
+ else if (elemText == TQString::tqfromLatin1("pt"))
d->language = pt;
- else if (elemText == TQString::fromLatin1("pt-br"))
+ else if (elemText == TQString::tqfromLatin1("pt-br"))
d->language = pt_br;
- else if (elemText == TQString::fromLatin1("pt-pt"))
+ else if (elemText == TQString::tqfromLatin1("pt-pt"))
d->language = pt_pt;
- else if (elemText == TQString::fromLatin1("ro"))
+ else if (elemText == TQString::tqfromLatin1("ro"))
d->language = ro;
- else if (elemText == TQString::fromLatin1("ro-mo"))
+ else if (elemText == TQString::tqfromLatin1("ro-mo"))
d->language = ro_mo;
- else if (elemText == TQString::fromLatin1("ro-ro"))
+ else if (elemText == TQString::tqfromLatin1("ro-ro"))
d->language = ro_ro;
- else if (elemText == TQString::fromLatin1("ru"))
+ else if (elemText == TQString::tqfromLatin1("ru"))
d->language = ru;
- else if (elemText == TQString::fromLatin1("ru-mo"))
+ else if (elemText == TQString::tqfromLatin1("ru-mo"))
d->language = ru_mo;
- else if (elemText == TQString::fromLatin1("ru-ru"))
+ else if (elemText == TQString::tqfromLatin1("ru-ru"))
d->language = ru_ru;
- else if (elemText == TQString::fromLatin1("sr"))
+ else if (elemText == TQString::tqfromLatin1("sr"))
d->language = sr;
- else if (elemText == TQString::fromLatin1("sk"))
+ else if (elemText == TQString::tqfromLatin1("sk"))
d->language = sk;
- else if (elemText == TQString::fromLatin1("sl"))
+ else if (elemText == TQString::tqfromLatin1("sl"))
d->language = sl;
- else if (elemText == TQString::fromLatin1("es"))
+ else if (elemText == TQString::tqfromLatin1("es"))
d->language = es;
- else if (elemText == TQString::fromLatin1("es-ar"))
+ else if (elemText == TQString::tqfromLatin1("es-ar"))
d->language = es_ar;
- else if (elemText == TQString::fromLatin1("es-bo"))
+ else if (elemText == TQString::tqfromLatin1("es-bo"))
d->language = es_bo;
- else if (elemText == TQString::fromLatin1("es-cl"))
+ else if (elemText == TQString::tqfromLatin1("es-cl"))
d->language = es_cl;
- else if (elemText == TQString::fromLatin1("es-co"))
+ else if (elemText == TQString::tqfromLatin1("es-co"))
d->language = es_co;
- else if (elemText == TQString::fromLatin1("es-cr"))
+ else if (elemText == TQString::tqfromLatin1("es-cr"))
d->language = es_cr;
- else if (elemText == TQString::fromLatin1("es-do"))
+ else if (elemText == TQString::tqfromLatin1("es-do"))
d->language = es_do;
- else if (elemText == TQString::fromLatin1("es-ec"))
+ else if (elemText == TQString::tqfromLatin1("es-ec"))
d->language = es_ec;
- else if (elemText == TQString::fromLatin1("es-sv"))
+ else if (elemText == TQString::tqfromLatin1("es-sv"))
d->language = es_sv;
- else if (elemText == TQString::fromLatin1("es-gt"))
+ else if (elemText == TQString::tqfromLatin1("es-gt"))
d->language = es_gt;
- else if (elemText == TQString::fromLatin1("es-hn"))
+ else if (elemText == TQString::tqfromLatin1("es-hn"))
d->language = es_hn;
- else if (elemText == TQString::fromLatin1("es-mx"))
+ else if (elemText == TQString::tqfromLatin1("es-mx"))
d->language = es_mx;
- else if (elemText == TQString::fromLatin1("es-ni"))
+ else if (elemText == TQString::tqfromLatin1("es-ni"))
d->language = es_ni;
- else if (elemText == TQString::fromLatin1("es-pa"))
+ else if (elemText == TQString::tqfromLatin1("es-pa"))
d->language = es_pa;
- else if (elemText == TQString::fromLatin1("es-py"))
+ else if (elemText == TQString::tqfromLatin1("es-py"))
d->language = es_py;
- else if (elemText == TQString::fromLatin1("es-pe"))
+ else if (elemText == TQString::tqfromLatin1("es-pe"))
d->language = es_pe;
- else if (elemText == TQString::fromLatin1("es-pr"))
+ else if (elemText == TQString::tqfromLatin1("es-pr"))
d->language = es_pr;
- else if (elemText == TQString::fromLatin1("es-es"))
+ else if (elemText == TQString::tqfromLatin1("es-es"))
d->language = es_es;
- else if (elemText == TQString::fromLatin1("es-uy"))
+ else if (elemText == TQString::tqfromLatin1("es-uy"))
d->language = es_uy;
- else if (elemText == TQString::fromLatin1("es-ve"))
+ else if (elemText == TQString::tqfromLatin1("es-ve"))
d->language = es_ve;
- else if (elemText == TQString::fromLatin1("sv"))
+ else if (elemText == TQString::tqfromLatin1("sv"))
d->language = sv;
- else if (elemText == TQString::fromLatin1("sv-fi"))
+ else if (elemText == TQString::tqfromLatin1("sv-fi"))
d->language = sv_fi;
- else if (elemText == TQString::fromLatin1("sv-se"))
+ else if (elemText == TQString::tqfromLatin1("sv-se"))
d->language = sv_se;
- else if (elemText == TQString::fromLatin1("tr"))
+ else if (elemText == TQString::tqfromLatin1("tr"))
d->language = tr;
- else if (elemText == TQString::fromLatin1("uk"))
+ else if (elemText == TQString::tqfromLatin1("uk"))
d->language = uk;
else
d->language = UndefinedLanguage;
}
if (d->format == AtomFeed)
- tagName=TQString::fromLatin1("issued"); // atom doesn't specify this for feeds
+ tagName=TQString::tqfromLatin1("issued"); // atom doesn't specify this for feeds
// but some broken feeds do this
else
- tagName=TQString::fromLatin1("pubDate");
+ tagName=TQString::tqfromLatin1("pubDate");
if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
time_t _time;
@@ -408,7 +408,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->pubDate.setTime_t(_time);
}
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("dc:date"))).isNull()) {
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("dc:date"))).isNull()) {
time_t _time = parseISO8601Date(elemText);
/* \bug This isn't really the right way since it will set the date to
* Jan 1 1970, 1:00:00 if the passed date was invalid; this means that
@@ -418,9 +418,9 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
}
if (d->format == AtomFeed)
- tagName=TQString::fromLatin1("modified");
+ tagName=TQString::tqfromLatin1("modified");
else
- tagName=TQString::fromLatin1("lastBuildDate");
+ tagName=TQString::tqfromLatin1("lastBuildDate");
if (!(elemText = extractNode(channelNode, tagName)).isNull()) {
time_t _time;
if (d->format == AtomFeed)
@@ -430,44 +430,44 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
d->lastBuildDate.setTime_t(_time);
}
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("rating"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull())
d->rating = elemText;
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull())
d->docs = elemText;
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull())
d->managingEditor = elemText;
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull())
d->webMaster = elemText;
- if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull())
+ if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull())
d->ttl = elemText.toUInt();
- n = channelNode.namedItem(TQString::fromLatin1("skipHours"));
+ n = channelNode.namedItem(TQString::tqfromLatin1("skipHours"));
if (!n.isNull())
for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
- if (e.tagName() == TQString::fromLatin1("hour"))
+ if (e.tagName() == TQString::tqfromLatin1("hour"))
d->skipHours.append(e.text().toUInt());
- n = channelNode.namedItem(TQString::fromLatin1("skipDays"));
+ n = channelNode.namedItem(TQString::tqfromLatin1("skipDays"));
if (!n.isNull()) {
Day day;
TQString elemText;
for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement())
- if (e.tagName() == TQString::fromLatin1("day")) {
+ if (e.tagName() == TQString::tqfromLatin1("day")) {
elemText = e.text().lower();
- if (elemText == TQString::fromLatin1("monday"))
+ if (elemText == TQString::tqfromLatin1("monday"))
day = Monday;
- else if (elemText == TQString::fromLatin1("tuesday"))
+ else if (elemText == TQString::tqfromLatin1("tuesday"))
day = Tuesday;
- else if (elemText == TQString::fromLatin1("wednesday"))
+ else if (elemText == TQString::tqfromLatin1("wednesday"))
day = Wednesday;
- else if (elemText == TQString::fromLatin1("thursday"))
+ else if (elemText == TQString::tqfromLatin1("thursday"))
day = Thursday;
- else if (elemText == TQString::fromLatin1("friday"))
+ else if (elemText == TQString::tqfromLatin1("friday"))
day = Friday;
- else if (elemText == TQString::fromLatin1("saturday"))
+ else if (elemText == TQString::tqfromLatin1("saturday"))
day = Saturday;
- else if (elemText == TQString::fromLatin1("sunday"))
+ else if (elemText == TQString::tqfromLatin1("sunday"))
day = Sunday;
else
day = UndefinedDay;
@@ -496,16 +496,16 @@ Version Document::version() const
TQString Document::verbVersion() const
{
switch (d->version) {
- case v0_90: return TQString::fromLatin1("0.90");
- case v0_91: return TQString::fromLatin1("0.91");
- case v0_92: return TQString::fromLatin1("0.92");
- case v0_93: return TQString::fromLatin1("0.93");
- case v0_94: return TQString::fromLatin1("0.94");
- case v1_0: return TQString::fromLatin1("1.0");
- case v2_0: return TQString::fromLatin1("2.0");
- case vAtom_0_3: return TQString::fromLatin1("0.3");
- case vAtom_0_2: return TQString::fromLatin1("0.2");
- case vAtom_0_1: return TQString::fromLatin1("0.1");
+ case v0_90: return TQString::tqfromLatin1("0.90");
+ case v0_91: return TQString::tqfromLatin1("0.91");
+ case v0_92: return TQString::tqfromLatin1("0.92");
+ case v0_93: return TQString::tqfromLatin1("0.93");
+ case v0_94: return TQString::tqfromLatin1("0.94");
+ case v1_0: return TQString::tqfromLatin1("1.0");
+ case v2_0: return TQString::tqfromLatin1("2.0");
+ case vAtom_0_3: return TQString::tqfromLatin1("0.3");
+ case vAtom_0_2: return TQString::tqfromLatin1("0.2");
+ case vAtom_0_1: return TQString::tqfromLatin1("0.1");
}
return TQString();
}
diff --git a/plugins/rssfeed/rss/global.h b/plugins/rssfeed/rss/global.h
index 92d3866..e4bc7c7 100644
--- a/plugins/rssfeed/rss/global.h
+++ b/plugins/rssfeed/rss/global.h
@@ -39,7 +39,7 @@ namespace RSS
* Possible status values returned by the signal
* Loader::loadingComplete().
*/
- enum Status {
+ enum tqStatus {
Success, /**
* Nothing went wrong so far, but you still have to check
* what values are returned by the classes since it's not
diff --git a/plugins/rssfeed/rss/image.cpp b/plugins/rssfeed/rss/image.cpp
index cb8d7c8..98074be 100644
--- a/plugins/rssfeed/rss/image.cpp
+++ b/plugins/rssfeed/rss/image.cpp
@@ -48,17 +48,17 @@ Image::Image(const TQDomNode &node) : TQObject(), d(new Private)
{
TQString elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
d->title = elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull())
d->url = elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
d->link = elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
d->description = elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull())
d->height = elemText.toUInt();
- if (!(elemText = extractNode(node, TQString::fromLatin1("width"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull())
d->width = elemText.toUInt();
}
diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp
index 6c5b3d5..835a2e6 100644
--- a/plugins/rssfeed/rss/loader.cpp
+++ b/plugins/rssfeed/rss/loader.cpp
@@ -240,7 +240,7 @@ Loader *Loader::create()
Loader *Loader::create(TQObject *object, const char *slot)
{
Loader *loader = create();
- connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
+ connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
object, slot);
return loader;
}
@@ -300,7 +300,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success)
d->retriever = NULL;
Document rssDoc;
- Status status = Success;
+ tqStatus status = Success;
if (success) {
TQDomDocument doc;
diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h
index 807bee5..438ebaf 100644
--- a/plugins/rssfeed/rss/loader.h
+++ b/plugins/rssfeed/rss/loader.h
@@ -209,8 +209,8 @@ namespace RSS
*
* \code
* Loader *loader = Loader::create();
- * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
- * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
+ * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)),
+ * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus)));
* loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
* \endcode
*
@@ -234,7 +234,7 @@ namespace RSS
* 'slotLoadingComplete' method might look like this:
*
* \code
- * void MyClass::slotLoadingComplete(Loader *loader, Document doc, Status status)
+ * void MyClass::slotLoadingComplete(Loader *loader, Document doc, tqStatus status)
* {
* // Note that Loader::~Loader() is private, so you cannot delete Loader instances.
* // You don't need to do that anyway since Loader instances delete themselves.
@@ -320,9 +320,9 @@ namespace RSS
* the case if you intend to call getPixmap() on Document::image()!
* @param status A status byte telling whether there were any problems
* while retrieving or parsing the data.
- * @see Document, Status
+ * @see Document, tqStatus
*/
- void loadingComplete(Loader *loader, Document doc, Status status);
+ void loadingComplete(Loader *loader, Document doc, tqStatus status);
private slots:
void slotRetrieverDone(const TQByteArray &data, bool success);
diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp
index 7d88c3d..571717a 100644
--- a/plugins/rssfeed/rss/testlibrss.cpp
+++ b/plugins/rssfeed/rss/testlibrss.cpp
@@ -19,12 +19,12 @@ static const KCmdLineOptions options[] =
void Tester::test( const TQString &url )
{
Loader *loader = Loader::create();
- connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
- this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
+ connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
+ this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) );
loader->loadFrom( url, new FileRetriever );
}
-void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
+void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status )
{
if ( status == Success )
{
diff --git a/plugins/rssfeed/rss/testlibrss.h b/plugins/rssfeed/rss/testlibrss.h
index 3d3e963..18e1832 100644
--- a/plugins/rssfeed/rss/testlibrss.h
+++ b/plugins/rssfeed/rss/testlibrss.h
@@ -10,7 +10,7 @@
using RSS::Loader;
using RSS::Document;
-using RSS::Status;
+using RSS::tqStatus;
class Tester : public TQObject
{
@@ -20,7 +20,7 @@ class Tester : public TQObject
void test( const TQString &url );
private slots:
- void slotLoadingComplete( Loader *loader, Document doc, Status status );
+ void slotLoadingComplete( Loader *loader, Document doc, tqStatus status );
};
#endif
diff --git a/plugins/rssfeed/rss/textinput.cpp b/plugins/rssfeed/rss/textinput.cpp
index 04799fc..a12442f 100644
--- a/plugins/rssfeed/rss/textinput.cpp
+++ b/plugins/rssfeed/rss/textinput.cpp
@@ -38,13 +38,13 @@ TextInput::TextInput(const TQDomNode &node) : d(new Private)
{
TQString elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("title"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull())
d->title = elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull())
d->description = elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("name"))))
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("name"))))
d->name = elemText;
- if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
+ if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
d->link = elemText;
}
diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index 2b70193..f051f1b 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -223,7 +223,7 @@ namespace kt
RssArticle::List::iterator it;
for ( it = m_articles.begin(); it != m_articles.end(); )
{
- if ((*it).pubDate().daysTo(TQDateTime::currentDateTime()) > m_articleAge)
+ if ((*it).pubDate().daysTo(TQDateTime::tqcurrentDateTime()) > m_articleAge)
{
it = m_articles.erase(it);
removed = true;
@@ -254,12 +254,12 @@ namespace kt
feedLoading = true;
cleanArticles();
Loader * feedLoader = Loader::create();
- connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
- this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) );
+ connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
+ this, TQT_SLOT( feedLoaded( Loader *, Document, tqStatus ) ) );
feedLoader->loadFrom( m_feedUrl, new FileRetriever );
}
- void RssFeed::feedLoaded(Loader *feedLoader, Document doc, Status status)
+ void RssFeed::feedLoaded(Loader *feedLoader, Document doc, tqStatus status)
{
feedLoading = false;
@@ -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::currentDateTime()) < m_articleAge && !m_articles.contains(curArticle))
+ if (curArticle.pubDate().daysTo(TQDateTime::tqcurrentDateTime()) < m_articleAge && !m_articles.contains(curArticle))
{
m_articles.prepend(curArticle);
emit scanRssArticle(curArticle);
@@ -306,8 +306,8 @@ namespace kt
qDebug( "There was and error loading the feed\n");
}
- disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
- this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) );
+ disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ),
+ this, TQT_SLOT( feedLoaded( Loader *, Document, tqStatus ) ) );
feedLoader->deleteLater();
}
diff --git a/plugins/rssfeed/rssfeed.h b/plugins/rssfeed/rssfeed.h
index 835d1b3..5213d8f 100644
--- a/plugins/rssfeed/rssfeed.h
+++ b/plugins/rssfeed/rssfeed.h
@@ -73,7 +73,7 @@ namespace kt
public slots:
void refreshFeed();
- void feedLoaded(Loader *feedLoader, Document doc, Status status);
+ void feedLoaded(Loader *feedLoader, Document doc, tqStatus status);
void clearArticles();
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index bd08224..20f81a6 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -40,7 +40,7 @@
#include <tqdatetimeedit.h>
#include <tqtable.h>
#include <tqregexp.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <torrent/globals.h>
#include <util/log.h>
diff --git a/plugins/rssfeed/rssfeedwidget.ui b/plugins/rssfeed/rssfeedwidget.ui
index 62c2af8..5cd8e89 100644
--- a/plugins/rssfeed/rssfeedwidget.ui
+++ b/plugins/rssfeed/rssfeedwidget.ui
@@ -48,7 +48,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<grid>
<property name="name">
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>90</width>
<height>21</height>
@@ -194,7 +194,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
@@ -252,7 +252,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>60</width>
<height>21</height>
@@ -277,7 +277,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout47</cstring>
+ <cstring>tqlayout47</cstring>
</property>
<hbox>
<property name="name">
@@ -367,7 +367,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout28</cstring>
+ <cstring>tqlayout28</cstring>
</property>
<vbox>
<property name="name">
@@ -476,7 +476,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<vbox>
<property name="name">
@@ -484,7 +484,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<hbox>
<property name="name">
@@ -526,7 +526,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout12</cstring>
+ <cstring>tqlayout12</cstring>
</property>
<hbox>
<property name="name">
@@ -565,7 +565,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<vbox>
<property name="name">
@@ -573,7 +573,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout28</cstring>
+ <cstring>tqlayout28</cstring>
</property>
<hbox>
<property name="name">
@@ -600,7 +600,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>50</width>
<height>21</height>
@@ -614,7 +614,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>60</width>
<height>32767</height>
@@ -633,7 +633,7 @@
<property name="name">
<cstring>seriesBox</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32000</width>
<height>32000</height>
@@ -648,7 +648,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<hbox>
<property name="name">
@@ -664,7 +664,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -686,7 +686,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout10</cstring>
+ <cstring>tqlayout10</cstring>
</property>
<grid>
<property name="name">
@@ -792,7 +792,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout33</cstring>
+ <cstring>tqlayout33</cstring>
</property>
<hbox>
<property name="name">
@@ -880,7 +880,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
@@ -910,7 +910,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>170</width>
<height>21</height>
diff --git a/plugins/rssfeed/rssfilter.cpp b/plugins/rssfeed/rssfilter.cpp
index 32d13d0..51ac2ff 100644
--- a/plugins/rssfeed/rssfilter.cpp
+++ b/plugins/rssfeed/rssfilter.cpp
@@ -302,8 +302,8 @@ namespace kt
regEx.setPattern(*episodeFormats.at(i));
if (regEx.search(article.title()) >= 0)
{
- season = (*regEx.capturedTexts().at(1)).toInt();
- episode = (*regEx.capturedTexts().at(2)).toInt();
+ season = (*regEx.tqcapturedTexts().at(1)).toInt();
+ episode = (*regEx.tqcapturedTexts().at(2)).toInt();
if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
{
return false;
@@ -313,8 +313,8 @@ namespace kt
if (regEx.search(article.link().prettyURL()) >= 0)
{
- season = (*regEx.capturedTexts().at(1)).toInt();
- episode = (*regEx.capturedTexts().at(2)).toInt();
+ season = (*regEx.tqcapturedTexts().at(1)).toInt();
+ episode = (*regEx.tqcapturedTexts().at(2)).toInt();
if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
{
return false;
@@ -324,8 +324,8 @@ namespace kt
if (regEx.search(article.description()) >= 0)
{
- season = (*regEx.capturedTexts().at(1)).toInt();
- episode = (*regEx.capturedTexts().at(2)).toInt();
+ season = (*regEx.tqcapturedTexts().at(1)).toInt();
+ episode = (*regEx.tqcapturedTexts().at(2)).toInt();
if (!episodeInRange(season,episode,ignoreMatches,alreadyDownloaded))
{
return false;
diff --git a/plugins/rssfeed/rssfilter.h b/plugins/rssfeed/rssfilter.h
index 2a24d7d..53695f5 100644
--- a/plugins/rssfeed/rssfilter.h
+++ b/plugins/rssfeed/rssfilter.h
@@ -42,8 +42,8 @@ namespace kt
{
public:
- FilterMatch() { m_season = 0; m_episode = 0; m_time = TQDateTime::currentDateTime().toString(); m_link=TQString(); };
- FilterMatch(int season, int episode, TQString link, TQString time = TQDateTime::currentDateTime().toString());
+ FilterMatch() { m_season = 0; m_episode = 0; m_time = TQDateTime::tqcurrentDateTime().toString(); m_link=TQString(); };
+ FilterMatch(int season, int episode, TQString link, TQString time = TQDateTime::tqcurrentDateTime().toString());
FilterMatch(const FilterMatch &other);
FilterMatch &operator=(const FilterMatch &other);
bool operator==(const FilterMatch &other) const;
diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
index 4c11bb9..972a220 100644
--- a/plugins/rssfeed/rsslinkdownloader.cpp
+++ b/plugins/rssfeed/rsslinkdownloader.cpp
@@ -42,7 +42,7 @@ namespace kt
if (!KURL(link).isValid())
{
// no valid URL, so just display an error message
- KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink));
+ KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").tqarg(curLink));
TQTimer::singleShot(50,this,TQT_SLOT(suicide()));
}
else
@@ -59,10 +59,10 @@ namespace kt
}
- void RssLinkDownloader::processLink(KIO::Job* jobStatus)
+ void RssLinkDownloader::processLink(KIO::Job* jobtqStatus)
{
- if (!jobStatus->error())
+ if (!jobtqStatus->error())
{
//the file downloaded ok - so let's check if it's a torrent
KMimeType linkType = *KMimeType::findByContent(curFile->data());
@@ -100,15 +100,15 @@ namespace kt
hrefText = TQString("HREF=\"?([^\">< ]*)[\" ]");
hrefText.setCaseSensitive(false);
- hrefTags.capturedTexts()[0].find(hrefText);
+ hrefTags.tqcapturedTexts()[0].find(hrefText);
//lets get the captured
TQString hrefLink = hrefText.capturedTexts()[1];
- if (hrefLink.startsWith("/"))
+ if (hrefLink.tqstartsWith("/"))
{
hrefLink = url.protocol() + "://" + url.host() + hrefLink;
}
- else if (!hrefLink.startsWith("http://", false))
+ else if (!hrefLink.tqstartsWith("http://", false))
{
hrefLink = url.url().left(url.url().findRev("/")+1) + hrefLink;
}
@@ -180,7 +180,7 @@ namespace kt
else
{
//failed to download a selected article from a feed
- KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink));
+ KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").tqarg(curLink));
}
deleteLater();
}
diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h
index 17d8676..2bd8bf1 100644
--- a/plugins/rssfeed/rsslinkdownloader.h
+++ b/plugins/rssfeed/rsslinkdownloader.h
@@ -59,7 +59,7 @@ namespace kt
public slots:
- void processLink(KIO::Job* jobStatus);
+ void processLink(KIO::Job* jobtqStatus);
void suicide();
signals: