diff -r f979ecb2b13e -r 42814f902fe6 calendarui/editors/src/CalenDescription.cpp --- a/calendarui/editors/src/CalenDescription.cpp Tue Feb 02 10:12:19 2010 +0200 +++ b/calendarui/editors/src/CalenDescription.cpp Fri Feb 19 22:49:53 2010 +0200 @@ -16,7 +16,6 @@ */ // system includes -#include #include #include #include @@ -193,17 +192,24 @@ TBool processed = EFalse; switch( aCommandId ) { - case ECalenCmdAddDescription: - { - processed = HandleAddDescriptionL(); - break; - } case ECalenCmdShowDescription: { ShowL(); processed = ETrue; break; } + case ECalenCmdAddDescriptionNew: + { + AddNewL(); + processed = ETrue; + break; + } + case ECalenCmdAddDescriptionExisting: + { + AddMemoL(); + processed = ETrue; + break; + } case ECalenCmdRemoveDescription: { RemoveL(); @@ -577,45 +583,4 @@ TRACE_EXIT_POINT; return desc; } - -// ---------------------------------------------------------------------------- -// CCalenDescription::HandleAddDescriptionL -// Handles the command ECalenAddDescription -// ---------------------------------------------------------------------------- -// -TBool CCalenDescription::HandleAddDescriptionL() - { - TRACE_ENTRY_POINT; - - TBool processed = EFalse; - TInt selectedIndex(0); - CAknListQueryDialog* dlg = new (ELeave) CAknListQueryDialog(&selectedIndex); - dlg->PrepareLC( R_DESCRIPTION_LIST_QUERY ); - - if(dlg->RunLD()) - { - switch(selectedIndex) - { - case 0: //ECalenCmdAddDescriptionNew - { - AddNewL(); - processed = ETrue; - break; - } - case 1: //ECalenCmdAddDescriptionExisting - { - AddMemoL(); - processed = ETrue; - break; - } - default: - break; - } - } - - TRACE_EXIT_POINT; - - return processed; - - } // End of File