--- a/epoc32/include/mw/eikenv.inl	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/eikenv.inl	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// 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
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -13,7 +13,8 @@
 // Description:
 //
 
-
+#ifndef __EIKENV_INL__
+#define __EIKENV_INL__
 
 /**
  Gets the CEikonEnv maintained by the framework for the application. 
@@ -28,13 +29,6 @@
 inline CEikonEnv* CEikonEnv::Static()
 	{ return((CEikonEnv*)(CCoeEnv::Static())); }
 
-/**
-@publishedPartner
-@released
-*/
-inline TInt CEikonEnv::EditableControlStandardHeight() const
-	{ return(iEditableControlStandardHeight); }
-
 /** Gets the Uikon process that manages the files of applications started in this 
 environment.
 
@@ -50,6 +44,12 @@
 inline const MEikAlertWin* CEikonEnv::Alert() const
 	{ return(iAlertWin); }
 
+inline const CEikDialog* MEikAlertWin::AsEikDialog() const
+    {return (const CEikDialog*)const_cast<MEikAlertWin*>(this)->AsEikDialog();}
+
+inline const CCoeControl* MEikAlertWin::AsCoeControl() const
+    {return (const CCoeControl*)const_cast<MEikAlertWin*>(this)->AsCoeControl();}
+
 /** Gets the minus nudge character, this could be the left arrow for example. 
 
 @return Minus nudge character. */
@@ -92,63 +92,6 @@
 inline void CEikonEnv::SetColor(TLogicalColor aLogicalColor, TRgb aColor)
 	{ ColorList().SetColor(aLogicalColor, aColor); }
 
-/**
-@publishedPartner
-@released
-*/
-inline void CEikonEnv::SetCDlgDialogFactory(MEikCDlgDialogFactory* aDialogFactory)
-	{iCDlgDialogFactory=aDialogFactory;}
-
-/**
-@publishedPartner
-@released
-*/
-inline void CEikonEnv::SetPrintDialogFactory(MEikPrintDialogFactory* aDialogFactory)
-	{iPrintDialogFactory=aDialogFactory;}
-
-/**
-@publishedPartner
-@released
-*/
-inline void CEikonEnv::SetFileDialogFactory(MEikFileDialogFactory* aDialogFactory)
-	{iFileDialogFactory=aDialogFactory;}
-
-/**
-@publishedPartner
-@released
-*/
-inline void CEikonEnv::SetIrFactory(MEikIrFactory* aIrFactory)
-	{iIrFactory=aIrFactory;}
-
-/**
-@publishedPartner
-@released
-*/
-inline MEikCDlgDialogFactory* CEikonEnv::CDlgDialogFactory() const
-	{return iCDlgDialogFactory;}
-
-/**
-@publishedPartner
-@released
-*/
-inline MEikPrintDialogFactory* CEikonEnv::PrintDialogFactory() const
-	{return iPrintDialogFactory;}
-
-/**
-@publishedPartner
-@released
-*/
-inline MEikFileDialogFactory* CEikonEnv::FileDialogFactory() const
-	{return iFileDialogFactory;}
-
-/**
-@publishedPartner
-@released
-*/
-inline MEikIrFactory* CEikonEnv::IrFactory() const
-	{return iIrFactory;}
-
-
 inline TInt CEikonEnv::AddLibraryL(TCreateByTypeFunction aControlFactory)
 	{return(AddLibraryL(aControlFactory, NULL));}
 inline TInt CEikonEnv::AddLibraryL(TFileName* aResourceFile)
@@ -158,37 +101,15 @@
 inline void CEikonEnv::RemoveLibrary(TInt aResourceFileOffset)
 	{RemoveLibrary(NULL, aResourceFileOffset);}
 
-
 /**
 @publishedPartner
 @deprecated
+WARNING: For internal use ONLY. Compatibility is not guaranteed in future releases.
 */
 inline CBase* CEikonEnv::Extension() const
 	{return iExtension;}
 
-/**
-@publishedPartner
-@released
-*/
-inline TInt CEikonEnv::StatusPaneCoreResId() const
-	{return iStatusPaneCoreResId;}
+
 
-/**
-@publishedPartner
-@released
-*/
-inline void CEikonEnv::SetStatusPaneCoreResId(TInt aStatusPaneCoreResId)
-	{iStatusPaneCoreResId=aStatusPaneCoreResId;}
+#endif // __EIKENV_INL__
 
-/**
-@publishedPartner
-@released
-*/
-inline CEikAutoMenuTitleArray* CEikonEnv::AutoMenuTitleArray() const
-	{return iAutoMenuTitleArray;}
-
-inline const CEikDialog* MEikAlertWin::AsEikDialog() const
-	{return (const CEikDialog*)const_cast<MEikAlertWin*>(this)->AsEikDialog();}
-
-inline const CCoeControl* MEikAlertWin::AsCoeControl() const
-	{return (const CCoeControl*)const_cast<MEikAlertWin*>(this)->AsCoeControl();}