diff options
Diffstat (limited to 'plugins/rssfeed')
28 files changed, 924 insertions, 913 deletions
diff --git a/plugins/rssfeed/rss/article.cpp b/plugins/rssfeed/rss/article.cpp index 571490e..476eb09 100644 --- a/plugins/rssfeed/rss/article.cpp +++ b/plugins/rssfeed/rss/article.cpp @@ -17,8 +17,8 @@ #include <kurllabel.h> #include <kmdcodec.h> -#include <qdatetime.h> -#include <qdom.h> +#include <tqdatetime.h> +#include <tqdom.h> using namespace RSS; namespace RSS @@ -28,11 +28,11 @@ namespace RSS struct Article::Private : public Shared { - QString title; + TQString title; KURL link; - QString description; - QDateTime pubDate; - QString guid; + TQString description; + TQDateTime pubDate; + TQString guid; bool guidIsPermaLink; MetaInfoMap meta; KURL commentsLink; @@ -48,28 +48,28 @@ Article::Article(const Article &other) : d(0) *this = other; } -Article::Article(const QDomNode &node, Format format) : d(new Private) +Article::Article(const TQDomNode &node, Format format) : d(new Private) { - QString elemText; + TQString elemText; d->numComments=0; - if (!(elemText = extractNode(node, QString::fromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) d->title = elemText; - QDomNode n; + TQDomNode n; bool foundTorrentEnclosure = false; for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { - const QDomElement e = n.toElement(); - if ( (e.tagName()==QString::fromLatin1("enclosure") ) ) + const TQDomElement e = n.toElement(); + if ( (e.tagName()==TQString::tqfromLatin1("enclosure") ) ) { - QString enclosureAttr = e.attribute(QString::fromLatin1("type")); + TQString enclosureAttr = e.attribute(TQString::tqfromLatin1("type")); if (!enclosureAttr.isNull() ) { if (enclosureAttr == "application/x-bittorrent") { - enclosureAttr = e.attribute(QString::fromLatin1("url")); + enclosureAttr = e.attribute(TQString::tqfromLatin1("url")); if (!enclosureAttr.isNull() ) { d->link=enclosureAttr; @@ -85,44 +85,44 @@ Article::Article(const QDomNode &node, Format format) : d(new Private) { if (format==AtomFeed) { - QDomNode n; + TQDomNode n; for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) { - const QDomElement e = n.toElement(); - if ( (e.tagName()==QString::fromLatin1("link")) && - (e.attribute(QString::fromLatin1("rel"))==QString::fromLatin1("alternate"))) + const TQDomElement e = n.toElement(); + if ( (e.tagName()==TQString::tqfromLatin1("link")) && + (e.attribute(TQString::tqfromLatin1("rel"))==TQString::tqfromLatin1("alternate"))) { - d->link=n.toElement().attribute(QString::fromLatin1("href")); + d->link=n.toElement().attribute(TQString::tqfromLatin1("href")); break; } } } else { - if (!(elemText = extractNode(node, QString::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 - QString tagName=(format==AtomFeed)? QString::fromLatin1("content"): QString::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, QString::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, QString::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, QString::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 QDomNode &node, Format format) : d(new Private) if (_time != 0) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(node, QString::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 QDomNode &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 = QDateTime::currentDateTime(); + d->pubDate = TQDateTime::tqcurrentDateTime(); } - if (!(elemText = extractNode(node, QString::fromLatin1("wfw:comment"))).isNull()) { + if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) { d->commentsLink = elemText; } - if (!(elemText = extractNode(node, QString::fromLatin1("slash:comments"))).isNull()) { + if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) { d->numComments = elemText.toInt(); } - tagName=(format==AtomFeed)? QString::fromLatin1("id"): QString::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(QString::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; @@ -172,18 +172,18 @@ Article::Article(const QDomNode &node, Format format) : d(new Private) d->guidIsPermaLink = false; md5Machine.reset(); - QDomNode n(node); + TQDomNode n(node); md5Machine.update(d->title.utf8()); md5Machine.update(d->description.utf8()); - d->guid = QString(md5Machine.hexDigest().data()); - d->meta[QString::fromLatin1("guidIsHash")] = QString::fromLatin1("true"); + d->guid = TQString(md5Machine.hexDigest().data()); + d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true"); } - for (QDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling()) + for (TQDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling()) { - if (i.isElement() && i.toElement().tagName() == QString::fromLatin1("metaInfo:meta")) + if (i.isElement() && i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta")) { - QString type = i.toElement().attribute(QString::fromLatin1("type")); + TQString type = i.toElement().attribute(TQString::tqfromLatin1("type")); d->meta[type] = i.toElement().text(); } } @@ -195,7 +195,7 @@ Article::~Article() delete d; } -QString Article::title() const +TQString Article::title() const { return d->title; } @@ -205,12 +205,12 @@ const KURL &Article::link() const return d->link; } -QString Article::description() const +TQString Article::description() const { return d->description; } -QString Article::guid() const +TQString Article::guid() const { return d->guid; } @@ -220,7 +220,7 @@ bool Article::guidIsPermaLink() const return d->guidIsPermaLink; } -const QDateTime &Article::pubDate() const +const TQDateTime &Article::pubDate() const { return d->pubDate; } @@ -236,14 +236,14 @@ int Article::comments() const } -QString Article::meta(const QString &key) const +TQString Article::meta(const TQString &key) const { return d->meta[key]; } -KURLLabel *Article::widget(QWidget *parent, const char *name) const +KURLLabel *Article::widget(TQWidget *tqparent, const char *name) const { - KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name); + KURLLabel *label = new KURLLabel(d->link.url(), d->title, tqparent, name); label->setUseTips(true); if (!d->description.isNull()) label->setTipText(d->description); diff --git a/plugins/rssfeed/rss/article.h b/plugins/rssfeed/rss/article.h index bab7a38..93f1908 100644 --- a/plugins/rssfeed/rss/article.h +++ b/plugins/rssfeed/rss/article.h @@ -11,15 +11,15 @@ #ifndef LIBRSS_ARTICLE_H #define LIBRSS_ARTICLE_H -#include <qmap.h> +#include <tqmap.h> #include "global.h" -class QDateTime; -class QDomNode; -template <class> class QValueList; -class QString; -class QWidget; +class TQDateTime; +class TQDomNode; +template <class> class TQValueList; +class TQString; +class TQWidget; class KURL; class KURLLabel; @@ -37,7 +37,7 @@ namespace RSS /** * A list of articles. */ - typedef QValueList<Article> List; + typedef TQValueList<Article> List; /** * Default constructor. @@ -52,10 +52,10 @@ namespace RSS /** * Constructs an Article from a piece of RSS markup. - * @param node A QDomNode which references the DOM leaf to be used + * @param node A TQDomNode which references the DOM leaf to be used * for constructing the Article. */ - Article(const QDomNode &node, Format format); + Article(const TQDomNode &node, Format format); /** * Assignment operator. @@ -87,10 +87,10 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The headline of this article, or QString::null if + * @return The headline of this article, or TQString() if * no headline was available. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards @@ -103,20 +103,20 @@ namespace RSS /** * RSS 0.91 and upwards - * @return A story synopsis, or QString::null if no description + * @return A story synopsis, or TQString() if no description * was available. */ - QString description() const; + TQString description() const; /** * RSS 2.0 and upwards * @return An article GUID (globally unique identifier). */ - QString guid() const; + TQString guid() const; /** * RSS 2.0 and upwards - * @return If this article GUID is permalink. Has no meaning when guid() is QString::null. + * @return If this article GUID is permalink. Has no meaning when guid() is TQString(). */ bool guidIsPermaLink() const; @@ -124,30 +124,30 @@ namespace RSS * RSS 2.0 and upwards * @return The date when the article was published. */ - const QDateTime &pubDate() const; + const TQDateTime &pubDate() const; const KURL &commentsLink() const; int comments() const; - QString meta(const QString &key) const; + TQString meta(const TQString &key) const; /** - * @param parent The parent widget for the KURLLabel. + * @param tqparent The tqparent widget for the KURLLabel. * @param name A name for the widget which will be used internally. * @return a widget (a KURLLabel in this case) for the Article. * This makes building a user-interface which contains the * information in this Article object more convenient. * The returned KURLLabel's caption will be the title(), clicking - * on it will emit the URL link(), and it has a QToolTip attached + * on it will emit the URL link(), and it has a TQToolTip attached * to it which displays the description() (in case it has one, * if there is no description, the URL which the label links to * will be used). * Note that you have to delete the KURLLabel object returned by * this method yourself. */ - KURLLabel *widget(QWidget *parent = 0, const char *name = 0) const; + KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const; - typedef QMap<QString, QString> MetaInfoMap; + typedef TQMap<TQString, TQString> MetaInfoMap; private: struct Private; diff --git a/plugins/rssfeed/rss/document.cpp b/plugins/rssfeed/rss/document.cpp index be353e4..f2e3763 100644 --- a/plugins/rssfeed/rss/document.cpp +++ b/plugins/rssfeed/rss/document.cpp @@ -18,9 +18,9 @@ #include <krfcdate.h> #include <kurl.h> -#include <qdatetime.h> -#include <qdom.h> -#include <qptrlist.h> +#include <tqdatetime.h> +#include <tqdom.h> +#include <tqptrlist.h> using namespace RSS; @@ -40,22 +40,22 @@ struct Document::Private : public Shared } Version version; - QString title; - QString description; + TQString title; + TQString description; KURL link; Image *image; TextInput *textInput; Article::List articles; Language language; Format format; - QString copyright; - QDateTime pubDate; - QDateTime lastBuildDate; - QString rating; + TQString copyright; + TQDateTime pubDate; + TQDateTime lastBuildDate; + TQString rating; KURL docs; int ttl; - QString managingEditor; - QString webMaster; + TQString managingEditor; + TQString webMaster; HourList skipHours; DayList skipDays; bool valid; @@ -70,51 +70,51 @@ Document::Document(const Document &other) : d(0) *this = other; } -Document::Document(const QDomDocument &doc) : d(new Private) +Document::Document(const TQDomDocument &doc) : d(new Private) { - QString elemText; - QDomNode rootNode = doc.documentElement(); + TQString elemText; + TQDomNode rootNode = doc.documentElement(); // Determine the version of the present RSS markup. - QString attr; + TQString attr; // we should probably check that it ISN'T feed or rss, rather than check if it is xhtml - if (rootNode.toElement().tagName()==QString::fromLatin1("html")) + if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html")) d->valid=false; else d->valid=true; - attr = rootNode.toElement().attribute(QString::fromLatin1("version"), QString::null); + attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString()); if (!attr.isNull()) { if (rootNode.toElement().tagName()=="feed") { d->format=AtomFeed; - if (attr == QString::fromLatin1("0.3")) + if (attr == TQString::tqfromLatin1("0.3")) d->version = vAtom_0_3; - else if (attr == QString::fromLatin1("0.2")) /* smt -> review */ + else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */ d->version = vAtom_0_2; - else if (attr == QString::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 == QString::fromLatin1("0.91")) + if (attr == TQString::tqfromLatin1("0.91")) d->version = v0_91; - else if (attr == QString::fromLatin1("0.92")) + else if (attr == TQString::tqfromLatin1("0.92")) d->version = v0_92; - else if (attr == QString::fromLatin1("0.93")) + else if (attr == TQString::tqfromLatin1("0.93")) d->version = v0_93; - else if (attr == QString::fromLatin1("0.94")) + else if (attr == TQString::tqfromLatin1("0.94")) d->version = v0_94; - else if (attr.startsWith("2.0") || attr == QString::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(QString::fromLatin1("xmlns"), QString::null); + 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,275 +124,275 @@ Document::Document(const QDomDocument &doc) : d(new Private) * distinguish the RSS versions by analyzing the relationship between * the nodes. */ - if (attr == QString::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 == QString::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; } } } - QDomNode channelNode; + TQDomNode channelNode; if (d->format == AtomFeed) channelNode=rootNode; else - channelNode=rootNode.namedItem(QString::fromLatin1("channel")); + channelNode=rootNode.namedItem(TQString::tqfromLatin1("channel")); - if (!(elemText = extractNode(channelNode, QString::fromLatin1("title"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("link"))).isNull()) d->link = elemText; - /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent + /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0. */ - QDomNode parentNode; + TQDomNode tqparentNode; if (d->version == v0_90 || d->version == v1_0 || d->format == AtomFeed) - parentNode = rootNode; + tqparentNode = rootNode; else { // following is a HACK for broken 0.91 feeds like xanga.com's - if (!rootNode.namedItem(QString::fromLatin1("item")).isNull()) - parentNode = rootNode; + if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull()) + tqparentNode = rootNode; else - parentNode = channelNode; + tqparentNode = channelNode; } // image and textinput aren't supported by Atom.. handle in case feed provides - QDomNode n = parentNode.namedItem(QString::fromLatin1("image")); + TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = parentNode.namedItem(QString::fromLatin1("textinput")); + n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); // Our (hopefully faster) version of elementsByTagName() - QString tagName; + TQString tagName; if (d->format == AtomFeed) - tagName=QString::fromLatin1("entry"); + tagName=TQString::tqfromLatin1("entry"); else - tagName=QString::fromLatin1("item"); + tagName=TQString::tqfromLatin1("item"); - for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { - const QDomElement e = n.toElement(); + for (n = tqparentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { + const TQDomElement e = n.toElement(); if (e.tagName() == tagName) d->articles.append(Article(e, d->format)); } - if (!(elemText = extractNode(channelNode, QString::fromLatin1("copyright"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("copyright"))).isNull()) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(QString::fromLatin1("xml:lang"), QString::null); + elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString()); else - elemText = extractNode(channelNode, QString::fromLatin1("language")); + elemText = extractNode(channelNode, TQString::tqfromLatin1("language")); if (!elemText.isNull()){ - if (elemText == QString::fromLatin1("af")) + if (elemText == TQString::tqfromLatin1("af")) d->language = af; - else if (elemText == QString::fromLatin1("sq")) + else if (elemText == TQString::tqfromLatin1("sq")) d->language = sq; - else if (elemText == QString::fromLatin1("eu")) + else if (elemText == TQString::tqfromLatin1("eu")) d->language = eu; - else if (elemText == QString::fromLatin1("be")) + else if (elemText == TQString::tqfromLatin1("be")) d->language = be; - else if (elemText == QString::fromLatin1("bg")) + else if (elemText == TQString::tqfromLatin1("bg")) d->language = bg; - else if (elemText == QString::fromLatin1("ca")) + else if (elemText == TQString::tqfromLatin1("ca")) d->language = ca; - else if (elemText == QString::fromLatin1("zh-cn")) + else if (elemText == TQString::tqfromLatin1("zh-cn")) d->language = zh_cn; - else if (elemText == QString::fromLatin1("zh-tw")) + else if (elemText == TQString::tqfromLatin1("zh-tw")) d->language = zh_tw; - else if (elemText == QString::fromLatin1("hr")) + else if (elemText == TQString::tqfromLatin1("hr")) d->language = hr; - else if (elemText == QString::fromLatin1("cs")) + else if (elemText == TQString::tqfromLatin1("cs")) d->language = cs; - else if (elemText == QString::fromLatin1("da")) + else if (elemText == TQString::tqfromLatin1("da")) d->language = da; - else if (elemText == QString::fromLatin1("nl")) + else if (elemText == TQString::tqfromLatin1("nl")) d->language = nl; - else if (elemText == QString::fromLatin1("nl-be")) + else if (elemText == TQString::tqfromLatin1("nl-be")) d->language = nl_be; - else if (elemText == QString::fromLatin1("nl-nl")) + else if (elemText == TQString::tqfromLatin1("nl-nl")) d->language = nl_nl; - else if (elemText == QString::fromLatin1("en")) + else if (elemText == TQString::tqfromLatin1("en")) d->language = en; - else if (elemText == QString::fromLatin1("en-au")) + else if (elemText == TQString::tqfromLatin1("en-au")) d->language = en_au; - else if (elemText == QString::fromLatin1("en-bz")) + else if (elemText == TQString::tqfromLatin1("en-bz")) d->language = en_bz; - else if (elemText == QString::fromLatin1("en-ca")) + else if (elemText == TQString::tqfromLatin1("en-ca")) d->language = en_ca; - else if (elemText == QString::fromLatin1("en-ie")) + else if (elemText == TQString::tqfromLatin1("en-ie")) d->language = en_ie; - else if (elemText == QString::fromLatin1("en-jm")) + else if (elemText == TQString::tqfromLatin1("en-jm")) d->language = en_jm; - else if (elemText == QString::fromLatin1("en-nz")) + else if (elemText == TQString::tqfromLatin1("en-nz")) d->language = en_nz; - else if (elemText == QString::fromLatin1("en-ph")) + else if (elemText == TQString::tqfromLatin1("en-ph")) d->language = en_ph; - else if (elemText == QString::fromLatin1("en-za")) + else if (elemText == TQString::tqfromLatin1("en-za")) d->language = en_za; - else if (elemText == QString::fromLatin1("en-tt")) + else if (elemText == TQString::tqfromLatin1("en-tt")) d->language = en_tt; - else if (elemText == QString::fromLatin1("en-gb")) + else if (elemText == TQString::tqfromLatin1("en-gb")) d->language = en_gb; - else if (elemText == QString::fromLatin1("en-us")) + else if (elemText == TQString::tqfromLatin1("en-us")) d->language = en_us; - else if (elemText == QString::fromLatin1("en-zw")) + else if (elemText == TQString::tqfromLatin1("en-zw")) d->language = en_zw; - else if (elemText == QString::fromLatin1("fo")) + else if (elemText == TQString::tqfromLatin1("fo")) d->language = fo; - else if (elemText == QString::fromLatin1("fi")) + else if (elemText == TQString::tqfromLatin1("fi")) d->language = fi; - else if (elemText == QString::fromLatin1("fr")) + else if (elemText == TQString::tqfromLatin1("fr")) d->language = fr; - else if (elemText == QString::fromLatin1("fr-be")) + else if (elemText == TQString::tqfromLatin1("fr-be")) d->language = fr_be; - else if (elemText == QString::fromLatin1("fr-ca")) + else if (elemText == TQString::tqfromLatin1("fr-ca")) d->language = fr_ca; - else if (elemText == QString::fromLatin1("fr-fr")) + else if (elemText == TQString::tqfromLatin1("fr-fr")) d->language = fr_fr; - else if (elemText == QString::fromLatin1("fr-lu")) + else if (elemText == TQString::tqfromLatin1("fr-lu")) d->language = fr_lu; - else if (elemText == QString::fromLatin1("fr-mc")) + else if (elemText == TQString::tqfromLatin1("fr-mc")) d->language = fr_mc; - else if (elemText == QString::fromLatin1("fr-ch")) + else if (elemText == TQString::tqfromLatin1("fr-ch")) d->language = fr_ch; - else if (elemText == QString::fromLatin1("gl")) + else if (elemText == TQString::tqfromLatin1("gl")) d->language = gl; - else if (elemText == QString::fromLatin1("gd")) + else if (elemText == TQString::tqfromLatin1("gd")) d->language = gd; - else if (elemText == QString::fromLatin1("de")) + else if (elemText == TQString::tqfromLatin1("de")) d->language = de; - else if (elemText == QString::fromLatin1("de-at")) + else if (elemText == TQString::tqfromLatin1("de-at")) d->language = de_at; - else if (elemText == QString::fromLatin1("de-de")) + else if (elemText == TQString::tqfromLatin1("de-de")) d->language = de_de; - else if (elemText == QString::fromLatin1("de-li")) + else if (elemText == TQString::tqfromLatin1("de-li")) d->language = de_li; - else if (elemText == QString::fromLatin1("de-lu")) + else if (elemText == TQString::tqfromLatin1("de-lu")) d->language = de_lu; - else if (elemText == QString::fromLatin1("de-ch")) + else if (elemText == TQString::tqfromLatin1("de-ch")) d->language = de_ch; - else if (elemText == QString::fromLatin1("el")) + else if (elemText == TQString::tqfromLatin1("el")) d->language = el; - else if (elemText == QString::fromLatin1("hu")) + else if (elemText == TQString::tqfromLatin1("hu")) d->language = hu; - else if (elemText == QString::fromLatin1("is")) + else if (elemText == TQString::tqfromLatin1("is")) d->language = is; - else if (elemText == QString::fromLatin1("id")) + else if (elemText == TQString::tqfromLatin1("id")) d->language = id; - else if (elemText == QString::fromLatin1("ga")) + else if (elemText == TQString::tqfromLatin1("ga")) d->language = ga; - else if (elemText == QString::fromLatin1("it")) + else if (elemText == TQString::tqfromLatin1("it")) d->language = it; - else if (elemText == QString::fromLatin1("it-it")) + else if (elemText == TQString::tqfromLatin1("it-it")) d->language = it_it; - else if (elemText == QString::fromLatin1("it-ch")) + else if (elemText == TQString::tqfromLatin1("it-ch")) d->language = it_ch; - else if (elemText == QString::fromLatin1("ja")) + else if (elemText == TQString::tqfromLatin1("ja")) d->language = ja; - else if (elemText == QString::fromLatin1("ko")) + else if (elemText == TQString::tqfromLatin1("ko")) d->language = ko; - else if (elemText == QString::fromLatin1("mk")) + else if (elemText == TQString::tqfromLatin1("mk")) d->language = mk; - else if (elemText == QString::fromLatin1("no")) + else if (elemText == TQString::tqfromLatin1("no")) d->language = no; - else if (elemText == QString::fromLatin1("pl")) + else if (elemText == TQString::tqfromLatin1("pl")) d->language = pl; - else if (elemText == QString::fromLatin1("pt")) + else if (elemText == TQString::tqfromLatin1("pt")) d->language = pt; - else if (elemText == QString::fromLatin1("pt-br")) + else if (elemText == TQString::tqfromLatin1("pt-br")) d->language = pt_br; - else if (elemText == QString::fromLatin1("pt-pt")) + else if (elemText == TQString::tqfromLatin1("pt-pt")) d->language = pt_pt; - else if (elemText == QString::fromLatin1("ro")) + else if (elemText == TQString::tqfromLatin1("ro")) d->language = ro; - else if (elemText == QString::fromLatin1("ro-mo")) + else if (elemText == TQString::tqfromLatin1("ro-mo")) d->language = ro_mo; - else if (elemText == QString::fromLatin1("ro-ro")) + else if (elemText == TQString::tqfromLatin1("ro-ro")) d->language = ro_ro; - else if (elemText == QString::fromLatin1("ru")) + else if (elemText == TQString::tqfromLatin1("ru")) d->language = ru; - else if (elemText == QString::fromLatin1("ru-mo")) + else if (elemText == TQString::tqfromLatin1("ru-mo")) d->language = ru_mo; - else if (elemText == QString::fromLatin1("ru-ru")) + else if (elemText == TQString::tqfromLatin1("ru-ru")) d->language = ru_ru; - else if (elemText == QString::fromLatin1("sr")) + else if (elemText == TQString::tqfromLatin1("sr")) d->language = sr; - else if (elemText == QString::fromLatin1("sk")) + else if (elemText == TQString::tqfromLatin1("sk")) d->language = sk; - else if (elemText == QString::fromLatin1("sl")) + else if (elemText == TQString::tqfromLatin1("sl")) d->language = sl; - else if (elemText == QString::fromLatin1("es")) + else if (elemText == TQString::tqfromLatin1("es")) d->language = es; - else if (elemText == QString::fromLatin1("es-ar")) + else if (elemText == TQString::tqfromLatin1("es-ar")) d->language = es_ar; - else if (elemText == QString::fromLatin1("es-bo")) + else if (elemText == TQString::tqfromLatin1("es-bo")) d->language = es_bo; - else if (elemText == QString::fromLatin1("es-cl")) + else if (elemText == TQString::tqfromLatin1("es-cl")) d->language = es_cl; - else if (elemText == QString::fromLatin1("es-co")) + else if (elemText == TQString::tqfromLatin1("es-co")) d->language = es_co; - else if (elemText == QString::fromLatin1("es-cr")) + else if (elemText == TQString::tqfromLatin1("es-cr")) d->language = es_cr; - else if (elemText == QString::fromLatin1("es-do")) + else if (elemText == TQString::tqfromLatin1("es-do")) d->language = es_do; - else if (elemText == QString::fromLatin1("es-ec")) + else if (elemText == TQString::tqfromLatin1("es-ec")) d->language = es_ec; - else if (elemText == QString::fromLatin1("es-sv")) + else if (elemText == TQString::tqfromLatin1("es-sv")) d->language = es_sv; - else if (elemText == QString::fromLatin1("es-gt")) + else if (elemText == TQString::tqfromLatin1("es-gt")) d->language = es_gt; - else if (elemText == QString::fromLatin1("es-hn")) + else if (elemText == TQString::tqfromLatin1("es-hn")) d->language = es_hn; - else if (elemText == QString::fromLatin1("es-mx")) + else if (elemText == TQString::tqfromLatin1("es-mx")) d->language = es_mx; - else if (elemText == QString::fromLatin1("es-ni")) + else if (elemText == TQString::tqfromLatin1("es-ni")) d->language = es_ni; - else if (elemText == QString::fromLatin1("es-pa")) + else if (elemText == TQString::tqfromLatin1("es-pa")) d->language = es_pa; - else if (elemText == QString::fromLatin1("es-py")) + else if (elemText == TQString::tqfromLatin1("es-py")) d->language = es_py; - else if (elemText == QString::fromLatin1("es-pe")) + else if (elemText == TQString::tqfromLatin1("es-pe")) d->language = es_pe; - else if (elemText == QString::fromLatin1("es-pr")) + else if (elemText == TQString::tqfromLatin1("es-pr")) d->language = es_pr; - else if (elemText == QString::fromLatin1("es-es")) + else if (elemText == TQString::tqfromLatin1("es-es")) d->language = es_es; - else if (elemText == QString::fromLatin1("es-uy")) + else if (elemText == TQString::tqfromLatin1("es-uy")) d->language = es_uy; - else if (elemText == QString::fromLatin1("es-ve")) + else if (elemText == TQString::tqfromLatin1("es-ve")) d->language = es_ve; - else if (elemText == QString::fromLatin1("sv")) + else if (elemText == TQString::tqfromLatin1("sv")) d->language = sv; - else if (elemText == QString::fromLatin1("sv-fi")) + else if (elemText == TQString::tqfromLatin1("sv-fi")) d->language = sv_fi; - else if (elemText == QString::fromLatin1("sv-se")) + else if (elemText == TQString::tqfromLatin1("sv-se")) d->language = sv_se; - else if (elemText == QString::fromLatin1("tr")) + else if (elemText == TQString::tqfromLatin1("tr")) d->language = tr; - else if (elemText == QString::fromLatin1("uk")) + else if (elemText == TQString::tqfromLatin1("uk")) d->language = uk; else d->language = UndefinedLanguage; } if (d->format == AtomFeed) - tagName=QString::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=QString::fromLatin1("pubDate"); + tagName=TQString::tqfromLatin1("pubDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; @@ -408,7 +408,7 @@ Document::Document(const QDomDocument &doc) : d(new Private) d->pubDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, QString::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 QDomDocument &doc) : d(new Private) } if (d->format == AtomFeed) - tagName=QString::fromLatin1("modified"); + tagName=TQString::tqfromLatin1("modified"); else - tagName=QString::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 QDomDocument &doc) : d(new Private) d->lastBuildDate.setTime_t(_time); } - if (!(elemText = extractNode(channelNode, QString::fromLatin1("rating"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("rating"))).isNull()) d->rating = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("docs"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("docs"))).isNull()) d->docs = elemText; - if (!(elemText = extractNode(channelNode, QString::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, QString::fromLatin1("webMaster"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("webMaster"))).isNull()) d->webMaster = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("ttl"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::tqfromLatin1("ttl"))).isNull()) d->ttl = elemText.toUInt(); - n = channelNode.namedItem(QString::fromLatin1("skipHours")); + n = channelNode.namedItem(TQString::tqfromLatin1("skipHours")); if (!n.isNull()) - for (QDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == QString::fromLatin1("hour")) + for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) + if (e.tagName() == TQString::tqfromLatin1("hour")) d->skipHours.append(e.text().toUInt()); - n = channelNode.namedItem(QString::fromLatin1("skipDays")); + n = channelNode.namedItem(TQString::tqfromLatin1("skipDays")); if (!n.isNull()) { Day day; - QString elemText; - for (QDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) - if (e.tagName() == QString::fromLatin1("day")) { + TQString elemText; + for (TQDomElement e = n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) + if (e.tagName() == TQString::tqfromLatin1("day")) { elemText = e.text().lower(); - if (elemText == QString::fromLatin1("monday")) + if (elemText == TQString::tqfromLatin1("monday")) day = Monday; - else if (elemText == QString::fromLatin1("tuesday")) + else if (elemText == TQString::tqfromLatin1("tuesday")) day = Tuesday; - else if (elemText == QString::fromLatin1("wednesday")) + else if (elemText == TQString::tqfromLatin1("wednesday")) day = Wednesday; - else if (elemText == QString::fromLatin1("thursday")) + else if (elemText == TQString::tqfromLatin1("thursday")) day = Thursday; - else if (elemText == QString::fromLatin1("friday")) + else if (elemText == TQString::tqfromLatin1("friday")) day = Friday; - else if (elemText == QString::fromLatin1("saturday")) + else if (elemText == TQString::tqfromLatin1("saturday")) day = Saturday; - else if (elemText == QString::fromLatin1("sunday")) + else if (elemText == TQString::tqfromLatin1("sunday")) day = Sunday; else day = UndefinedDay; @@ -493,29 +493,29 @@ Version Document::version() const return d->version; } -QString Document::verbVersion() const +TQString Document::verbVersion() const { switch (d->version) { - case v0_90: return QString::fromLatin1("0.90"); - case v0_91: return QString::fromLatin1("0.91"); - case v0_92: return QString::fromLatin1("0.92"); - case v0_93: return QString::fromLatin1("0.93"); - case v0_94: return QString::fromLatin1("0.94"); - case v1_0: return QString::fromLatin1("1.0"); - case v2_0: return QString::fromLatin1("2.0"); - case vAtom_0_3: return QString::fromLatin1("0.3"); - case vAtom_0_2: return QString::fromLatin1("0.2"); - case vAtom_0_1: return QString::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 QString::null; + return TQString(); } -QString Document::title() const +TQString Document::title() const { return d->title; } -QString Document::description() const +TQString Document::description() const { return d->description; } @@ -555,22 +555,22 @@ Language Document::language() const return d->language; } -QString Document::copyright() const +TQString Document::copyright() const { return d->copyright; } -const QDateTime &Document::pubDate() const +const TQDateTime &Document::pubDate() const { return d->pubDate; } -const QDateTime &Document::lastBuildDate() const +const TQDateTime &Document::lastBuildDate() const { return d->lastBuildDate; } -QString Document::rating() const +TQString Document::rating() const { return d->rating; } @@ -580,12 +580,12 @@ const KURL &Document::docs() const return d->docs; } -QString Document::managingEditor() const +TQString Document::managingEditor() const { return d->managingEditor; } -QString Document::webMaster() const +TQString Document::webMaster() const { return d->webMaster; } diff --git a/plugins/rssfeed/rss/document.h b/plugins/rssfeed/rss/document.h index 1ead634..c65c15e 100644 --- a/plugins/rssfeed/rss/document.h +++ b/plugins/rssfeed/rss/document.h @@ -14,8 +14,8 @@ #include "article.h" #include "global.h" -class QDateTime; -class QDomDocument; +class TQDateTime; +class TQDomDocument; namespace RSS { @@ -45,7 +45,7 @@ namespace RSS /** * Constructs a Document from a piece of XML markup. */ - Document(const QDomDocument &doc); + Document(const TQDomDocument &doc); /** * Assignment operator. @@ -75,28 +75,28 @@ namespace RSS /** * Convenience method. Differs from version() only in how the result * is returned. - * @return A QString representing the verbose version of the + * @return A TQString representing the verbose version of the * document. * @see version() */ - QString verbVersion() const; + TQString verbVersion() const; /** * RSS 0.90 and upwards - * @return The title of the RSS document, or QString::null if no + * @return The title of the RSS document, or TQString() if no * title was available. This is often the name of the news source * from which the RSS document was retrieved. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards - * @return The description of the RSS document, or QString::null + * @return The description of the RSS document, or TQString() * if no description was available. This is usually a short slogan * or description of the news source from which the RSS document * was retrieved. */ - QString description() const; + TQString description() const; /** * RSS 0.90 and upwards @@ -158,28 +158,28 @@ namespace RSS /** * RSS 0.91 and upwards * @return A copyright of the information contained in the RSS - * document, or QString::null if no copyright is available. + * document, or TQString() if no copyright is available. */ - QString copyright() const; + TQString copyright() const; /** * RSS 0.91 and upwards * @return The date when the RSS document was published. */ - const QDateTime &pubDate() const; + const TQDateTime &pubDate() const; /** * RSS 0.91 and upwards. * @return The last time the channel was modified. */ - const QDateTime &lastBuildDate() const; + const TQDateTime &lastBuildDate() const; /** * RSS 0.91 and upwards * @return A <a href="http://www.w3.org/PICS/#Specs">PICS</a> * rating for this page. */ - QString rating() const; + TQString rating() const; /** * RSS 0.91 and upwards @@ -197,16 +197,16 @@ namespace RSS * bull@mancuso.com (Bull Mancuso). * @see webMaster() */ - QString managingEditor() const; + TQString managingEditor() const; /** * RSS 0.91 and upwards * @return The email address of the webmaster for the site, the * person to contact if there are technical problems with the - * channel, or QString::null if this information isn't available. + * channel, or TQString() if this information isn't available. * @see managingEditor() */ - QString webMaster() const; + TQString webMaster() const; /** * RSS 0.91 and upwards diff --git a/plugins/rssfeed/rss/global.h b/plugins/rssfeed/rss/global.h index 3a954e6..e4bc7c7 100644 --- a/plugins/rssfeed/rss/global.h +++ b/plugins/rssfeed/rss/global.h @@ -12,7 +12,7 @@ #define LIBRSS_GLOBAL_H template <class> -class QValueList; +class TQValueList; namespace RSS { @@ -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 @@ -133,12 +133,12 @@ namespace RSS /** * This type is used by Document::skipDays(). */ - typedef QValueList<Day> DayList; + typedef TQValueList<Day> DayList; /** * This type is used by Document::skipHours(). */ - typedef QValueList<unsigned short> HourList; + typedef TQValueList<unsigned short> HourList; } #endif // LIBRSS_GLOBAL_H diff --git a/plugins/rssfeed/rss/image.cpp b/plugins/rssfeed/rss/image.cpp index 33e1544..98074be 100644 --- a/plugins/rssfeed/rss/image.cpp +++ b/plugins/rssfeed/rss/image.cpp @@ -14,9 +14,9 @@ #include <kio/job.h> #include <kurl.h> -#include <qbuffer.h> -#include <qdom.h> -#include <qpixmap.h> +#include <tqbuffer.h> +#include <tqdom.h> +#include <tqpixmap.h> using namespace RSS; @@ -25,40 +25,40 @@ struct Image::Private : public Shared Private() : height(31), width(88), pixmapBuffer(NULL), job(NULL) { } - QString title; + TQString title; KURL url; KURL link; - QString description; + TQString description; unsigned int height; unsigned int width; - QBuffer *pixmapBuffer; + TQBuffer *pixmapBuffer; KIO::Job *job; }; -Image::Image() : QObject(), d(new Private) +Image::Image() : TQObject(), d(new Private) { } -Image::Image(const Image &other) : QObject(), d(0) +Image::Image(const Image &other) : TQObject(), d(0) { *this = other; } -Image::Image(const QDomNode &node) : QObject(), d(new Private) +Image::Image(const TQDomNode &node) : TQObject(), d(new Private) { - QString elemText; + TQString elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("url"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("url"))).isNull()) d->url = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) d->link = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("height"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("height"))).isNull()) d->height = elemText.toUInt(); - if (!(elemText = extractNode(node, QString::fromLatin1("width"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("width"))).isNull()) d->width = elemText.toUInt(); } @@ -72,7 +72,7 @@ Image::~Image() } } -QString Image::title() const +TQString Image::title() const { return d->title; } @@ -87,7 +87,7 @@ const KURL &Image::link() const return d->link; } -QString Image::description() const +TQString Image::description() const { return d->description; } @@ -108,25 +108,25 @@ void Image::getPixmap() if (d->pixmapBuffer) return; - d->pixmapBuffer = new QBuffer; + d->pixmapBuffer = new TQBuffer; d->pixmapBuffer->open(IO_WriteOnly); d->job = KIO::get(d->url, false, false); - connect(d->job, SIGNAL(data(KIO::Job *, const QByteArray &)), - this, SLOT(slotData(KIO::Job *, const QByteArray &))); - connect(d->job, SIGNAL(result(KIO::Job *)), this, SLOT(slotResult(KIO::Job *))); + connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); + connect(d->job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *))); } -void Image::slotData(KIO::Job *, const QByteArray &data) +void Image::slotData(KIO::Job *, const TQByteArray &data) { d->pixmapBuffer->writeBlock(data.data(), data.size()); } void Image::slotResult(KIO::Job *job) { - QPixmap pixmap; + TQPixmap pixmap; if (!job->error()) - pixmap = QPixmap(d->pixmapBuffer->buffer()); + pixmap = TQPixmap(d->pixmapBuffer->buffer()); emit gotPixmap(pixmap); delete d->pixmapBuffer; diff --git a/plugins/rssfeed/rss/image.h b/plugins/rssfeed/rss/image.h index e9e65b1..f0a43ca 100644 --- a/plugins/rssfeed/rss/image.h +++ b/plugins/rssfeed/rss/image.h @@ -13,9 +13,9 @@ #include "global.h" -#include <qobject.h> +#include <tqobject.h> -class QDomNode; +class TQDomNode; namespace KIO { @@ -31,9 +31,10 @@ namespace RSS * is via Document::image(). * @see Document::image() */ - class Image : public QObject + class Image : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -48,10 +49,10 @@ namespace RSS /** * Constructs an Image from a piece of RSS markup. - * @param node A QDomNode which references the DOM leaf to be used + * @param node A TQDomNode which references the DOM leaf to be used * for constructing the Image. */ - Image(const QDomNode &node); + Image(const TQDomNode &node); /** * Assignment operator. @@ -83,10 +84,10 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The 'caption' of this image, or QString::null if no + * @return The 'caption' of this image, or TQString() if no * caption is available. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards @@ -112,11 +113,11 @@ namespace RSS /** * RSS 0.91 and upwards * @return A description of what this picture shows, or - * QString::null if no description is available. Useful for + * TQString() if no description is available. Useful for * people who deactivated images but want or need to know what is * shown. */ - QString description() const; + TQString description() const; /** * RSS 0.91 and upwards @@ -125,7 +126,7 @@ namespace RSS * this value to be between 1 and 400. * '0' if this information isn't available. This is merely provided * for completeness, you should not rely on this value but rather - * check what height the QPixmap as returned by gotPixmap() + * check what height the TQPixmap as returned by gotPixmap() * reports. */ unsigned int height() const; @@ -136,7 +137,7 @@ namespace RSS * default value is 88 pixels. The RSS 0.91 Specification requires * this value to be between 1 and 144. * This is merely provided for completeness, you should not rely - * on this value but rather check what width the QPixmap as + * on this value but rather check what width the TQPixmap as * returned by gotPixmap() reports. */ unsigned int width() const; @@ -157,10 +158,10 @@ namespace RSS * @param pixmap The pixmap as constructed from the data referenced * by the URL returned by link(). */ - void gotPixmap(const QPixmap &pixmap); + void gotPixmap(const TQPixmap &pixmap); private slots: - void slotData(KIO::Job *job, const QByteArray &data); + void slotData(KIO::Job *job, const TQByteArray &data); void slotResult(KIO::Job *job); private: diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp index 9dfb50a..835a2e6 100644 --- a/plugins/rssfeed/rss/loader.cpp +++ b/plugins/rssfeed/rss/loader.cpp @@ -16,11 +16,11 @@ #include <kurl.h> #include <kdebug.h> -#include <qdom.h> -#include <qbuffer.h> -#include <qregexp.h> -#include <qstringlist.h> -#include <qtimer.h> +#include <tqdom.h> +#include <tqbuffer.h> +#include <tqregexp.h> +#include <tqstringlist.h> +#include <tqtimer.h> using namespace RSS; @@ -45,7 +45,7 @@ struct FileRetriever::Private delete buffer; } - QBuffer *buffer; + TQBuffer *buffer; int lastError; KIO::Job *job; }; @@ -72,7 +72,7 @@ void FileRetriever::retrieveData(const KURL &url) if (d->buffer) return; - d->buffer = new QBuffer; + d->buffer = new TQBuffer; d->buffer->open(IO_WriteOnly); KURL u=url; @@ -83,13 +83,13 @@ void FileRetriever::retrieveData(const KURL &url) d->job = KIO::get(u, !m_useCache, false); - QTimer::singleShot(1000*90, this, SLOT(slotTimeout())); + TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout())); - connect(d->job, SIGNAL(data(KIO::Job *, const QByteArray &)), - SLOT(slotData(KIO::Job *, const QByteArray &))); - connect(d->job, SIGNAL(result(KIO::Job *)), SLOT(slotResult(KIO::Job *))); - connect(d->job, SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)), - SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &))); + connect(d->job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), + TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); + connect(d->job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *))); + connect(d->job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)), + TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &))); } void FileRetriever::slotTimeout() @@ -101,7 +101,7 @@ void FileRetriever::slotTimeout() d->lastError = KIO::ERR_SERVER_TIMEOUT; - emit dataRetrieved(QByteArray(), false); + emit dataRetrieved(TQByteArray(), false); } int FileRetriever::errorCode() const @@ -109,14 +109,14 @@ int FileRetriever::errorCode() const return d->lastError; } -void FileRetriever::slotData(KIO::Job *, const QByteArray &data) +void FileRetriever::slotData(KIO::Job *, const TQByteArray &data) { d->buffer->writeBlock(data.data(), data.size()); } void FileRetriever::slotResult(KIO::Job *job) { - QByteArray data = d->buffer->buffer(); + TQByteArray data = d->buffer->buffer(); data.detach(); delete d->buffer; @@ -155,7 +155,7 @@ struct OutputRetriever::Private } KShellProcess *process; - QBuffer *buffer; + TQBuffer *buffer; int lastError; }; @@ -175,14 +175,14 @@ void OutputRetriever::retrieveData(const KURL &url) if (d->buffer || d->process) return; - d->buffer = new QBuffer; + d->buffer = new TQBuffer; d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, SIGNAL(processExited(KProcess *)), - SLOT(slotExited(KProcess *))); - connect(d->process, SIGNAL(receivedStdout(KProcess *, char *, int)), - SLOT(slotOutput(KProcess *, char *, int))); + connect(d->process, TQT_SIGNAL(processExited(KProcess *)), + TQT_SLOT(slotExited(KProcess *))); + connect(d->process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + TQT_SLOT(slotOutput(KProcess *, char *, int))); *d->process << url.path(); d->process->start(KProcess::NotifyOnExit, KProcess::Stdout); } @@ -202,7 +202,7 @@ void OutputRetriever::slotExited(KProcess *p) if (!p->normalExit()) d->lastError = p->exitStatus(); - QByteArray data = d->buffer->buffer(); + TQByteArray data = d->buffer->buffer(); data.detach(); delete d->buffer; @@ -237,10 +237,10 @@ Loader *Loader::create() return new Loader; } -Loader *Loader::create(QObject *object, const char *slot) +Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), object, slot); return loader; } @@ -262,8 +262,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->url=url; d->retriever = retriever; - connect(d->retriever, SIGNAL(dataRetrieved(const QByteArray &, bool)), - this, SLOT(slotRetrieverDone(const QByteArray &, bool))); + connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } @@ -281,7 +281,7 @@ void Loader::abort() delete d->retriever; d->retriever=NULL; } - emit loadingComplete(this, QDomDocument(), Aborted); + emit loadingComplete(this, TQDomDocument(), Aborted); delete this; } @@ -292,7 +292,7 @@ const KURL &Loader::discoveredFeedURL() const #include <kdebug.h> -void Loader::slotRetrieverDone(const QByteArray &data, bool success) +void Loader::slotRetrieverDone(const TQByteArray &data, bool success) { d->lastError = d->retriever->errorCode(); @@ -300,29 +300,29 @@ void Loader::slotRetrieverDone(const QByteArray &data, bool success) d->retriever = NULL; Document rssDoc; - Status status = Success; + tqStatus status = Success; if (success) { - QDomDocument doc; + TQDomDocument doc; /* Some servers insert whitespace before the <?xml...?> declaration. - * QDom doesn't tolerate that (and it's right, that's invalid XML), + * TQDom doesn't tolerate that (and it's right, that's invalid XML), * so we strip that. */ const char *charData = data.data(); int len = data.count(); - while (len && QChar(*charData).isSpace()) { + while (len && TQChar(*charData).isSpace()) { --len; ++charData; } - if ( len > 3 && QChar(*charData) == QChar(0357) ) { // 0357 0273 0277 + if ( len > 3 && TQChar(*charData) == TQChar(0357) ) { // 0357 0273 0277 len -= 3; charData += 3; } - QByteArray tmpData; + TQByteArray tmpData; tmpData.setRawData(charData, len); if (doc.setContent(tmpData)) @@ -349,24 +349,24 @@ void Loader::slotRetrieverDone(const QByteArray &data, bool success) delete this; } -void Loader::discoverFeeds(const QByteArray &data) +void Loader::discoverFeeds(const TQByteArray &data) { - QString str = QString(data).simplifyWhiteSpace(); - QString s2; - //QTextStream ts( &str, IO_WriteOnly ); + TQString str = TQString(data).simplifyWhiteSpace(); + TQString s2; + //TQTextStream ts( &str, IO_WriteOnly ); //ts << data.data(); // "<[\\s]link[^>]*rel[\\s]=[\\s]\\\"[\\s]alternate[\\s]\\\"[^>]*>" // "type[\\s]=[\\s]\\\"application/rss+xml\\\"" // "href[\\s]=[\\s]\\\"application/rss+xml\\\"" - QRegExp rx( "(?:REL)[^=]*=[^sAa]*(?:service.feed|ALTERNATE)[\\s]*[^s][^s](?:[^>]*)(?:HREF)[^=]*=[^A-Z0-9-_~,./$]*([^'\">\\s]*)", false); + TQRegExp rx( "(?:REL)[^=]*=[^sAa]*(?:service.feed|ALTERNATE)[\\s]*[^s][^s](?:[^>]*)(?:HREF)[^=]*=[^A-Z0-9-_~,./$]*([^'\">\\s]*)", false); if (rx.search(str)!=-1) s2=rx.cap(1); else{ // does not support Atom/RSS autodiscovery.. try finding feeds by brute force.... int pos=0; - QStringList feeds; - QString host=d->url.host(); + TQStringList feeds; + TQString host=d->url.host(); rx.setPattern("(?:<A )[^H]*(?:HREF)[^=]*=[^A-Z0-9-_~,./]*([^'\">\\s]*)"); while ( pos >= 0 ) { pos = rx.search( str, pos ); @@ -381,7 +381,7 @@ void Loader::discoverFeeds(const QByteArray &data) s2=feeds.first(); KURL testURL; // loop through, prefer feeds on same host - for ( QStringList::Iterator it = feeds.begin(); it != feeds.end(); ++it ) { + for ( TQStringList::Iterator it = feeds.begin(); it != feeds.end(); ++it ) { testURL=*it; if (testURL.host()==host) { diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h index fb06634..438ebaf 100644 --- a/plugins/rssfeed/rss/loader.h +++ b/plugins/rssfeed/rss/loader.h @@ -15,7 +15,7 @@ class KURL; -#include <qobject.h> +#include <tqobject.h> namespace KIO { @@ -32,9 +32,10 @@ namespace RSS * a new retrieval algorithm which can then be plugged into the RSS loader. * @see Loader, FileRetriever, OutputRetriever */ - class DataRetriever : public QObject + class DataRetriever : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -75,7 +76,7 @@ namespace RSS * wrong and that the data parameter might contain no or invalid * data. */ - void dataRetrieved(const QByteArray &data, bool success); + void dataRetrieved(const TQByteArray &data, bool success); private: DataRetriever(const DataRetriever &other); @@ -89,6 +90,7 @@ namespace RSS class FileRetriever : public DataRetriever { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -135,7 +137,7 @@ namespace RSS void slotTimeout(); private slots: - void slotData(KIO::Job *job, const QByteArray &data); + void slotData(KIO::Job *job, const TQByteArray &data); void slotResult(KIO::Job *job); void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl, const KURL &toUrl); @@ -158,6 +160,7 @@ namespace RSS class OutputRetriever : public DataRetriever { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -206,8 +209,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, 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 * @@ -231,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. @@ -239,7 +242,7 @@ namespace RSS * if (status != RSS::Success) * return; * - * QString title = doc.title(); + * TQString title = doc.title(); * // do whatever you want with the information. * } * \endcode @@ -249,9 +252,10 @@ namespace RSS * loadingComplete signal goes out of scope. This is e.g. the case if you * intend to call getPixmap() on Document::image()! */ - class Loader : public QObject + class Loader : public TQObject { Q_OBJECT + TQ_OBJECT friend class someClassWhichDoesNotExist; public: /** @@ -268,10 +272,10 @@ namespace RSS * Convenience method. Does the same as the above method except that * it also does the job of connecting the loadingComplete() signal * to the given slot for you. - * @param object A QObject which features the specified slot + * @param object A TQObject which features the specified slot * @param slot Which slot to connect to. */ - static Loader *create(QObject *object, const char *slot); + static Loader *create(TQObject *object, const char *slot); /** * Loads the RSS file referenced by the given URL using the @@ -316,19 +320,19 @@ 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 QByteArray &data, bool success); + void slotRetrieverDone(const TQByteArray &data, bool success); private: Loader(); Loader(const Loader &other); Loader &operator=(const Loader &other); ~Loader(); - void discoverFeeds(const QByteArray &data); + void discoverFeeds(const TQByteArray &data); struct Private; Private *d; diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp index 5d98bba..571717a 100644 --- a/plugins/rssfeed/rss/testlibrss.cpp +++ b/plugins/rssfeed/rss/testlibrss.cpp @@ -16,15 +16,15 @@ static const KCmdLineOptions options[] = }; -void Tester::test( const QString &url ) +void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, 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 c65fa3b..18e1832 100644 --- a/plugins/rssfeed/rss/testlibrss.h +++ b/plugins/rssfeed/rss/testlibrss.h @@ -1,7 +1,7 @@ #ifndef TESTLIBRSS_H #define TESTLIBRSS_H -#include <qobject.h> +#include <tqobject.h> #include "loader.h" #include "document.h" @@ -10,16 +10,17 @@ using RSS::Loader; using RSS::Document; -using RSS::Status; +using RSS::tqStatus; -class Tester : public QObject +class Tester : public TQObject { Q_OBJECT + TQ_OBJECT public: - void test( const QString &url ); + 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 432b773..a12442f 100644 --- a/plugins/rssfeed/rss/textinput.cpp +++ b/plugins/rssfeed/rss/textinput.cpp @@ -13,15 +13,15 @@ #include <kurl.h> -#include <qdom.h> +#include <tqdom.h> using namespace RSS; struct TextInput::Private : public Shared { - QString title; - QString description; - QString name; + TQString title; + TQString description; + TQString name; KURL link; }; @@ -34,17 +34,17 @@ TextInput::TextInput(const TextInput &other) : d(0) *this = other; } -TextInput::TextInput(const QDomNode &node) : d(new Private) +TextInput::TextInput(const TQDomNode &node) : d(new Private) { - QString elemText; + TQString elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("title"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("name")))) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("name")))) d->name = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull()) d->link = elemText; } @@ -54,17 +54,17 @@ TextInput::~TextInput() delete d; } -QString TextInput::title() const +TQString TextInput::title() const { return d->title; } -QString TextInput::description() const +TQString TextInput::description() const { return d->description; } -QString TextInput::name() const +TQString TextInput::name() const { return d->name; } diff --git a/plugins/rssfeed/rss/textinput.h b/plugins/rssfeed/rss/textinput.h index dd13c42..cbf5bdb 100644 --- a/plugins/rssfeed/rss/textinput.h +++ b/plugins/rssfeed/rss/textinput.h @@ -15,8 +15,8 @@ class KURL; -class QDomNode; -class QString; +class TQDomNode; +class TQString; namespace RSS { @@ -43,10 +43,10 @@ namespace RSS /** * Constructs a TextInput from a piece of RSS markup. - * @param node A QDomNode which references the DOM leaf to be used + * @param node A TQDomNode which references the DOM leaf to be used * for constructing the TextInput. */ - TextInput(const QDomNode &node); + TextInput(const TQDomNode &node); /** * Assignment operator. @@ -79,25 +79,25 @@ namespace RSS /** * RSS 0.90 and upwards * @return The title (often a label to be used for the input field) - * of the text input, or QString::null if no title is available. + * of the text input, or TQString() if no title is available. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards * @return The description (usually used as a tooltip which appears * if the mouse hovers above the input field for a short time) of - * the text input, or QString::null if no description is + * the text input, or TQString() if no description is * available. */ - QString description() const; + TQString description() const; /** * RSS 0.90 and upwards * @return The name of the text input (what's this for?) of the - * text input, or QString::null, if no name is available. + * text input, or TQString(), if no name is available. */ - QString name() const; + TQString name() const; /** * RSS 0.90 and upwards diff --git a/plugins/rssfeed/rss/tools_p.cpp b/plugins/rssfeed/rss/tools_p.cpp index c1ebbc9..51fcbf5 100644 --- a/plugins/rssfeed/rss/tools_p.cpp +++ b/plugins/rssfeed/rss/tools_p.cpp @@ -11,39 +11,39 @@ #include "tools_p.h" #include <krfcdate.h> -#include <qdom.h> +#include <tqdom.h> -time_t RSS::parseISO8601Date(const QString &s) +time_t RSS::parseISO8601Date(const TQString &s) { // do some sanity check: 26-12-2004T00:00+00:00 is parsed to epoch+1 in the KRFCDate, which is wrong. So let's check if the date begins with YYYY -fo if (s.stripWhiteSpace().left(4).toInt() < 1000) return 0; // error // FIXME: imho this is done in KRFCDate::parseDateISO8601() automatically, so we could omit it? -fo - if (s.find('T') != -1) + if (s.tqfind('T') != -1) return KRFCDate::parseDateISO8601(s); else return KRFCDate::parseDateISO8601(s + "T12:00:00"); } -QString RSS::extractNode(const QDomNode &parent, const QString &elemName, bool isInlined) +TQString RSS::extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined) { - QDomNode node = parent.namedItem(elemName); + TQDomNode node = tqparent.namedItem(elemName); if (node.isNull()) - return QString::null; + return TQString(); - QString result = node.toElement().text(); + TQString result = node.toElement().text(); - bool hasPre = result.contains("<pre>",false); - bool hasHtml = hasPre || result.contains("<"); // FIXME: test if we have html, should be more clever -> regexp + bool hasPre = result.tqcontains("<pre>",false); + bool hasHtml = hasPre || result.tqcontains("<"); // 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.replace(QChar('\n'), "<br />"); + result = result = result.tqreplace(TQChar('\n'), "<br />"); if(!hasPre) // strip white spaces if no <pre> result = result.simplifyWhiteSpace(); if (result.isEmpty()) - return QString::null; + return TQString(); return result; } diff --git a/plugins/rssfeed/rss/tools_p.h b/plugins/rssfeed/rss/tools_p.h index 5076004..1f77171 100644 --- a/plugins/rssfeed/rss/tools_p.h +++ b/plugins/rssfeed/rss/tools_p.h @@ -13,8 +13,8 @@ #include <time.h> -class QDomNode; -class QString; +class TQDomNode; +class TQString; namespace RSS { @@ -26,8 +26,8 @@ namespace RSS unsigned int count; }; - QString extractNode(const QDomNode &parent, const QString &elemName, bool isInlined=true); - time_t parseISO8601Date(const QString &s); + TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined=true); + time_t parseISO8601Date(const TQString &s); } #endif // LIBRSS_TOOLS_P_H diff --git a/plugins/rssfeed/rssarticle.cpp b/plugins/rssfeed/rssarticle.cpp index afc932d..a73b3c9 100644 --- a/plugins/rssfeed/rssarticle.cpp +++ b/plugins/rssfeed/rssarticle.cpp @@ -43,7 +43,7 @@ namespace kt *this = other; } - RssArticle::RssArticle(QString title, KURL link, QString description, QDateTime pubDate, QString guid, int downloaded) + RssArticle::RssArticle(TQString title, KURL link, TQString description, TQDateTime pubDate, TQString guid, int downloaded) { m_title = title; m_link = link; @@ -74,20 +74,20 @@ namespace kt return m_guid==other.guid(); } - QDataStream &operator<<( QDataStream &out, const RssArticle &article ) + TQDataStream &operator<<( TQDataStream &out, const RssArticle &article ) { out << article.title() << article.link() << article.description() << article.pubDate() << article.guid() << article.downloaded(); return out; } - QDataStream &operator>>( QDataStream &in, RssArticle &article ) + TQDataStream &operator>>( TQDataStream &in, RssArticle &article ) { KURL link; - QString title; - QString description; - QDateTime pubDate; - QString guid; + TQString title; + TQString description; + TQDateTime pubDate; + TQString guid; int downloaded; in >> title >> link >> description >> pubDate >> guid >> downloaded; article = RssArticle(title, link, description, pubDate, guid, downloaded); diff --git a/plugins/rssfeed/rssarticle.h b/plugins/rssfeed/rssarticle.h index 4d8c536..e727456 100644 --- a/plugins/rssfeed/rssarticle.h +++ b/plugins/rssfeed/rssarticle.h @@ -20,9 +20,9 @@ #ifndef RSSARTICLE_H #define RSSARTICLE_H -#include <qstring.h> -#include <qdatetime.h> -#include <qdatastream.h> +#include <tqstring.h> +#include <tqdatetime.h> +#include <tqdatastream.h> #include <kurl.h> @@ -41,7 +41,7 @@ namespace kt { public: - typedef QValueList<RssArticle> List; + typedef TQValueList<RssArticle> List; /** * Default constructor. @@ -51,31 +51,31 @@ namespace kt RssArticle(const RssArticle &other); RssArticle &operator=(const RssArticle &other); bool operator==(const RssArticle &other) const; - RssArticle(QString title, KURL link, QString description, QDateTime pubDate, QString guid, int downloaded = 0); + RssArticle(TQString title, KURL link, TQString description, TQDateTime pubDate, TQString guid, int downloaded = 0); - void setTitle(const QString& title) { m_title=title; } + void setTitle(const TQString& title) { m_title=title; } void setDownloaded(const int downloaded) { m_downloaded=downloaded; } - QString title() const { return m_title; } + TQString title() const { return m_title; } KURL link() const { return m_link; } - QString description() const { return m_description; } - QDateTime pubDate() const { return m_pubDate; } - QString guid() const { return m_guid; } + TQString description() const { return m_description; } + TQDateTime pubDate() const { return m_pubDate; } + TQString guid() const { return m_guid; } int downloaded() const { return m_downloaded; } ~RssArticle(); private: KURL m_link; - QString m_title; - QString m_description; - QDateTime m_pubDate; - QString m_guid; + TQString m_title; + TQString m_description; + TQDateTime m_pubDate; + TQString m_guid; int m_downloaded; }; - QDataStream &operator<<( QDataStream &out, const RssArticle &article ); - QDataStream &operator>>( QDataStream &in, RssArticle &article ); + TQDataStream &operator<<( TQDataStream &out, const RssArticle &article ); + TQDataStream &operator>>( TQDataStream &in, RssArticle &article ); } diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp index 0d1244b..f5b4c64 100644 --- a/plugins/rssfeed/rssfeed.cpp +++ b/plugins/rssfeed/rssfeed.cpp @@ -23,9 +23,9 @@ #include <kstandarddirs.h> #include <krfcdate.h> #include <kio/netaccess.h> -#include <qfile.h> -#include <qapplication.h> -#include <qdir.h> +#include <tqfile.h> +#include <tqapplication.h> +#include <tqdir.h> namespace kt { @@ -35,7 +35,7 @@ namespace kt if (m_active) { refreshFeed(); - refreshTimer.start(QTime().msecsTo(m_autoRefresh)); + refreshTimer.start(TQTime().msecsTo(m_autoRefresh)); } else { @@ -48,13 +48,13 @@ namespace kt feedLoading = false; loadArticles(); - connect(&refreshTimer, SIGNAL(timeout()), this, SLOT( refreshFeed() ) ); - connect(this, SIGNAL(articlesChanged(const RssArticle::List&)), this, SLOT( saveArticles() ) ); + connect(&refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( refreshFeed() ) ); + connect(this, TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT( saveArticles() ) ); startFeed(); } - RssFeed::RssFeed(QObject * parent) : QObject(parent) + RssFeed::RssFeed(TQObject * tqparent) : TQObject(tqparent) { m_active = false; m_articleAge = 365; @@ -64,7 +64,7 @@ namespace kt initialize(); } - RssFeed::RssFeed(KURL feedUrl, QString title, bool active, int articleAge, bool ignoreTTL, QTime autoRefresh ) + RssFeed::RssFeed(KURL feedUrl, TQString title, bool active, int articleAge, bool ignoreTTL, TQTime autoRefresh ) { m_feedUrl = feedUrl; m_title = title; @@ -76,7 +76,7 @@ namespace kt initialize(); } - RssFeed::RssFeed(const RssFeed &other) : QObject() + RssFeed::RssFeed(const RssFeed &other) : TQObject() { *this = other; } @@ -109,7 +109,7 @@ namespace kt } } - void RssFeed::setFeedUrl( const QString& url ) + void RssFeed::setFeedUrl( const TQString& url ) { if (m_feedUrl != url) { @@ -146,7 +146,7 @@ namespace kt } } - void RssFeed::setTitle( const QString& title ) + void RssFeed::setTitle( const TQString& title ) { if (m_title != title) { @@ -155,14 +155,14 @@ namespace kt } } - void RssFeed::setAutoRefresh( const QTime& autoRefresh ) + void RssFeed::setAutoRefresh( const TQTime& autoRefresh ) { if (m_autoRefresh != autoRefresh) { m_autoRefresh = autoRefresh; if (m_active) { - refreshTimer.changeInterval(QTime().msecsTo(m_autoRefresh)); + refreshTimer.changeInterval(TQTime().msecsTo(m_autoRefresh)); } emit autoRefreshChanged(autoRefresh); @@ -178,25 +178,25 @@ namespace kt } } - QString RssFeed::getFilename() + TQString RssFeed::getFilename() { - QDir directory; + TQDir directory; directory.mkdir(KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds"); - return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr"; + return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).tqreplace("/", "_").tqreplace(":", "_") + ".ktr"; } void RssFeed::loadArticles() { - QString filename = getFilename(); + TQString filename = getFilename(); //load articles from disk - QFile file(filename); + TQFile file(filename); if (file.exists()) { file.open( IO_ReadOnly ); - QDataStream in(&file); + TQDataStream in(&file); in >> m_articles; emit articlesChanged( m_articles ); @@ -205,13 +205,13 @@ namespace kt void RssFeed::saveArticles() { - QString filename = getFilename(); + TQString filename = getFilename(); //load articles from disk - QFile file(filename); + TQFile file(filename); file.open( IO_WriteOnly ); - QDataStream out(&file); + TQDataStream out(&file); out << m_articles; } @@ -223,7 +223,7 @@ namespace kt RssArticle::List::iterator it; for ( it = m_articles.begin(); it != m_articles.end(); ) { - if ((*it).pubDate().daysTo(QDateTime::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, SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, 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; @@ -267,7 +267,7 @@ namespace kt { bool added = false; - if (m_title.isEmpty() || m_title == QString("New")) + if (m_title.isEmpty() || m_title == TQString("New")) { setTitle(doc.title()); emit updateTitle(doc.title()); @@ -277,11 +277,11 @@ namespace kt { if (doc.ttl() < 0) { - setAutoRefresh(QTime().addSecs(3600)); + setAutoRefresh(TQTime().addSecs(3600)); } else { - setAutoRefresh(QTime().addSecs(doc.ttl() * 60)); + setAutoRefresh(TQTime().addSecs(doc.ttl() * 60)); } } @@ -290,7 +290,7 @@ namespace kt for (int i=doc.articles().count()-1; i>=0; i--) { curArticle = doc.articles()[i]; - if (curArticle.pubDate().daysTo(QDateTime::currentDateTime()) < m_articleAge && !m_articles.contains(curArticle)) + if (curArticle.pubDate().daysTo(TQDateTime::tqcurrentDateTime()) < m_articleAge && !m_articles.tqcontains(curArticle)) { m_articles.prepend(curArticle); emit scanRssArticle(curArticle); @@ -306,13 +306,13 @@ namespace kt qDebug( "There was and error loading the feed\n"); } - disconnect( feedLoader, SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, SLOT( feedLoaded( Loader *, Document, Status ) ) ); + disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ), + this, TQT_SLOT( feedLoaded( Loader *, Document, tqStatus ) ) ); feedLoader->deleteLater(); } - void RssFeed::setDownloaded(QString link, int downloaded) + void RssFeed::setDownloaded(TQString link, int downloaded) { bool changed = false; @@ -332,21 +332,21 @@ namespace kt } } - QDataStream &operator<<( QDataStream &out, const RssFeed &feed ) + TQDataStream &operator<<( TQDataStream &out, const RssFeed &feed ) { out << feed.feedUrl() << feed.title() << int(feed.active()) << feed.articleAge() << int(feed.ignoreTTL()) << feed.autoRefresh(); return out; } - QDataStream &operator>>( QDataStream &in, RssFeed &feed ) + TQDataStream &operator>>( TQDataStream &in, RssFeed &feed ) { KURL feedUrl; - QString title; + TQString title; int active; int articleAge; int ignoreTTL; - QTime autoRefresh; + TQTime autoRefresh; in >> feedUrl >> title >> active >> articleAge >> ignoreTTL >> autoRefresh; feed = RssFeed(feedUrl, title, active, articleAge, ignoreTTL, autoRefresh); diff --git a/plugins/rssfeed/rssfeed.h b/plugins/rssfeed/rssfeed.h index 9bcd2f7..279862b 100644 --- a/plugins/rssfeed/rssfeed.h +++ b/plugins/rssfeed/rssfeed.h @@ -20,12 +20,12 @@ #ifndef RSSFEED_H #define RSSFEED_H -#include <qobject.h> -#include <qstring.h> -#include <qdatetime.h> -#include <qvaluelist.h> -#include <qtimer.h> -#include <qdatastream.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqdatetime.h> +#include <tqvaluelist.h> +#include <tqtimer.h> +#include <tqdatastream.h> #include <kurl.h> @@ -45,16 +45,17 @@ namespace kt * */ - class RssFeed : public QObject + class RssFeed : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. */ - RssFeed(QObject * parent = 0); - RssFeed(KURL feedUrl, QString title = "", bool active = false, int articleAge = 3, bool ignoreTTL = false, QTime autoRefresh = QTime()); + RssFeed(TQObject * tqparent = 0); + RssFeed(KURL feedUrl, TQString title = "", bool active = false, int articleAge = 3, bool ignoreTTL = false, TQTime autoRefresh = TQTime()); RssFeed(const RssFeed &other); RssFeed &operator=(const RssFeed &other); ~RssFeed(); @@ -62,8 +63,8 @@ namespace kt KURL feedUrl() const { return m_feedUrl; } bool active() const { return m_active; } int articleAge() const { return m_articleAge; } - QString title() const { return m_title; } - QTime autoRefresh() const { return m_autoRefresh; } + TQString title() const { return m_title; } + TQTime autoRefresh() const { return m_autoRefresh; } bool ignoreTTL() const { return m_ignoreTTL; } @@ -72,28 +73,28 @@ namespace kt public slots: void refreshFeed(); - void feedLoaded(Loader *feedLoader, Document doc, Status status); + void feedLoaded(Loader *feedLoader, Document doc, tqStatus status); void clearArticles(); void setFeedUrl( const KURL& url ); - void setFeedUrl( const QString& url ); + void setFeedUrl( const TQString& url ); void setActive( bool active ); void setArticleAge( int articleAge ); - void setTitle( const QString& title ); - void setAutoRefresh( const QTime& autoRefresh ); + void setTitle( const TQString& title ); + void setAutoRefresh( const TQTime& autoRefresh ); void setIgnoreTTL( bool ignoreTTL ); void saveArticles(); - void setDownloaded(QString link, int downloaded); + void setDownloaded(TQString link, int downloaded); signals: void feedUrlChanged( const KURL& url ); void activeChanged( bool active ); void articleAgeChanged( int articleAge ); - void titleChanged( const QString& title ); - void updateTitle( const QString& title ); - void autoRefreshChanged( const QTime& autoRefresh ); + void titleChanged( const TQString& title ); + void updateTitle( const TQString& title ); + void autoRefreshChanged( const TQTime& autoRefresh ); void ignoreTTLChanged( bool ignoreTTL ); void articlesChanged( const RssArticle::List& articles ); @@ -104,23 +105,23 @@ namespace kt KURL m_feedUrl; bool m_active; int m_articleAge; - QString m_title; - QTime m_autoRefresh; + TQString m_title; + TQTime m_autoRefresh; bool m_ignoreTTL; RssArticle::List m_articles; - QTimer refreshTimer; + TQTimer refreshTimer; bool feedLoading; - QString getFilename(); + TQString getFilename(); void initialize(); void startFeed(); void cleanArticles(); void loadArticles(); }; - QDataStream &operator<<( QDataStream &out, const RssFeed &feed ); - QDataStream &operator>>( QDataStream &in, RssFeed &feed ); + TQDataStream &operator<<( TQDataStream &out, const RssFeed &feed ); + TQDataStream &operator>>( TQDataStream &in, RssFeed &feed ); } diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp index 106ca0f..6646f06 100644 --- a/plugins/rssfeed/rssfeedmanager.cpp +++ b/plugins/rssfeed/rssfeedmanager.cpp @@ -28,19 +28,19 @@ // #include <kmimetype.h> #include <kmessagebox.h> -#include <qstring.h> -#include <qobject.h> -#include <qfile.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqobject.h> +#include <tqfile.h> +#include <tqdatetime.h> -#include <qlineedit.h> +#include <tqlineedit.h> #include <kurlrequester.h> -#include <qspinbox.h> -#include <qcheckbox.h> -#include <qdatetimeedit.h> -#include <qtable.h> -#include <qregexp.h> -#include <qlayout.h> +#include <tqspinbox.h> +#include <tqcheckbox.h> +#include <tqdatetimeedit.h> +#include <tqtable.h> +#include <tqregexp.h> +#include <tqlayout.h> #include <torrent/globals.h> #include <util/log.h> @@ -48,7 +48,7 @@ #include <interfaces/coreinterface.h> -#include <qapplication.h> +#include <tqapplication.h> #include "../../libktorrent/torrent/bdecoder.h" #include "../../libktorrent/torrent/bnode.h" @@ -60,7 +60,7 @@ using namespace bt; namespace kt { - RssFeedManager::RssFeedManager(CoreInterface* core, QWidget * parent) : RssFeedWidget(parent) + RssFeedManager::RssFeedManager(CoreInterface* core, TQWidget * tqparent) : RssFeedWidget(tqparent) { //Construct the manager m_core = core; @@ -75,7 +75,7 @@ namespace kt feedArticles->setLeftMargin(0); feedArticles->verticalHeader()->hide(); feedArticles->setNumCols(3); - feedArticles->setColumnLabels(QStringList() << i18n("Title") << i18n("Description") << i18n("Link")); + feedArticles->setColumnLabels(TQStringList() << i18n("Title") << i18n("Description") << i18n("Link")); feedArticles->horizontalHeader()->setStretchEnabled(true, 0); feedArticles->hideColumn(1); feedArticles->hideColumn(2); @@ -84,7 +84,7 @@ namespace kt filterMatches->setLeftMargin(0); filterMatches->verticalHeader()->hide(); filterMatches->setNumCols(4); - filterMatches->setColumnLabels(QStringList() << i18n("Season") << i18n("Episode") << i18n("Time") << i18n("Link")); + filterMatches->setColumnLabels(TQStringList() << i18n("Season") << i18n("Episode") << i18n("Time") << i18n("Link")); filterMatches->setColumnWidth(0, 60); filterMatches->setColumnWidth(1, 60); filterMatches->setColumnWidth(2, 180); @@ -94,37 +94,37 @@ namespace kt loadFilterList(); //connect the buttons - connect(newFeed, SIGNAL(clicked()), this, SLOT(addNewFeed() ) ); - connect(deleteFeed, SIGNAL(clicked()), this, SLOT(deleteSelectedFeed() ) ); + connect(newFeed, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewFeed() ) ); + connect(deleteFeed, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedFeed() ) ); - connect(newAcceptFilter, SIGNAL(clicked()), this, SLOT(addNewAcceptFilter() ) ); - connect(deleteAcceptFilter, SIGNAL(clicked()), this, SLOT(deleteSelectedAcceptFilter() ) ); + connect(newAcceptFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewAcceptFilter() ) ); + connect(deleteAcceptFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedAcceptFilter() ) ); - connect(newRejectFilter, SIGNAL(clicked()), this, SLOT(addNewRejectFilter() ) ); - connect(deleteRejectFilter, SIGNAL(clicked()), this, SLOT(deleteSelectedRejectFilter() ) ); + connect(newRejectFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewRejectFilter() ) ); + connect(deleteRejectFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedRejectFilter() ) ); //connect the changing of the active feed - connect(feedlist, SIGNAL(selectionChanged()), this, SLOT(changedActiveFeed()) ); + connect(feedlist, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveFeed()) ); //connect the changing of the url to enable the refresh button - connect(feedUrl, SIGNAL(textChanged(const QString &)), this, SLOT(changedFeedUrl()) ); + connect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changedFeedUrl()) ); //connect the changing of the filters - connect(acceptFilterList, SIGNAL(selectionChanged()), this, SLOT(changedActiveAcceptFilter()) ); - connect(rejectFilterList, SIGNAL(selectionChanged()), this, SLOT(changedActiveRejectFilter()) ); + connect(acceptFilterList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveAcceptFilter()) ); + connect(rejectFilterList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveRejectFilter()) ); //connect the selection and downloading of articles - connect(feedArticles, SIGNAL(selectionChanged()), this, SLOT(changedArticleSelection()) ); - connect(downloadArticle, SIGNAL(clicked()), this, SLOT(downloadSelectedArticles()) ); + connect(feedArticles, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedArticleSelection()) ); + connect(downloadArticle, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadSelectedArticles()) ); //connect the selection, downloading and deletion of matches - connect(filterMatches, SIGNAL(selectionChanged()), this, SLOT(changedMatchSelection()) ); - connect(downloadFilterMatch, SIGNAL(clicked()), this, SLOT(downloadSelectedMatches()) ); - connect(deleteFilterMatch, SIGNAL(clicked()), this, SLOT(deleteSelectedMatches()) ); + connect(filterMatches, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedMatchSelection()) ); + connect(downloadFilterMatch, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadSelectedMatches()) ); + connect(deleteFilterMatch, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedMatches()) ); //connect the test text update to the slot - connect(testText, SIGNAL(textChanged(const QString &)), this, SLOT(testTextChanged()) ); - connect(testTestText, SIGNAL(clicked()), this, SLOT(testFilter()) ); + connect(testText, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(testTextChanged()) ); + connect(testTestText, TQT_SIGNAL(clicked()), this, TQT_SLOT(testFilter()) ); changedActiveFeed(); changedActiveAcceptFilter(); @@ -138,7 +138,7 @@ namespace kt void RssFeedManager::clearArticles() { - int pos = feeds.find((RssFeed *)sender()); + int pos = feeds.tqfind((RssFeed *)sender()); if (pos >= 0) { @@ -159,65 +159,65 @@ namespace kt void RssFeedManager::connectFeed(int index) { - connect(feedTitle, SIGNAL(textChanged(const QString &)), feeds.at(index), SLOT(setTitle(const QString &) ) ); - connect(feeds.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(setFeedTitle(const QString &) ) ); + connect(feedTitle, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setTitle(const TQString &) ) ); + connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFeedTitle(const TQString &) ) ); //url - connect(feedUrl, SIGNAL(textChanged(const QString &)), feeds.at(index), SLOT(setFeedUrl(const QString&) ) ); - connect(feeds.at(index), SIGNAL(feedUrlChanged(const KURL&)), feedUrl, SLOT(setKURL(const KURL&) ) ); + connect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setFeedUrl(const TQString&) ) ); + connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQT_SLOT(setKURL(const KURL&) ) ); //articleAge - connect(feedArticleAge, SIGNAL(valueChanged(int)), feeds.at(index), SLOT(setArticleAge(int) ) ); - connect(feeds.at(index), SIGNAL(articleAgeChanged(int)), feedArticleAge, SLOT(setValue(int) ) ); + connect(feedArticleAge, TQT_SIGNAL(valueChanged(int)), feeds.at(index), TQT_SLOT(setArticleAge(int) ) ); + connect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQT_SLOT(setValue(int) ) ); //active - connect(feedActive, SIGNAL(toggled(bool)), feeds.at(index), SLOT(setActive(bool) ) ); - connect(feeds.at(index), SIGNAL(activeChanged(bool)), feedActive, SLOT(setChecked(bool) ) ); + connect(feedActive, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setActive(bool) ) ); + connect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), feedActive, TQT_SLOT(setChecked(bool) ) ); //autoRefresh - connect(feedAutoRefresh, SIGNAL(valueChanged(const QTime&)), feeds.at(index), SLOT(setAutoRefresh(const QTime&) ) ); - connect(feeds.at(index), SIGNAL(autoRefreshChanged(const QTime&)), feedAutoRefresh, SLOT(setTime(const QTime&) ) ); + connect(feedAutoRefresh, TQT_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQT_SLOT(setAutoRefresh(const TQTime&) ) ); + connect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQT_SLOT(setTime(const TQTime&) ) ); //ignoreTTL - connect(feedIgnoreTTL, SIGNAL(toggled(bool)), feeds.at(index), SLOT(setIgnoreTTL(bool) ) ); - connect(feeds.at(index), SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, SLOT(setChecked(bool) ) ); + connect(feedIgnoreTTL, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setIgnoreTTL(bool) ) ); + connect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQT_SLOT(setChecked(bool) ) ); //articles - connect(feeds.at(index), SIGNAL(articlesChanged(const RssArticle::List&)), this, SLOT(updateArticles(const RssArticle::List&) ) ); + connect(feeds.at(index), TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT(updateArticles(const RssArticle::List&) ) ); //connect the refresh button - connect(refreshFeed, SIGNAL(clicked()), feeds.at(index), SLOT(refreshFeed()) ); + connect(refreshFeed, TQT_SIGNAL(clicked()), feeds.at(index), TQT_SLOT(refreshFeed()) ); } void RssFeedManager::disconnectFeed(int index) { - disconnect(feedTitle, SIGNAL(textChanged(const QString &)), feeds.at(index), SLOT(setTitle(const QString &) ) ); - disconnect(feeds.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(setFeedTitle(const QString &) ) ); + disconnect(feedTitle, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setTitle(const TQString &) ) ); + disconnect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFeedTitle(const TQString &) ) ); //url - disconnect(feedUrl, SIGNAL(textChanged(const QString &)), feeds.at(index), SLOT(setFeedUrl(const QString&) ) ); - disconnect(feeds.at(index), SIGNAL(feedUrlChanged(const KURL&)), feedUrl, SLOT(setKURL(const KURL&) ) ); + disconnect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setFeedUrl(const TQString&) ) ); + disconnect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQT_SLOT(setKURL(const KURL&) ) ); //articleAge - disconnect(feedArticleAge, SIGNAL(valueChanged(int)), feeds.at(index), SLOT(setArticleAge(int) ) ); - disconnect(feeds.at(index), SIGNAL(articleAgeChanged(int)), feedArticleAge, SLOT(setValue(int) ) ); + disconnect(feedArticleAge, TQT_SIGNAL(valueChanged(int)), feeds.at(index), TQT_SLOT(setArticleAge(int) ) ); + disconnect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQT_SLOT(setValue(int) ) ); //active - disconnect(feedActive, SIGNAL(toggled(bool)), feeds.at(index), SLOT(setActive(bool) ) ); - disconnect(feeds.at(index), SIGNAL(activeChanged(bool)), feedActive, SLOT(setChecked(bool) ) ); + disconnect(feedActive, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setActive(bool) ) ); + disconnect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), feedActive, TQT_SLOT(setChecked(bool) ) ); //autoRefresh - disconnect(feedAutoRefresh, SIGNAL(valueChanged(const QTime&)), feeds.at(index), SLOT(setAutoRefresh(const QTime&) ) ); - disconnect(feeds.at(index), SIGNAL(autoRefreshChanged(const QTime&)), feedAutoRefresh, SLOT(setTime(const QTime&) ) ); + disconnect(feedAutoRefresh, TQT_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQT_SLOT(setAutoRefresh(const TQTime&) ) ); + disconnect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQT_SLOT(setTime(const TQTime&) ) ); //ignoreTTL - disconnect(feedIgnoreTTL, SIGNAL(toggled(bool)), feeds.at(index), SLOT(setIgnoreTTL(bool) ) ); - disconnect(feeds.at(index), SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, SLOT(setChecked(bool) ) ); + disconnect(feedIgnoreTTL, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setIgnoreTTL(bool) ) ); + disconnect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQT_SLOT(setChecked(bool) ) ); //articles - disconnect(feeds.at(index), SIGNAL(articlesChanged(const RssArticle::List&)), this, SLOT(updateArticles(const RssArticle::List&) ) ); + disconnect(feeds.at(index), TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT(updateArticles(const RssArticle::List&) ) ); - disconnect(refreshFeed, SIGNAL(clicked()), feeds.at(index), SLOT(refreshFeed()) ); + disconnect(refreshFeed, TQT_SIGNAL(clicked()), feeds.at(index), TQT_SLOT(refreshFeed()) ); } void RssFeedManager::connectFilter(int index, bool acceptFilter) @@ -225,69 +225,69 @@ namespace kt if (acceptFilter) { //title - connect(filterTitle, SIGNAL(textChanged(const QString &)), acceptFilters.at(index), SLOT(setTitle(const QString &) ) ); - connect(acceptFilters.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(setFilterTitle(const QString &) ) ); + connect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); //active - connect(filterActive, SIGNAL(toggled(bool)), acceptFilters.at(index), SLOT(setActive(bool) ) ); - connect(acceptFilters.at(index), SIGNAL(activeChanged(bool)), filterActive, SLOT(setChecked(bool) ) ); + connect(filterActive, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setActive(bool) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); //regExps - connect(filterRegExps, SIGNAL(changed()), this, SLOT(updateRegExps()) ); + connect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); //series - connect(filterSeries, SIGNAL(toggled(bool)), acceptFilters.at(index), SLOT(setSeries(bool) ) ); - connect(acceptFilters.at(index), SIGNAL(seriesChanged(bool)), filterSeries, SLOT(setChecked(bool) ) ); + connect(filterSeries, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSeries(bool) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); //sansEpisode - connect(filterSansEpisode, SIGNAL(toggled(bool)), acceptFilters.at(index), SLOT(setSansEpisode(bool) ) ); - connect(acceptFilters.at(index), SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, SLOT(setChecked(bool) ) ); + connect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); //minSeason - connect(filterMinSeason, SIGNAL(valueChanged(int)), acceptFilters.at(index), SLOT(setMinSeason(int) ) ); - connect(acceptFilters.at(index), SIGNAL(minSeasonChanged(int)), filterMinSeason, SLOT(setValue(int) ) ); + connect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); //minEpisode - connect(filterMinEpisode, SIGNAL(valueChanged(int)), acceptFilters.at(index), SLOT(setMinEpisode(int) ) ); - connect(acceptFilters.at(index), SIGNAL(minEpisodeChanged(int)), filterMinEpisode, SLOT(setValue(int) ) ); + connect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); //maxSeason - connect(filterMaxSeason, SIGNAL(valueChanged(int)), acceptFilters.at(index), SLOT(setMaxSeason(int) ) ); - connect(acceptFilters.at(index), SIGNAL(maxSeasonChanged(int)), filterMaxSeason, SLOT(setValue(int) ) ); + connect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); //maxEpisode - connect(filterMaxEpisode, SIGNAL(valueChanged(int)), acceptFilters.at(index), SLOT(setMaxEpisode(int) ) ); - connect(acceptFilters.at(index), SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, SLOT(setValue(int) ) ); + connect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); //matches - connect(acceptFilters.at(index), SIGNAL(matchesChanged(const QValueList<FilterMatch>&)), this, SLOT(updateMatches(const QValueList<FilterMatch>&) ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - connect(processFilter, SIGNAL(clicked()), acceptFilters.at(index), SIGNAL(rescanFilter()) ); + connect(processFilter, TQT_SIGNAL(clicked()), acceptFilters.at(index), TQT_SIGNAL(rescanFilter()) ); } else { //title - connect(filterTitle, SIGNAL(textChanged(const QString &)), rejectFilters.at(index), SLOT(setTitle(const QString &) ) ); - connect(rejectFilters.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(setFilterTitle(const QString &) ) ); + connect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); //active - connect(filterActive, SIGNAL(toggled(bool)), rejectFilters.at(index), SLOT(setActive(bool) ) ); - connect(rejectFilters.at(index), SIGNAL(activeChanged(bool)), filterActive, SLOT(setChecked(bool) ) ); + connect(filterActive, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setActive(bool) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); //regExps - connect(filterRegExps, SIGNAL(changed()), this, SLOT(updateRegExps()) ); + connect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); //series - connect(filterSeries, SIGNAL(toggled(bool)), rejectFilters.at(index), SLOT(setSeries(bool) ) ); - connect(rejectFilters.at(index), SIGNAL(seriesChanged(bool)), filterSeries, SLOT(setChecked(bool) ) ); + connect(filterSeries, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSeries(bool) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); //sansEpisode - connect(filterSansEpisode, SIGNAL(toggled(bool)), rejectFilters.at(index), SLOT(setSansEpisode(bool) ) ); - connect(rejectFilters.at(index), SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, SLOT(setChecked(bool) ) ); + connect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); //minSeason - connect(filterMinSeason, SIGNAL(valueChanged(int)), rejectFilters.at(index), SLOT(setMinSeason(int) ) ); - connect(rejectFilters.at(index), SIGNAL(minSeasonChanged(int)), filterMinSeason, SLOT(setValue(int) ) ); + connect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); //minEpisode - connect(filterMinEpisode, SIGNAL(valueChanged(int)), rejectFilters.at(index), SLOT(setMinEpisode(int) ) ); - connect(rejectFilters.at(index), SIGNAL(minEpisodeChanged(int)), filterMinEpisode, SLOT(setValue(int) ) ); + connect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); //maxSeason - connect(filterMaxSeason, SIGNAL(valueChanged(int)), rejectFilters.at(index), SLOT(setMaxSeason(int) ) ); - connect(rejectFilters.at(index), SIGNAL(maxSeasonChanged(int)), filterMaxSeason, SLOT(setValue(int) ) ); + connect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); //maxEpisode - connect(filterMaxEpisode, SIGNAL(valueChanged(int)), rejectFilters.at(index), SLOT(setMaxEpisode(int) ) ); - connect(rejectFilters.at(index), SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, SLOT(setValue(int) ) ); + connect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); //matches - connect(rejectFilters.at(index), SIGNAL(matchesChanged(const QValueList<FilterMatch>&)), this, SLOT(updateMatches(const QValueList<FilterMatch>&) ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - connect(processFilter, SIGNAL(clicked()), rejectFilters.at(index), SIGNAL(rescanFilter()) ); + connect(processFilter, TQT_SIGNAL(clicked()), rejectFilters.at(index), TQT_SIGNAL(rescanFilter()) ); } } @@ -297,68 +297,68 @@ namespace kt if (acceptFilter) { //title - disconnect(filterTitle, SIGNAL(textChanged(const QString &)), acceptFilters.at(index), SLOT(setTitle(const QString &) ) ); - disconnect(acceptFilters.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(setFilterTitle(const QString &) ) ); + disconnect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); //active - disconnect(filterActive, SIGNAL(toggled(bool)), acceptFilters.at(index), SLOT(setActive(bool) ) ); - disconnect(acceptFilters.at(index), SIGNAL(activeChanged(bool)), filterActive, SLOT(setChecked(bool) ) ); + disconnect(filterActive, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setActive(bool) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); //regExps - disconnect(filterRegExps, SIGNAL(changed()), this, SLOT(updateRegExps()) ); + disconnect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); //series - disconnect(filterSeries, SIGNAL(toggled(bool)), acceptFilters.at(index), SLOT(setSeries(bool) ) ); - disconnect(acceptFilters.at(index), SIGNAL(seriesChanged(bool)), filterSeries, SLOT(setChecked(bool) ) ); + disconnect(filterSeries, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSeries(bool) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); //sansEpisode - disconnect(filterSansEpisode, SIGNAL(toggled(bool)), acceptFilters.at(index), SLOT(setSansEpisode(bool) ) ); - disconnect(acceptFilters.at(index), SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, SLOT(setChecked(bool) ) ); + disconnect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); //minSeason - disconnect(filterMinSeason, SIGNAL(valueChanged(int)), acceptFilters.at(index), SLOT(setMinSeason(int) ) ); - disconnect(acceptFilters.at(index), SIGNAL(minSeasonChanged(int)), filterMinSeason, SLOT(setValue(int) ) ); + disconnect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); //minEpisode - disconnect(filterMinEpisode, SIGNAL(valueChanged(int)), acceptFilters.at(index), SLOT(setMinEpisode(int) ) ); - disconnect(acceptFilters.at(index), SIGNAL(minEpisodeChanged(int)), filterMinEpisode, SLOT(setValue(int) ) ); + disconnect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); //maxSeason - disconnect(filterMaxSeason, SIGNAL(valueChanged(int)), acceptFilters.at(index), SLOT(setMaxSeason(int) ) ); - disconnect(acceptFilters.at(index), SIGNAL(maxSeasonChanged(int)), filterMaxSeason, SLOT(setValue(int) ) ); + disconnect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); //maxEpisode - disconnect(filterMaxEpisode, SIGNAL(valueChanged(int)), acceptFilters.at(index), SLOT(setMaxEpisode(int) ) ); - disconnect(acceptFilters.at(index), SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, SLOT(setValue(int) ) ); + disconnect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); //matches - disconnect(acceptFilters.at(index), SIGNAL(matchesChanged(const QValueList<FilterMatch>&)), this, SLOT(updateMatches(const QValueList<FilterMatch>&) ) ); + disconnect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - disconnect(processFilter, SIGNAL(clicked()), acceptFilters.at(index), SIGNAL(rescanFilter()) ); + disconnect(processFilter, TQT_SIGNAL(clicked()), acceptFilters.at(index), TQT_SIGNAL(rescanFilter()) ); } else { //title - disconnect(filterTitle, SIGNAL(textChanged(const QString &)), rejectFilters.at(index), SLOT(setTitle(const QString &) ) ); - disconnect(rejectFilters.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(setFilterTitle(const QString &) ) ); + disconnect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); //active - disconnect(filterActive, SIGNAL(toggled(bool)), rejectFilters.at(index), SLOT(setActive(bool) ) ); - disconnect(rejectFilters.at(index), SIGNAL(activeChanged(bool)), filterActive, SLOT(setChecked(bool) ) ); + disconnect(filterActive, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setActive(bool) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); //regExps - disconnect(filterRegExps, SIGNAL(changed()), this, SLOT(updateRegExps()) ); + disconnect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); //series - disconnect(filterSeries, SIGNAL(toggled(bool)), rejectFilters.at(index), SLOT(setSeries(bool) ) ); - disconnect(rejectFilters.at(index), SIGNAL(seriesChanged(bool)), filterSeries, SLOT(setChecked(bool) ) ); + disconnect(filterSeries, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSeries(bool) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); //sansEpisode - disconnect(filterSansEpisode, SIGNAL(toggled(bool)), rejectFilters.at(index), SLOT(setSansEpisode(bool) ) ); - disconnect(rejectFilters.at(index), SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, SLOT(setChecked(bool) ) ); + disconnect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); //minSeason - disconnect(filterMinSeason, SIGNAL(valueChanged(int)), rejectFilters.at(index), SLOT(setMinSeason(int) ) ); - disconnect(rejectFilters.at(index), SIGNAL(minSeasonChanged(int)), filterMinSeason, SLOT(setValue(int) ) ); + disconnect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); //minEpisode - disconnect(filterMinEpisode, SIGNAL(valueChanged(int)), rejectFilters.at(index), SLOT(setMinEpisode(int) ) ); - disconnect(rejectFilters.at(index), SIGNAL(minEpisodeChanged(int)), filterMinEpisode, SLOT(setValue(int) ) ); + disconnect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); //maxSeason - disconnect(filterMaxSeason, SIGNAL(valueChanged(int)), rejectFilters.at(index), SLOT(setMaxSeason(int) ) ); - disconnect(rejectFilters.at(index), SIGNAL(maxSeasonChanged(int)), filterMaxSeason, SLOT(setValue(int) ) ); + disconnect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); //maxEpisode - disconnect(filterMaxEpisode, SIGNAL(valueChanged(int)), rejectFilters.at(index), SLOT(setMaxEpisode(int) ) ); - disconnect(rejectFilters.at(index), SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, SLOT(setValue(int) ) ); + disconnect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); //matches - disconnect(rejectFilters.at(index), SIGNAL(matchesChanged(const QValueList<FilterMatch>&)), this, SLOT(updateMatches(const QValueList<FilterMatch>&) ) ); + disconnect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - disconnect(processFilter, SIGNAL(clicked()), rejectFilters.at(index), SIGNAL(rescanFilter()) ); + disconnect(processFilter, TQT_SIGNAL(clicked()), rejectFilters.at(index), TQT_SIGNAL(rescanFilter()) ); } } @@ -375,27 +375,27 @@ namespace kt feedlist->setCurrentItem(index); //update the feed list - connect(feeds.at(index), SIGNAL(titleChanged(const QString&)), this, SLOT(updateFeedList()) ); + connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateFeedList()) ); //clear the articles list when the url is changed - connect(feeds.at(index), SIGNAL(feedUrlChanged(const KURL&)), this, SLOT(clearArticles() ) ); + connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), this, TQT_SLOT(clearArticles() ) ); //connect the scanArticle signal to the scanArticle slot - connect(feeds.at(index), SIGNAL(scanRssArticle(RssArticle)), this, SLOT(scanArticle(RssArticle) ) ); + connect(feeds.at(index), TQT_SIGNAL(scanRssArticle(RssArticle)), this, TQT_SLOT(scanArticle(RssArticle) ) ); //connect all the fields to the save slot //title - connect(feeds.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFeedList() ) ); //url - connect(feeds.at(index), SIGNAL(feedUrlChanged(const KURL&)), this, SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), this, TQT_SLOT(saveFeedList() ) ); //articleAge - connect(feeds.at(index), SIGNAL(articleAgeChanged(int)), this, SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), this, TQT_SLOT(saveFeedList() ) ); //active - connect(feeds.at(index), SIGNAL(activeChanged(bool)), this, SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), this, TQT_SLOT(saveFeedList() ) ); //autoRefresh - connect(feeds.at(index), SIGNAL(autoRefreshChanged(const QTime&)), this, SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), this, TQT_SLOT(saveFeedList() ) ); //ignoreTTL - connect(feeds.at(index), SIGNAL(ignoreTTLChanged(bool)), this, SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), this, TQT_SLOT(saveFeedList() ) ); } @@ -410,52 +410,52 @@ namespace kt acceptFilterList->insertItem(acceptFilters.at(index)->title()); acceptFilterList->setCurrentItem(index); - connect(acceptFilters.at(index), SIGNAL(titleChanged(const QString&)), this, SLOT(updateAcceptFilterList()) ); + connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateAcceptFilterList()) ); //connect all the fields to the save slot //title - connect(acceptFilters.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFilterList() ) ); //active - connect(acceptFilters.at(index), SIGNAL(activeChanged( bool )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); //regexps - connect(acceptFilters.at(index), SIGNAL(regExpsChanged( const QStringList& )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(saveFilterList() ) ); //series - connect(acceptFilters.at(index), SIGNAL(seriesChanged( bool )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); //sansEpisode - connect(acceptFilters.at(index), SIGNAL(sansEpisodeChanged( bool )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); //minSeason - connect(acceptFilters.at(index), SIGNAL(minSeasonChanged (int )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); //minEpisode - connect(acceptFilters.at(index), SIGNAL(minEpisodeChanged (int )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); //maxSeason - connect(acceptFilters.at(index), SIGNAL(maxSeasonChanged (int )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); //maxEpiosde - connect(acceptFilters.at(index), SIGNAL(maxEpisodeChanged (int )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); //matches - connect(acceptFilters.at(index), SIGNAL(matchesChanged( const QValueList<FilterMatch>& )), this, SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQT_SLOT(saveFilterList() ) ); //connect the rescan signal to the rescan slot - connect(acceptFilters.at(index), SIGNAL(rescanFilter()), this, SLOT(rescanFilter()) ); + connect(acceptFilters.at(index), TQT_SIGNAL(rescanFilter()), this, TQT_SLOT(rescanFilter()) ); // //connect all except the matchesChanged to the rescanFilter slot // //title -// connect(acceptFilters.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(rescanFilter() ) ); // //active -// connect(acceptFilters.at(index), SIGNAL(activeChanged( bool )), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); // //regexps -// connect(acceptFilters.at(index), SIGNAL(regExpsChanged( const QStringList& )), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(rescanFilter() ) ); // //series -// connect(acceptFilters.at(index), SIGNAL(seriesChanged( bool )), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); // //sansEpisode -// connect(acceptFilters.at(index), SIGNAL(sansEpisodeChanged( bool )), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); // //minSeason -// connect(acceptFilters.at(index), SIGNAL(minSeasonChanged (int )), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(rescanFilter() ) ); // //minEpisode -// connect(acceptFilters.at(index), SIGNAL(minEpisodeChanged (int )), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(rescanFilter() ) ); // //maxSeason -// connect(acceptFilters.at(index), SIGNAL(maxSeasonChanged (int )), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(rescanFilter() ) ); // //maxEpiosde -// connect(acceptFilters.at(index), SIGNAL(maxEpisodeChanged (int )), this, SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(rescanFilter() ) ); } @@ -470,29 +470,29 @@ namespace kt rejectFilterList->insertItem(rejectFilters.at(index)->title()); rejectFilterList->setCurrentItem(index); - connect(rejectFilters.at(index), SIGNAL(titleChanged(const QString&)), this, SLOT(updateRejectFilterList()) ); + connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateRejectFilterList()) ); //connect all the fields to the save slot //title - connect(rejectFilters.at(index), SIGNAL(titleChanged(const QString &)), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFilterList() ) ); //active - connect(rejectFilters.at(index), SIGNAL(activeChanged( bool )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); //regexps - connect(rejectFilters.at(index), SIGNAL(regExpsChanged( const QStringList& )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(saveFilterList() ) ); //series - connect(rejectFilters.at(index), SIGNAL(seriesChanged( bool )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); //sansEpisode - connect(rejectFilters.at(index), SIGNAL(sansEpisodeChanged( bool )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); //minSeason - connect(rejectFilters.at(index), SIGNAL(minSeasonChanged (int )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); //minEpisode - connect(rejectFilters.at(index), SIGNAL(minEpisodeChanged (int )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); //maxSeason - connect(rejectFilters.at(index), SIGNAL(maxSeasonChanged (int )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); //maxEpiosde - connect(rejectFilters.at(index), SIGNAL(maxEpisodeChanged (int )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); //matches - connect(rejectFilters.at(index), SIGNAL(matchesChanged( const QValueList<FilterMatch>& )), this, SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQT_SLOT(saveFilterList() ) ); } @@ -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.find((RssFeed *)sender()); + int pos = feeds.tqfind((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.find((RssFilter *)sender()); + int pos = acceptFilters.tqfind((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.find((RssFilter *)sender()); + int pos = rejectFilters.tqfind((RssFilter *)sender()); if (pos < 0) { @@ -704,7 +704,7 @@ namespace kt feedArticles->setNumRows(articles.count()); for (int i=0; i<articles.count(); i++) { - QString info; + TQString info; if (articles[i].downloaded()==1) { info = ": Manually downloaded"; @@ -719,13 +719,13 @@ namespace kt } } - void RssFeedManager::updateMatches(const QValueList<FilterMatch>& matches) + void RssFeedManager::updateMatches(const TQValueList<FilterMatch>& matches) { filterMatches->setNumRows(matches.count()); for (int i=0; i<matches.count(); i++) { - filterMatches->setText(i, 0, QString::number(matches[i].season())); - filterMatches->setText(i, 1, QString::number(matches[i].episode())); + filterMatches->setText(i, 0, TQString::number(matches[i].season())); + filterMatches->setText(i, 1, TQString::number(matches[i].episode())); filterMatches->setText(i, 2, matches[i].time()); filterMatches->setText(i, 3, matches[i].link()); } @@ -773,7 +773,7 @@ namespace kt curDownload = new RssLinkDownloader(m_core, feedArticles->text(j, 2)); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, SIGNAL(linkDownloaded( QString, int )), feeds.at(i), SLOT(setDownloaded(QString, int)) ); + connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); } } } @@ -793,7 +793,7 @@ namespace kt void RssFeedManager::deleteSelectedMatches() { - QStringList selectedLinks; + TQStringList selectedLinks; for (int i=0; i<filterMatches->numSelections(); i++) { int endRow = filterMatches->selection(i).topRow() + filterMatches->selection(i).numRows(); @@ -883,7 +883,7 @@ namespace kt //active feedActive->setChecked(false); //autoRefresh - feedAutoRefresh->setTime(QTime()); + feedAutoRefresh->setTime(TQTime()); //ignoreTTL feedIgnoreTTL->setChecked(false); //articles @@ -1080,12 +1080,12 @@ namespace kt } } - QString RssFeedManager::getFeedListFilename() + TQString RssFeedManager::getFeedListFilename() { return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds.ktr"; } - QString RssFeedManager::getFilterListFilename() + TQString RssFeedManager::getFilterListFilename() { return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfilters.ktr"; } @@ -1097,13 +1097,13 @@ namespace kt feedListSaving = true; - QString filename = getFeedListFilename(); + TQString filename = getFeedListFilename(); //save feeds to disk - QFile file(filename); + TQFile file(filename); file.open( IO_WriteOnly ); - QDataStream out(&file); + TQDataStream out(&file); out << feeds.count(); @@ -1117,15 +1117,15 @@ namespace kt void RssFeedManager::loadFeedList() { - QString filename = getFeedListFilename(); + TQString filename = getFeedListFilename(); //load feeds from disk - QFile file(filename); + TQFile file(filename); if (file.exists()) { file.open( IO_ReadOnly ); - QDataStream in(&file); + TQDataStream in(&file); int numFeeds; @@ -1150,13 +1150,13 @@ namespace kt filterListSaving = true; - QString filename = getFilterListFilename(); + TQString filename = getFilterListFilename(); //save feeds to disk - QFile file(filename); + TQFile file(filename); file.open( IO_WriteOnly ); - QDataStream out(&file); + TQDataStream out(&file); out << acceptFilters.count(); @@ -1177,15 +1177,15 @@ namespace kt void RssFeedManager::loadFilterList() { - QString filename = getFilterListFilename(); + TQString filename = getFilterListFilename(); //load feeds from disk - QFile file(filename); + TQFile file(filename); if (file.exists()) { file.open( IO_ReadOnly ); - QDataStream in(&file); + TQDataStream in(&file); int numFilters; @@ -1232,7 +1232,7 @@ namespace kt RssLinkDownloader * curDownload = new RssLinkDownloader(m_core, article.link().prettyURL(), filter); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, SIGNAL(linkDownloaded( QString, int )), feeds.at(i), SLOT(setDownloaded(QString, int)) ); + connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); } } } @@ -1245,7 +1245,7 @@ namespace kt RssLinkDownloader * curDownload = new RssLinkDownloader(m_core, article.link().prettyURL(), acceptFilters.at(i)); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, SIGNAL(linkDownloaded( QString, int )), feeds.at(i), SLOT(setDownloaded(QString, int)) ); + connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); } } } @@ -1254,7 +1254,7 @@ namespace kt void RssFeedManager::rescanFilter() { - int pos = acceptFilters.find((RssFilter *)sender()); + int pos = acceptFilters.tqfind((RssFilter *)sender()); if (pos >= 0) { @@ -1270,7 +1270,7 @@ namespace kt void RssFeedManager::testTextChanged() { - testText->setPaletteBackgroundColor(QColor(255, 255, 255)); + testText->setPaletteBackgroundColor(TQColor(255, 255, 255)); testTestText->setEnabled(!testText->text().isEmpty()); } @@ -1293,22 +1293,22 @@ namespace kt if (curFilter->scanArticle(testArticle, false, false)) { - testText->setPaletteBackgroundColor(QColor(0, 255, 0)); + testText->setPaletteBackgroundColor(TQColor(0, 255, 0)); } else { - testText->setPaletteBackgroundColor(QColor(255, 0, 0)); + testText->setPaletteBackgroundColor(TQColor(255, 0, 0)); } } - void RssFeedManager::setFilterTitle(const QString& title) + void RssFeedManager::setFilterTitle(const TQString& title) { int cursorPos = filterTitle->cursorPosition(); filterTitle->setText(title); filterTitle->setCursorPosition(cursorPos); } - void RssFeedManager::setFeedTitle(const QString& title) + void RssFeedManager::setFeedTitle(const TQString& title) { int cursorPos = feedTitle->cursorPosition(); feedTitle->setText(title); diff --git a/plugins/rssfeed/rssfeedmanager.h b/plugins/rssfeed/rssfeedmanager.h index 1afc766..2d3e7cd 100644 --- a/plugins/rssfeed/rssfeedmanager.h +++ b/plugins/rssfeed/rssfeedmanager.h @@ -22,12 +22,12 @@ #include <kdirlister.h> #include <kfileitem.h> -#include <qstring.h> -#include <qobject.h> -#include <qdir.h> +#include <tqstring.h> +#include <tqobject.h> +#include <tqdir.h> -#include <qptrlist.h> -#include <qwidget.h> +#include <tqptrlist.h> +#include <tqwidget.h> #include "rssfeedwidget.h" #include "rssfeed.h" @@ -47,6 +47,7 @@ namespace kt class RssFeedManager : public RssFeedWidget { Q_OBJECT + TQ_OBJECT public: /** @@ -54,7 +55,7 @@ namespace kt * @param core Pointer to core interface * @param openSilently Wheather to open torrent silently or nor. */ - RssFeedManager(CoreInterface* core, QWidget * parent = 0); + RssFeedManager(CoreInterface* core, TQWidget * tqparent = 0); ~RssFeedManager(); public slots: @@ -85,7 +86,7 @@ namespace kt void deleteSelectedRejectFilter(); void updateRegExps(); - void updateMatches(const QValueList<FilterMatch>& matches); + void updateMatches(const TQValueList<FilterMatch>& matches); void saveFeedList(); void saveFilterList(); @@ -102,24 +103,24 @@ namespace kt void testTextChanged(); void testFilter(); - void setFilterTitle(const QString& title); - void setFeedTitle(const QString& title); + void setFilterTitle(const TQString& title); + void setFeedTitle(const TQString& title); private: CoreInterface* m_core; - QPtrList<RssFeed> feeds; + TQPtrList<RssFeed> feeds; int currentFeed; - QPtrList<RssFilter> acceptFilters; + TQPtrList<RssFilter> acceptFilters; int currentAcceptFilter; - QPtrList<RssFilter> rejectFilters; + TQPtrList<RssFilter> rejectFilters; int currentRejectFilter; - QString getFeedListFilename(); + TQString getFeedListFilename(); void loadFeedList(); - QString getFilterListFilename(); + TQString getFilterListFilename(); void loadFilterList(); bool feedListSaving; diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp index 0d845b7..66761cc 100644 --- a/plugins/rssfeed/rssfeedplugin.cpp +++ b/plugins/rssfeed/rssfeedplugin.cpp @@ -26,8 +26,8 @@ #include <util/constants.h> #include <util/log.h> -#include <qstring.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqfile.h> #include <kmessagebox.h> #include <klocale.h> @@ -42,13 +42,13 @@ K_EXPORT_COMPONENT_FACTORY(ktrssfeedplugin,KGenericFactory<kt::RssFeedPlugin>("r namespace kt { - const QString NAME = "RSS Feeds"; - const QString AUTHOR = "Alan Jones"; - const QString EMAIL = "skyphyr@gmail.com"; - const QString DESCRIPTION = i18n("Automatically scans RSS feeds for torrent matching regular expressions and loads them."); + const TQString NAME = "RSS Feeds"; + const TQString AUTHOR = "Alan Jones"; + const TQString EMAIL = "skyphyr@gmail.com"; + const TQString DESCRIPTION = i18n("Automatically scans RSS feeds for torrent matching regular expressions and loads them."); - RssFeedPlugin::RssFeedPlugin(QObject* parent, const char* name, const QStringList& args) - : Plugin(parent, name, args,NAME,i18n("RSS Feeds"),AUTHOR,EMAIL,DESCRIPTION,"player_playlist") + RssFeedPlugin::RssFeedPlugin(TQObject* tqparent, const char* name, const TQStringList& args) + : Plugin(tqparent, name, args,NAME,i18n("RSS Feeds"),AUTHOR,EMAIL,DESCRIPTION,"player_playlist") { m_rssFeedManager = 0; } @@ -77,7 +77,7 @@ namespace kt m_rssFeedManager = 0; } - bool RssFeedPlugin::versionCheck(const QString & version) const + bool RssFeedPlugin::versionCheck(const TQString & version) const { return version == KT_VERSION_MACRO; } diff --git a/plugins/rssfeed/rssfeedplugin.h b/plugins/rssfeed/rssfeedplugin.h index 4ecc6af..991727f 100644 --- a/plugins/rssfeed/rssfeedplugin.h +++ b/plugins/rssfeed/rssfeedplugin.h @@ -22,7 +22,7 @@ #include <interfaces/plugin.h> -class QString; +class TQString; namespace kt @@ -37,13 +37,14 @@ namespace kt class RssFeedPlugin : public Plugin { Q_OBJECT + TQ_OBJECT public: - RssFeedPlugin(QObject* parent, const char* name, const QStringList& args); + RssFeedPlugin(TQObject* tqparent, const char* name, const TQStringList& args); virtual ~RssFeedPlugin(); virtual void load(); virtual void unload(); - virtual bool versionCheck(const QString& version) const; + virtual bool versionCheck(const TQString& version) const; private: RssFeedManager * m_rssFeedManager; diff --git a/plugins/rssfeed/rssfeedwidget.ui b/plugins/rssfeed/rssfeedwidget.ui index 55bd27b..2a4b014 100644 --- a/plugins/rssfeed/rssfeedwidget.ui +++ b/plugins/rssfeed/rssfeedwidget.ui @@ -2,7 +2,7 @@ <class>RssFeedWidget</class> <comment>The display widget for the rssfeed tab</comment> <author>Alan Jones</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>RssFeedWidget</cstring> </property> @@ -21,14 +21,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabs</cstring> </property> <property name="margin"> <number>2</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>feeds</cstring> </property> @@ -39,22 +39,22 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter16</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQListBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>feedlist</cstring> </property> @@ -67,7 +67,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>deleteFeed</cstring> </property> @@ -78,7 +78,7 @@ <string>De&lete</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>newFeed</cstring> </property> @@ -88,7 +88,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>feedLayout</cstring> </property> @@ -101,7 +101,7 @@ <cstring>feedUrl</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>feedUrlLabel</cstring> </property> @@ -120,7 +120,7 @@ <cstring>feedUrl</cstring> </property> </widget> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>feedBox</cstring> </property> @@ -152,14 +152,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>downloadArticle</cstring> </property> @@ -173,7 +173,7 @@ <string></string> </property> </widget> - <widget class="QTable" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQTable" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>feedArticles</cstring> </property> @@ -192,15 +192,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <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"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>feedRefreshTimeLabel</cstring> </property> @@ -219,7 +219,7 @@ <cstring>feedAutoRefresh</cstring> </property> </widget> - <widget class="QTimeEdit"> + <widget class="TQTimeEdit"> <property name="name"> <cstring>feedAutoRefresh</cstring> </property> @@ -234,7 +234,7 @@ </time> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>feedIgnoreTTL</cstring> </property> @@ -252,14 +252,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>refreshFeed</cstring> </property> @@ -275,15 +275,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <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"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>feedTitleLabel</cstring> </property> @@ -302,12 +302,12 @@ <cstring>feedTitle</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>feedTitle</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>feedArticleAgeLabel</cstring> </property> @@ -323,7 +323,7 @@ <string>Keep Articles (days)</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>feedArticleAge</cstring> </property> @@ -331,7 +331,7 @@ <number>3650</number> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>feedActive</cstring> </property> @@ -354,7 +354,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>filters</cstring> </property> @@ -365,15 +365,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout28</cstring> + <cstring>tqlayout28</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox12</cstring> </property> @@ -392,12 +392,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQListBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>acceptFilterList</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>deleteAcceptFilter</cstring> </property> @@ -411,7 +411,7 @@ <string></string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>newAcceptFilter</cstring> </property> @@ -421,7 +421,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox13</cstring> </property> @@ -443,12 +443,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQListBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>rejectFilterList</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>deleteRejectFilter</cstring> </property> @@ -462,7 +462,7 @@ <string></string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>newRejectFilter</cstring> </property> @@ -474,23 +474,23 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>filterTitleLabel</cstring> </property> @@ -509,12 +509,12 @@ <cstring>filterTitle</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>filterTitle</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>filterActive</cstring> </property> @@ -524,9 +524,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -563,23 +563,23 @@ <set>Remove|Add</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout28</cstring> + <cstring>tqlayout28</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>filterSeries</cstring> </property> @@ -600,21 +600,21 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>processFilter</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -629,11 +629,11 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>seriesBox</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> @@ -646,9 +646,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -664,14 +664,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>filterSansEpisode</cstring> </property> @@ -684,20 +684,20 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>filterMinSeason</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>filterMaxEpisodeLabel</cstring> </property> @@ -713,17 +713,17 @@ <string>Max Episode</string> </property> </widget> - <widget class="QSpinBox" row="0" column="3"> + <widget class="TQSpinBox" row="0" column="3"> <property name="name"> <cstring>filterMinEpisode</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>filterMaxSeason</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>filterMaxSeasonLabel</cstring> </property> @@ -742,7 +742,7 @@ <cstring>filterMinSeason</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>filterMinSeasonLabel</cstring> </property> @@ -761,12 +761,12 @@ <cstring>filterMinSeason</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="3"> + <widget class="TQSpinBox" row="1" column="3"> <property name="name"> <cstring>filterMaxEpisode</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>filterMinEpisodeLabel</cstring> </property> @@ -790,15 +790,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout33</cstring> + <cstring>tqlayout33</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>testTextLabel</cstring> </property> @@ -817,7 +817,7 @@ <cstring>testText</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>testText</cstring> </property> @@ -829,7 +829,7 @@ </color> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>testTestText</cstring> </property> @@ -842,7 +842,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>filterMatchesBox</cstring> </property> @@ -861,7 +861,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTable"> + <widget class="TQTable"> <property name="name"> <cstring>filterMatches</cstring> </property> @@ -878,15 +878,15 @@ <enum>MultiRow</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>downloadFilterMatch</cstring> </property> @@ -910,14 +910,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>170</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>deleteFilterMatch</cstring> </property> @@ -958,7 +958,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="2" margin="2"/> +<tqlayoutdefaults spacing="2" margin="2"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/plugins/rssfeed/rssfilter.cpp b/plugins/rssfeed/rssfilter.cpp index 6cf1f1f..e7c4925 100644 --- a/plugins/rssfeed/rssfilter.cpp +++ b/plugins/rssfeed/rssfilter.cpp @@ -22,7 +22,7 @@ namespace kt { - FilterMatch::FilterMatch(int season, int episode, QString link, QString time) + FilterMatch::FilterMatch(int season, int episode, TQString link, TQString time) { m_season = season; m_episode = episode; @@ -53,7 +53,7 @@ namespace kt return m_link==other.link() && m_season==other.season() && m_episode==other.episode(); } - RssFilter::RssFilter(QObject * parent) : QObject(parent) + RssFilter::RssFilter(TQObject * tqparent) : TQObject(tqparent) { m_title = "New"; m_active = false; @@ -62,9 +62,9 @@ namespace kt m_minSeason = m_minEpisode = m_maxSeason = m_maxEpisode = 0; } - RssFilter::RssFilter(QString title, bool active, QStringList regExps, bool series, bool sansEpisode, + RssFilter::RssFilter(TQString title, bool active, TQStringList regExps, bool series, bool sansEpisode, int minSeason, int minEpisode, int maxSeason, int maxEpisode, - QValueList<FilterMatch> matches) + TQValueList<FilterMatch> matches) { m_title = title; m_active = active; @@ -78,7 +78,7 @@ namespace kt m_matches = matches; } - RssFilter::RssFilter(const RssFilter &other) : QObject() + RssFilter::RssFilter(const RssFilter &other) : TQObject() { *this = other; } @@ -102,7 +102,7 @@ namespace kt return *this; } - void RssFilter::setTitle( const QString& title ) + void RssFilter::setTitle( const TQString& title ) { if (m_title != title) { @@ -121,7 +121,7 @@ namespace kt } } - void RssFilter::setRegExps( const QStringList& regExps ) + void RssFilter::setRegExps( const TQStringList& regExps ) { if (regExps != m_regExps) { @@ -191,7 +191,7 @@ namespace kt } } - void RssFilter::setMatches( const QValueList<FilterMatch>& matches ) + void RssFilter::setMatches( const TQValueList<FilterMatch>& matches ) { if (matches != m_matches) { @@ -252,7 +252,7 @@ namespace kt if (!m_active && saveMatch) return false; - QRegExp regEx; + TQRegExp regEx; regEx.setCaseSensitive(false); if (!m_regExps.count()) @@ -263,7 +263,7 @@ namespace kt if (m_regExps[i].isEmpty()) continue; - QString curExp = m_regExps[i]; + TQString curExp = m_regExps[i]; bool invert=false; if (curExp.startsWith( "!" )) @@ -276,14 +276,14 @@ namespace kt if (!invert) { - if (!article.title().contains(regEx) && !article.link().prettyURL().contains(regEx) && !article.description().contains(regEx) ) + if (!article.title().tqcontains(regEx) && !article.link().prettyURL().tqcontains(regEx) && !article.description().tqcontains(regEx) ) { return false; } } else { - if (article.title().contains(regEx) || article.link().prettyURL().contains(regEx) || article.description().contains(regEx) ) + if (article.title().tqcontains(regEx) || article.link().prettyURL().tqcontains(regEx) || article.description().tqcontains(regEx) ) { return false; } @@ -295,15 +295,15 @@ namespace kt if (m_series) { - QStringList episodeFormats; + TQStringList episodeFormats; episodeFormats << "s([0-9]{1,2})[de]([0-9]{1,2})[^0-9]" << "[^0-9]([0-9]{1,2})x([0-9]{1,2})[^0-9]" << "[^0-9]([0-9]{1,2})([0-9]{2})[^0-9]"; for (int i=0; i<episodeFormats.count(); i++) { 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; @@ -354,10 +354,10 @@ namespace kt return true; } - void RssFilter::deleteMatch(const QString& link) + void RssFilter::deleteMatch(const TQString& link) { - QValueList<FilterMatch>::iterator it = m_matches.begin(); + TQValueList<FilterMatch>::iterator it = m_matches.begin(); while (it != m_matches.end()) { if ((*it).link() == link) @@ -372,43 +372,43 @@ namespace kt } - QDataStream &operator<<( QDataStream &out, const FilterMatch &filterMatch ) + TQDataStream &operator<<( TQDataStream &out, const FilterMatch &filterMatch ) { out << filterMatch.season() << filterMatch.episode() << filterMatch.time() << filterMatch.link(); return out; } - QDataStream &operator>>( QDataStream &in, FilterMatch &filterMatch ) + TQDataStream &operator>>( TQDataStream &in, FilterMatch &filterMatch ) { int season, episode; - QString time; - QString link; + TQString time; + TQString link; in >> season >> episode >> time >> link; filterMatch = FilterMatch(season, episode, link, time); return in; } - QDataStream &operator<<( QDataStream &out, const RssFilter &filter ) + TQDataStream &operator<<( TQDataStream &out, const RssFilter &filter ) { out << filter.title() << int(filter.active()) << filter.regExps() << int(filter.series()) << int(filter.sansEpisode()) << filter.minSeason() << filter.minEpisode() << filter.maxSeason() << filter.maxEpisode() << filter.matches(); return out; } - QDataStream &operator>>( QDataStream &in, RssFilter &filter ) + TQDataStream &operator>>( TQDataStream &in, RssFilter &filter ) { - QString title; + TQString title; int active; - QStringList regExps; + TQStringList regExps; int series; int sansEpisode; int minSeason; int minEpisode; int maxSeason; int maxEpisode; - QValueList<FilterMatch> matches; + TQValueList<FilterMatch> matches; in >> title >> active >> regExps >> series >> sansEpisode >> minSeason >> minEpisode >> maxSeason >> maxEpisode >> matches; filter = RssFilter(title, active, regExps, series, sansEpisode, minSeason, minEpisode, maxSeason, maxEpisode, matches); diff --git a/plugins/rssfeed/rssfilter.h b/plugins/rssfeed/rssfilter.h index be31d18..2bf3dca 100644 --- a/plugins/rssfeed/rssfilter.h +++ b/plugins/rssfeed/rssfilter.h @@ -20,11 +20,11 @@ #ifndef RSSFILTER_H #define RSSFILTER_H -#include <qobject.h> -#include <qstring.h> -#include <qtimer.h> -#include <qdatastream.h> -#include <qregexp.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqtimer.h> +#include <tqdatastream.h> +#include <tqregexp.h> #include "rssarticle.h" @@ -42,109 +42,110 @@ namespace kt { public: - FilterMatch() { m_season = 0; m_episode = 0; m_time = QDateTime::currentDateTime().toString(); m_link=QString(); }; - FilterMatch(int season, int episode, QString link, QString time = QDateTime::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; ~FilterMatch() {}; - QString link() const { return m_link; } + TQString link() const { return m_link; } int season() const { return m_season; } int episode() const { return m_episode; } - QString time() const { return m_time; } + TQString time() const { return m_time; } - void setLink(const QString& link) { m_link = link; } + void setLink(const TQString& link) { m_link = link; } void setSeason(int season) { m_season = season; } void setEpisode(int episode) { m_episode = episode; } - void setTime(QString time) { m_time = time; } + void setTime(TQString time) { m_time = time; } private: int m_season; int m_episode; - QString m_link; - QString m_time; + TQString m_link; + TQString m_time; }; - class RssFilter : public QObject + class RssFilter : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. */ - RssFilter(QObject * parent = 0); + RssFilter(TQObject * tqparent = 0); RssFilter(const RssFilter &other); - RssFilter(QString title, bool active, QStringList regexps, bool series, bool sansEpisode, + RssFilter(TQString title, bool active, TQStringList regexps, bool series, bool sansEpisode, int minSeason, int minEpisode, int maxSeason, int maxEpisode, - QValueList<FilterMatch> matches); + TQValueList<FilterMatch> matches); RssFilter &operator=(const RssFilter &other); ~RssFilter(); - QString title() const { return m_title; } + TQString title() const { return m_title; } bool active() const { return m_active; } - QStringList regExps() const { return m_regExps; } + TQStringList regExps() const { return m_regExps; } bool series() const { return m_series; } bool sansEpisode() const { return m_sansEpisode; } int minSeason() const { return m_minSeason; } int minEpisode() const { return m_minEpisode; } int maxSeason() const { return m_maxSeason; } int maxEpisode() const { return m_maxEpisode; } - QValueList<FilterMatch> matches() const { return m_matches; } + TQValueList<FilterMatch> matches() const { return m_matches; } bool scanArticle(RssArticle article, bool ignoreMatches = true, bool saveMatch = true); - void deleteMatch(const QString& link); + void deleteMatch(const TQString& link); public slots: - void setTitle( const QString& title ); + void setTitle( const TQString& title ); void setActive( bool active ); - void setRegExps ( const QStringList& regexps ); + void setRegExps ( const TQStringList& regexps ); void setSeries ( bool series ); void setSansEpisode ( bool sansEpisode ); void setMinSeason( int minSeason ); void setMinEpisode( int minEpisode ); void setMaxSeason( int maxSeason ); void setMaxEpisode( int maxEpisode ); - void setMatches( const QValueList<FilterMatch>& matches ); + void setMatches( const TQValueList<FilterMatch>& matches ); //void scanFilter(); signals: - void titleChanged( const QString& title ); + void titleChanged( const TQString& title ); void activeChanged( bool active ); - void regExpsChanged( const QStringList& regexps ); + void regExpsChanged( const TQStringList& regexps ); void seriesChanged( bool series ); void sansEpisodeChanged( bool sansEpisode ); void minSeasonChanged (int minSeason); void minEpisodeChanged (int minEpisode); void maxSeasonChanged (int maxSeason); void maxEpisodeChanged (int maxEpisode); - void matchesChanged( const QValueList<FilterMatch>& matches ); + void matchesChanged( const TQValueList<FilterMatch>& matches ); void rescanFilter(); private: - QString m_title; + TQString m_title; bool m_active; - QStringList m_regExps; + TQStringList m_regExps; bool m_series; bool m_sansEpisode; int m_minSeason; int m_minEpisode; int m_maxSeason; int m_maxEpisode; - QValueList<FilterMatch> m_matches; + TQValueList<FilterMatch> m_matches; bool episodeInRange(int season, int episode, bool ignoreMatches, bool& alreadyDownloaded); }; - QDataStream &operator<<( QDataStream &out, const FilterMatch &filterMatch ); - QDataStream &operator>>( QDataStream &in, FilterMatch &filterMatch ); + TQDataStream &operator<<( TQDataStream &out, const FilterMatch &filterMatch ); + TQDataStream &operator>>( TQDataStream &in, FilterMatch &filterMatch ); - QDataStream &operator<<( QDataStream &out, const RssFilter &filter ); - QDataStream &operator>>( QDataStream &in, RssFilter &filter ); + TQDataStream &operator<<( TQDataStream &out, const RssFilter &filter ); + TQDataStream &operator>>( TQDataStream &in, RssFilter &filter ); } diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp index 4b0f390..467055e 100644 --- a/plugins/rssfeed/rsslinkdownloader.cpp +++ b/plugins/rssfeed/rsslinkdownloader.cpp @@ -23,7 +23,7 @@ #include <kmimetype.h> #include <kmessagebox.h> -#include <qfile.h> +#include <tqfile.h> #include "../../libktorrent/torrent/bdecoder.h" #include "../../libktorrent/torrent/bnode.h" @@ -33,7 +33,7 @@ using namespace bt; namespace kt { - RssLinkDownloader::RssLinkDownloader(CoreInterface* core, QString link, RssFilter * filter, QObject * parent) : QObject (parent) + RssLinkDownloader::RssLinkDownloader(CoreInterface* core, TQString link, RssFilter * filter, TQObject * tqparent) : TQObject (tqparent) { //tempFile.setAutoDelete(true); m_core = core; @@ -42,15 +42,15 @@ 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)); - QTimer::singleShot(50,this,SLOT(suicide())); + KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").tqarg(curLink)); + TQTimer::singleShot(50,this,TQT_SLOT(suicide())); } else { //first let's download the link so we can process it to check for the actual torrent curLink = curSubLink = link; curFile = KIO::storedGet(link,false,false); - connect(curFile, SIGNAL(result(KIO::Job*)),this,SLOT(processLink( KIO::Job* ))); + connect(curFile, TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(processLink( KIO::Job* ))); } } @@ -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()); @@ -72,22 +72,22 @@ namespace kt { KURL url = curLink; //let's go through the data and populate our sublink array - QTextStream html(curFile->data(), IO_ReadOnly); + TQTextStream html(curFile->data(), IO_ReadOnly); //go through a line at a time checking for a torrent - QString htmlline = html.readLine(); + TQString htmlline = html.readLine(); while (!htmlline.isNull()) { - QRegExp hrefTags = QString("<A.*HREF.*</A"); + TQRegExp hrefTags = TQString("<A.*HREF.*</A"); hrefTags.setCaseSensitive(false); hrefTags.setMinimal(true); int matchPos = 0; - while (htmlline.find(hrefTags, matchPos) >= 0) + while (htmlline.tqfind(hrefTags, matchPos) >= 0) { matchPos += hrefTags.matchedLength(); //we're found an <a href tag - let's check it if contains download - QRegExp hrefText = QString("d(own)?load"); + TQRegExp hrefText = TQString("d(own)?load"); hrefText.setCaseSensitive(false); if (!hrefTags.capturedTexts()[0].contains(hrefText)) @@ -97,20 +97,20 @@ namespace kt } //we're found an <a href tag - now let's the the url out of it - hrefText = QString("HREF=\"?([^\">< ]*)[\" ]"); + hrefText = TQString("HREF=\"?([^\">< ]*)[\" ]"); hrefText.setCaseSensitive(false); - hrefTags.capturedTexts()[0].find(hrefText); + hrefTags.tqcapturedTexts()[0].tqfind(hrefText); //lets get the captured - QString hrefLink = hrefText.capturedTexts()[1]; + 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; + hrefLink = url.url().left(url.url().tqfindRev("/")+1) + hrefLink; } subLinks.append(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(); } @@ -189,7 +189,7 @@ namespace kt curSubLink = subLinks.first(); subLinks.pop_front(); curFile = KIO::storedGet(curSubLink,false,false); - connect(curFile, SIGNAL(result(KIO::Job*)),this,SLOT(processLink( KIO::Job* ))); + connect(curFile, TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(processLink( KIO::Job* ))); } } diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h index 2266f29..0c5541f 100644 --- a/plugins/rssfeed/rsslinkdownloader.h +++ b/plugins/rssfeed/rsslinkdownloader.h @@ -28,7 +28,7 @@ #include <util/log.h> #include <util/constants.h> -#include <qstring.h> +#include <tqstring.h> #include "rssfilter.h" #include "rssarticle.h" @@ -44,30 +44,31 @@ namespace kt * */ - class RssLinkDownloader : public QObject + class RssLinkDownloader : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. */ - RssLinkDownloader(CoreInterface* core, QString link, RssFilter * filter = 0, QObject * parent = 0); + RssLinkDownloader(CoreInterface* core, TQString link, RssFilter * filter = 0, TQObject * tqparent = 0); ~RssLinkDownloader(); public slots: - void processLink(KIO::Job* jobStatus); + void processLink(KIO::Job* jobtqStatus); void suicide(); signals: - void linkDownloaded( QString link, int downloaded ); + void linkDownloaded( TQString link, int downloaded ); private: KIO::StoredTransferJob * curFile; - QString curLink, curSubLink; - QStringList subLinks; + TQString curLink, curSubLink; + TQStringList subLinks; RssFilter * curFilter; bool firstLink; |