void ComingUpViewItemModel::updateEvents() { modelEventList->clear(); theData.clear(); QList<CalendarEvent*>& eventList = viewManager.GetEvents(); //int eventsLimitedTo = 3, comingUpEventCnt=0; int cntr = eventList.count(); QDate today = QDate::currentDate(); KDateTime daysLaterDate = KDateTime(today.addDays(7)); for ( int i=0;i<cntr;i++ ) { CalendarEvent* event = eventList.at(i); bool addEvent = false; //Bug#7244 Author: [email protected] //Fixed the issue with display of "coming up" "Later" event list if ( restrictEventCount == true ) { if ( today == event->StartDate().date() ) { addEvent = true; } } else { if(event->StartDate().date() > daysLaterDate.date()) { break; } else if ( event->StartDate().date() > today ) { addEvent = true; } } if ( addEvent ) { modelEventList->append(event); QString dateString; //Bug#7320 Author: [email protected] //This piece of code fixes the issue with display of event //If today: Display time followed by event //Else Display Date-time followed by event if(today == event->StartDate().date()) { dateString = event->StartDate().toString ( "hh:mm AP" ); } else { dateString = event->StartDate().toString ( "ddd dd hh:mm AP" ); } QString alarmsString("alarmOFF"); if ( event->Alarm() ) { alarmsString = "alarmON"; } theData.append( QStringList() << dateString << event->Description() << alarmsString ); } } }