Merge lp:~renatofilho/qtorganizer5-eds/fix-1362781-rtm into lp:qtorganizer5-eds/rtm-14.09

[Renato Araujo Oliveira Filho]

Fixed recurrence rule limit date.

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed UI labels, did you update the pot file? NO LABEL

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGED

Unmerged revisions

68. By Renato Araujo Oliveira Filho on 2015-01-06

Fixed recurrence rule limit date.

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2014-10-09 03:39:33 +0000
+++ organizer/qorganizer-eds-engine.cpp	2015-01-06 14:05:12 +0000
@@ -1999,11 +1999,20 @@
                     break;
             }
 
-            if (qRule.limitDate().isValid()) {
-                rule->until = icaltime_from_timet(QDateTime(qRule.limitDate()).toTime_t(), TRUE);
+            switch (qRule.limitType()) {
+            case QOrganizerRecurrenceRule::DateLimit:
+                if (qRule.limitDate().isValid()) {
+                    rule->until = icaltime_from_timet(QDateTime(qRule.limitDate()).toTime_t(), TRUE);
+                }
+                break;
+            case QOrganizerRecurrenceRule::CountLimit:
+                if (qRule.limitCount() > 0) {
+                    rule->count = qRule.limitCount();
+                }
+                break;
+            case QOrganizerRecurrenceRule::NoLimit:
+            default:
                 rule->count = ICAL_RECURRENCE_ARRAY_MAX;
-            } else if (qRule.limitCount() > 0) {
-                rule->count = qRule.limitCount();
             }
 
             QSet<int> positions = qRule.positions();

=== modified file 'tests/unittest/recurrence-test.cpp'
--- tests/unittest/recurrence-test.cpp	2014-10-06 18:07:08 +0000
+++ tests/unittest/recurrence-test.cpp	2015-01-06 14:05:12 +0000
@@ -171,7 +171,7 @@
         filter.setCollectionId(m_collection.id());
         items = m_engine->items(filter,
                                 QDateTime(QDate(2013, 11, 30), QTime(0,0,0)),
-                                QDateTime(QDate(2014, 1, 1), QTime(0,0,0)),
+                                QDateTime(QDate(2015, 1, 1), QTime(0,0,0)),
                                 100,
                                 sort,
                                 hint,