Cleaning up property public API and usage of typedefs

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / internal / controls / navigation-frame / navigation-control-impl.h

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
index 99f325a..8221a8f 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
@@ -18,12 +18,11 @@
  *
  */
 
-//EXTERNAL INCLUDES
-
+// EXTERNAL INCLUDES
 #include <list>
+#include <dali/public-api/actors/layer.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
@@ -48,7 +47,7 @@ class NavigationBar;
  * NavigationControl implements a controller than manages the navigation of hierarchical contents.
  * @see Dali::Toolkit::NavigationControl for more details.
  */
-class NavigationControl : public ControlImpl
+class NavigationControl : public Control
 {
 public:
 
@@ -123,7 +122,7 @@ public:
    * @param[in] attributes The attributes with which to perfrom this action.
    * @return true if action has been accepted by this control
    */
-  static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes);
+  static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes);
 
 public:
 
@@ -137,36 +136,36 @@ public:
    */
   Toolkit::NavigationControl::ItemPoppedSignalV2& ItemPoppedSignal();
 
-private: // override functions from ControlImpl
+private: // override functions from Control
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnInitialize()
+   * @copydoc Control::OnInitialize()
    */
   virtual void OnInitialize();
 
   /**
-   * From ControlImpl; called after a child has been added to the owning actor.
+   * From Control; called after a child has been added to the owning actor.
    * @param[in] child The child which has been added.
    */
   virtual void OnControlChildAdd( Actor& child );
 
   /**
-   * @copydoc Toolkit::ControlImple::OnStageConnection()
+   * @copydoc Control::OnStageConnection()
    */
   virtual void OnStageConnection();
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+   * @copydoc Control::OnRelaidOut()
    */
   virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnControlSizeSet
+   * @copydoc Control::OnControlSizeSet
    */
   virtual void OnControlSizeSet( const Vector3& size );
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnKeyEvent()
+   * @copydoc Control::OnKeyEvent()
    */
   virtual bool OnKeyEvent( const KeyEvent& event );