1.1 --- a/epoc32/include/txtetext.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/txtetext.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,26 +1,33 @@
     1.4 -// Copyright (c) 1997-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 -// which accompanies this distribution, and is available
     1.9 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.10 -//
    1.11 -// Initial Contributors:
    1.12 -// Nokia Corporation - initial contribution.
    1.13 -//
    1.14 -// Contributors:
    1.15 -//
    1.16 -// Description:
    1.17 -//
    1.18 +/*
    1.19 +* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
    1.20 +* All rights reserved.
    1.21 +* This component and the accompanying materials are made available
    1.22 +* under the terms of "Eclipse Public License v1.0"
    1.23 +* which accompanies this distribution, and is available
    1.24 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.25 +*
    1.26 +* Initial Contributors:
    1.27 +* Nokia Corporation - initial contribution.
    1.28 +*
    1.29 +* Contributors:
    1.30 +*
    1.31 +* Description: 
    1.32 +*
    1.33 +*/
    1.34 +
    1.35  
    1.36  #ifndef __TXTETEXT_H__
    1.37  #define __TXTETEXT_H__
    1.38  
    1.39  #include <e32std.h>
    1.40  #include <e32base.h>
    1.41 -#include <fldset.h>
    1.42  #include <s32std.h>
    1.43  
    1.44 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.45 +#include <fldset.h>
    1.46 +#include <txtetext_internal.h>
    1.47 +#include <txtclipboard.h>
    1.48 +#endif
    1.49  
    1.50  // Forward references
    1.51  class CParaFormatLayer;
    1.52 @@ -36,21 +43,6 @@
    1.53  class RFs;
    1.54  
    1.55  
    1.56 -/**
    1.57 -UIDs
    1.58 -@internalComponent
    1.59 -*/
    1.60 -const TUid KPlainTextFieldDataUid = {268435555};
    1.61 -const TUid KEditableTextUid = {268450334};
    1.62 -const TUid KPlainTextCharacterDataUid = {268450341};
    1.63 -const TUid KClipboardUidTypePlainText = {268450333};
    1.64 -const TUid KUidRichText = {271013233};
    1.65 -
    1.66 -/**
    1.67 -@internalComponent
    1.68 -*/
    1.69 -const TInt KMaxFieldBufferSize=0x14;
    1.70 -
    1.71  /** 
    1.72  An abstract base class which defines the behaviour common to all editable 
    1.73  text classes.
    1.74 @@ -619,7 +611,7 @@
    1.75  	//
    1.76  	// Field functions
    1.77  	IMPORT_C void SetFieldFactory(MTextFieldFactory* aFactory);
    1.78 -	inline const MTextFieldFactory* FieldFactory() const;
    1.79 +	IMPORT_C const MTextFieldFactory* FieldFactory() const;
    1.80  	IMPORT_C CTextField* NewTextFieldL(TUid aFieldType) const;
    1.81  	IMPORT_C void InsertFieldL(TInt aPos,CTextField* aField,TUid aFieldType); 
    1.82  	IMPORT_C virtual void UpdateFieldL(TInt aPos);