From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/kmaccount.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'kmail/kmaccount.h') diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 2872b1110..02df2421c 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -49,12 +49,13 @@ using KPIM::ProgressItem; class KMAccount; typedef TQValueList< ::KMAccount* > AccountList; -class KMPrecommand : public QObject +class KMPrecommand : public TQObject { Q_OBJECT + TQ_OBJECT public: - KMPrecommand(const TQString &precommand, TQObject *parent = 0); + KMPrecommand(const TQString &precommand, TQObject *tqparent = 0); virtual ~KMPrecommand(); bool start(); @@ -73,6 +74,7 @@ protected: class KMAccount: public TQObject, public KAccount { Q_OBJECT + TQ_OBJECT friend class KMail::AccountManager; friend class ::KMail::FolderJob; friend class ::AccountsPageReceivingTab; // part of the config dialog @@ -81,7 +83,7 @@ class KMAccount: public TQObject, public KAccount public: virtual ~KMAccount(); - enum CheckStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted, + enum ChecktqStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted, CheckError }; /** The default check interval */ @@ -90,7 +92,7 @@ public: /** * Returns type of the account */ - virtual TQString type() const { return TQString::null; } + virtual TQString type() const { return TQString(); } /** * Reimplemented, set account name @@ -229,7 +231,7 @@ public: * @param newMail true if new mail arrived * @param status the status of the mail check */ - void checkDone( bool newMail, CheckStatus status ); + void checkDone( bool newMail, ChecktqStatus status ); /** * Abort all running mail checks. Used when closing the last KMMainWin. @@ -258,7 +260,7 @@ signals: * @param newMail true if there was new mail * @param status the status of the mail check **/ - virtual void finishedCheck( bool newMail, CheckStatus status ); + virtual void finishedCheck( bool newMail, ChecktqStatus status ); /** * Emitted after the mail check is finished. -- cgit v1.2.1