1.1 --- a/epoc32/include/mw/mtclbase.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/mtclbase.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -11,8 +11,13 @@
    1.16  // Contributors:
    1.17  //
    1.18  // Description:
    1.19 +// MTCLBASE.H
    1.20  //
    1.21 -
    1.22 +/**
    1.23 + * @file 
    1.24 + * @publishedAll
    1.25 + * @released
    1.26 + */
    1.27  
    1.28  #ifndef __MTCLBASE_H__
    1.29  #define __MTCLBASE_H__
    1.30 @@ -25,16 +30,8 @@
    1.31  #include <msvstd.hrh>
    1.32  #include <cmsvrecipientlist.h>
    1.33  
    1.34 -/**
    1.35 -UId for 8-bit/16-bit Character set mechanism.
    1.36 -@internalTechnology
    1.37 -@prototype
    1.38 -*/
    1.39 -const TInt KUIDCharacterSet = 999; 
    1.40 -
    1.41  class CMsvAttachmentWaiter;
    1.42  
    1.43 -
    1.44  /** Specifies one or more parts of a message in message-forwarding, message-reply, 
    1.45  and message-validation functions.
    1.46  
    1.47 @@ -50,6 +47,12 @@
    1.48  class CCharFormatLayer;
    1.49  
    1.50  
    1.51 +//
    1.52 +// Prototype of expected factory function
    1.53 +
    1.54 +typedef CBaseMtm* MtmFactoryFunctionL(CRegisteredMtmDll&, CMsvSession&);
    1.55 +
    1.56 +
    1.57  /** Specifies function IDs for standard MTM functions.
    1.58  
    1.59  The function IDs are specified such that they do not coincide
    1.60 @@ -67,12 +70,6 @@
    1.61  	};
    1.62  
    1.63  
    1.64 -////////////////////////////////////////////////////////
    1.65 -// Prototype of expected factory function
    1.66 -
    1.67 -typedef CBaseMtm* MtmFactoryFunctionL(CRegisteredMtmDll&, CMsvSession&);
    1.68 -
    1.69 -
    1.70  /***********************************************
    1.71  ***********************************************/
    1.72  class CBaseMtm : public CBase, public MMsvEntryObserver
    1.73 @@ -476,7 +473,9 @@
    1.74   	
    1.75   	//For setting the character encoding value, options are 7-bit, 8-bit and 16-bit Unicode.
    1.76   	IMPORT_C TInt SetMessageCharacterSet(TUint aCharSet);
    1.77 -
    1.78 +	IMPORT_C void SetExtensionData(TAny* aSortData);
    1.79 +	IMPORT_C TAny* GetExtensionData();
    1.80 +	
    1.81  protected:
    1.82  	IMPORT_C CBaseMtm(CRegisteredMtmDll& aRegisteredMtmDll, CMsvSession& aSession);
    1.83  	//
    1.84 @@ -509,11 +508,12 @@
    1.85  	// From CBase
    1.86  	IMPORT_C virtual TInt Extension_(TUint aExtensionId, TAny*& a0, TAny* a1);
    1.87  
    1.88 -
    1.89  private:
    1.90  	void DeleteEntry();
    1.91  	
    1.92  	void AddFilePathAttachmentL(const TDesC& aFilePath, const TDesC8& aMimeType, TUint aCharset, CMsvAttachment::TMsvAttachmentType aType, TRequestStatus& aStatus);
    1.93 +	
    1.94 +
    1.95  
    1.96  protected:
    1.97  	/** The current context. */
    1.98 @@ -534,6 +534,8 @@
    1.99  	Implementations can modify this if they wish to apply particular formatting 
   1.100  	to body text. */
   1.101  	CCharFormatLayer* iCharFormatLayer;
   1.102 +
   1.103 +
   1.104  	
   1.105  private:
   1.106  	TMsvId	iEntryId;