From bd0f0feb2e1af8a346dc724c81f31214c52128e4 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 17 Aug 2005 22:44:12 +0000
Subject: conflict settings

---
(limited to 'korganizer/koprefs.h')

diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 9749ba3..576edf9 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -349,6 +349,15 @@ class KOPrefs : public KPimPrefs
     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;
--
cgit v0.9.0.2