author | zautrix <zautrix> | 2005-04-17 14:27:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-17 14:27:55 (UTC) |
commit | b411ec2d8961d07c3e2e9aefc9e04322b7851859 (patch) (side-by-side diff) | |
tree | 79e2a70f1ad32562456b0bfa03aa2b916095fbb0 /korganizer/koglobals.cpp | |
parent | 2d81c75c4ffb8f144ae58e90e68496500d07a19e (diff) | |
download | kdepimpi-b411ec2d8961d07c3e2e9aefc9e04322b7851859.zip kdepimpi-b411ec2d8961d07c3e2e9aefc9e04322b7851859.tar.gz kdepimpi-b411ec2d8961d07c3e2e9aefc9e04322b7851859.tar.bz2 |
qdebugcleanup
-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 @@ -23,99 +23,70 @@ #include <qapplication.h> #include <kdebug.h> #include <kglobal.h> #include <kconfig.h> #include <kstandarddirs.h> #include <kglobalsettings.h> #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() { if (!mSelf) { mSelf = new KOGlobals; } return mSelf; } KOGlobals::KOGlobals() { KConfig *cfg = KOGlobals::config(); 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() { static KConfig *mConfig = 0; if (!mConfig) { KOPrefs *p = KOPrefs::instance(); mConfig = p->getConfig(); //mConfig = new KConfig( locateLocal( "config", "korganizerrc" ) ); } return mConfig; } 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; int w = wid->frameSize().width(); int h = wid->frameSize().height(); QRect desk = KGlobalSettings::desktopGeometry(wid); if ( w > desk.width() ) { w = desk.width(); resized = true; } |