# HG changeset patch # User William Roberts # Date 1279812771 -3600 # Node ID e6894b852bc65fac898516ce5da6d5cec318e5a2 # Parent 4b686cfad39d876a02db517759bc739c9be711ab# Parent e08ac1a3ba2bd74f7061bed8c6cd3b6b58c692dd Catchup to latest Symbian^4 diff -r e08ac1a3ba2b -r e6894b852bc6 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml diff -r e08ac1a3ba2b -r e6894b852bc6 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml diff -r e08ac1a3ba2b -r e6894b852bc6 calendarengines/agnversit2/inc/CleanupPointerArray.inl --- a/calendarengines/agnversit2/inc/CleanupPointerArray.inl Mon Jul 19 15:12:16 2010 +0100 +++ b/calendarengines/agnversit2/inc/CleanupPointerArray.inl Thu Jul 22 16:32:51 2010 +0100 @@ -35,7 +35,7 @@ @internalTechnology */ template -inline void TCleanupPointerArray::ResetAndDestroy(TAny* aPtr) +inline void TCleanupPointerArray::ResetAndDestroy(TAny* aPtr) { reinterpret_cast(aPtr)->ResetAndDestroy(); } diff -r e08ac1a3ba2b -r e6894b852bc6 calendarui/regionalplugins/calenregionalutil/inc/calenlunarlocalizedinfo.h --- a/calendarui/regionalplugins/calenregionalutil/inc/calenlunarlocalizedinfo.h Mon Jul 19 15:12:16 2010 +0100 +++ b/calendarui/regionalplugins/calenregionalutil/inc/calenlunarlocalizedinfo.h Thu Jul 22 16:32:51 2010 +0100 @@ -51,13 +51,13 @@ */ IMPORT_C const TDesC& GetField( TField aField ); - IMPORT_C const TDesC& Festival() { return iFestival; } - IMPORT_C const TDesC& SolarTerm() { return iSolarTerm; } - IMPORT_C const TDesC& FullLunarDate() { return iFullLunarDate; } - IMPORT_C const TDesC& LunarYear() { return iLunarYear; } - IMPORT_C const TDesC& LunarMonthAndDay() { return iLunarMonthAndDay; } - IMPORT_C const TDesC& AnimalYear() { return iAnimalYear; } - IMPORT_C const TDesC& GregorianDate() { return iGregorianDate; } + const TDesC& Festival() { return iFestival; } + const TDesC& SolarTerm() { return iSolarTerm; } + const TDesC& FullLunarDate() { return iFullLunarDate; } + const TDesC& LunarYear() { return iLunarYear; } + const TDesC& LunarMonthAndDay() { return iLunarMonthAndDay; } + const TDesC& AnimalYear() { return iAnimalYear; } + const TDesC& GregorianDate() { return iGregorianDate; } private: CCalenLunarLocalizedInfo(); diff -r e08ac1a3ba2b -r e6894b852bc6 clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml diff -r e08ac1a3ba2b -r e6894b852bc6 clock/clockui/clockviews/data/xml/clockmainview.docml diff -r e08ac1a3ba2b -r e6894b852bc6 clock/clockui/clockviews/data/xml/worldclockview.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockviews/data/xml/worldclockview.docml Thu Jul 22 16:32:51 2010 +0100 @@ -0,0 +1,78 @@ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r e08ac1a3ba2b -r e6894b852bc6 notes/data/xml/notescollectionsview.docml diff -r e08ac1a3ba2b -r e6894b852bc6 notes/data/xml/notesfavoriteview.docml diff -r e08ac1a3ba2b -r e6894b852bc6 notes/data/xml/notesmainview.docml diff -r e08ac1a3ba2b -r e6894b852bc6 notes/data/xml/notesnoteview.docml diff -r e08ac1a3ba2b -r e6894b852bc6 notes/data/xml/notestodoview.docml diff -r e08ac1a3ba2b -r e6894b852bc6 notes/notesui/noteseditor/data/xml/notesnoteeditor.docml diff -r e08ac1a3ba2b -r e6894b852bc6 pimappservices/calendar/shared/src/agmdebug.cpp --- a/pimappservices/calendar/shared/src/agmdebug.cpp Mon Jul 19 15:12:16 2010 +0100 +++ b/pimappservices/calendar/shared/src/agmdebug.cpp Thu Jul 22 16:32:51 2010 +0100 @@ -26,7 +26,7 @@ EXPORT_C void AgmDebug::DebugLog(const char* aFmt,...) { - VA_LIST list = {NULL}; + VA_LIST list; VA_START(list,aFmt); TPtrC8 fmt8((const TText8*)aFmt); @@ -49,7 +49,7 @@ EXPORT_C void AgmDebug::DebugLogTimeStampL(const char* aFmt,...) { - VA_LIST list = {NULL}; + VA_LIST list; VA_START(list,aFmt); TPtrC8 fmt8((const TText8*)aFmt);