fixing some of the comments and changing copy-by-value to by reference in size negoti...

[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 c0519cd..1962246 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>
@@ -123,19 +122,19 @@ 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:
 
   /**
    * @copydoc Dali::Toolkit::NavigatinControl::ItemPushedSignal()
    */
-  Toolkit::NavigationControl::ItemPushedSignalV2& ItemPushedSignal();
+  Toolkit::NavigationControl::ItemPushedSignalType& ItemPushedSignal();
 
   /**
    * @copydoc Dali::Toolkit::NavigatinControl::ItemPoppedSignal()
    */
-  Toolkit::NavigationControl::ItemPoppedSignalV2& ItemPoppedSignal();
+  Toolkit::NavigationControl::ItemPoppedSignalType& ItemPoppedSignal();
 
 private: // override functions from Control
 
@@ -156,9 +155,9 @@ private: // override functions from Control
   virtual void OnStageConnection();
 
   /**
-   * @copydoc Control::OnRelaidOut()
+   * @copydoc Control::OnRelayout()
    */
-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
 
   /**
    * @copydoc Control::OnControlSizeSet
@@ -235,8 +234,8 @@ private:
   Toolkit::Popup               mPopupMenu;
 
 private:
-  Toolkit::NavigationControl::ItemPushedSignalV2 mItemPushedSignal;   ///< The signal to notify the item push
-  Toolkit::NavigationControl::ItemPoppedSignalV2 mItemPoppedSignal;   ///< The signal to notify the item pop
+  Toolkit::NavigationControl::ItemPushedSignalType mItemPushedSignal;   ///< The signal to notify the item push
+  Toolkit::NavigationControl::ItemPoppedSignalType mItemPoppedSignal;   ///< The signal to notify the item pop
 };
 
 } // namespace Internal