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.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 9749ba3..576edf9 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -348,8 +348,17 @@ class KOPrefs : public KPimPrefs
QPtrList<KopiCalendarFile> mCalendars;
int mNextAvailableCalendar;
bool mGlobalUpdateDisabled;
+
+ bool mDetectConflicts;
+ bool mCheckConflictsAllDayAllDay;
+ bool mCheckConflictsAllDayNonAD;
+ bool mCheckConflictsNonADAllDay;
+ bool mCheckConflictsNonADNonAD;
+ QString mFilterConflictEditItem;
+ QString mFilterConflictAllItem;
+
private:
QDict<QColor> mCategoryColors;
QArray<KopiCalendarFile*> mDefCalColors;
QColor mDefaultCategoryColor;