diff -r 579cc610882e -r ef813d54df51 calendarui/controller/src/calenactionuiutils.cpp --- a/calendarui/controller/src/calenactionuiutils.cpp Tue Jul 06 14:14:56 2010 +0300 +++ b/calendarui/controller/src/calenactionuiutils.cpp Wed Aug 18 09:47:38 2010 +0300 @@ -32,6 +32,10 @@ #include "caleninstanceid.h" #include "CleanupResetAndDestroy.h" #include "calendateutils.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "calenactionuiutilsTraces.h" +#endif // ----------------------------------------------------------------------------- // CCalenCommonUI::FindPossibleInstanceL @@ -42,10 +46,16 @@ AgendaEntry CalenActionUiUtils::findPossibleInstanceL(const TCalenInstanceId& id, AgendaUtil* agendaUtil ) { - TRACE_ENTRY_POINT; + OstTraceFunctionEntry0( CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_ENTRY ); - QList instances = agendaUtil->createEntryIdListForDay(id.mInstanceTime, - AgendaUtil::FilterFlags(AgendaUtil::IncludeAll)); + AgendaUtil::FilterFlags filter = + AgendaUtil::FilterFlags(AgendaUtil::IncludeAnniversaries | + AgendaUtil::IncludeAppointments | + AgendaUtil::IncludeEvents | + AgendaUtil::IncludeReminders | + AgendaUtil::IncludeIncompletedTodos); + QList instances = + agendaUtil->createEntryIdListForDay(id.mInstanceTime, filter); AgendaEntry result; // For instances finishing the next day (now possible with unified DateTime editor), @@ -78,7 +88,7 @@ } } - TRACE_EXIT_POINT; + OstTraceFunctionExit0( CALENACTIONUIUTILS_FINDPOSSIBLEINSTANCEL_EXIT ); return result; } @@ -94,15 +104,15 @@ AgendaEntry& entry, const bool status ) { - TRACE_ENTRY_POINT; - + OstTraceFunctionEntry0( CALENACTIONUIUTILS_SETTODOCOMPLETESTATUS_ENTRY ); + ASSERT( !entry.isNull() ); QDateTime now = QDateTime::currentDateTime(); // set as completed or restore and update the entry in the database - agendaUtil->setCompleted(entry, status, now) + agendaUtil->setCompleted(entry, status, now); - TRACE_EXIT_POINT; + OstTraceFunctionExit0( CALENACTIONUIUTILS_SETTODOCOMPLETESTATUS_EXIT ); } // End of file