# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269861956 -3600
# Node ID 43cbef41dd6d96f6ce5fc61fc646ffd0b73f2fb8
# Parent  022fc9a9f172a24746181633787809d2538b4216# Parent  0d213b5329c68054e1731caea9674fbcdf8e2bb6
Merge.

diff -r 0d213b5329c6 -r 43cbef41dd6d email/imum/Mtms/Inc/Imap4MtmUi.h
--- a/email/imum/Mtms/Inc/Imap4MtmUi.h	Sun Mar 14 13:09:10 2010 +0000
+++ b/email/imum/Mtms/Inc/Imap4MtmUi.h	Mon Mar 29 12:25:56 2010 +0100
@@ -596,7 +596,7 @@
         /**
         * DoFilteredPopulateL
         */
-        CMsvOperation* CImap4MtmUi::DoFilteredPopulateL(
+        CMsvOperation* DoFilteredPopulateL(
             TRequestStatus& aStatus,
             const CMsvEntrySelection& aSelection,
             TInt aFunctionId,
diff -r 0d213b5329c6 -r 43cbef41dd6d messagingappbase/mce/inc/MceDeliveryReportView.h
--- a/messagingappbase/mce/inc/MceDeliveryReportView.h	Sun Mar 14 13:09:10 2010 +0000
+++ b/messagingappbase/mce/inc/MceDeliveryReportView.h	Mon Mar 29 12:25:56 2010 +0100
@@ -150,7 +150,7 @@
          * C++ constructor
          *
          */
-        CMceDeliveryReportView::CMceDeliveryReportView( CMceSessionHolder& aSessionHolder );
+        CMceDeliveryReportView( CMceSessionHolder& aSessionHolder );
         /**
          * Constructor, second phase.
          */
diff -r 0d213b5329c6 -r 43cbef41dd6d messagingappbase/mcesettings/inc/MceSettingsMoveProgress.h
--- a/messagingappbase/mcesettings/inc/MceSettingsMoveProgress.h	Sun Mar 14 13:09:10 2010 +0000
+++ b/messagingappbase/mcesettings/inc/MceSettingsMoveProgress.h	Mon Mar 29 12:25:56 2010 +0100
@@ -93,7 +93,7 @@
     /**
     * Constructor
     */
-    CMceMoveProgress::CMceMoveProgress(
+    CMceMoveProgress(
     	CMsvSession*& aSession, MMsvSessionObserver& aObserver,
     	TInt& aSource, const TInt& aTarget, TBool aDeleteCopiedStore,
     	CMceGeneralSettingsDialog& aGeneralSettings, TBool aDeleteOnly);
diff -r 0d213b5329c6 -r 43cbef41dd6d messagingappbase/ncnlist/inc/NcnHandlerAudio.h
--- a/messagingappbase/ncnlist/inc/NcnHandlerAudio.h	Sun Mar 14 13:09:10 2010 +0000
+++ b/messagingappbase/ncnlist/inc/NcnHandlerAudio.h	Mon Mar 29 12:25:56 2010 +0100
@@ -155,7 +155,7 @@
 		 */
 		TBool IsBeepOnceSetL( const MProfile& aProfile ) const;	
 		 /* Plays Alert tone */
-		void CNcnHandlerAudio::StartPlayToneL();	
+		void StartPlayToneL();	
 		
     public:     // Data   
     protected:  // Data
diff -r 0d213b5329c6 -r 43cbef41dd6d mobilemessaging/mmsui/viewerinc/UniMmsViewerAppUi.h
--- a/mobilemessaging/mmsui/viewerinc/UniMmsViewerAppUi.h	Sun Mar 14 13:09:10 2010 +0000
+++ b/mobilemessaging/mmsui/viewerinc/UniMmsViewerAppUi.h	Mon Mar 29 12:25:56 2010 +0100
@@ -494,7 +494,7 @@
         * This function returns EFalse, if media is DRM protected and
         * no rights exist.
         */         
-        TBool CMmsViewerAppUi::MediaCanPlay(const CMsgMediaControl* aMedia,
+        TBool MediaCanPlay(const CMsgMediaControl* aMedia,
                                             const CUniObject* aMmsObject ) const;
 
 
diff -r 0d213b5329c6 -r 43cbef41dd6d mobilemessaging/msgmedia/src/MmsConformance.cpp
--- a/mobilemessaging/msgmedia/src/MmsConformance.cpp	Sun Mar 14 13:09:10 2010 +0000
+++ b/mobilemessaging/msgmedia/src/MmsConformance.cpp	Mon Mar 29 12:25:56 2010 +0100
@@ -195,7 +195,7 @@
 EXPORT_C TBool CMmsConformance::IsConformantMime( const TPtrC8& aMimeType )
     {
     LocalFuncPtr funcPtr = ResolveFunction( aMimeType );
-    return ( funcPtr != ResolveNonconformantAttachment );
+    return ( funcPtr != &CMmsConformance::ResolveNonconformantAttachment );
     }
 
 // -----------------------------------------------------------------------------
@@ -285,55 +285,55 @@
     //Resolve conf. status according to recognized MIME type
     if ( aMimeType.CompareF( KMsgMimeTextPlain ) == 0 )
         {
-        funcPtr = CMmsConformance::ResolveTextPlain;
+        funcPtr = &CMmsConformance::ResolveTextPlain;
         }
     else if ( iMmsVersion > KMmsVersion12 &&
               aMimeType.CompareF( KMsgMimeTextXhtml ) == 0 )
         {
-        funcPtr = ResolveTextXhtml;
+        funcPtr = &CMmsConformance::ResolveTextXhtml;
         }
     else if ( aMimeType.CompareF( KMsgMimeAudioAmr ) == 0 )
         {
-        funcPtr = ResolveAudioAmr;
+        funcPtr = &CMmsConformance::ResolveAudioAmr;
         }
     else if ( aMimeType.CompareF( KMsgMimeAudioSpMidi ) == 0 )
         {
-        funcPtr = ResolveAudioSpMidi;
+        funcPtr = &CMmsConformance::ResolveAudioSpMidi;
         }
     else if ( aMimeType.CompareF( KMsgMimeImageJpeg ) == 0 )
         {
-        funcPtr = ResolveImageJpeg;
+        funcPtr = &CMmsConformance::ResolveImageJpeg;
         }
     else if ( aMimeType.CompareF( KMsgMimeImageGif ) == 0 )
         {
-        funcPtr = ResolveImageGif;
+        funcPtr = &CMmsConformance::ResolveImageGif;
         }
     else if ( aMimeType.CompareF( KMsgMimeImageWbmp ) == 0 )
         {
-        funcPtr = ResolveImageWbmp;
+        funcPtr = &CMmsConformance::ResolveImageWbmp;
         }
     else if ( aMimeType.CompareF( KMsgMimeImagePng ) == 0 )
         {
-        funcPtr = ResolveImagePng;
+        funcPtr = &CMmsConformance::ResolveImagePng;
         }
     else if (!( iResolverFlags & EMms3gpp2Mode ) &&
     		  ( aMimeType.CompareF( KMsgMimeVideo3gpp ) == 0  ) )
         {
-        funcPtr = ResolveVideo3gpp;
+        funcPtr = &CMmsConformance::ResolveVideo3gpp;
         }
     else if ( ( iResolverFlags & EMms3gpp2Mode ) &&
     		  ( aMimeType.CompareF( KMsgMimeVideo3gpp2 ) == 0  ) )
         {
-        funcPtr = ResolveVideo3gpp2;
+        funcPtr = &CMmsConformance::ResolveVideo3gpp2;
         }
     else if ( aMimeType.CompareF( KMsgMimeVCard ) == 0 ||
               aMimeType.CompareF( KMsgMimeVCal ) == 0 )
         {
-        funcPtr = ResolveAttachment;
+        funcPtr = &CMmsConformance::ResolveAttachment;
         }
     else
         {
-        funcPtr = ResolveNonconformantAttachment;
+        funcPtr = &CMmsConformance::ResolveNonconformantAttachment;
         }
    return funcPtr;
    }
diff -r 0d213b5329c6 -r 43cbef41dd6d msg_plat/smil_engine_api/inc/smiltimelist.h
--- a/msg_plat/smil_engine_api/inc/smiltimelist.h	Sun Mar 14 13:09:10 2010 +0000
+++ b/msg_plat/smil_engine_api/inc/smiltimelist.h	Mon Mar 29 12:25:56 2010 +0100
@@ -47,7 +47,7 @@
 		/**
         * Destructor.
         */
-		virtual TSmilTimeList::~TSmilTimeList();		
+		virtual ~TSmilTimeList();		
 
 		void SetObject(CSmilObject* aObject);