1.1 --- a/epoc32/include/gmxmlparser.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/gmxmlparser.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2003-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 @@ -17,8 +17,6 @@
    1.16  // 
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file
    1.23  */
    1.24 @@ -27,8 +25,9 @@
    1.25  #define __GMXMLPARSER_H__
    1.26  
    1.27  #include <e32std.h>
    1.28 -#include <eikenv.h>
    1.29 +#include <txtetext.h>
    1.30  #include <gmxmlconstants.h>
    1.31 +#include <f32file.h>
    1.32  
    1.33  //forward reference
    1.34  class CMDXMLDocument;
    1.35 @@ -66,9 +65,9 @@
    1.36  	/** Status codes returned by GetData() implementations. */
    1.37  	enum TDataProviderResults
    1.38  		{
    1.39 -		KMoreData,		///< Returned by the interface implementation when it is returning more data.
    1.40 -		KDataStreamError,	///< Returned by the interface when an unrecoverable error prevents obtaining more data.  A recoverable error should be represented by KDataNotReady.
    1.41 -		KDataStreamEnd	///< Returned by the interface when there is no more data to come.
    1.42 +		KMoreData,		//< Returned by the interface implementation when it is returning more data.
    1.43 +		KDataStreamError,	//< Returned by the interface when an unrecoverable error prevents obtaining more data.  A recoverable error should be represented by KDataNotReady.
    1.44 +		KDataStreamEnd	//< Returned by the interface when there is no more data to come.
    1.45  		};
    1.46  
    1.47  public:
    1.48 @@ -223,8 +222,8 @@
    1.49  	/** Defines input stream character widths. */
    1.50  	enum TMDXMLParserInputCharWidth
    1.51  		{
    1.52 -		EAscii = 0x01, ///< ASCII
    1.53 -		EUnicode = 0x02 ///<Unicode
    1.54 +		EAscii = 0x01, //< ASCII
    1.55 +		EUnicode = 0x02 //<Unicode
    1.56  		};
    1.57  	
    1.58  	/** Sets the input stream character width.