diff options
| author | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-10-12 16:27:54 +1000 |
|---|---|---|
| committer | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-10-12 16:28:23 +1000 |
| commit | e4dda28cf585afc6e2dc9a6b2cb7f55d65529cc8 (patch) | |
| tree | 5b520d718adafcbfbf65fc50ef9cda1a809df070 /doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp | |
| parent | 15681bcc32110e901e7a612500f73c3bcd3112a3 (diff) | |
| parent | e4a6e91fb4384fded8eca123c0d407e9c840a639 (diff) | |
Merge branch '1.1' into new-renames2
Conflicts:
plugins/organizer/maemo5/qorganizerasynchprocess.cpp
plugins/organizer/maemo5/qorganizermaemo5.cpp
plugins/organizer/maemo5/qorganizermaemo5_p.h
plugins/organizer/skeleton/qorganizerskeleton.cpp
plugins/organizer/skeleton/qorganizerskeleton_p.h
plugins/organizer/symbian/organizeritemrequestserviceprovider.cpp
plugins/organizer/symbian/qorganizersymbian_p.h
plugins/organizer/symbian/transform/organizereventtimerangetransform.cpp
plugins/organizer/symbian/transform/organizertodotimerangetransform.cpp
plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp
src/organizer/details/qorganizeritemdetails.cpp
src/organizer/engines/qorganizeritemmemorybackend.cpp
src/organizer/engines/qorganizeritemmemorybackend_p.h
src/organizer/items/qorganizerevent.cpp
src/organizer/items/qorganizerevent.h
src/organizer/items/qorganizertodo.h
src/organizer/qorganizermanager.cpp
src/organizer/qorganizermanagerengine.cpp
src/organizer/qorganizermanagerengine.h
src/organizer/qorganizermanagerenginefactory.cpp
src/organizer/qorganizerrecurrencerule.cpp
src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp
src/organizer/requests/qorganizeritemoccurrencefetchrequest.h
src/organizer/requests/qorganizeritemrequests_p.h
Diffstat (limited to 'doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp')
| -rw-r--r-- | doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp index 105ef178de..212e22bfa5 100644 --- a/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp +++ b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp @@ -90,7 +90,7 @@ void snippets() //! [Creating a recurrent event] //! [Retrieving occurrences of a particular recurrent event within a time period] - QList<QOrganizerItem> instances = defaultManager.itemInstances(recEvent, startDateTime, endDateTime); + QList<QOrganizerItem> instances = defaultManager.itemOccurrences(recEvent, startDateTime, endDateTime); //! [Retrieving occurrences of a particular recurrent event within a time period] qDebug() << "dumping retrieved instances:"; foreach(const QOrganizerItem& currInst, instances) @@ -101,12 +101,12 @@ void snippets() //! [Retrieving the next 5 occurrences of a particular recurrent event] - instances = defaultManager.itemInstances(recEvent, QDateTime::currentDateTime(), QDateTime(), 5); + instances = defaultManager.itemOccurrences(recEvent, QDateTime::currentDateTime(), QDateTime(), 5); //! [Retrieving the next 5 occurrences of a particular recurrent event] //! [Retrieving the next 10 occurrences of any item (Agenda View)] // XXX TODO: make this more convenient. - // QOIM::itemInstances(count) ? + // QOIM::itemOccurrences(count) ? //! [Retrieving the next 10 occurrences of any item (Agenda View)] //! [Creating a non-recurrent entry] @@ -130,9 +130,9 @@ void snippets() //! [Retrieving any entry (not occurrence) which matches a search criteria] //! [Creating an exception to a particular recurrent event] - // the following line should be made simpler via QOIM::itemInstances(item, startDateTime, endDateTime, count)... + // the following line should be made simpler via QOIM::itemOccurrences(item, startDateTime, endDateTime, count)... /* FIXME: correct the example - QOrganizerEventOccurrence nextMarshmallowMeeting = QOrganizerEventOccurrence(defaultManager.itemInstances().value(0)); // should use dfil. + QOrganizerEventOccurrence nextMarshmallowMeeting = QOrganizerEventOccurrence(defaultManager.itemOccurrences().value(0)); // should use dfil. nextMarshmallowMeeting.setStartDateTime(QDateTime::fromString("13.05.2010 18:00:00", "dd.MM.yy hh:mm:ss")); nextMarshmallowMeeting.setEndDateTime(QDateTime::fromString("13.05.2010 20:00:00", "dd.MM.yy hh:mm:ss")); nextMarshmallowMeeting.addComment("The next meeting will go for an hour longer (starting one "\ |