| -rw-r--r-- | korganizer/koglobals.cpp | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index 8016034..9ece77f 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -31,25 +31,12 @@ #include <klocale.h> #include <kcalendarsystem.h> -#ifndef KORG_NOKALARMD -#include "kalarmdclient.h" -#endif -#include "simplealarmclient.h" #include "koglobals.h" #include "koprefs.h" -class NopAlarmClient : public AlarmClient -{ - public: - void startDaemon() {} - bool setCalendars( const QStringList & ) { return false; } - bool addCalendar( const QString & ) { return false; } - bool removeCalendar( const QString & ) { return false; } - bool reloadCalendar( const QString & ) { return false; } -}; KOGlobals *KOGlobals::mSelf = 0; KOGlobals *KOGlobals::self() @@ -67,19 +54,8 @@ KOGlobals::KOGlobals() cfg->setGroup("General"); mCalendarSystem = KGlobal::locale()->calendar(); - cfg->setGroup("AlarmDaemon"); - QString alarmClient = cfg->readEntry( "Daemon", "kalarmd" ); - if ( alarmClient == "simple" ) { - mAlarmClient = new SimpleAlarmClient; -#ifndef KORG_NOKALARMD - } else if ( alarmClient == "kalarmd" ) { - mAlarmClient = new KalarmdClient; -#endif - } else { - mAlarmClient = new NopAlarmClient; - } } KConfig* KOGlobals::config() { @@ -93,21 +69,16 @@ KConfig* KOGlobals::config() } KOGlobals::~KOGlobals() { - delete mAlarmClient; + } const KCalendarSystem *KOGlobals::calendarSystem() const { return mCalendarSystem; } -AlarmClient *KOGlobals::alarmClient() const -{ - return mAlarmClient; -} - void KOGlobals::fitDialogToScreen( QWidget *wid, bool force ) { bool resized = false; |