diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:53:50 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:53:50 +0000 |
commit | 7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch) | |
tree | 8474f9b444b2756228600050f07a7ff25de532b2 /akregator/src/librss | |
parent | f587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff) | |
download | tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'akregator/src/librss')
-rw-r--r-- | akregator/src/librss/article.cpp | 94 | ||||
-rw-r--r-- | akregator/src/librss/article.h | 34 | ||||
-rw-r--r-- | akregator/src/librss/category.cpp | 24 | ||||
-rw-r--r-- | akregator/src/librss/category.h | 8 | ||||
-rw-r--r-- | akregator/src/librss/document.cpp | 376 | ||||
-rw-r--r-- | akregator/src/librss/document.h | 30 | ||||
-rw-r--r-- | akregator/src/librss/enclosure.cpp | 40 | ||||
-rw-r--r-- | akregator/src/librss/enclosure.h | 10 | ||||
-rw-r--r-- | akregator/src/librss/feeddetector.cpp | 54 | ||||
-rw-r--r-- | akregator/src/librss/feeddetector.h | 22 | ||||
-rw-r--r-- | akregator/src/librss/global.h | 4 | ||||
-rw-r--r-- | akregator/src/librss/image.cpp | 48 | ||||
-rw-r--r-- | akregator/src/librss/image.h | 22 | ||||
-rw-r--r-- | akregator/src/librss/loader.cpp | 98 | ||||
-rw-r--r-- | akregator/src/librss/loader.h | 24 | ||||
-rw-r--r-- | akregator/src/librss/testlibrss.cpp | 6 | ||||
-rw-r--r-- | akregator/src/librss/testlibrss.h | 4 | ||||
-rw-r--r-- | akregator/src/librss/textinput.cpp | 26 | ||||
-rw-r--r-- | akregator/src/librss/textinput.h | 16 | ||||
-rw-r--r-- | akregator/src/librss/tools_p.cpp | 116 | ||||
-rw-r--r-- | akregator/src/librss/tools_p.h | 10 |
21 files changed, 533 insertions, 533 deletions
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 010cf5dcb..244130535 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -19,8 +19,8 @@ #include <kurllabel.h> #include <kmdcodec.h> -#include <qdatetime.h> -#include <qdom.h> +#include <tqdatetime.h> +#include <tqdom.h> using namespace RSS; namespace RSS @@ -30,18 +30,18 @@ namespace RSS struct Article::Private : public Shared { - QString title; + TQString title; KURL link; - QString description; - QDateTime pubDate; - QString guid; - QString author; + TQString description; + TQDateTime pubDate; + TQString guid; + TQString author; bool guidIsPermaLink; MetaInfoMap meta; KURL commentsLink; int numComments; Enclosure enclosure; - QValueList<Category> categories; + TQValueList<Category> categories; }; Article::Article() : d(new Private) @@ -58,15 +58,15 @@ Enclosure Article::enclosure() const return d->enclosure; } -QValueList<Category> Article::categories() const +TQValueList<Category> Article::categories() const { return d->categories; } -Article::Article(const QDomNode &node, Format format, Version version) : d(new Private) +Article::Article(const TQDomNode &node, Format format, Version version) : d(new Private) { - QString elemText; + TQString elemText; d->numComments=0; @@ -75,38 +75,38 @@ Article::Article(const QDomNode &node, Format format, Version version) : d(new P 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")) == QString::fromLatin1("alternate"))) + const TQDomElement e = n.toElement(); + if ( (e.tagName()==TQString::fromLatin1("link")) && + (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate"))) { - d->link=n.toElement().attribute(QString::fromLatin1("href")); + d->link=n.toElement().attribute(TQString::fromLatin1("href")); break; } } } else { - if (!(elemText = extractNode(node, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("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::fromLatin1("content"): TQString::fromLatin1("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::fromLatin1("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::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull()) d->description = elemText; } } @@ -116,21 +116,21 @@ Article::Article(const QDomNode &node, Format format, Version version) : d(new P if (format == AtomFeed) { if (version == vAtom_1_0) - elemText = extractNode(node, QString::fromLatin1("updated")); + elemText = extractNode(node, TQString::fromLatin1("updated")); else - elemText = extractNode(node, QString::fromLatin1("issued")); + elemText = extractNode(node, TQString::fromLatin1("issued")); if (!elemText.isNull()) time = parseISO8601Date(elemText); } else { - elemText = extractNode(node, QString::fromLatin1("pubDate")); + elemText = extractNode(node, TQString::fromLatin1("pubDate")); if (!elemText.isNull()) time = KRFCDate::parseDate(elemText); } - if (!(elemText = extractNode(node, QString::fromLatin1("dc:date"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull()) { time = parseISO8601Date(elemText); } @@ -139,32 +139,32 @@ Article::Article(const QDomNode &node, Format format, Version version) : d(new P if (time != 0) d->pubDate.setTime_t(time); - if (!(elemText = extractNode(node, QString::fromLatin1("wfw:comment"))).isNull()) { + if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) { d->commentsLink = elemText; } - if (!(elemText = extractNode(node, QString::fromLatin1("slash:comments"))).isNull()) { + if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) { d->numComments = elemText.toInt(); } - QDomElement element = QDomNode(node).toElement(); + TQDomElement element = TQDomNode(node).toElement(); // in RSS 1.0, we use <item about> attribute as ID // FIXME: pass format version instead of checking for attribute - if (!element.isNull() && element.hasAttribute(QString::fromLatin1("rdf:about"))) + if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about"))) { - d->guid = element.attribute(QString::fromLatin1("rdf:about")); // HACK: using ns properly did not work + d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work d->guidIsPermaLink = false; } else { - tagName=(format==AtomFeed)? QString::fromLatin1("id"): QString::fromLatin1("guid"); - QDomNode n = node.namedItem(tagName); + tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid"); + TQDomNode 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::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false; if (!(elemText = extractNode(node, tagName)).isNull()) d->guid = elemText; } @@ -174,29 +174,29 @@ Article::Article(const QDomNode &node, Format format, Version version) : d(new P 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::fromLatin1("guidIsHash")] = TQString::fromLatin1("true"); } - QDomNode enclosure = element.namedItem(QString::fromLatin1("enclosure")); + TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure")); if (enclosure.isElement()) d->enclosure = Enclosure::fromXML(enclosure.toElement()); d->author = parseItemAuthor(element, format, version); - for (QDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling()) + for (TQDomNode i = node.firstChild(); !i.isNull(); i = i.nextSibling()) { if (i.isElement()) { - if (i.toElement().tagName() == QString::fromLatin1("metaInfo:meta")) + if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta")) { - QString type = i.toElement().attribute(QString::fromLatin1("type")); + TQString type = i.toElement().attribute(TQString::fromLatin1("type")); d->meta[type] = i.toElement().text(); } - else if (i.toElement().tagName() == QString::fromLatin1("category")) + else if (i.toElement().tagName() == TQString::fromLatin1("category")) { d->categories.append(Category::fromXML(i.toElement())); } @@ -210,12 +210,12 @@ Article::~Article() delete d; } -QString Article::title() const +TQString Article::title() const { return d->title; } -QString Article::author() const +TQString Article::author() const { return d->author; } @@ -225,12 +225,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; } @@ -240,7 +240,7 @@ bool Article::guidIsPermaLink() const return d->guidIsPermaLink; } -const QDateTime &Article::pubDate() const +const TQDateTime &Article::pubDate() const { return d->pubDate; } @@ -256,12 +256,12 @@ 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 *parent, const char *name) const { KURLLabel *label = new KURLLabel(d->link.url(), d->title, parent, name); label->setUseTips(true); diff --git a/akregator/src/librss/article.h b/akregator/src/librss/article.h index 74deb2539..4aa11850a 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -11,7 +11,7 @@ #ifndef LIBRSS_ARTICLE_H #define LIBRSS_ARTICLE_H -#include <qmap.h> +#include <tqmap.h> #include "global.h" @@ -40,7 +40,7 @@ namespace RSS /** * A list of articles. */ - typedef QValueList<Article> List; + typedef TQValueList<Article> List; /** * Default constructor. @@ -55,10 +55,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, Version version); + Article(const TQDomNode &node, Format format, Version version); /** * Assignment operator. @@ -90,10 +90,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::null if * no headline was available. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards @@ -106,25 +106,25 @@ namespace RSS /** * RSS 0.91 and upwards - * @return A story synopsis, or QString::null if no description + * @return A story synopsis, or TQString::null if no description * was available. */ - QString description() const; + TQString description() const; /** * a string desribing the author of the item. */ - QString author() const; + TQString author() 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::null. */ bool guidIsPermaLink() const; @@ -132,7 +132,7 @@ 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; @@ -140,9 +140,9 @@ namespace RSS Enclosure enclosure() const; /** returns a list of categories this article is assigned to. (RSS2 only, Atom is not supported yet) */ - QValueList<Category> categories() const; + TQValueList<Category> categories() const; - QString meta(const QString &key) const; + TQString meta(const TQString &key) const; /** * @param parent The parent widget for the KURLLabel. @@ -151,16 +151,16 @@ namespace RSS * 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 *parent = 0, const char *name = 0) const; - typedef QMap<QString, QString> MetaInfoMap; + typedef TQMap<TQString, TQString> MetaInfoMap; private: struct Private; diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp index 07508ecaf..3fd5bee22 100644 --- a/akregator/src/librss/category.cpp +++ b/akregator/src/librss/category.cpp @@ -25,8 +25,8 @@ #include "category.h" #include "tools_p.h" -#include <qdom.h> -#include <qstring.h> +#include <tqdom.h> +#include <tqstring.h> class QString; @@ -37,8 +37,8 @@ class Category::CategoryPrivate : public Shared { public: bool isNull; - QString category; - QString domain; + TQString category; + TQString domain; bool operator==(const CategoryPrivate &other) const { @@ -61,11 +61,11 @@ bool Category::isNull() const return d == 0; } -Category Category::fromXML(const QDomElement& e) +Category Category::fromXML(const TQDomElement& e) { Category obj; - if (e.hasAttribute(QString::fromLatin1("domain"))) - obj.d->domain = e.attribute(QString::fromLatin1("domain")); + if (e.hasAttribute(TQString::fromLatin1("domain"))) + obj.d->domain = e.attribute(TQString::fromLatin1("domain")); obj.d->category = e.text(); obj.d->isNull = false; return obj; @@ -81,7 +81,7 @@ Category::Category(const Category& other) : d(0) *this = other; } -Category::Category(const QString& category, const QString& domain) : d(new CategoryPrivate) +Category::Category(const TQString& category, const TQString& domain) : d(new CategoryPrivate) { d->isNull = false; d->category = category; @@ -114,14 +114,14 @@ bool Category::operator==(const Category &other) const return *d == *other.d; } -QString Category::category() const +TQString Category::category() const { - return !d->isNull ? d->category : QString::null; + return !d->isNull ? d->category : TQString::null; } -QString Category::domain() const +TQString Category::domain() const { - return !d->isNull ? d->domain : QString::null; + return !d->isNull ? d->domain : TQString::null; } } // namespace RSS diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h index 43267b903..597b34e1f 100644 --- a/akregator/src/librss/category.h +++ b/akregator/src/librss/category.h @@ -37,19 +37,19 @@ namespace RSS { public: - static Category fromXML(const QDomElement& e); + static Category fromXML(const TQDomElement& e); Category(); Category(const Category& other); - Category(const QString& category, const QString& domain); + Category(const TQString& category, const TQString& domain); virtual ~Category(); Category& operator=(const Category& other); bool operator==(const Category& other) const; - QString category() const; + TQString category() const; - QString domain() const; + TQString domain() const; bool isNull() const; diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index ad9614f98..b52ea87c9 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/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> #include <kdebug.h> @@ -42,22 +42,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; @@ -72,48 +72,48 @@ Document::Document(const Document &other) : d(0) *this = other; } -static QString extractLink(const QDomNode& node, Format format) +static TQString extractLink(const TQDomNode& node, Format format) { 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")) == QString::fromLatin1("alternate"))) + const TQDomElement e = n.toElement(); + if ( (e.tagName() == TQString::fromLatin1("link")) + && (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate"))) { - return n.toElement().attribute(QString::fromLatin1("href")); + return n.toElement().attribute(TQString::fromLatin1("href")); } } } - return extractNode(node, QString::fromLatin1("link")); + return extractNode(node, TQString::fromLatin1("link")); } -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::fromLatin1("html")) d->valid=false; else d->valid=true; - attr = rootNode.toElement().attribute(QString::fromLatin1("version"), QString::null); - if (rootNode.toElement().tagName()==QString::fromLatin1("feed")) + attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString::null); + if (rootNode.toElement().tagName()==TQString::fromLatin1("feed")) { d->format=AtomFeed; - if (attr == QString::fromLatin1("0.3")) + if (attr == TQString::fromLatin1("0.3")) d->version = vAtom_0_3; - else if (attr == QString::fromLatin1("0.2")) /* smt -> review */ + else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */ d->version = vAtom_0_2; - else if (attr == QString::fromLatin1("0.1")) /* smt -> review */ + else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */ d->version = vAtom_0_1; else d->version = vAtom_1_0; @@ -121,13 +121,13 @@ Document::Document(const QDomDocument &doc) : d(new Private) else { d->format=RSSFeed; - if (attr == QString::fromLatin1("0.91")) + if (attr == TQString::fromLatin1("0.91")) d->version = v0_91; - else if (attr == QString::fromLatin1("0.92")) + else if (attr == TQString::fromLatin1("0.92")) d->version = v0_92; - else if (attr == QString::fromLatin1("0.93")) + else if (attr == TQString::fromLatin1("0.93")) d->version = v0_93; - else if (attr == QString::fromLatin1("0.94")) + else if (attr == TQString::fromLatin1("0.94")) d->version = v0_94; else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally // backward-compatible, this should work @@ -137,7 +137,7 @@ Document::Document(const QDomDocument &doc) : d(new Private) if (d->format==UnknownFormat) { - attr = rootNode.toElement().attribute(QString::fromLatin1("xmlns"), QString::null); + attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString::null); if (!attr.isNull()) { /* * Hardcoding these URLs is actually a bad idea, since the DTD doesn't @@ -147,27 +147,27 @@ 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::fromLatin1("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::fromLatin1("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::fromLatin1("channel")); if (!(elemText = extractTitle(channelNode)).isNull()) d->title = elemText; - QString descriptionTagName = "description"; + TQString descriptionTagName = "description"; if (d->format == AtomFeed) { @@ -186,246 +186,246 @@ Document::Document(const QDomDocument &doc) : d(new Private) /* This is ugly but necessary since RSS 0.90 and 1.0 have a different parent * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0. */ - QDomNode parentNode; + TQDomNode parentNode; if (d->version == v0_90 || d->version == v1_0 || d->format == AtomFeed) parentNode = rootNode; else { // following is a HACK for broken 0.91 feeds like xanga.com's - if (!rootNode.namedItem(QString::fromLatin1("item")).isNull()) + if (!rootNode.namedItem(TQString::fromLatin1("item")).isNull()) parentNode = rootNode; else parentNode = channelNode; } // image and textinput aren't supported by Atom.. handle in case feed provides - QDomNode n = parentNode.namedItem(QString::fromLatin1("image")); + TQDomNode n = parentNode.namedItem(TQString::fromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = parentNode.namedItem(QString::fromLatin1("textinput")); + n = parentNode.namedItem(TQString::fromLatin1("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::fromLatin1("entry"); else - tagName=QString::fromLatin1("item"); + tagName=TQString::fromLatin1("item"); for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { - const QDomElement e = n.toElement(); + const TQDomElement e = n.toElement(); if (e.tagName() == tagName) d->articles.append(Article(e, d->format, d->version)); } - if (!(elemText = extractNode(channelNode, QString::fromLatin1("copyright"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("copyright"))).isNull()) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(QString::fromLatin1("xml:lang"), QString::null); + elemText = rootNode.toElement().attribute(TQString::fromLatin1("xml:lang"), TQString::null); else - elemText = extractNode(channelNode, QString::fromLatin1("language")); + elemText = extractNode(channelNode, TQString::fromLatin1("language")); if (!elemText.isNull()){ - if (elemText == QString::fromLatin1("af")) + if (elemText == TQString::fromLatin1("af")) d->language = af; - else if (elemText == QString::fromLatin1("sq")) + else if (elemText == TQString::fromLatin1("sq")) d->language = sq; - else if (elemText == QString::fromLatin1("eu")) + else if (elemText == TQString::fromLatin1("eu")) d->language = eu; - else if (elemText == QString::fromLatin1("be")) + else if (elemText == TQString::fromLatin1("be")) d->language = be; - else if (elemText == QString::fromLatin1("bg")) + else if (elemText == TQString::fromLatin1("bg")) d->language = bg; - else if (elemText == QString::fromLatin1("ca")) + else if (elemText == TQString::fromLatin1("ca")) d->language = ca; - else if (elemText == QString::fromLatin1("zh-cn")) + else if (elemText == TQString::fromLatin1("zh-cn")) d->language = zh_cn; - else if (elemText == QString::fromLatin1("zh-tw")) + else if (elemText == TQString::fromLatin1("zh-tw")) d->language = zh_tw; - else if (elemText == QString::fromLatin1("hr")) + else if (elemText == TQString::fromLatin1("hr")) d->language = hr; - else if (elemText == QString::fromLatin1("cs")) + else if (elemText == TQString::fromLatin1("cs")) d->language = cs; - else if (elemText == QString::fromLatin1("da")) + else if (elemText == TQString::fromLatin1("da")) d->language = da; - else if (elemText == QString::fromLatin1("nl")) + else if (elemText == TQString::fromLatin1("nl")) d->language = nl; - else if (elemText == QString::fromLatin1("nl-be")) + else if (elemText == TQString::fromLatin1("nl-be")) d->language = nl_be; - else if (elemText == QString::fromLatin1("nl-nl")) + else if (elemText == TQString::fromLatin1("nl-nl")) d->language = nl_nl; - else if (elemText == QString::fromLatin1("en")) + else if (elemText == TQString::fromLatin1("en")) d->language = en; - else if (elemText == QString::fromLatin1("en-au")) + else if (elemText == TQString::fromLatin1("en-au")) d->language = en_au; - else if (elemText == QString::fromLatin1("en-bz")) + else if (elemText == TQString::fromLatin1("en-bz")) d->language = en_bz; - else if (elemText == QString::fromLatin1("en-ca")) + else if (elemText == TQString::fromLatin1("en-ca")) d->language = en_ca; - else if (elemText == QString::fromLatin1("en-ie")) + else if (elemText == TQString::fromLatin1("en-ie")) d->language = en_ie; - else if (elemText == QString::fromLatin1("en-jm")) + else if (elemText == TQString::fromLatin1("en-jm")) d->language = en_jm; - else if (elemText == QString::fromLatin1("en-nz")) + else if (elemText == TQString::fromLatin1("en-nz")) d->language = en_nz; - else if (elemText == QString::fromLatin1("en-ph")) + else if (elemText == TQString::fromLatin1("en-ph")) d->language = en_ph; - else if (elemText == QString::fromLatin1("en-za")) + else if (elemText == TQString::fromLatin1("en-za")) d->language = en_za; - else if (elemText == QString::fromLatin1("en-tt")) + else if (elemText == TQString::fromLatin1("en-tt")) d->language = en_tt; - else if (elemText == QString::fromLatin1("en-gb")) + else if (elemText == TQString::fromLatin1("en-gb")) d->language = en_gb; - else if (elemText == QString::fromLatin1("en-us")) + else if (elemText == TQString::fromLatin1("en-us")) d->language = en_us; - else if (elemText == QString::fromLatin1("en-zw")) + else if (elemText == TQString::fromLatin1("en-zw")) d->language = en_zw; - else if (elemText == QString::fromLatin1("fo")) + else if (elemText == TQString::fromLatin1("fo")) d->language = fo; - else if (elemText == QString::fromLatin1("fi")) + else if (elemText == TQString::fromLatin1("fi")) d->language = fi; - else if (elemText == QString::fromLatin1("fr")) + else if (elemText == TQString::fromLatin1("fr")) d->language = fr; - else if (elemText == QString::fromLatin1("fr-be")) + else if (elemText == TQString::fromLatin1("fr-be")) d->language = fr_be; - else if (elemText == QString::fromLatin1("fr-ca")) + else if (elemText == TQString::fromLatin1("fr-ca")) d->language = fr_ca; - else if (elemText == QString::fromLatin1("fr-fr")) + else if (elemText == TQString::fromLatin1("fr-fr")) d->language = fr_fr; - else if (elemText == QString::fromLatin1("fr-lu")) + else if (elemText == TQString::fromLatin1("fr-lu")) d->language = fr_lu; - else if (elemText == QString::fromLatin1("fr-mc")) + else if (elemText == TQString::fromLatin1("fr-mc")) d->language = fr_mc; - else if (elemText == QString::fromLatin1("fr-ch")) + else if (elemText == TQString::fromLatin1("fr-ch")) d->language = fr_ch; - else if (elemText == QString::fromLatin1("gl")) + else if (elemText == TQString::fromLatin1("gl")) d->language = gl; - else if (elemText == QString::fromLatin1("gd")) + else if (elemText == TQString::fromLatin1("gd")) d->language = gd; - else if (elemText == QString::fromLatin1("de")) + else if (elemText == TQString::fromLatin1("de")) d->language = de; - else if (elemText == QString::fromLatin1("de-at")) + else if (elemText == TQString::fromLatin1("de-at")) d->language = de_at; - else if (elemText == QString::fromLatin1("de-de")) + else if (elemText == TQString::fromLatin1("de-de")) d->language = de_de; - else if (elemText == QString::fromLatin1("de-li")) + else if (elemText == TQString::fromLatin1("de-li")) d->language = de_li; - else if (elemText == QString::fromLatin1("de-lu")) + else if (elemText == TQString::fromLatin1("de-lu")) d->language = de_lu; - else if (elemText == QString::fromLatin1("de-ch")) + else if (elemText == TQString::fromLatin1("de-ch")) d->language = de_ch; - else if (elemText == QString::fromLatin1("el")) + else if (elemText == TQString::fromLatin1("el")) d->language = el; - else if (elemText == QString::fromLatin1("hu")) + else if (elemText == TQString::fromLatin1("hu")) d->language = hu; - else if (elemText == QString::fromLatin1("is")) + else if (elemText == TQString::fromLatin1("is")) d->language = is; - else if (elemText == QString::fromLatin1("id")) + else if (elemText == TQString::fromLatin1("id")) d->language = id; - else if (elemText == QString::fromLatin1("ga")) + else if (elemText == TQString::fromLatin1("ga")) d->language = ga; - else if (elemText == QString::fromLatin1("it")) + else if (elemText == TQString::fromLatin1("it")) d->language = it; - else if (elemText == QString::fromLatin1("it-it")) + else if (elemText == TQString::fromLatin1("it-it")) d->language = it_it; - else if (elemText == QString::fromLatin1("it-ch")) + else if (elemText == TQString::fromLatin1("it-ch")) d->language = it_ch; - else if (elemText == QString::fromLatin1("ja")) + else if (elemText == TQString::fromLatin1("ja")) d->language = ja; - else if (elemText == QString::fromLatin1("ko")) + else if (elemText == TQString::fromLatin1("ko")) d->language = ko; - else if (elemText == QString::fromLatin1("mk")) + else if (elemText == TQString::fromLatin1("mk")) d->language = mk; - else if (elemText == QString::fromLatin1("no")) + else if (elemText == TQString::fromLatin1("no")) d->language = no; - else if (elemText == QString::fromLatin1("pl")) + else if (elemText == TQString::fromLatin1("pl")) d->language = pl; - else if (elemText == QString::fromLatin1("pt")) + else if (elemText == TQString::fromLatin1("pt")) d->language = pt; - else if (elemText == QString::fromLatin1("pt-br")) + else if (elemText == TQString::fromLatin1("pt-br")) d->language = pt_br; - else if (elemText == QString::fromLatin1("pt-pt")) + else if (elemText == TQString::fromLatin1("pt-pt")) d->language = pt_pt; - else if (elemText == QString::fromLatin1("ro")) + else if (elemText == TQString::fromLatin1("ro")) d->language = ro; - else if (elemText == QString::fromLatin1("ro-mo")) + else if (elemText == TQString::fromLatin1("ro-mo")) d->language = ro_mo; - else if (elemText == QString::fromLatin1("ro-ro")) + else if (elemText == TQString::fromLatin1("ro-ro")) d->language = ro_ro; - else if (elemText == QString::fromLatin1("ru")) + else if (elemText == TQString::fromLatin1("ru")) d->language = ru; - else if (elemText == QString::fromLatin1("ru-mo")) + else if (elemText == TQString::fromLatin1("ru-mo")) d->language = ru_mo; - else if (elemText == QString::fromLatin1("ru-ru")) + else if (elemText == TQString::fromLatin1("ru-ru")) d->language = ru_ru; - else if (elemText == QString::fromLatin1("sr")) + else if (elemText == TQString::fromLatin1("sr")) d->language = sr; - else if (elemText == QString::fromLatin1("sk")) + else if (elemText == TQString::fromLatin1("sk")) d->language = sk; - else if (elemText == QString::fromLatin1("sl")) + else if (elemText == TQString::fromLatin1("sl")) d->language = sl; - else if (elemText == QString::fromLatin1("es")) + else if (elemText == TQString::fromLatin1("es")) d->language = es; - else if (elemText == QString::fromLatin1("es-ar")) + else if (elemText == TQString::fromLatin1("es-ar")) d->language = es_ar; - else if (elemText == QString::fromLatin1("es-bo")) + else if (elemText == TQString::fromLatin1("es-bo")) d->language = es_bo; - else if (elemText == QString::fromLatin1("es-cl")) + else if (elemText == TQString::fromLatin1("es-cl")) d->language = es_cl; - else if (elemText == QString::fromLatin1("es-co")) + else if (elemText == TQString::fromLatin1("es-co")) d->language = es_co; - else if (elemText == QString::fromLatin1("es-cr")) + else if (elemText == TQString::fromLatin1("es-cr")) d->language = es_cr; - else if (elemText == QString::fromLatin1("es-do")) + else if (elemText == TQString::fromLatin1("es-do")) d->language = es_do; - else if (elemText == QString::fromLatin1("es-ec")) + else if (elemText == TQString::fromLatin1("es-ec")) d->language = es_ec; - else if (elemText == QString::fromLatin1("es-sv")) + else if (elemText == TQString::fromLatin1("es-sv")) d->language = es_sv; - else if (elemText == QString::fromLatin1("es-gt")) + else if (elemText == TQString::fromLatin1("es-gt")) d->language = es_gt; - else if (elemText == QString::fromLatin1("es-hn")) + else if (elemText == TQString::fromLatin1("es-hn")) d->language = es_hn; - else if (elemText == QString::fromLatin1("es-mx")) + else if (elemText == TQString::fromLatin1("es-mx")) d->language = es_mx; - else if (elemText == QString::fromLatin1("es-ni")) + else if (elemText == TQString::fromLatin1("es-ni")) d->language = es_ni; - else if (elemText == QString::fromLatin1("es-pa")) + else if (elemText == TQString::fromLatin1("es-pa")) d->language = es_pa; - else if (elemText == QString::fromLatin1("es-py")) + else if (elemText == TQString::fromLatin1("es-py")) d->language = es_py; - else if (elemText == QString::fromLatin1("es-pe")) + else if (elemText == TQString::fromLatin1("es-pe")) d->language = es_pe; - else if (elemText == QString::fromLatin1("es-pr")) + else if (elemText == TQString::fromLatin1("es-pr")) d->language = es_pr; - else if (elemText == QString::fromLatin1("es-es")) + else if (elemText == TQString::fromLatin1("es-es")) d->language = es_es; - else if (elemText == QString::fromLatin1("es-uy")) + else if (elemText == TQString::fromLatin1("es-uy")) d->language = es_uy; - else if (elemText == QString::fromLatin1("es-ve")) + else if (elemText == TQString::fromLatin1("es-ve")) d->language = es_ve; - else if (elemText == QString::fromLatin1("sv")) + else if (elemText == TQString::fromLatin1("sv")) d->language = sv; - else if (elemText == QString::fromLatin1("sv-fi")) + else if (elemText == TQString::fromLatin1("sv-fi")) d->language = sv_fi; - else if (elemText == QString::fromLatin1("sv-se")) + else if (elemText == TQString::fromLatin1("sv-se")) d->language = sv_se; - else if (elemText == QString::fromLatin1("tr")) + else if (elemText == TQString::fromLatin1("tr")) d->language = tr; - else if (elemText == QString::fromLatin1("uk")) + else if (elemText == TQString::fromLatin1("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::fromLatin1("issued"); // atom doesn't specify this for feeds // but some broken feeds do this else - tagName=QString::fromLatin1("pubDate"); + tagName=TQString::fromLatin1("pubDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; @@ -441,7 +441,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::fromLatin1("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 @@ -451,9 +451,9 @@ Document::Document(const QDomDocument &doc) : d(new Private) } if (d->format == AtomFeed) - tagName=QString::fromLatin1("modified"); + tagName=TQString::fromLatin1("modified"); else - tagName=QString::fromLatin1("lastBuildDate"); + tagName=TQString::fromLatin1("lastBuildDate"); if (!(elemText = extractNode(channelNode, tagName)).isNull()) { time_t _time; if (d->format == AtomFeed) @@ -463,44 +463,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::fromLatin1("rating"))).isNull()) d->rating = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("docs"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("docs"))).isNull()) d->docs = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1((d->format == AtomFeed) ? "author" : "managingEditor"))).isNull()) d->managingEditor = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("webMaster"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("webMaster"))).isNull()) d->webMaster = elemText; - if (!(elemText = extractNode(channelNode, QString::fromLatin1("ttl"))).isNull()) + if (!(elemText = extractNode(channelNode, TQString::fromLatin1("ttl"))).isNull()) d->ttl = elemText.toUInt(); - n = channelNode.namedItem(QString::fromLatin1("skipHours")); + n = channelNode.namedItem(TQString::fromLatin1("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::fromLatin1("hour")) d->skipHours.append(e.text().toUInt()); - n = channelNode.namedItem(QString::fromLatin1("skipDays")); + n = channelNode.namedItem(TQString::fromLatin1("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::fromLatin1("day")) { elemText = e.text().lower(); - if (elemText == QString::fromLatin1("monday")) + if (elemText == TQString::fromLatin1("monday")) day = Monday; - else if (elemText == QString::fromLatin1("tuesday")) + else if (elemText == TQString::fromLatin1("tuesday")) day = Tuesday; - else if (elemText == QString::fromLatin1("wednesday")) + else if (elemText == TQString::fromLatin1("wednesday")) day = Wednesday; - else if (elemText == QString::fromLatin1("thursday")) + else if (elemText == TQString::fromLatin1("thursday")) day = Thursday; - else if (elemText == QString::fromLatin1("friday")) + else if (elemText == TQString::fromLatin1("friday")) day = Friday; - else if (elemText == QString::fromLatin1("saturday")) + else if (elemText == TQString::fromLatin1("saturday")) day = Saturday; - else if (elemText == QString::fromLatin1("sunday")) + else if (elemText == TQString::fromLatin1("sunday")) day = Sunday; else day = UndefinedDay; @@ -526,30 +526,30 @@ 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 vAtom_1_0: return QString::fromLatin1("1.0"); + case v0_90: return TQString::fromLatin1("0.90"); + case v0_91: return TQString::fromLatin1("0.91"); + case v0_92: return TQString::fromLatin1("0.92"); + case v0_93: return TQString::fromLatin1("0.93"); + case v0_94: return TQString::fromLatin1("0.94"); + case v1_0: return TQString::fromLatin1("1.0"); + case v2_0: return TQString::fromLatin1("2.0"); + case vAtom_0_3: return TQString::fromLatin1("0.3"); + case vAtom_0_2: return TQString::fromLatin1("0.2"); + case vAtom_0_1: return TQString::fromLatin1("0.1"); + case vAtom_1_0: return TQString::fromLatin1("1.0"); } - return QString::null; + return TQString::null; } -QString Document::title() const +TQString Document::title() const { return d->title; } -QString Document::description() const +TQString Document::description() const { return d->description; } @@ -589,22 +589,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; } @@ -614,12 +614,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/akregator/src/librss/document.h b/akregator/src/librss/document.h index 161960720..450dcf3ba 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -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::null 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::null * 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::null 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::null if this information isn't available. * @see managingEditor() */ - QString webMaster() const; + TQString webMaster() const; /** * RSS 0.91 and upwards diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp index 60898f1bf..602a25588 100644 --- a/akregator/src/librss/enclosure.cpp +++ b/akregator/src/librss/enclosure.cpp @@ -25,8 +25,8 @@ #include "enclosure.h" #include "tools_p.h" -#include <qdom.h> -#include <qstring.h> +#include <tqdom.h> +#include <tqstring.h> #include <kdebug.h> @@ -39,9 +39,9 @@ class Enclosure::EnclosurePrivate : public Shared public: bool isNull; - QString url; + TQString url; int length; - QString type; + TQString type; bool operator==(const EnclosurePrivate &other) const { @@ -52,35 +52,35 @@ class Enclosure::EnclosurePrivate : public Shared }; -Enclosure Enclosure::fromXML(const QDomElement& e) +Enclosure Enclosure::fromXML(const TQDomElement& e) { - QString url, type; + TQString url, type; int length = -1; - if (e.hasAttribute(QString::fromLatin1("url"))) - url = e.attribute(QString::fromLatin1("url")); + if (e.hasAttribute(TQString::fromLatin1("url"))) + url = e.attribute(TQString::fromLatin1("url")); - if (e.hasAttribute(QString::fromLatin1("length"))) + if (e.hasAttribute(TQString::fromLatin1("length"))) { bool ok; - int c = e.attribute(QString::fromLatin1("length")).toInt(&ok); + int c = e.attribute(TQString::fromLatin1("length")).toInt(&ok); length = ok ? c : -1; } - if (e.hasAttribute(QString::fromLatin1("type"))) - type = e.attribute(QString::fromLatin1("type")); + if (e.hasAttribute(TQString::fromLatin1("type"))) + type = e.attribute(TQString::fromLatin1("type")); return Enclosure(url, length, type); } -QDomElement Enclosure::toXML(QDomDocument document) const +TQDomElement Enclosure::toXML(TQDomDocument document) const { - QDomElement e = document.createElement(QString::fromLatin1("enclosure")); + TQDomElement e = document.createElement(TQString::fromLatin1("enclosure")); if (!d->url.isNull()) - e.setAttribute(QString::fromLatin1("url"), d->url); + e.setAttribute(TQString::fromLatin1("url"), d->url); if (d->length != -1) - e.setAttribute(QString::fromLatin1("length"), QString::number(d->length)); + e.setAttribute(TQString::fromLatin1("length"), TQString::number(d->length)); if (!d->type.isNull()) - e.setAttribute(QString::fromLatin1("type"), d->type); + e.setAttribute(TQString::fromLatin1("type"), d->type); return e; } @@ -96,7 +96,7 @@ Enclosure::Enclosure(const Enclosure& other) : d(0) *this = other; } -Enclosure::Enclosure(const QString& url, int length, const QString& type) : d(new EnclosurePrivate) +Enclosure::Enclosure(const TQString& url, int length, const TQString& type) : d(new EnclosurePrivate) { d->isNull = false; d->url = url; @@ -135,7 +135,7 @@ bool Enclosure::isNull() const return d->isNull; } -QString Enclosure::url() const +TQString Enclosure::url() const { return d->url; } @@ -145,7 +145,7 @@ int Enclosure::length() const return d->length; } -QString Enclosure::type() const +TQString Enclosure::type() const { return d->type; } diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h index d3db5d12a..d97fbd4bf 100644 --- a/akregator/src/librss/enclosure.h +++ b/akregator/src/librss/enclosure.h @@ -37,12 +37,12 @@ namespace RSS { public: - static Enclosure fromXML(const QDomElement& e); - QDomElement toXML(QDomDocument document) const; + static Enclosure fromXML(const TQDomElement& e); + TQDomElement toXML(TQDomDocument document) const; Enclosure(); Enclosure(const Enclosure& other); - Enclosure(const QString& url, int length, const QString& type); + Enclosure(const TQString& url, int length, const TQString& type); virtual ~Enclosure(); bool isNull() const; @@ -51,13 +51,13 @@ namespace RSS bool operator==(const Enclosure& other) const; /** returns the URL of the enclosure */ - QString url() const; + TQString url() const; /** returns the size of the enclosure in bytes */ int length() const; /** returns the mime type of the enclosure */ - QString type() const; + TQString type() const; private: diff --git a/akregator/src/librss/feeddetector.cpp b/akregator/src/librss/feeddetector.cpp index a45b18776..4407ff09f 100644 --- a/akregator/src/librss/feeddetector.cpp +++ b/akregator/src/librss/feeddetector.cpp @@ -22,10 +22,10 @@ without including the source code for Qt in the source distribution. */ -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> #include <kcharsets.h> #include <kurl.h> @@ -34,26 +34,26 @@ using namespace RSS; -FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) +FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s) { //reduce all sequences of spaces, newlines etc. to one space: - QString str = s.simplifyWhiteSpace(); + TQString str = s.simplifyWhiteSpace(); // extracts <link> tags - QRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false); + TQRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false); // extracts the URL (href="url") - QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); // extracts type attribute - QRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); // extracts the title (title="title") - QRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); int pos = 0; int matchpos = 0; // get all <link> tags - QStringList linkTags; + TQStringList linkTags; //int strlength = str.length(); while ( matchpos != -1 ) { @@ -67,9 +67,9 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) FeedDetectorEntryList list; - for ( QStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it ) + for ( TQStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it ) { - QString type; + TQString type; int pos = reType.search(*it, 0); if (pos != -1) type = reType.cap(1).lower(); @@ -79,14 +79,14 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) && type != "application/atom+xml" && type != "text/xml" ) continue; - QString title; + TQString title; pos = reTitle.search(*it, 0); if (pos != -1) title = reTitle.cap(1); title = KCharsets::resolveEntities(title); - QString url; + TQString url; pos = reHref.search(*it, 0); if (pos != -1) url = reHref.cap(1); @@ -105,33 +105,33 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) return list; } -QStringList FeedDetector::extractBruteForce(const QString& s) +TQStringList FeedDetector::extractBruteForce(const TQString& s) { - QString str = s.simplifyWhiteSpace(); + TQString str = s.simplifyWhiteSpace(); - QRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false); + TQRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false); // extracts the URL (href="url") - QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); - QRegExp rssrdfxml(".*(RSS|RDF|XML)", false); + TQRegExp rssrdfxml(".*(RSS|RDF|XML)", false); int pos = 0; int matchpos = 0; // get all <a href> tags and capture url - QStringList list; + TQStringList list; //int strlength = str.length(); while ( matchpos != -1 ) { matchpos = reAhrefTag.search(str, pos); if ( matchpos != -1 ) { - QString ahref = str.mid(matchpos, reAhrefTag.matchedLength()); + TQString ahref = str.mid(matchpos, reAhrefTag.matchedLength()); int hrefpos = reHref.search(ahref, 0); if ( hrefpos != -1 ) { - QString url = reHref.cap(1); + TQString url = reHref.cap(1); url = KCharsets::resolveEntities(url); @@ -146,9 +146,9 @@ QStringList FeedDetector::extractBruteForce(const QString& s) return list; } -QString FeedDetector::fixRelativeURL(const QString &s, const KURL &baseurl) +TQString FeedDetector::fixRelativeURL(const TQString &s, const KURL &baseurl) { - QString s2=s; + TQString s2=s; KURL u; if (KURL::isRelativeURL(s2)) { @@ -160,8 +160,8 @@ QString FeedDetector::fixRelativeURL(const QString &s, const KURL &baseurl) else if (s2.startsWith("/")) { KURL b2(baseurl); - b2.setPath(QString()); // delete path and query, so that only protocol://host remains - b2.setQuery(QString()); + b2.setPath(TQString()); // delete path and query, so that only protocol://host remains + b2.setQuery(TQString()); u = KURL(b2, s2.remove(0,1)); // remove leading "/" } else diff --git a/akregator/src/librss/feeddetector.h b/akregator/src/librss/feeddetector.h index c27acf76e..2f502acd4 100644 --- a/akregator/src/librss/feeddetector.h +++ b/akregator/src/librss/feeddetector.h @@ -25,8 +25,8 @@ #ifndef LIBRSS_FEEDDETECTOR_H #define LIBRSS_FEEDDETECTOR_H -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> class QStringList; class KURL; @@ -38,18 +38,18 @@ namespace RSS { public: FeedDetectorEntry() {} - FeedDetectorEntry(const QString& url, const QString& title) + FeedDetectorEntry(const TQString& url, const TQString& title) : m_url(url), m_title(title) {} - const QString& url() const { return m_url; } - const QString& title() const { return m_title; } + const TQString& url() const { return m_url; } + const TQString& title() const { return m_title; } private: - const QString m_url; - const QString m_title; + const TQString m_url; + const TQString m_title; }; - typedef QValueList<FeedDetectorEntry> FeedDetectorEntryList; + typedef TQValueList<FeedDetectorEntry> FeedDetectorEntryList; /** a class providing functions to detect linked feeds in HTML sources */ class FeedDetector @@ -61,16 +61,16 @@ namespace RSS @param s the html source to scan (the actual source, no URI) @return a list containing the detected feeds */ - static FeedDetectorEntryList extractFromLinkTags(const QString& s); + static FeedDetectorEntryList extractFromLinkTags(const TQString& s); /** \brief searches an HTML page for slightly feed-like looking links and catches everything not running away quickly enough. Extracts links from @c <a @c href> tags which end with @c xml, @c rss or @c rdf @param s the html source to scan (the actual source, no URI) @return a list containing the detected feeds */ - static QStringList extractBruteForce(const QString& s); + static TQStringList extractBruteForce(const TQString& s); - static QString fixRelativeURL(const QString &s, const KURL &baseurl); + static TQString fixRelativeURL(const TQString &s, const KURL &baseurl); private: FeedDetector() {} diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index cec9609c7..68cfb83a3 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -136,12 +136,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/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 33e1544ae..265c37117 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/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::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("url"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("url"))).isNull()) d->url = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull()) d->link = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("height"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("height"))).isNull()) d->height = elemText.toUInt(); - if (!(elemText = extractNode(node, QString::fromLatin1("width"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("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; } @@ -112,21 +112,21 @@ void Image::getPixmap() 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/akregator/src/librss/image.h b/akregator/src/librss/image.h index 74197edb6..f79026683 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -13,7 +13,7 @@ #include "global.h" -#include <qobject.h> +#include <tqobject.h> class QDomNode; @@ -48,10 +48,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 +83,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::null if no * caption is available. */ - QString title() const; + TQString title() const; /** * RSS 0.90 and upwards @@ -112,11 +112,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::null 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 +125,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 +136,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 +157,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/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index d63d17676..df7f51a66 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -18,12 +18,12 @@ #include <kurl.h> #include <kdebug.h> -#include <qdom.h> -#include <qbuffer.h> -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qtimer.h> +#include <tqdom.h> +#include <tqbuffer.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqtimer.h> using namespace RSS; @@ -50,15 +50,15 @@ class FileRetriever::Private delete buffer; } - QBuffer *buffer; + TQBuffer *buffer; int lastError; KIO::Job *job; - static KStaticDeleter<QString> userAgentsd; - static QString* userAgent; + static KStaticDeleter<TQString> userAgentsd; + static TQString* userAgent; }; -KStaticDeleter<QString> FileRetriever::Private::userAgentsd; -QString* FileRetriever::Private::userAgent = 0L; +KStaticDeleter<TQString> FileRetriever::Private::userAgentsd; +TQString* FileRetriever::Private::userAgent = 0L; FileRetriever::FileRetriever() : d(new Private) { @@ -71,17 +71,17 @@ FileRetriever::~FileRetriever() bool FileRetriever::m_useCache = true; -QString FileRetriever::userAgent() +TQString FileRetriever::userAgent() { if (Private::userAgent == 0L) - FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new QString); + FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new TQString); return *Private::userAgent; } -void FileRetriever::setUserAgent(const QString &ua) +void FileRetriever::setUserAgent(const TQString &ua) { if (Private::userAgent == 0L) - FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new QString); + FileRetriever::Private::userAgentsd.setObject(Private::userAgent, new TQString); (*Private::userAgent) = ua; } @@ -106,18 +106,18 @@ void FileRetriever::retrieveData(const KURL &url) d->job = KIO::get(u, false, false); d->job->addMetaData("cache", m_useCache ? "refresh" : "reload"); - QString ua = userAgent(); + TQString ua = userAgent(); if (!ua.isEmpty()) d->job->addMetaData("UserAgent", ua); - 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() @@ -129,7 +129,7 @@ void FileRetriever::slotTimeout() d->lastError = KIO::ERR_SERVER_TIMEOUT; - emit dataRetrieved(QByteArray(), false); + emit dataRetrieved(TQByteArray(), false); } int FileRetriever::errorCode() const @@ -137,14 +137,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; @@ -183,7 +183,7 @@ struct OutputRetriever::Private } KShellProcess *process; - QBuffer *buffer; + TQBuffer *buffer; int lastError; }; @@ -207,10 +207,10 @@ void OutputRetriever::retrieveData(const KURL &url) 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); } @@ -230,7 +230,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; @@ -265,10 +265,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, Status)), object, slot); return loader; } @@ -290,8 +290,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); } @@ -309,7 +309,7 @@ void Loader::abort() delete d->retriever; d->retriever=NULL; } - emit loadingComplete(this, QDomDocument(), Aborted); + emit loadingComplete(this, TQDomDocument(), Aborted); delete this; } @@ -318,7 +318,7 @@ const KURL &Loader::discoveredFeedURL() const return d->discoveredFeedURL; } -void Loader::slotRetrieverDone(const QByteArray &data, bool success) +void Loader::slotRetrieverDone(const TQByteArray &data, bool success) { d->lastError = d->retriever->errorCode(); @@ -329,7 +329,7 @@ void Loader::slotRetrieverDone(const QByteArray &data, bool success) Status 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), @@ -339,16 +339,16 @@ void Loader::slotRetrieverDone(const QByteArray &data, bool success) 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)) @@ -375,11 +375,11 @@ 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(); + TQString str = TQString(data).simplifyWhiteSpace(); - QStringList feeds; + TQStringList feeds; FeedDetectorEntryList list = FeedDetector::extractFromLinkTags(str); @@ -391,12 +391,12 @@ void Loader::discoverFeeds(const QByteArray &data) if (list.isEmpty()) feeds = FeedDetector::extractBruteForce(str); - QString feed = feeds.first(); - QString host = d->url.host(); + TQString feed = feeds.first(); + TQString host = d->url.host(); KURL testURL; // loop through, prefer feeds on same host - QStringList::Iterator end( feeds.end() ); - for ( QStringList::Iterator it = feeds.begin(); it != end; ++it) + TQStringList::Iterator end( feeds.end() ); + for ( TQStringList::Iterator it = feeds.begin(); it != end; ++it) { testURL=*it; if (testURL.host() == host) @@ -406,7 +406,7 @@ void Loader::discoverFeeds(const QByteArray &data) } } - d->discoveredFeedURL = feed.isNull() ? QString() : FeedDetector::fixRelativeURL(feed, d->url); + d->discoveredFeedURL = feed.isNull() ? TQString() : FeedDetector::fixRelativeURL(feed, d->url); } #include "loader.moc" diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index d60bad744..e958239f2 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -15,7 +15,7 @@ class KURL; -#include <qobject.h> +#include <tqobject.h> namespace KIO { @@ -75,7 +75,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); @@ -120,8 +120,8 @@ namespace RSS virtual void abort(); static void setUseCache(bool enabled); - static void setUserAgent(const QString &ua); - static QString userAgent(); + static void setUserAgent(const TQString &ua); + static TQString userAgent(); signals: /** @@ -137,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); @@ -208,8 +208,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, Status)), + * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -241,7 +241,7 @@ namespace RSS * if (status != RSS::Success) * return; * - * QString title = doc.title(); + * TQString title = doc.title(); * // do whatever you want with the information. * } * \endcode @@ -270,10 +270,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 @@ -323,14 +323,14 @@ namespace RSS void loadingComplete(Loader *loader, Document doc, Status 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/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index 5d98bba46..7d88c3d1f 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -16,11 +16,11 @@ 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, Status ) ), + this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( url, new FileRetriever ); } diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index c65fa3bd2..b84a0ab5c 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.h @@ -1,7 +1,7 @@ #ifndef TESTLIBRSS_H #define TESTLIBRSS_H -#include <qobject.h> +#include <tqobject.h> #include "loader.h" #include "document.h" @@ -16,7 +16,7 @@ class Tester : public QObject { Q_OBJECT public: - void test( const QString &url ); + void test( const TQString &url ); private slots: void slotLoadingComplete( Loader *loader, Document doc, Status status ); diff --git a/akregator/src/librss/textinput.cpp b/akregator/src/librss/textinput.cpp index 432b773aa..04799fcaa 100644 --- a/akregator/src/librss/textinput.cpp +++ b/akregator/src/librss/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::fromLatin1("title"))).isNull()) d->title = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("description"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("description"))).isNull()) d->description = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("name")))) + if (!(elemText = extractNode(node, TQString::fromLatin1("name")))) d->name = elemText; - if (!(elemText = extractNode(node, QString::fromLatin1("link"))).isNull()) + if (!(elemText = extractNode(node, TQString::fromLatin1("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/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h index dd13c424b..fa16108ce 100644 --- a/akregator/src/librss/textinput.h +++ b/akregator/src/librss/textinput.h @@ -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::null 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::null 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::null, if no name is available. */ - QString name() const; + TQString name() const; /** * RSS 0.90 and upwards diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index dec831814..41996fd8f 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -11,13 +11,13 @@ #include "tools_p.h" #include <krfcdate.h> -#include <qdom.h> +#include <tqdom.h> #include <kcharsets.h> -#include <qregexp.h> +#include <tqregexp.h> namespace RSS { -time_t parseISO8601Date(const QString &s) +time_t 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) @@ -30,19 +30,19 @@ time_t parseISO8601Date(const QString &s) return KRFCDate::parseDateISO8601(s + "T12:00:00"); } -QString childNodesAsXML(const QDomNode& parent) +TQString childNodesAsXML(const TQDomNode& parent) { - QDomNodeList list = parent.childNodes(); - QString str; - QTextStream ts( &str, IO_WriteOnly ); + TQDomNodeList list = parent.childNodes(); + TQString str; + TQTextStream ts( &str, IO_WriteOnly ); for (uint i = 0; i < list.count(); ++i) ts << list.item(i); return str.stripWhiteSpace(); } -static QString plainTextToHtml(const QString& plainText) +static TQString plainTextToHtml(const TQString& plainText) { - QString str(plainText); + TQString str(plainText); str.replace("&", "&"); str.replace("\"", """); str.replace("<", "<"); @@ -53,46 +53,46 @@ static QString plainTextToHtml(const QString& plainText) enum ContentFormat { Text, HTML, XML, Binary }; -static ContentFormat mapTypeToFormat(const QString& modep, const QString& typep, const QString& src) +static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& typep, const TQString& src) { - QString mode = modep.isNull() ? "escaped" : modep; - QString type = typep; + TQString mode = modep.isNull() ? "escaped" : modep; + TQString type = typep; //"If neither the type attribute nor the src attribute is provided, //Atom Processors MUST behave as though the type attribute were //present with a value of "text"" if (type.isNull() && src.isEmpty()) - type = QString::fromUtf8("text"); + type = TQString::fromUtf8("text"); - if (type == QString::fromUtf8("html") - || type == QString::fromUtf8("text/html")) + if (type == TQString::fromUtf8("html") + || type == TQString::fromUtf8("text/html")) return HTML; - if (type == QString::fromUtf8("text") - || (type.startsWith(QString::fromUtf8("text/"), false) - && !type.startsWith(QString::fromUtf8("text/xml"), false)) + if (type == TQString::fromUtf8("text") + || (type.startsWith(TQString::fromUtf8("text/"), false) + && !type.startsWith(TQString::fromUtf8("text/xml"), false)) ) return Text; - QStringList xmltypes; - xmltypes.append(QString::fromUtf8("xhtml")); + TQStringList xmltypes; + xmltypes.append(TQString::fromUtf8("xhtml")); // XML media types as defined in RFC3023: - xmltypes.append(QString::fromUtf8("text/xml")); - xmltypes.append(QString::fromUtf8("application/xml")); - xmltypes.append(QString::fromUtf8("text/xml-external-parsed-entity")); - xmltypes.append(QString::fromUtf8("application/xml-external-parsed-entity")); - xmltypes.append(QString::fromUtf8("application/xml-dtd")); + xmltypes.append(TQString::fromUtf8("text/xml")); + xmltypes.append(TQString::fromUtf8("application/xml")); + xmltypes.append(TQString::fromUtf8("text/xml-external-parsed-entity")); + xmltypes.append(TQString::fromUtf8("application/xml-external-parsed-entity")); + xmltypes.append(TQString::fromUtf8("application/xml-dtd")); if (xmltypes.contains(type) - || type.endsWith(QString::fromUtf8("+xml"), false) - || type.endsWith(QString::fromUtf8("/xml"), false)) + || type.endsWith(TQString::fromUtf8("+xml"), false) + || type.endsWith(TQString::fromUtf8("/xml"), false)) return XML; return Binary; } -static QString extractAtomContent(const QDomElement& e) +static TQString extractAtomContent(const TQDomElement& e) { ContentFormat format = mapTypeToFormat(e.attribute("mode"), e.attribute("type"), @@ -111,20 +111,20 @@ static QString extractAtomContent(const QDomElement& e) return childNodesAsXML(e).simplifyWhiteSpace(); case Binary: default: - return QString(); + return TQString(); } - return QString(); + return TQString(); } -QString extractNode(const QDomNode &parent, const QString &elemName, bool isInlined) +TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined) { - QDomNode node = parent.namedItem(elemName); + TQDomNode node = parent.namedItem(elemName); if (node.isNull()) - return QString::null; + return TQString::null; - QDomElement e = node.toElement(); - QString result = e.text().stripWhiteSpace(); // let's assume plain text + TQDomElement e = node.toElement(); + TQString result = e.text().stripWhiteSpace(); // let's assume plain text if (elemName == "content") // we have Atom here { @@ -135,47 +135,47 @@ QString extractNode(const QDomNode &parent, const QString &elemName, bool isInli bool hasPre = result.contains("<pre>", false) || result.contains("<pre ", false); bool hasHtml = hasPre || result.contains("<"); // FIXME: test if we have html, should be more clever -> regexp if(!isInlined && !hasHtml) // perform nl2br if not a inline elt and it has no html elts - result = result = result.replace(QChar('\n'), "<br />"); + result = result = result.replace(TQChar('\n'), "<br />"); if(!hasPre) // strip white spaces if no <pre> result = result.simplifyWhiteSpace(); } - return result.isEmpty() ? QString::null : result; + return result.isEmpty() ? TQString::null : result; } -QString extractTitle(const QDomNode & parent) +TQString extractTitle(const TQDomNode & parent) { - QDomNode node = parent.namedItem(QString::fromLatin1("title")); + TQDomNode node = parent.namedItem(TQString::fromLatin1("title")); if (node.isNull()) - return QString::null; + return TQString::null; - QString result = node.toElement().text(); + TQString result = node.toElement().text(); - result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(QRegExp("<[^>]*>"), "").remove("\\")); + result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(TQRegExp("<[^>]*>"), "").remove("\\")); result = result.simplifyWhiteSpace(); if (result.isEmpty()) - return QString::null; + return TQString::null; return result; } -static void authorFromString(const QString& strp, QString& name, QString& email) +static void authorFromString(const TQString& strp, TQString& name, TQString& email) { - QString str = strp.stripWhiteSpace(); + TQString str = strp.stripWhiteSpace(); if (str.isEmpty()) return; // look for something looking like a mail address ( "foo@bar.com", // "<foo@bar.com>") and extract it - QRegExp remail("<?([^@\\s<]+@[^>\\s]+)>?"); // FIXME: user "proper" regexp, + TQRegExp remail("<?([^@\\s<]+@[^>\\s]+)>?"); // FIXME: user "proper" regexp, // search kmail source for it int pos = remail.search(str); if (pos != -1) { - QString all = remail.cap(0); + TQString all = remail.cap(0); email = remail.cap(1); str.replace(all, ""); // remove mail address } @@ -190,7 +190,7 @@ static void authorFromString(const QString& strp, QString& name, QString& email) // str is of the format "Foo M. Bar (President)", // we should not cut anything. - QRegExp rename("^\\(([^\\)]*)\\)"); + TQRegExp rename("^\\(([^\\)]*)\\)"); pos = rename.search(name); @@ -199,32 +199,32 @@ static void authorFromString(const QString& strp, QString& name, QString& email) name = rename.cap(1); } - name = name.isEmpty() ? QString() : name; - email = email.isEmpty() ? QString() : email; + name = name.isEmpty() ? TQString() : name; + email = email.isEmpty() ? TQString() : email; } -QString parseItemAuthor(const QDomElement& element, Format format, Version version) +TQString parseItemAuthor(const TQDomElement& element, Format format, Version version) { - QString name; - QString email; + TQString name; + TQString email; - QDomElement dcCreator = element.namedItem("dc:creator").toElement(); + TQDomElement dcCreator = element.namedItem("dc:creator").toElement(); if (!dcCreator.isNull()) authorFromString(dcCreator.text(), name, email); else if (format == AtomFeed) { - QDomElement atomAuthor = element.namedItem("author").toElement(); + TQDomElement atomAuthor = element.namedItem("author").toElement(); if (atomAuthor.isNull()) atomAuthor = element.namedItem("atom:author").toElement(); if (!atomAuthor.isNull()) { - QDomElement atomName = atomAuthor.namedItem("name").toElement(); + TQDomElement atomName = atomAuthor.namedItem("name").toElement(); if (atomName.isNull()) atomName = atomAuthor.namedItem("atom:name").toElement(); name = atomName.text().stripWhiteSpace(); - QDomElement atomEmail = atomAuthor.namedItem("email").toElement(); + TQDomElement atomEmail = atomAuthor.namedItem("email").toElement(); if (atomEmail.isNull()) atomEmail = atomAuthor.namedItem("atom:email").toElement(); email = atomEmail.text().stripWhiteSpace(); @@ -239,7 +239,7 @@ QString parseItemAuthor(const QDomElement& element, Format format, Version versi name = email; if (!email.isNull()) - return QString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name); + return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name); else return name; } diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h index a257da8a6..9fad6f9e2 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -29,11 +29,11 @@ namespace RSS unsigned int count; }; - QString extractNode(const QDomNode &parent, const QString &elemName, bool isInlined=true); - QString extractTitle(const QDomNode &parent); - QString childNodesAsXML(const QDomNode& parent); - time_t parseISO8601Date(const QString &s); - QString parseItemAuthor(const QDomElement& element, Format format, Version version); + TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true); + TQString extractTitle(const TQDomNode &parent); + TQString childNodesAsXML(const TQDomNode& parent); + time_t parseISO8601Date(const TQString &s); + TQString parseItemAuthor(const TQDomElement& element, Format format, Version version); } #endif // LIBRSS_TOOLS_P_H |