diff options
Diffstat (limited to 'akregator/src/librss')
-rw-r--r-- | akregator/src/librss/article.cpp | 4 | ||||
-rw-r--r-- | akregator/src/librss/article.h | 12 | ||||
-rw-r--r-- | akregator/src/librss/category.cpp | 8 | ||||
-rw-r--r-- | akregator/src/librss/category.h | 4 | ||||
-rw-r--r-- | akregator/src/librss/document.cpp | 24 | ||||
-rw-r--r-- | akregator/src/librss/document.h | 8 | ||||
-rw-r--r-- | akregator/src/librss/enclosure.cpp | 4 | ||||
-rw-r--r-- | akregator/src/librss/enclosure.h | 4 | ||||
-rw-r--r-- | akregator/src/librss/feeddetector.cpp | 4 | ||||
-rw-r--r-- | akregator/src/librss/feeddetector.h | 4 | ||||
-rw-r--r-- | akregator/src/librss/global.h | 2 | ||||
-rw-r--r-- | akregator/src/librss/image.h | 7 | ||||
-rw-r--r-- | akregator/src/librss/loader.cpp | 6 | ||||
-rw-r--r-- | akregator/src/librss/loader.h | 18 | ||||
-rw-r--r-- | akregator/src/librss/testlibrss.cpp | 6 | ||||
-rw-r--r-- | akregator/src/librss/testlibrss.h | 7 | ||||
-rw-r--r-- | akregator/src/librss/textinput.h | 6 | ||||
-rw-r--r-- | akregator/src/librss/tools_p.cpp | 24 | ||||
-rw-r--r-- | akregator/src/librss/tools_p.h | 6 |
19 files changed, 82 insertions, 76 deletions
diff --git a/akregator/src/librss/article.cpp b/akregator/src/librss/article.cpp index 59949244b..14e0bb125 100644 --- a/akregator/src/librss/article.cpp +++ b/akregator/src/librss/article.cpp @@ -261,9 +261,9 @@ TQString Article::meta(const TQString &key) const return d->meta[key]; } -KURLLabel *Article::widget(TQWidget *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/akregator/src/librss/article.h b/akregator/src/librss/article.h index 611dd408f..833b224a4 100644 --- a/akregator/src/librss/article.h +++ b/akregator/src/librss/article.h @@ -90,7 +90,7 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The headline of this article, or TQString::null if + * @return The headline of this article, or TQString() if * no headline was available. */ TQString title() const; @@ -106,7 +106,7 @@ namespace RSS /** * RSS 0.91 and upwards - * @return A story synopsis, or TQString::null if no description + * @return A story synopsis, or TQString() if no description * was available. */ TQString description() const; @@ -124,7 +124,7 @@ namespace RSS /** * RSS 2.0 and upwards - * @return If this article GUID is permalink. Has no meaning when guid() is TQString::null. + * @return If this article GUID is permalink. Has no meaning when guid() is TQString(). */ bool guidIsPermaLink() const; @@ -145,10 +145,10 @@ namespace RSS 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 tqcontains the + * 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 TQToolTip attached @@ -158,7 +158,7 @@ namespace RSS * Note that you have to delete the KURLLabel object returned by * this method yourself. */ - KURLLabel *widget(TQWidget *parent = 0, const char *name = 0) const; + KURLLabel *widget(TQWidget *tqparent = 0, const char *name = 0) const; typedef TQMap<TQString, TQString> MetaInfoMap; diff --git a/akregator/src/librss/category.cpp b/akregator/src/librss/category.cpp index 6dc63d3bb..c020655ce 100644 --- a/akregator/src/librss/category.cpp +++ b/akregator/src/librss/category.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "category.h" @@ -116,12 +116,12 @@ bool Category::operator==(const Category &other) const TQString Category::category() const { - return !d->isNull ? d->category : TQString::null; + return !d->isNull ? d->category : TQString(); } TQString Category::domain() const { - return !d->isNull ? d->domain : TQString::null; + return !d->isNull ? d->domain : TQString(); } } // namespace RSS diff --git a/akregator/src/librss/category.h b/akregator/src/librss/category.h index 9baec64e5..0c40e418f 100644 --- a/akregator/src/librss/category.h +++ b/akregator/src/librss/category.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LIBRSS_RSS_CATEGORY_H diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 170ceaa7e..696802ec7 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -105,7 +105,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else d->valid=true; - attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString::null); + attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString()); if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed")) { d->format=AtomFeed; @@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) if (d->format==UnknownFormat) { - attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString::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 @@ -183,27 +183,27 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->link = extractLink(channelNode, d->format); - /* 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. */ - TQDomNode 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(TQString::tqfromLatin1("item")).isNull()) - parentNode = rootNode; + tqparentNode = rootNode; else - parentNode = channelNode; + tqparentNode = channelNode; } // image and textinput aren't supported by Atom.. handle in case feed provides - TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image")); + TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = parentNode.namedItem(TQString::tqfromLatin1("textinput")); + n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); @@ -214,7 +214,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) else tagName=TQString::tqfromLatin1("item"); - for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { + 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, d->version)); @@ -224,7 +224,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private) d->copyright = elemText; if (d->format == AtomFeed) - elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString::null); + elemText = rootNode.toElement().attribute(TQString::tqfromLatin1("xml:lang"), TQString()); else elemText = extractNode(channelNode, TQString::tqfromLatin1("language")); @@ -541,7 +541,7 @@ TQString Document::verbVersion() const case vAtom_0_1: return TQString::tqfromLatin1("0.1"); case vAtom_1_0: return TQString::tqfromLatin1("1.0"); } - return TQString::null; + return TQString(); } TQString Document::title() const diff --git a/akregator/src/librss/document.h b/akregator/src/librss/document.h index 55ac264cc..7a94e59d4 100644 --- a/akregator/src/librss/document.h +++ b/akregator/src/librss/document.h @@ -83,7 +83,7 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The title of the RSS document, or TQString::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. */ @@ -91,7 +91,7 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The description of the RSS document, or TQString::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. @@ -158,7 +158,7 @@ namespace RSS /** * RSS 0.91 and upwards * @return A copyright of the information contained in the RSS - * document, or TQString::null if no copyright is available. + * document, or TQString() if no copyright is available. */ TQString copyright() const; @@ -203,7 +203,7 @@ namespace RSS * 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 TQString::null if this information isn't available. + * channel, or TQString() if this information isn't available. * @see managingEditor() */ TQString webMaster() const; diff --git a/akregator/src/librss/enclosure.cpp b/akregator/src/librss/enclosure.cpp index 864c19fce..666162683 100644 --- a/akregator/src/librss/enclosure.cpp +++ b/akregator/src/librss/enclosure.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "enclosure.h" diff --git a/akregator/src/librss/enclosure.h b/akregator/src/librss/enclosure.h index e15c86782..154f8bc06 100644 --- a/akregator/src/librss/enclosure.h +++ b/akregator/src/librss/enclosure.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LIBRSS_RSS_ENCLOSURE_H diff --git a/akregator/src/librss/feeddetector.cpp b/akregator/src/librss/feeddetector.cpp index 4407ff09f..099cc2a79 100644 --- a/akregator/src/librss/feeddetector.cpp +++ b/akregator/src/librss/feeddetector.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqregexp.h> diff --git a/akregator/src/librss/feeddetector.h b/akregator/src/librss/feeddetector.h index 94eab63b4..e5a036906 100644 --- a/akregator/src/librss/feeddetector.h +++ b/akregator/src/librss/feeddetector.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LIBRSS_FEEDDETECTOR_H diff --git a/akregator/src/librss/global.h b/akregator/src/librss/global.h index 33c7a03b7..397a4aac0 100644 --- a/akregator/src/librss/global.h +++ b/akregator/src/librss/global.h @@ -42,7 +42,7 @@ namespace RSS * Possible status values returned by the signal * Loader::loadingComplete(). */ - enum Status { + enum tqStatus { Success, /** * Nothing went wrong so far, but you still have to check * what values are returned by the classes since it's not diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h index 41f7a33de..1df799ff3 100644 --- a/akregator/src/librss/image.h +++ b/akregator/src/librss/image.h @@ -31,9 +31,10 @@ namespace RSS * is via Document::image(). * @see Document::image() */ - class KDE_EXPORT Image : public QObject + class KDE_EXPORT Image : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -83,7 +84,7 @@ namespace RSS /** * RSS 0.90 and upwards - * @return The 'caption' of this image, or TQString::null if no + * @return The 'caption' of this image, or TQString() if no * caption is available. */ TQString title() const; @@ -112,7 +113,7 @@ namespace RSS /** * RSS 0.91 and upwards * @return A description of what this picture shows, or - * TQString::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. */ diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 74467d01c..edc384323 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -268,7 +268,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), object, slot); return loader; } @@ -326,13 +326,13 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success) d->retriever = NULL; Document rssDoc; - Status status = Success; + tqStatus status = Success; if (success) { 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. */ diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index e958239f2..2129bc792 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -32,9 +32,10 @@ namespace RSS * a new retrieval algorithm which can then be plugged into the RSS loader. * @see Loader, FileRetriever, OutputRetriever */ - class KDE_EXPORT DataRetriever : public QObject + class KDE_EXPORT DataRetriever : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -89,6 +90,7 @@ namespace RSS class KDE_EXPORT FileRetriever : public DataRetriever { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -160,6 +162,7 @@ namespace RSS class OutputRetriever : public DataRetriever { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -208,8 +211,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), + * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, tqStatus))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -233,7 +236,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. @@ -251,9 +254,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 KDE_EXPORT Loader : public QObject + class KDE_EXPORT Loader : public TQObject { Q_OBJECT + TQ_OBJECT friend class someClassWhichDoesNotExist; public: /** @@ -318,9 +322,9 @@ namespace RSS * the case if you intend to call getPixmap() on Document::image()! * @param status A status byte telling whether there were any problems * while retrieving or parsing the data. - * @see Document, Status + * @see Document, tqStatus */ - void loadingComplete(Loader *loader, Document doc, Status status); + void loadingComplete(Loader *loader, Document doc, tqStatus status); private slots: void slotRetrieverDone(const TQByteArray &data, bool success); diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index 7d88c3d1f..571717ae3 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -19,12 +19,12 @@ static const KCmdLineOptions options[] = void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, tqStatus ) ), + this, TQT_SLOT( slotLoadingComplete( Loader *, Document, tqStatus ) ) ); loader->loadFrom( url, new FileRetriever ); } -void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) +void Tester::slotLoadingComplete( Loader *loader, Document doc, tqStatus status ) { if ( status == Success ) { diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h index b84a0ab5c..18e18327d 100644 --- a/akregator/src/librss/testlibrss.h +++ b/akregator/src/librss/testlibrss.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 TQString &url ); private slots: - void slotLoadingComplete( Loader *loader, Document doc, Status status ); + void slotLoadingComplete( Loader *loader, Document doc, tqStatus status ); }; #endif diff --git a/akregator/src/librss/textinput.h b/akregator/src/librss/textinput.h index 9cc873cf3..cbf5bdb6d 100644 --- a/akregator/src/librss/textinput.h +++ b/akregator/src/librss/textinput.h @@ -79,7 +79,7 @@ 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 TQString::null if no title is available. + * of the text input, or TQString() if no title is available. */ TQString title() const; @@ -87,7 +87,7 @@ namespace RSS * 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 TQString::null if no description is + * the text input, or TQString() if no description is * available. */ TQString description() const; @@ -95,7 +95,7 @@ namespace RSS /** * RSS 0.90 and upwards * @return The name of the text input (what's this for?) of the - * text input, or TQString::null, if no name is available. + * text input, or TQString(), if no name is available. */ TQString name() const; diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index e12bea883..48b4a52a0 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -24,15 +24,15 @@ time_t parseISO8601Date(const TQString &s) 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"); } -TQString childNodesAsXML(const TQDomNode& parent) +TQString childNodesAsXML(const TQDomNode& tqparent) { - TQDomNodeList list = parent.childNodes(); + TQDomNodeList list = tqparent.childNodes(); TQString str; TQTextStream ts( &str, IO_WriteOnly ); for (uint i = 0; i < list.count(); ++i) @@ -117,11 +117,11 @@ static TQString extractAtomContent(const TQDomElement& e) return TQString(); } -TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined) +TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined) { - TQDomNode node = parent.namedItem(elemName); + TQDomNode node = tqparent.namedItem(elemName); if (node.isNull()) - return TQString::null; + return TQString(); TQDomElement e = node.toElement(); TQString result = e.text().stripWhiteSpace(); // let's assume plain text @@ -140,14 +140,14 @@ TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isI result = result.simplifyWhiteSpace(); } - return result.isEmpty() ? TQString::null : result; + return result.isEmpty() ? TQString() : result; } -TQString extractTitle(const TQDomNode & parent) +TQString extractTitle(const TQDomNode & tqparent) { - TQDomNode node = parent.namedItem(TQString::tqfromLatin1("title")); + TQDomNode node = tqparent.namedItem(TQString::tqfromLatin1("title")); if (node.isNull()) - return TQString::null; + return TQString(); TQString result = node.toElement().text(); @@ -155,7 +155,7 @@ TQString extractTitle(const TQDomNode & parent) result = result.simplifyWhiteSpace(); if (result.isEmpty()) - return TQString::null; + return TQString(); return result; } @@ -186,7 +186,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema // after removing the email, str might have // the format "(Foo M. Bar)". We cut off - // parentheses if there are any. However, if + // tqparentheses if there are any. However, if // str is of the format "Foo M. Bar (President)", // we should not cut anything. diff --git a/akregator/src/librss/tools_p.h b/akregator/src/librss/tools_p.h index 47be905d8..900baa225 100644 --- a/akregator/src/librss/tools_p.h +++ b/akregator/src/librss/tools_p.h @@ -29,9 +29,9 @@ namespace RSS unsigned int count; }; - TQString extractNode(const TQDomNode &parent, const TQString &elemName, bool isInlined=true); - TQString extractTitle(const TQDomNode &parent); - TQString childNodesAsXML(const TQDomNode& parent); + TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool isInlined=true); + TQString extractTitle(const TQDomNode &tqparent); + TQString childNodesAsXML(const TQDomNode& tqparent); time_t parseISO8601Date(const TQString &s); TQString parseItemAuthor(const TQDomElement& element, Format format, Version version); } |