diff options
Diffstat (limited to 'plugins/rssfeed/rss')
-rw-r--r-- | plugins/rssfeed/rss/article.cpp | 86 | ||||
-rw-r--r-- | plugins/rssfeed/rss/article.h | 42 | ||||
-rw-r--r-- | plugins/rssfeed/rss/document.cpp | 374 | ||||
-rw-r--r-- | plugins/rssfeed/rss/document.h | 34 | ||||
-rw-r--r-- | plugins/rssfeed/rss/global.h | 8 | ||||
-rw-r--r-- | plugins/rssfeed/rss/image.cpp | 50 | ||||
-rw-r--r-- | plugins/rssfeed/rss/image.h | 27 | ||||
-rw-r--r-- | plugins/rssfeed/rss/loader.cpp | 86 | ||||
-rw-r--r-- | plugins/rssfeed/rss/loader.h | 34 | ||||
-rw-r--r-- | plugins/rssfeed/rss/testlibrss.cpp | 8 | ||||
-rw-r--r-- | plugins/rssfeed/rss/testlibrss.h | 11 | ||||
-rw-r--r-- | plugins/rssfeed/rss/textinput.cpp | 26 | ||||
-rw-r--r-- | plugins/rssfeed/rss/textinput.h | 20 | ||||
-rw-r--r-- | plugins/rssfeed/rss/tools_p.cpp | 22 | ||||
-rw-r--r-- | plugins/rssfeed/rss/tools_p.h | 8 |
15 files changed, 421 insertions, 415 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 |