merge with master

[framework/osp/ime.git] / src / FUiIme_InputMethodImpl.h

diff --git a/src/FUiIme_InputMethodImpl.h b/src/FUiIme_InputMethodImpl.h
index cd5021b..0aebe15 100644 (file)
--- a/src/FUiIme_InputMethodImpl.h
+++ b/src/FUiIme_InputMethodImpl.h
@@ -38,32 +38,28 @@
 #include <FBaseObject.h>\r
 #include <FBaseString.h>\r
 #include <FGrpRectangle.h>\r
-#include <FLclLocale.h>\r
 #include <FUiImeIInputMethodListener.h>\r
 #include <FUiImeIInputMethodProvider.h>\r
 #include <FUiImeInputMethod.h>\r
+#include <FUiKeyTypes.h>\r
 \r
-#include "FUiIme_Key.h"\r
 #include "FUiIme_InputServiceBinder.h"\r
 \r
 namespace Tizen { namespace Ui { namespace Ime {\r
 \r
+class _EcoreEventHandler;\r
 class _EcoreFdHandler;\r
-class _ScimDataConverter;\r
-class _InputServiceSignalListener;\r
 \r
 /**\r
 * @class _InputMethodImpl\r
 * @brief This class is a concrete class of the %_InputMethodImpl class.\r
-* @since 2.0\r
+* @since 2.1\r
 *\r
 */\r
 class _InputMethodImpl\r
        : public Tizen::Base::Object\r
 {\r
 public:\r
-       virtual ~_InputMethodImpl(void);\r
-\r
        static _InputMethodImpl* GetInstance(InputMethod& inputMethod);\r
 \r
        void SetInputMethodProvider(IInputMethodProvider* pProvider);\r
@@ -71,6 +67,7 @@ public:
 \r
        result DeleteText(int cursorOffset, int length);\r
        result NotifyInputPanelState(Tizen::Ui::InputPanelShowState state);\r
+       result NotifyLanguageChanged(void);\r
        result RequestSurroundingText(int lengthBeforeCursor, int lengthAfterCursor);\r
        result SendCompositeText(const Tizen::Base::String& text);\r
        result SendKeyEvent(Tizen::Ui::KeyCode code, Tizen::Ui::KeyState state);\r
@@ -78,14 +75,13 @@ public:
 \r
 private:\r
        _InputMethodImpl(void);\r
+       virtual ~_InputMethodImpl(void);\r
 \r
        _InputMethodImpl(const _InputMethodImpl& rhs);\r
        _InputMethodImpl& operator=(const _InputMethodImpl& rhs);\r
 \r
-       result Construct(InputMethod& inputMethod);\r
+       result Construct(void);\r
 \r
-       bool HasPendingEvent(void) const;\r
-       result ProcessPendingEvent(void);\r
        result SetEcoreEvasAttribute(void);\r
        void SetInputServiceSignalCallback(void);\r
 \r
@@ -93,16 +89,13 @@ private:
        void ShowInputPanel(void);\r
 \r
 private:\r
-       static _InputMethodImpl* __pInputMethodImpl;\r
+       friend class InputMethod;\r
 \r
        scim::HelperAgent* __pHelperAgent;\r
 \r
-       InputMethod* __pInputMethod;\r
-\r
+       _EcoreEventHandler* __pEcoreEventHandler;\r
        _EcoreFdHandler* __pEcoreFdHandler;\r
        _InputServiceBinder* __pInputServiceBinder;\r
-       _InputServiceSignalListener* __pInputServiceSignalListener;\r
-       _ScimDataConverter* __pScimDataConverter;\r
 };\r
 \r
 }}} // Tizen::Ui::Ime\r