Merge "Cleanup for removal of ImageAttributes from public API" into tizen

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-imf-manager.cpp

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 986346e..0aee8ec 100644 (file)
--- 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 <boost/bind.hpp>
 #include <dali/public-api/object/base-object.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/events/key-event-integ.h>
@@ -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();
@@ -50,7 +49,7 @@ public:
   void Reset();
 
   bool RestoreAfterFocusLost() const;
-  void SetRestoreAferFocusLost( bool toggle );
+  void SetRestoreAfterFocusLost( bool toggle );
   void NotifyCursorPosition();
   int GetCursorPosition();
   void SetCursorPosition( unsigned int cursorPosition );
@@ -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<Dali::Integration::KeyEvent> mKeyEvents; ///< Stores key events to be sent from idle call-back.
-  ImfManagerSignalV2      mActivatedSignalV2;
-  ImfEventSignalV2        mEventSignalV2;
+  ImfManagerSignalType      mActivatedSignal;
+  ImfEventSignalType        mEventSignal;
 
 
   static Dali::ImfManager mToolkitImfManager;
@@ -170,7 +169,7 @@ bool ImfManager::RestoreAfterFocusLost() const
   return mRestoreAfterFocusLost;
 }
 
-void ImfManager::SetRestoreAferFocusLost( bool toggle )
+void ImfManager::SetRestoreAfterFocusLost( bool toggle )
 {
   mRestoreAfterFocusLost = toggle;
 }
@@ -241,9 +240,9 @@ bool ImfManager::RestoreAfterFocusLost() const
   return Internal::Adaptor::ImfManager::GetImplementation(*this).RestoreAfterFocusLost();
 }
 
-void ImfManager::SetRestoreAferFocusLost( bool toggle )
+void ImfManager::SetRestoreAfterFocusLost( bool toggle )
 {
-  Internal::Adaptor::ImfManager::GetImplementation(*this).SetRestoreAferFocusLost( toggle );
+  Internal::Adaptor::ImfManager::GetImplementation(*this).SetRestoreAfterFocusLost( toggle );
 }
 
 void ImfManager::Reset()
@@ -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();
 }