diff -r 3f8368f032cf -r e3554c9069b6 profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp --- a/profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp Tue Feb 02 00:22:03 2010 +0200 +++ b/profilesservices/ProfileEngine/EngSrc/CProfileImpl.cpp Fri Mar 19 09:34:30 2010 +0200 @@ -19,9 +19,15 @@ // INCLUDE FILES #include "CProfileImpl.h" +#include "CProfileNameImpl.h" +#include "CProfileTonesImpl.h" +#include "CProfileExtraTonesImpl.h" +#include "CProfileExtraSettingsImpl.h" +#include "CProfilePresenceImpl.h" +#include "ProfileEngUtils.h" +#include "ProfileEnginePrivateCRKeys.h" #include #include -#include #include #include #include @@ -30,16 +36,9 @@ #include #include #include -#include "CProfileNameImpl.h" -#include "CProfileTonesImpl.h" -#include "CProfileExtraTonesImpl.h" -#include "CProfileExtraSettingsImpl.h" -#include "CProfilePresenceImpl.h" -#include "MProfilesLocalFeatures.h" -#include "MProfileUtilitySingleton.h" -#include "ProfilesVariant.hrh" -#include "ProfileEngUtils.h" -#include "ProfileEnginePrivateCRKeys.h" +#include +#include +#include #include // CONSTANTS @@ -216,39 +215,7 @@ const TArray CProfileImpl::AlertForL() { TInt contactIdListCount( iAlertFor.Count() ); - if( contactIdListCount > 0 ) - { - // create CPbkContactEngine - CPbkContactEngine* contactEngine = CPbkContactEngine::NewL( &iFs ); - CleanupStack::PushL( contactEngine ); - CContactIdArray* groupIds = contactEngine->Database().GetGroupIdListL(); - if( !groupIds ) - { // There are no groups in Contacts db -> clear the alert for IDs: - iAlertFor.Reset(); - } - else - { - CleanupStack::PushL( groupIds ); - TInt err; - for( TInt i( 0 ) ; i < contactIdListCount ; ++i ) - { - err = groupIds->Find( iAlertFor[i] ); - - if( err == KErrNotFound ) - { - // remove this - iAlertFor.Remove( i ); - --contactIdListCount; - --i; - err = KErrNone; - } - User::LeaveIfError( err ); - } - CleanupStack::PopAndDestroy(); // groupIds - } - CleanupStack::PopAndDestroy(); // contactEngine - } return iAlertFor.Array(); }