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
@@ -83,38 +83,34 @@ class KOPrefs : public KPimPrefs
     QString mAdditional;
 
     bool    mEmailControlCenter;
 
     bool    mBcc;
     bool    mAutoSave;
     int     mAutoSaveInterval;
     bool    mConfirm;
 
     bool    mEnableGroupScheduling;
     bool    mEnableProjectView;
 
     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;
 
     int     mWorkingHoursStart;
     int     mWorkingHoursEnd;
     bool    mExcludeHolidays;
     bool    mExcludeSaturdays;
     bool    mMarcusBainsShowSeconds;
 
     QFont   mTimeBarFont;
     QFont   mMonthViewFont;
     QFont   mAgendaViewFont;
     QFont   mMarcusBainsFont;
     QFont   mTimeLabelsFont;
@@ -257,48 +253,57 @@ class KOPrefs : public KPimPrefs
     bool mViewChangeHoldFullscreen;
     bool mViewChangeHoldNonFullscreen;
     bool mCenterOnCurrentTime;
     bool mSetTimeToDayStartAt;
     bool mHighlightCurrentDay;
     bool mUseHighlightLightColor;
     bool mListViewMonthTimespan;
     bool mWNViewShowsParents;
     bool mWNViewShowLocation;
     bool mTodoViewShowsPercentage;
     bool mTodoViewUsesCatColors;
     bool mTodoViewUsesSmallFont;
     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;
 
     bool mUseInternalAlarmNotification;
     int mAlarmPlayBeeps;
     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;
 
     QFont mDefaultTimeBarFont;
     QFont mDefaultViewFont;
     QFont mDefaultMonthViewFont;
 
     QString mName;
     QString mEmail;
 };
 
 #endif