1.1 --- a/epoc32/include/uri8.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/uri8.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2001-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 @@ -18,8 +18,6 @@
    1.16  // 
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file Uri8.h
    1.23   @publishedAll
    1.24 @@ -32,7 +30,7 @@
    1.25  // System includes
    1.26  //
    1.27  #include <e32base.h>
    1.28 -#include <f32fsys.h>
    1.29 +#include <f32file.h>
    1.30  #include <uricommon.h>
    1.31  
    1.32  
    1.33 @@ -92,13 +90,20 @@
    1.34  	@since		6.0
    1.35   */
    1.36  	friend class CUri8;
    1.37 -
    1.38 +#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.39 +/**
    1.40 +	A friend class used for testing.
    1.41 +	@see		TUriC8StateAccessor
    1.42 +	@since		6.0	
    1.43 + */
    1.44 +#else
    1.45  /**
    1.46  	A friend class used for testing.
    1.47  	@see		TUriC8StateAccessor
    1.48  	@since		6.0
    1.49  	@internalComponent
    1.50   */
    1.51 +#endif	//SYMBIAN_ENABLE_SPLIT_HEADERS
    1.52  	friend class TUriC8StateAccessor;
    1.53  
    1.54  	};
    1.55 @@ -181,13 +186,21 @@
    1.56  	/** The parsed uri object.
    1.57  	 */
    1.58  	TUriC8	iUri;
    1.59 -
    1.60 +	
    1.61 +#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.62 +/**
    1.63 +	A friend class used for testing.
    1.64 +	@see		TUri8StateAccessor
    1.65 +	@since		6.0
    1.66 +	*/
    1.67 +#else
    1.68  /**
    1.69  	A friend class used for testing.
    1.70  	@see		TUri8StateAccessor
    1.71  	@since		6.0
    1.72  	@internalComponent
    1.73   */
    1.74 +#endif	//SYMBIAN_ENABLE_SPLIT_HEADERS
    1.75  	friend class TUri8StateAccessor;
    1.76  
    1.77  	};