diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/mw/eikbhelp.h
--- a/epoc32/include/mw/eikbhelp.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/eikbhelp.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 2000-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.
@@ -18,29 +18,9 @@
 
 #include <coemain.h>
 
-const TUid KEikBubbleHelpUid={0x10008E48};
-
-class CCoeControl;
-
-/**
-@publishedPartner
-@deprecated
-*/
-class MEikTriggeredHelp	
-	{
-// The MEikTriggeredHelp class defines an interface for UI classes 
-// to implement triggered, transient help message display.
-public:
-	virtual void TriggerHelp(const TDesC& aDes,const TRect& aRect,TInt aHandle)=0;
-	virtual void CancelHelp()=0;
-	virtual void CancelHelpTrigger()=0;
-	virtual TBool IsDisplayingHelp(TInt aHandle)=0;
-	virtual void Release()=0;
-protected:
-	IMPORT_C virtual void MEikTriggeredHelp_Reserved_1();
-	IMPORT_C virtual void MEikTriggeredHelp_Reserved_2();
-	};
-
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <uikon/eikmischelp.h>
+#endif
 
 /** Provides the static functions that control bubble help.
 
@@ -58,35 +38,4 @@
 	IMPORT_C static TBool IsDisplaying(TInt aHandle);
 	};
 
-
-/**
-@publishedPartner
-@deprecated
-*/
-class CEikBubbleHelp : public CCoeStatic
-// The CEikBubbleHelp class implements global static storage and access to the object providing bubble help
-// for the application.  
-	{
-	~CEikBubbleHelp();
-public: 
-	IMPORT_C static void SetTriggeredHelpL(MEikTriggeredHelp* aTriggeredHelp);
-public:
-	static void Trigger(const TDesC& aDes,const TRect& aRect,TInt aHandle=-1);
-	static void Cancel();
-	static void CancelTrigger();
-	static TBool IsDisplaying(TInt aHandle);
-private:
-	inline CEikBubbleHelp();
-	inline static CEikBubbleHelp* Self();
-private:
-	MEikTriggeredHelp* iHelp;
-	};
-
-inline CEikBubbleHelp::CEikBubbleHelp()
-	: CCoeStatic(KEikBubbleHelpUid)
-	{}
-
-inline CEikBubbleHelp* CEikBubbleHelp::Self()
-	{return STATIC_CAST(CEikBubbleHelp*,CCoeEnv::Static(KEikBubbleHelpUid));}
-
 #endif