summaryrefslogtreecommitdiffstats
path: root/knewsticker/common/newsengine.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /knewsticker/common/newsengine.h
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
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
Diffstat (limited to 'knewsticker/common/newsengine.h')
-rw-r--r--knewsticker/common/newsengine.h11
1 files changed, 7 insertions, 4 deletions
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<Article> Ptr;
typedef TQValueList<Ptr> 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,