1.1 --- a/epoc32/include/mw/eikenv.inl	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/eikenv.inl	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     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 +// 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 @@ -13,7 +13,8 @@
    1.16  // Description:
    1.17  //
    1.18  
    1.19 -
    1.20 +#ifndef __EIKENV_INL__
    1.21 +#define __EIKENV_INL__
    1.22  
    1.23  /**
    1.24   Gets the CEikonEnv maintained by the framework for the application. 
    1.25 @@ -28,13 +29,6 @@
    1.26  inline CEikonEnv* CEikonEnv::Static()
    1.27  	{ return((CEikonEnv*)(CCoeEnv::Static())); }
    1.28  
    1.29 -/**
    1.30 -@publishedPartner
    1.31 -@released
    1.32 -*/
    1.33 -inline TInt CEikonEnv::EditableControlStandardHeight() const
    1.34 -	{ return(iEditableControlStandardHeight); }
    1.35 -
    1.36  /** Gets the Uikon process that manages the files of applications started in this 
    1.37  environment.
    1.38  
    1.39 @@ -50,6 +44,12 @@
    1.40  inline const MEikAlertWin* CEikonEnv::Alert() const
    1.41  	{ return(iAlertWin); }
    1.42  
    1.43 +inline const CEikDialog* MEikAlertWin::AsEikDialog() const
    1.44 +    {return (const CEikDialog*)const_cast<MEikAlertWin*>(this)->AsEikDialog();}
    1.45 +
    1.46 +inline const CCoeControl* MEikAlertWin::AsCoeControl() const
    1.47 +    {return (const CCoeControl*)const_cast<MEikAlertWin*>(this)->AsCoeControl();}
    1.48 +
    1.49  /** Gets the minus nudge character, this could be the left arrow for example. 
    1.50  
    1.51  @return Minus nudge character. */
    1.52 @@ -92,63 +92,6 @@
    1.53  inline void CEikonEnv::SetColor(TLogicalColor aLogicalColor, TRgb aColor)
    1.54  	{ ColorList().SetColor(aLogicalColor, aColor); }
    1.55  
    1.56 -/**
    1.57 -@publishedPartner
    1.58 -@released
    1.59 -*/
    1.60 -inline void CEikonEnv::SetCDlgDialogFactory(MEikCDlgDialogFactory* aDialogFactory)
    1.61 -	{iCDlgDialogFactory=aDialogFactory;}
    1.62 -
    1.63 -/**
    1.64 -@publishedPartner
    1.65 -@released
    1.66 -*/
    1.67 -inline void CEikonEnv::SetPrintDialogFactory(MEikPrintDialogFactory* aDialogFactory)
    1.68 -	{iPrintDialogFactory=aDialogFactory;}
    1.69 -
    1.70 -/**
    1.71 -@publishedPartner
    1.72 -@released
    1.73 -*/
    1.74 -inline void CEikonEnv::SetFileDialogFactory(MEikFileDialogFactory* aDialogFactory)
    1.75 -	{iFileDialogFactory=aDialogFactory;}
    1.76 -
    1.77 -/**
    1.78 -@publishedPartner
    1.79 -@released
    1.80 -*/
    1.81 -inline void CEikonEnv::SetIrFactory(MEikIrFactory* aIrFactory)
    1.82 -	{iIrFactory=aIrFactory;}
    1.83 -
    1.84 -/**
    1.85 -@publishedPartner
    1.86 -@released
    1.87 -*/
    1.88 -inline MEikCDlgDialogFactory* CEikonEnv::CDlgDialogFactory() const
    1.89 -	{return iCDlgDialogFactory;}
    1.90 -
    1.91 -/**
    1.92 -@publishedPartner
    1.93 -@released
    1.94 -*/
    1.95 -inline MEikPrintDialogFactory* CEikonEnv::PrintDialogFactory() const
    1.96 -	{return iPrintDialogFactory;}
    1.97 -
    1.98 -/**
    1.99 -@publishedPartner
   1.100 -@released
   1.101 -*/
   1.102 -inline MEikFileDialogFactory* CEikonEnv::FileDialogFactory() const
   1.103 -	{return iFileDialogFactory;}
   1.104 -
   1.105 -/**
   1.106 -@publishedPartner
   1.107 -@released
   1.108 -*/
   1.109 -inline MEikIrFactory* CEikonEnv::IrFactory() const
   1.110 -	{return iIrFactory;}
   1.111 -
   1.112 -
   1.113  inline TInt CEikonEnv::AddLibraryL(TCreateByTypeFunction aControlFactory)
   1.114  	{return(AddLibraryL(aControlFactory, NULL));}
   1.115  inline TInt CEikonEnv::AddLibraryL(TFileName* aResourceFile)
   1.116 @@ -158,37 +101,15 @@
   1.117  inline void CEikonEnv::RemoveLibrary(TInt aResourceFileOffset)
   1.118  	{RemoveLibrary(NULL, aResourceFileOffset);}
   1.119  
   1.120 -
   1.121  /**
   1.122  @publishedPartner
   1.123  @deprecated
   1.124 +WARNING: For internal use ONLY. Compatibility is not guaranteed in future releases.
   1.125  */
   1.126  inline CBase* CEikonEnv::Extension() const
   1.127  	{return iExtension;}
   1.128  
   1.129 -/**
   1.130 -@publishedPartner
   1.131 -@released
   1.132 -*/
   1.133 -inline TInt CEikonEnv::StatusPaneCoreResId() const
   1.134 -	{return iStatusPaneCoreResId;}
   1.135  
   1.136 -/**
   1.137 -@publishedPartner
   1.138 -@released
   1.139 -*/
   1.140 -inline void CEikonEnv::SetStatusPaneCoreResId(TInt aStatusPaneCoreResId)
   1.141 -	{iStatusPaneCoreResId=aStatusPaneCoreResId;}
   1.142  
   1.143 -/**
   1.144 -@publishedPartner
   1.145 -@released
   1.146 -*/
   1.147 -inline CEikAutoMenuTitleArray* CEikonEnv::AutoMenuTitleArray() const
   1.148 -	{return iAutoMenuTitleArray;}
   1.149 +#endif // __EIKENV_INL__
   1.150  
   1.151 -inline const CEikDialog* MEikAlertWin::AsEikDialog() const
   1.152 -	{return (const CEikDialog*)const_cast<MEikAlertWin*>(this)->AsEikDialog();}
   1.153 -
   1.154 -inline const CCoeControl* MEikAlertWin::AsCoeControl() const
   1.155 -	{return (const CCoeControl*)const_cast<MEikAlertWin*>(this)->AsCoeControl();}