X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-imf-manager.cpp;h=0aee8ec07e298d90f67aa43e886776cc84390cfe;hb=f545f5694881e4ca9c10752535fddf2852cf3e5e;hp=260e70c92020bc2bf63f330f558bb258ab0927e2;hpb=b8c93847cc736bfc69876fd087ab06474fbfbe47;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp index 260e70c..0aee8ec 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp @@ -19,7 +19,6 @@ #include "toolkit-imf-manager.h" // EXTERNAL INCLUDES -#include #include #include #include @@ -36,8 +35,8 @@ class RenderSurface; class ImfManager : public Dali::BaseObject { public: - typedef Dali::ImfManager::ImfManagerSignalV2 ImfManagerSignalV2; - typedef Dali::ImfManager::ImfEventSignalV2 ImfEventSignalV2; + typedef Dali::ImfManager::ImfManagerSignalType ImfManagerSignalType; + typedef Dali::ImfManager::ImfEventSignalType ImfEventSignalType; public: static Dali::ImfManager Get(); @@ -58,8 +57,8 @@ public: std::string GetSurroundingText(); public: // Signals - ImfManagerSignalV2& ActivatedSignal() { return mActivatedSignalV2; } - ImfEventSignalV2& EventReceivedSignal() { return mEventSignalV2; } + ImfManagerSignalType& ActivatedSignal() { return mActivatedSignal; } + ImfEventSignalType& EventReceivedSignal() { return mEventSignal; } protected: virtual ~ImfManager(); @@ -80,8 +79,8 @@ private: bool mIdleCallbackConnected:1; ///< Whether the idle callback is already connected. std::vector mKeyEvents; ///< Stores key events to be sent from idle call-back. - ImfManagerSignalV2 mActivatedSignalV2; - ImfEventSignalV2 mEventSignalV2; + ImfManagerSignalType mActivatedSignal; + ImfEventSignalType mEventSignal; static Dali::ImfManager mToolkitImfManager; @@ -276,12 +275,12 @@ std::string ImfManager::GetSurroundingText() return Internal::Adaptor::ImfManager::GetImplementation(*this).GetSurroundingText(); } -ImfManager::ImfManagerSignalV2& ImfManager::ActivatedSignal() +ImfManager::ImfManagerSignalType& ImfManager::ActivatedSignal() { return Internal::Adaptor::ImfManager::GetImplementation(*this).ActivatedSignal(); } -ImfManager::ImfEventSignalV2& ImfManager::EventReceivedSignal() +ImfManager::ImfEventSignalType& ImfManager::EventReceivedSignal() { return Internal::Adaptor::ImfManager::GetImplementation(*this).EventReceivedSignal(); }