[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/kcal
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2006-09-16 8:04:53
Message-ID: 1158393893.680564.1011.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 585063 by djarvie:

Fix recurTimesOn()


 M  +9 -5      recurrence.cpp  


--- trunk/KDE/kdepimlibs/kcal/recurrence.cpp #585062:585063
@@ -748,11 +748,14 @@
     }
   }
 
-  if ( startDate() == date ) times << startDateTime().time();
+  KDateTime dt = startDateTime().toTimeSpec( timeSpec );
+  if ( dt.date() == date )
+    times << dt.time();
   bool foundDate = false;
   for ( i = 0, end = mRDateTimes.count();  i < end;  ++i ) {
-    if ( mRDateTimes[i].date() == date ) {
-      times << mRDateTimes[i].time();
+    dt = mRDateTimes[i].toTimeSpec( timeSpec );
+    if ( dt.date() == date ) {
+      times << dt.time();
       foundDate = true;
     } else if (foundDate) break; // <= Assume that the rdatetime list is sorted
   }
@@ -764,8 +767,9 @@
   foundDate = false;
   TimeList extimes;
   for ( i = 0, end = mExDateTimes.count();  i < end;  ++i ) {
-    if ( mExDateTimes[i].date() == date ) {
-      extimes << mExDateTimes[i].time();
+    dt = mExDateTimes[i].toTimeSpec( timeSpec );
+    if ( dt.date() == date ) {
+      extimes << dt.time();
       foundDate = true;
     } else if (foundDate) break;
   }
[prev in list] [next in list] [prev in thread] [next in thread]