DALi signals refactor to remove V2 naming

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / public-api / focus-manager / keyboard-focus-manager.h

diff --git a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
index 01a4862..3822fc6 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -41,7 +41,7 @@ class KeyboardFocusManager;
  * highlight for the focused actor and emits a signal when the focus
  * is changed.
  */
-class KeyboardFocusManager : public BaseHandle
+class DALI_IMPORT_API KeyboardFocusManager : public BaseHandle
 {
 public:
   //Signal Names
@@ -53,16 +53,16 @@ public:
 public:
 
   /// @brief Pre focus change signal
-  typedef SignalV2< Actor ( Actor, Actor, Control::KeyboardFocusNavigationDirection ) > PreFocusChangeSignalV2;
+  typedef Signal< Actor ( Actor, Actor, Control::KeyboardFocusNavigationDirection ) > PreFocusChangeSignalType;
 
   /// @brief Focus changed signal
-  typedef SignalV2< void ( Actor, Actor ) > FocusChangedSignalV2;
+  typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType;
 
   /// @brief Focus group changed signal
-  typedef SignalV2< void ( Actor, bool ) > FocusGroupChangedSignalV2;
+  typedef Signal< void ( Actor, bool ) > FocusGroupChangedSignalType;
 
   /// @brief Focused actor activated signal
-  typedef SignalV2< void ( Actor ) > FocusedActorActivatedSignalV2;
+  typedef Signal< void ( Actor ) > FocusedActorActivatedSignalType;
 
   /**
    * @brief Create a KeyboardFocusManager handle; this can be initialised with KeyboardFocusManager::New().
@@ -217,7 +217,7 @@ public: // Signals
    * @pre The Object has been initialized.
    * @return The signal to connect to.
    */
-  PreFocusChangeSignalV2& PreFocusChangeSignal();
+  PreFocusChangeSignalType& PreFocusChangeSignal();
 
   /**
    * @brief This signal is emitted after the current focused actor has been changed.
@@ -229,7 +229,7 @@ public: // Signals
    * @pre The Object has been initialized.
    * @return The signal to connect to.
    */
-  FocusChangedSignalV2& FocusChangedSignal();
+  FocusChangedSignalType& FocusChangedSignal();
 
   /**
    * @brief This signal is emitted when the focus group has been changed.
@@ -246,7 +246,7 @@ public: // Signals
    * @pre The Object has been initialized.
    * @return The signal to connect to.
    */
-  FocusGroupChangedSignalV2& FocusGroupChangedSignal();
+  FocusGroupChangedSignalType& FocusGroupChangedSignal();
 
   /**
    * @brief This signal is emitted when the current focused actor is activated.
@@ -258,7 +258,7 @@ public: // Signals
    * @pre The Object has been initialized.
    * @return The signal to connect to.
    */
-  FocusedActorActivatedSignalV2& FocusedActorActivatedSignal();
+  FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
 
   // Not intended for application developers