diff options
Diffstat (limited to 'kalarm/daemon.h')
| -rw-r--r-- | kalarm/daemon.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kalarm/daemon.h b/kalarm/daemon.h index a43d7a42e..df3fdd4d2 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -51,11 +51,11 @@ class Daemon : public TQObject 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); @@ -68,15 +68,15 @@ class Daemon : public TQObject 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 @@ -88,7 +88,7 @@ class Daemon : public TQObject 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(); @@ -104,7 +104,7 @@ class Daemon : public TQObject 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 |