summaryrefslogtreecommitdiffabout
path: root/korganizer/koprefs.h
Side-by-side diff
Diffstat (limited to 'korganizer/koprefs.h') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.h25
1 files changed, 15 insertions, 10 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index a9ac52f..33eda60 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -95,14 +95,10 @@ class KOPrefs : public KPimPrefs
int mDefaultFormat;
int mMailClient;
QString mTimeZone;
- QString mTimeZoneId;
//QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius
//int mTimeZoneOffset; // e.g. -240 min
- bool mUseDaylightsaving;
- int mDaylightsavingStart;
- int mDaylightsavingEnd;
int mStartTime;
int mDefaultDuration;
int mAlarmTime;
int mDaylightSavings;
@@ -269,16 +265,10 @@ class KOPrefs : public KPimPrefs
bool mTodoViewUsesForegroundColor;
bool mMonthViewUsesForegroundColor;
bool mHightlightDateTimeEdit;
- int mPreferredLanguage;
bool mUseQuicksave;
- int mPreferredTime;
- int mPreferredDate;
- bool mWeekStartsOnSunday;
bool mShortDateInViewer;
- QString mUserDateFormatLong;
- QString mUserDateFormatShort;
QStringList mLocationDefaults;
QStringList mEventSummaryUser;
QStringList mTodoSummaryUser;
@@ -288,8 +278,23 @@ class KOPrefs : public KPimPrefs
int mAlarmSuspendTime;
int mAlarmSuspendCount;
int mAlarmBeepInterval;
+
+ //US I copied the following settings into KPimGlobalPrefs
+ // that allows us later to easily remove the settings from here.
+ int mPreferredDate;
+ QString mUserDateFormatLong;
+ QString mUserDateFormatShort;
+ int mPreferredLanguage;
+ int mPreferredTime;
+ bool mWeekStartsOnSunday;
+ QString mTimeZoneId;
+ bool mUseDaylightsaving;
+ int mDaylightsavingStart;
+ int mDaylightsavingEnd;
+
+
private:
QDict<QColor> mCategoryColors;
QColor mDefaultCategoryColor;