4 files changed, 49 insertions, 24 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 749d9f6..336c3e8 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -216,34 +216,38 @@ bool CalendarLocal::addEvent( Event *event )
 void CalendarLocal::deleteEvent( Event *event )
 {
     if ( mUndoIncidence ) delete mUndoIncidence;
     mUndoIncidence = event->clone();
     if ( mEventList.removeRef( event ) ) {
         setModified( true );
     }
 }
 
 
 Event *CalendarLocal::event( const QString &uid )
 {
-
-  Event *event;
-
-  for ( event = mEventList.first(); event; event = mEventList.next() ) {
-      if ( event->uid() == uid && event->calEnabled() ) {
-      return event;
+    Event *event;
+    Event *retVal = 0;
+    for ( event = mEventList.first(); event; event = mEventList.next() ) {
+        if ( event->calEnabled() && event->uid() == uid ) {
+            if ( retVal ) {
+                if ( retVal->calID() > event->calID() ) {
+                    retVal = event;
+                }
+            } else {
+                retVal = event;
+            }
+        }
     }
-  }
-
-  return 0;
+  return retVal;
 }
 bool CalendarLocal::addTodoNoDup( Todo *todo )
 {
   Todo * eve;
     for ( eve = mTodoList.first(); eve ; eve = mTodoList.next() ) {
         if ( *eve == *todo ) {
             //qDebug("duplicate todo found! not inserted! ");
             return false;
         }
     }
     return addTodo( todo );
 }
@@ -328,30 +332,38 @@ QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
 }
 Event *CalendarLocal::event( QString syncProf,  QString id )
 {
   Event *todo;
   for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
       if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
 }
 Todo *CalendarLocal::todo( const QString &uid )
 {
-  Todo *todo;
+  Todo *todo;;
+  Todo *retVal = 0;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
-    if ( todo->calEnabled() && todo->uid() == uid ) return todo;
+      if ( todo->calEnabled() && todo->uid() == uid ) {
+          if ( retVal ) {
+                if ( retVal->calID() > todo->calID() ) {
+                    retVal = todo;
+                }
+            } else {
+                retVal = todo;
+            }
+      } 
   }
-
-  return 0;
+  return retVal;
 }
 QString CalendarLocal::nextSummary() const
 {
     return mNextSummary;
 }
 QDateTime CalendarLocal::nextAlarmEventDateTime()  const
 {
     return mNextAlarmEventDateTime;
 }
 void  CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted)
 {
     //mNextAlarmIncidence
@@ -777,29 +789,36 @@ Journal *CalendarLocal::journal( const QDate &date )
 {
 //  kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl;
 
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
       if ( it->calEnabled() && it->dtStart().date() == date )
       return it;
 
   return 0;
 }
 
 Journal *CalendarLocal::journal( const QString &uid )
 {
-  for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
-    if ( it->calEnabled() && it->uid() == uid )
-      return it;
-
-  return 0;
+    Journal * retVal = 0;
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        if ( it->calEnabled() && it->uid() == uid ) {
+            if ( retVal ) {
+                if ( retVal->calID() > it->calID() ) {
+                    retVal = it;
+                }
+            } else {
+                retVal = it;
+            }
+        }
+    return retVal;
 }
 
 QPtrList<Journal> CalendarLocal::journals()
 {
     QPtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 void CalendarLocal::setCalendarRemove( int id )
 {
    
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index 3510c7d..72f70c2 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -153,39 +153,39 @@ bool CalFilter::filterIncidence(Incidence *incidence)
         break;
     default:
         return false;
         break;
     }
     }
 
     //  kdDebug(5800) << "CalFilter::filterEvent(): " << event->getSummary() << endl;
 
   if (mCriteria & ShowCategories) {
     for (QStringList::Iterator it = mCategoryList.begin();
          it != mCategoryList.end(); ++it ) {
-      QStringList incidenceCategories = incidence->categories();
-      for (QStringList::Iterator it2 = incidenceCategories.begin();
-           it2 != incidenceCategories.end(); ++it2 ) {
+        //QStringList incidenceCategories = incidence->categories();
+      for (QStringList::Iterator it2 = incidence->categoriesP()->begin();
+           it2 != incidence->categoriesP()->end(); ++it2 ) {
         if ((*it) == (*it2)) {
           return true;
         }
       }
     }
     return false;
   } else {
     for (QStringList::Iterator it = mCategoryList.begin();
          it != mCategoryList.end(); ++it ) {
-      QStringList incidenceCategories = incidence->categories();
-      for (QStringList::Iterator it2 = incidenceCategories.begin();
-           it2 != incidenceCategories.end(); ++it2 ) {
+        //QStringList incidenceCategories = incidence->categories();
+      for (QStringList::Iterator it2 = incidence->categoriesP()->begin();
+           it2 != incidence->categoriesP()->end(); ++it2 ) {
         if ((*it) == (*it2)) {
           return false;
         }
       }
     }
     return true;
   }
     
 //  kdDebug(5800) << "CalFilter::filterEvent(): passed" << endl;
   
   return true;
 }
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 4382416..11f7ecc 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -387,24 +387,29 @@ void Incidence::setCategories(const QString &catStr)
 
   if (catStr.isEmpty()) return;
 
   mCategories = QStringList::split(",",catStr);
 
   QStringList::Iterator it;
   for(it = mCategories.begin();it != mCategories.end(); ++it) {
     *it = (*it).stripWhiteSpace();
   }
   checkCategories();
   updated();
 }
+// using this makes filtering 3 times faster
+QStringList* Incidence::categoriesP()
+{
+  return &mCategories;
+}
 
 QStringList Incidence::categories() const
 {
   return mCategories;
 }
 
 QString Incidence::categoriesStr()
 {
   return mCategories.join(",");
 }
 QString Incidence::categoriesStrWithSpace()
 {
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index fc97ce9..c88ba2f 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -148,24 +148,25 @@ class Incidence : public IncidenceBase
     /** sets the event's short summary. */
     void setSummary(const QString &summary);
     /** returns a reference to the event's summary. */
     QString summary() const;
 
     /** set event's applicable categories */
     void setCategories(const QStringList &categories, bool setForRelations = false);
     void addCategories(const QStringList &categories, bool addToRelations = false);
     /** set event's categories based on a comma delimited string */
     void setCategories(const QString &catStr);
     /** return categories in a list */
     QStringList categories() const;
+    QStringList* categoriesP();
     /** return categories as a comma separated string */
     QString categoriesStr();
     QString categoriesStrWithSpace();
 
     /** point at some other event to which the event relates. This function should
      *  only be used when constructing a calendar before the related Event
      *  exists. */
     void setRelatedToUid(const QString &);
     /** what event does this one relate to? This function should
      *  only be used when constructing a calendar before the related Event
      *  exists. */
     QString relatedToUid() const;