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 --- kalarm/kalarmd/alarmdaemon.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'kalarm/kalarmd/alarmdaemon.h') diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h index 54e7980a2..c05a4725c 100644 --- a/kalarm/kalarmd/alarmdaemon.h +++ b/kalarm/kalarmd/alarmdaemon.h @@ -32,8 +32,9 @@ class ADCalendar; class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface { Q_OBJECT + TQ_OBJECT public: - AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0); + AlarmDaemon(bool autostart, TQObject* tqparent = 0, const char* name = 0); private slots: //#ifdef AUTOSTART_KALARM @@ -66,8 +67,8 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface void reloadCal(ADCalendar*, bool reset); void checkAlarms(ADCalendar*); bool notifyEvent(ADCalendar*, const TQString& eventID); - void notifyCalStatus(const ADCalendar*); - void setTimerStatus(); + void notifyCaltqStatus(const ADCalendar*); + void setTimertqStatus(); static TQString expandURL(const TQString& urlString); TQTimer* mAlarmTimer; -- cgit v1.2.1