author | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
commit | 2cde25d8061acd536bccd698722952ce8555f5db (patch) (unidiff) | |
tree | 70f905e5de57b44c3503883b2f98925d9c92ef8b /korganizer/koprefs.h | |
parent | 645ceb7a95dce4716eb87a1b9191d3f3c1657be3 (diff) | |
download | kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.zip kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.gz kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.bz2 |
conflict res fix
-rw-r--r-- | korganizer/koprefs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 576edf9..bac8010 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -193,8 +193,9 @@ class KOPrefs : public KPimPrefs | |||
193 | int mAllDaySize; | 193 | int mAllDaySize; |
194 | bool mShowFullMenu; | 194 | bool mShowFullMenu; |
195 | bool mDailyRecur; | 195 | bool mDailyRecur; |
196 | bool mWeeklyRecur; | 196 | bool mWeeklyRecur; |
197 | bool mLongAllday; | ||
197 | bool mMonthDailyRecur; | 198 | bool mMonthDailyRecur; |
198 | bool mMonthWeeklyRecur; | 199 | bool mMonthWeeklyRecur; |
199 | bool mMonthShowIcons; | 200 | bool mMonthShowIcons; |
200 | bool mMonthShowTimes; | 201 | bool mMonthShowTimes; |
@@ -350,8 +351,9 @@ class KOPrefs : public KPimPrefs | |||
350 | bool mGlobalUpdateDisabled; | 351 | bool mGlobalUpdateDisabled; |
351 | 352 | ||
352 | 353 | ||
353 | bool mDetectConflicts; | 354 | bool mDetectConflicts; |
355 | bool mIncludeFree; | ||
354 | bool mCheckConflictsAllDayAllDay; | 356 | bool mCheckConflictsAllDayAllDay; |
355 | bool mCheckConflictsAllDayNonAD; | 357 | bool mCheckConflictsAllDayNonAD; |
356 | bool mCheckConflictsNonADAllDay; | 358 | bool mCheckConflictsNonADAllDay; |
357 | bool mCheckConflictsNonADNonAD; | 359 | bool mCheckConflictsNonADNonAD; |