From cdc55afb3d2c3ebd970843b7dce02acb1e6a189b Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 10 Jun 2005 20:13:31 +0000
Subject: many preparations for multiple calendars

---
(limited to 'libkcal/calfilter.cpp')

diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index 20078a7..3510c7d 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -78,6 +78,8 @@ void CalFilter::apply(QPtrList<Todo> *eventlist)
 }
 bool CalFilter::filterCalendarItem(Incidence *in)
 {
+    if ( !in->calEnabled() )
+        return false;
     if ( in->typeID() == eventID )
         return filterEvent( (Event*) in );
     else if ( in->typeID() == todoID )
@@ -88,6 +90,9 @@ bool CalFilter::filterCalendarItem(Incidence *in)
 }
 bool CalFilter::filterEvent(Event *event)
 {
+ 
+    if ( !event->calEnabled() )
+        return false;
     if (mCriteria & HideEvents) 
         return false;
   if (mCriteria & HideRecurring) {
@@ -98,12 +103,16 @@ bool CalFilter::filterEvent(Event *event)
 }
 bool CalFilter::filterJournal(Journal *j)
 {
+  if ( !j->calEnabled() )
+        return false;
   if (mCriteria & HideJournals) 
         return false;
   return true;
 }
 bool CalFilter::filterTodo(Todo *todo)
 {
+  if ( !todo->calEnabled() )
+        return false;
   if (mCriteria & HideTodos) 
         return false;
   if (mCriteria & HideCompleted) {
--
cgit v0.9.0.2