From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knewsticker/common/newsengine.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'knewsticker/common/newsengine.h') diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h index ffc5dd08..554b95fb 100644 --- a/knewsticker/common/newsengine.h +++ b/knewsticker/common/newsengine.h @@ -42,7 +42,7 @@ class KDE_EXPORT Article : public XMLNewsArticle, public KShared typedef KSharedPtr
Ptr; typedef TQValueList List; - Article(NewsSourceBase *, const TQString & = TQString::null, + Article(NewsSourceBase *, const TQString & = TQString(), const KURL & = KURL()); bool operator==(const Article &other) const; @@ -61,6 +61,7 @@ class KDE_EXPORT Article : public XMLNewsArticle, public KShared class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared { Q_OBJECT + TQ_OBJECT public: enum Subject { @@ -69,12 +70,12 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared }; struct Data { Data(const TQString &_name = I18N_NOOP("Unknown"), - const TQString &_sourceFile = TQString::null, - const TQString &_icon = TQString::null, + const TQString &_sourceFile = TQString(), + const TQString &_icon = TQString(), const Subject _subject = Computers, unsigned int _maxArticles = 10, bool _enabled = true, bool _isProgram = false, - const TQString &_language = TQString::fromLatin1("C")) + const TQString &_language = TQString::tqfromLatin1("C")) { name = _name; sourceFile = _sourceFile; @@ -135,6 +136,7 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared class KDE_EXPORT SourceFileNewsSource : public NewsSourceBase { Q_OBJECT + TQ_OBJECT public: SourceFileNewsSource(const NewsSourceBase::Data &, ConfigIface *); @@ -173,6 +175,7 @@ class KDE_EXPORT SourceFileNewsSource : public NewsSourceBase class KDE_EXPORT ProgramNewsSource : public NewsSourceBase { Q_OBJECT + TQ_OBJECT public: enum ErrorCode { NOERR = 0, EPERM, ENOENT, EIO = 5, E2BIG = 7, -- cgit v1.2.1