Many bugfixes

1 files changed, 44 insertions, 12 deletions

diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index dd74e10..e84f672 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -107,4 +107,5 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
     // differ in the other settings, because one (or both) 
     // may be not initialized properly
+
     if ( recurs != r2.recurs
   ||   rFreq != r2.rFreq
@@ -123,16 +124,47 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
       return rDays == r2.rDays
       &&     rWeekStart == r2.rWeekStart;
-    case rMonthlyPos:
-      return rMonthPositions.count() == r2.rMonthPositions.count();
-    case rMonthlyDay:
-      return rMonthDays.count() == r2.rMonthDays.count();
-    case rYearlyPos:
-      return rYearNums.count() == r2.rYearNums.count()
-      &&     rMonthPositions.count() == r2.rMonthPositions.count();
-    case rYearlyMonth:
-        return rYearNums.count() == r2.rYearNums.count()
-        &&     mFeb29YearlyType == r2.mFeb29YearlyType;
-    case rYearlyDay:
-      return rYearNums == r2.rYearNums;
+  case rMonthlyPos: {
+      QPtrList<rMonthPos> MonthPositions = rMonthPositions;
+      QPtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
+      if ( !MonthPositions.count() )
+          return false;
+      if ( !MonthPositions2.count() )
+          return false;
+      return MonthPositions.first()->rPos == MonthPositions2.first()->rPos;
+  }
+  case rMonthlyDay: {
+      QPtrList<int> MonthDays = rMonthDays ; 
+      QPtrList<int> MonthDays2 = r2.rMonthDays ;  
+      if ( !MonthDays.count() )
+          return false;
+      if ( !MonthDays2.count() )
+          return false; 
+      return *MonthDays.first() == *MonthDays2.first() ;
+  }
+  case rYearlyPos: {
+
+      QPtrList<int> YearNums = rYearNums;
+      QPtrList<int> YearNums2 = r2.rYearNums;
+      if ( *YearNums.first() != *YearNums2.first() )
+          return false;
+      QPtrList<rMonthPos> MonthPositions = rMonthPositions;
+      QPtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
+      if ( !MonthPositions.count() )
+          return false;
+      if ( !MonthPositions2.count() )
+          return false;
+      return MonthPositions.first()->rPos == MonthPositions2.first()->rPos;
+     
+  }
+  case rYearlyMonth: {
+      QPtrList<int> YearNums = rYearNums;
+      QPtrList<int> YearNums2 = r2.rYearNums;
+      return ( *YearNums.first() == *YearNums2.first()  && mFeb29YearlyType == r2.mFeb29YearlyType);
+  }
+      case rYearlyDay: {
+      QPtrList<int> YearNums = rYearNums;
+      QPtrList<int> YearNums2 = r2.rYearNums;
+      return ( *YearNums.first() == *YearNums2.first() );
+      }
     case rNone:
     case rMinutely: