[dali_1.0.28] Merge branch 'tizen'

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

diff --git a/base/dali-toolkit/public-api/focus-manager/focus-manager.h b/base/dali-toolkit/public-api/focus-manager/focus-manager.h
index b8ca24a..3d15023 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/focus-manager.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/image-actor.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -45,7 +45,7 @@ class FocusManager;
  * focused actor and emits a signal when the focus is changed.
  */
 
-class FocusManager : public BaseHandle
+class DALI_IMPORT_API FocusManager : public BaseHandle
 {
 public:
   // Signal Names
@@ -79,13 +79,13 @@ public:
  public:
 
   /// @brief Focus changed signal
-  typedef SignalV2< void ( Actor, Actor ) > FocusChangedSignalV2;
+  typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType;
 
   /// @brief Focus overshooted signal
-  typedef SignalV2< void ( Actor, FocusOvershotDirection ) > FocusOvershotSignalV2;
+  typedef Signal< void ( Actor, FocusOvershotDirection ) > FocusOvershotSignalType;
 
   /// @brief Focused actor activated signal
-  typedef SignalV2< void ( Actor ) > FocusedActorActivatedSignalV2;
+  typedef Signal< void ( Actor ) > FocusedActorActivatedSignalType;
 
   /**
    * @brief Create a FocusManager handle; this can be initialised with FocusManager::New().
@@ -375,7 +375,7 @@ public:
    * @pre The Object has been initialized.
    * @return The signal to connect to.
    */
-  FocusChangedSignalV2& FocusChangedSignal();
+  FocusChangedSignalType& FocusChangedSignal();
 
   /**
    * @brief This signal is emitted when there is no way to move focus further.
@@ -387,7 +387,7 @@ public:
    * @pre The Object has been initialized.
    * @return The signal to connect to.
    */
-  FocusOvershotSignalV2& FocusOvershotSignal();
+  FocusOvershotSignalType& FocusOvershotSignal();
 
   /**
    * @brief This signal is emitted when the current focused actor is activated.
@@ -399,11 +399,11 @@ public:
    * @pre The Object has been initialized.
    * @return The signal to connect to.
    */
-  FocusedActorActivatedSignalV2& FocusedActorActivatedSignal();
+  FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
 
 private:
 
-  FocusManager(Internal::FocusManager *impl);
+  explicit DALI_INTERNAL FocusManager(Internal::FocusManager *impl);
 
 }; // class FocusManager