diff -r ac7e4d1d9209 -r ebd48d2de13c textinput/peninputarc/inc/peninputlayoutcontrolinc/peninputlayout.h --- a/textinput/peninputarc/inc/peninputlayoutcontrolinc/peninputlayout.h Thu Aug 19 10:15:25 2010 +0300 +++ b/textinput/peninputarc/inc/peninputlayoutcontrolinc/peninputlayout.h Tue Aug 31 15:31:50 2010 +0300 @@ -30,7 +30,6 @@ #include "peninputlayoutbasecontrol.h" #include "peninputcmdparam.h" -class MAknsSkinInstance; class CFepUiCursor; class CControlGroup; @@ -545,24 +544,6 @@ */ //Advanced Tactile feedback REQ417-47932 IMPORT_C void ChangeFeedbackType(TInt aId, TInt aNewTactileType); - - IMPORT_C TBool NotDrawToLayoutDevice(); - IMPORT_C void DisableLayoutDrawing(TBool aFlag); - /** - * Get the layout SkinInstance - * - * @since S60 v4.0 - * @return SkinInstance - */ - inline MAknsSkinInstance* SkinInstance(); - - /** - * Get the layout TouchFeedbackInstance - * - * @since S60 v4.0 - * @return TouchFeedbackInstance - */ - inline MTouchFeedback* TouchFeedbackInstance(); protected: /** @@ -629,28 +610,7 @@ * @param aData Editor text and cursor pos information */ void SendEditorTextAndCursorPosL(TUint8* aData); - void SetSelfBmpDeviceFlag(TBool aFlag); -private: - NONSHARABLE_CLASS( CFepUiLayoutExt) : public CBase - { - public: - TBool iTactileSupported; - - /** - * Used to Cache skins instance - */ - MAknsSkinInstance* iSkinInstance; - - /** - * Used to Cache TouchFeedback instance - */ - MTouchFeedback* iTouchFeedbackInstance; - - TBool iSelfBmpDeviceFlag; - TBool iDisableDrawing; - }; - private: /** * Layout dragging position. Same as iLayoutPos, but only used when layout is @@ -700,13 +660,15 @@ */ TInt iLayoutReady; - CFepUiLayoutExt* iExtension; /** * Reserved item1 */ TInt iReserved1; -friend class CFepUiBaseCtrl; - + + /** + * Flag for tactile feedback support + */ + TBool iTactileSupported; }; #include "peninputlayout.inl"