diff -r 6b5524b4f673 -r 38bb213f60ba phonebookui/Phonebook2/UIControls/inc/CPbk2ContactEditorDlgImpl.h --- a/phonebookui/Phonebook2/UIControls/inc/CPbk2ContactEditorDlgImpl.h Wed Sep 15 11:56:55 2010 +0300 +++ b/phonebookui/Phonebook2/UIControls/inc/CPbk2ContactEditorDlgImpl.h Wed Oct 13 14:15:33 2010 +0300 @@ -354,7 +354,7 @@ void ClearControls(); TBool ContactHasAddress(TPbk2FieldGroupId aAddressGroup); void AddGroupFieldsL(TPbk2FieldGroupId aGroupId); - TBool AreAllFieldsEmptyL(); + TBool AreAllFieldsEmpty(); TBool IsUIDataChanged(); TBool IsAddressValidated(TPbk2FieldGroupId aGroupId); void DeleteActiveAddressGeoCoords(); @@ -373,8 +373,6 @@ TEventCode aType ); void RestorePrevNaviDecoratorL(); void RestoreStatusPaneL(); - static TInt DelayDlgDeleteCallBack( TAny* aCallBack ); - void DelayDlgDelete(); private: // Data structures @@ -465,24 +463,15 @@ HBufC* iTitleText; /// Own: Converts text between Unicode and SMS 7-bit CCnvCharacterSetConverter* iConverter; + /// Ref: A pointer to stack variable in CloseDialog() for knowing + /// if the destructor has already been called + TBool* iDestroyedPtr; /// Ref: Holds the TopMost NaviDecorator before pushing /// the empty one on to the top. /// Doesnt Own. CAknNavigationDecorator* iPrevNaviDecorator; TInt iCurrentstatuspane; - /// Own: For asynchronously delete editordlg. - CIdle* iDelayDelete; - // Own: Exit app ui after deleting the dialog - TBool iExitApp; - // Own: Whether the partial input screen is Opened - TBool iIsInputPaneOpen; - /// Ref: A pointer to stack variable in CloseDialog() for knowing - /// if the destructor has already been called - TBool* iDestroyedPtrForCloseDlg; - /// Ref: A pointer to stack variable in AddItemToContactL() for knowing - /// if the destructor has already been called - TBool* iDestroyedPtrForAddItem; }; #endif // CPBK2CONTACTEDITORDLGIMPL_H