X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fnavigation-frame%2Fnavigation-control-impl.h;h=41990a2f0ea3a56bc1729ed78f44ee0654eacf51;hp=964de5a5e9c044c5462b6b0bd36ec85a83dd1154;hb=1c3cb32385174b852b8d57b531625f733238f664;hpb=e2eda444afbe82e9591fe198eef339227f90a616

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h b/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
index 964de5a..41990a2 100644
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
@@ -1,33 +1,33 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H__
 #define __DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-//EXTERNAL INCLUDES
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
+// 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>
-#include <dali-toolkit/internal/controls/navigation-frame/navigation-bar.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>
+#include <dali-toolkit/internal/controls/navigation-frame/navigation-bar.h>
 
 namespace Dali
 {
@@ -47,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:
 
@@ -122,50 +122,50 @@ 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 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::OnRelayout()
    */
-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const 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 );
 
@@ -234,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