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/daemon.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'kalarm/daemon.h') diff --git a/kalarm/daemon.h b/kalarm/daemon.h index 58b34ecdf..fff7c7554 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -34,9 +34,10 @@ class AlarmEnableAction; class NotificationHandler; -class Daemon : public QObject +class Daemon : public TQObject { Q_OBJECT + TQ_OBJECT public: static void initialise(); static void createDcopHandler(); @@ -50,11 +51,11 @@ class Daemon : public QObject static void enableAutoStart(bool enable); static void notifyTimeChanged(); static void setAlarmsEnabled() { mInstance->setAlarmsEnabled(true); } - static void checkStatus() { checkIfRunning(); } + static void checktqStatus() { checkIfRunning(); } static bool monitoringAlarms(); static bool isRunning(bool startDaemon = true); static int maxTimeSinceCheck(); - static bool isRegistered() { return mStatus == REGISTERED; } + static bool isRegistered() { return mtqStatus == REGISTERED; } static void allowRegisterFailMsg() { mRegisterFailMsg = false; } static void queueEvent(const TQString& eventID); @@ -67,15 +68,15 @@ class Daemon : public QObject private slots: void slotCalendarSaved(AlarmCalendar*); void checkIfStarted(); - void slotStarted() { updateRegisteredStatus(true); } - void registerTimerExpired() { registrationResult((mStatus == REGISTERED), KAlarmd::FAILURE); } + void slotStarted() { updateRegisteredtqStatus(true); } + void registerTimerExpired() { registrationResult((mtqStatus == REGISTERED), KAlarmd::FAILURE); } void setAlarmsEnabled(bool enable); void timerCheckIfRunning(); void slotPreferencesChanged(); private: - enum Status // daemon status. KEEP IN THIS ORDER!! + enum tqStatus // daemon status. KEEP IN THIS ORDER!! { STOPPED, // daemon is not registered with DCOP RUNNING, // daemon is newly registered with DCOP @@ -87,7 +88,7 @@ class Daemon : public QObject static void registrationResult(bool reregister, int result, int version = 0); static void reload(); static void notifyEventHandled(const TQString& eventID, bool reloadCal); - static void updateRegisteredStatus(bool timeout = false); + static void updateRegisteredtqStatus(bool timeout = false); static void enableCalendar(bool enable); static void calendarIsEnabled(bool enabled); static bool checkIfRunning(); @@ -103,7 +104,7 @@ class Daemon : public QObject static int mStatusTimerCount; // countdown for fast status checking static int mStatusTimerInterval; // timer interval (seconds) for checking daemon status static int mStartTimeout; // remaining number of times to check if alarm daemon has started - static Status mStatus; // daemon status + static tqStatus mtqStatus; // daemon status static bool mRunning; // whether the alarm daemon is currently running static bool mCalendarDisabled; // monitoring of calendar is currently disabled by daemon static bool mEnableCalPending; // waiting to tell daemon to enable calendar @@ -119,8 +120,9 @@ class Daemon : public QObject class AlarmEnableAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: - AlarmEnableAction(int accel, TQObject* parent, const char* name = 0); + AlarmEnableAction(int accel, TQObject* tqparent, const char* name = 0); public slots: void setCheckedActual(bool); // set state and emit switched() signal virtual void setChecked(bool); // request state change and emit userClicked() signal -- cgit v1.2.1