summaryrefslogtreecommitdiffabout
path: root/korganizer/calendarview.h
Side-by-side diff
Diffstat (limited to 'korganizer/calendarview.h') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 51eb1d4..706d05d 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -508,6 +508,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
/** Select a view or adapt the current view to display the specified dates. */
void showDates( const KCal::DateList & );
void selectWeekNum ( int );
+ void checkConflictForEvent();
public:
// show a standard warning
@@ -534,6 +535,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
void setScrollBarStep(int val );
protected:
+ Event *mConflictingEvent;
void schedule(Scheduler::Method, Incidence *incidence = 0);
// returns KMsgBox::OKCandel()