diff -r 12af337248b1 -r bd7edf625bdd alarmui/src/AlmAlarmInfo.cpp
--- a/alarmui/src/AlmAlarmInfo.cpp	Tue Aug 31 15:13:43 2010 +0300
+++ b/alarmui/src/AlmAlarmInfo.cpp	Wed Sep 01 12:32:31 2010 +0100
@@ -31,11 +31,11 @@
 
 const TInt KAlarmNoteTextLength( 256 ); // KGlobalNoteTextLength
 const TInt KDateTimeDescLen( 20 ); // enough space for // "16:54" or "1:56 am" or "10.10.2010"
-// const TInt KClockAlarmType( -1 );
-// _LIT( KWesternSubjectSeparator, ", " );
-// _LIT( KArabicSubjectSeparator, " \x060c" );
-// _LIT( KNewLine, "\n" );
-// _LIT( KSpace, " " );
+const TInt KClockAlarmType( -1 );
+_LIT( KWesternSubjectSeparator, ", " );
+_LIT( KArabicSubjectSeparator, " \x060c" );
+_LIT( KNewLine, "\n" );
+_LIT( KSpace, " " );
 
 
 // ============================ MEMBER FUNCTIONS ===============================
@@ -45,9 +45,6 @@
 : iAlarmUtils( aAlarmUtils )
 {
     TRACE_ENTRY_POINT;
-    
-    iAlarmInfo = new SAlarmInfo;
-    
     TRACE_EXIT_POINT;
 }
 
@@ -59,12 +56,6 @@
     delete iLocation;
     delete iDate;
     delete iTime;
-    
-    if( iAlarmInfo )
-        {
-        delete iAlarmInfo;
-        iAlarmInfo = NULL;
-        }
     TRACE_EXIT_POINT;
 }
 
@@ -72,9 +63,9 @@
 // Get the text for the alarm query.
 // -----------------------------------------------------------------------------
 //
-void CAlmAlarmInfo::GetAlarmLabelL( const TASShdAlarm& /*aAlarm*/, 
-                                    HBufC*& /*aText*/, 
-                                    const CAlarmUtils::TAlarmType& /*aAlarmType*/ )
+void CAlmAlarmInfo::GetAlarmLabelL( const TASShdAlarm& aAlarm, 
+                                    HBufC*& aText, 
+                                    const CAlarmUtils::TAlarmType& aAlarmType )
 {
     /**
      *  Clock alarm:                  Other/unknown alarms:
@@ -110,8 +101,8 @@
     TRACE_ENTRY_POINT;
 
     // cover UI params...
-    // TInt coverUIAlarmType( KClockAlarmType );
-/*
+    TInt coverUIAlarmType( KClockAlarmType );
+
     switch( aAlarmType )
     {
         case CAlarmUtils::EAlarmTypeClock:
@@ -124,7 +115,7 @@
         case CAlarmUtils::EAlarmTypeOther:
         {
             // For Cover UI - unknown alarms are handled as calendar meetings
-            // coverUIAlarmType = CCalEntry::EAppt;
+            coverUIAlarmType = CCalEntry::EAppt;
 
             GetCoverUIParamsForClockAndOtherL( aAlarm, CAlarmUtils::EAlarmTypeOther );
             SetupUnknownAlarmL( aText );
@@ -148,7 +139,7 @@
 
             // entry type
             CCalEntry::TType type = entry->EntryTypeL();
-            // coverUIAlarmType = type;
+            coverUIAlarmType = type;
 
             GetCoverUIParamsForCalendarL( entry );
 
@@ -192,13 +183,14 @@
                                                                      *iCoverDate, 
                                                                      *iSubject, 
                                                                      *iLocation );
+    // ... and cleanup
     delete iSubject;   iSubject = NULL;
     delete iLocation;  iLocation = NULL;
     delete iDate;      iDate = NULL;
     delete iTime;      iTime = NULL;
     delete iCoverDate; iCoverDate = NULL;
     delete iCoverTime; iCoverTime = NULL;
-*/
+
     TRACE_EXIT_POINT;
 }
 
@@ -213,118 +205,10 @@
     TRACE_EXIT_POINT;
 }
 
-SAlarmInfo* CAlmAlarmInfo::GetAlarmInfo(TASShdAlarm aAlarm, CAlarmUtils::TAlarmType aAlarmType)
-{
-    // Based on the alarm type, get the appropriate information
-    switch( aAlarmType )
-        {
-        case CAlarmUtils::EAlarmTypeClock:
-            {
-            SetupClockAlarmL( aAlarm );
-            // Set the alarm type
-			iAlarmInfo->iAlarmAlertType = CAlarmUtils::EAlarmTypeClock;
-            }
-        break;
-
-        case CAlarmUtils::EAlarmTypeOther:
-            {
-            // TODO: Handle this case 
-            SetupUnknownAlarmL( aAlarm );
-            iAlarmInfo->iAlarmAlertType = CAlarmUtils::EAlarmTypeOther;
-            }
-        break;
-
-        case CAlarmUtils::EAlarmTypeCalendar:
-            {
-            // Check phone restore mode before creating agenda session
-            if( iAlarmUtils->IsPhoneInRestoreMode() )
-                {
-                User::Leave( KErrCancel );
-                }
-            // Set the alarm type
-            iAlarmInfo->iAlarmAlertType = CAlarmUtils::EAlarmTypeCalendar;
-            
-            // Fetch the calendar entry and instance time
-            CCalEntry* entry = NULL;
-            
-            // TODO: Use agenda interface to fetch the entry details
-            iAlarmUtils->FetchEntryL( entry );
-            CleanupStack::PushL( entry );
-            
-            const TTime instanceTime( iAlarmUtils->AlarmData().iInstanceTime.TimeLocalL() );
-
-            // Subject
-            iAlarmInfo->iSubject = HBufC::NewL( KAlarmNoteTextLength - KDateTimeDescLen );
-            iAlarmInfo->iSubject->Des().Append( entry->SummaryL().Left( iAlarmInfo->iSubject->Des().MaxLength() ) );
-            iAlarmInfo->iSubject->Des().TrimAll();
-
-            // Location
-            iAlarmInfo->iLocation = HBufC::NewL( Max( 0, KAlarmNoteTextLength - KDateTimeDescLen - iAlarmInfo->iSubject->Length() ) );
-            iAlarmInfo->iLocation->Des().Append( entry->LocationL().Left( iAlarmInfo->iLocation->Des().MaxLength() ) );
-            iAlarmInfo->iLocation->Des().TrimAll();
-
-            // Date
-            iAlarmInfo->iDate = instanceTime;
-
-            // Get the entry type
-            CCalEntry::TType type = entry->EntryTypeL();
-
-            // Based on the type of entry, get the information
-            switch( type )
-                {
-                case CCalEntry::EAppt:
-                case CCalEntry::EReminder:
-                    {
-                    // TODO : Format text based on type of entry
-                    // SetupAppointmentAlarmL( aAlarm );
-                    iAlarmInfo->iTime = instanceTime;
-                    iAlarmInfo->iIsTimed = ETrue;
-                    }
-                break;
-
-                case CCalEntry::ETodo:
-                    {
-                    // TODO : Format text based on type of entry
-                    //SetupToDoAlarmL( aAlarm );
-                    iAlarmInfo->iAlarmAlertType = CAlarmUtils::EAlarmTypeTodo;
-                    iAlarmInfo->iTime = TTime( 0 );
-                    iAlarmInfo->iIsTimed = EFalse;
-                    // No Location is there for todo alarms
-                    iAlarmInfo->iLocation = HBufC::NewL( 0 );
-                    }
-                break;
-                
-                case CCalEntry::EEvent:
-                    {
-                    // No time information for an all day event	
-                    iAlarmInfo->iTime = TTime( 0 );
-                    iAlarmInfo->iIsTimed = EFalse;
-                    }
-                break;
-                
-                default:
-                    {
-                    // TODO : Format text based on type of entry
-                    // SetupAnniversaryAlarmL( aAlarm );
-                    iAlarmInfo->iTime = TTime( 0 );
-                    }
-                break;
-                }
-            CleanupStack::PopAndDestroy( entry );
-            }
-        break;
-
-        default:
-            __ASSERT_DEBUG( EFalse, User::Invariant() );
-    }
-    return iAlarmInfo;
-}
-
 // =============================================================================
 // ALARM SETUP METHODS
 // =============================================================================
 
-/*
 // -----------------------------------------------------------------------------
 // Create alarm notification string for Clock alarm.
 // "[Clock alarm:][\n][time][\n][Description]"
@@ -503,7 +387,7 @@
     TRACE_EXIT_POINT;
 }
 
-*/
+
 
 // =============================================================================
 // STRING UTILITY FUNCTIONS
@@ -531,7 +415,6 @@
     TRACE_EXIT_POINT;
 }
 
-/*
 // -----------------------------------------------------------------------------
 // Create strings needed for calendar alarms.
 // AVKON global note can't (currently) show more than 256 characters.  So no 
@@ -633,42 +516,6 @@
     CleanupStack::PopAndDestroy( dateFormat );
     TRACE_EXIT_POINT;
 }
-*/
 
-void CAlmAlarmInfo::SetupUnknownAlarmL(TASShdAlarm /* aAlarm */)
-{
-    
-}
-
-void CAlmAlarmInfo::SetupClockAlarmL(TASShdAlarm aAlarm)
-{
-    // The alarm subject
-    iAlarmInfo->iSubject = aAlarm.Message().AllocL();
-    iAlarmInfo->iSubject->Des().TrimAll();
-
-    // Location must not be displayed for clock alarms
-    iAlarmInfo->iLocation = HBufC::NewL( 0 );
-
-    // The alarm time
-    iAlarmInfo->iTime = aAlarm.NextDueTime();
-
-    // Date must not be shown for clock alarms
-    iAlarmInfo->iDate = TTime( 0 );
-}
-
-void CAlmAlarmInfo::SetupAppointmentAlarmL(TASShdAlarm /* aAlarm */)
-{
-
-}
-
-void CAlmAlarmInfo::SetupToDoAlarmL(TASShdAlarm /* aAlarm */)
-{
-    
-}
-
-void CAlmAlarmInfo::SetupAnniversaryAlarmL(TASShdAlarm /* aAlarm */)
-{
-    
-}
 
 // End of File