X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fnavigation-view%2Fnavigation-view-impl.h;h=95bbd12e85d970965212c902f38175fc2dec826a;hb=b8da2e53925b9abb9fa362560069e8ca4aa62f81;hp=c6d9160ee5221fea2416107ae74d04203baabf4d;hpb=02318dd256a2edbef78a37cd40e153279385cc94;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h
index c6d9160..95bbd12 100644
--- a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h
+++ b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H__
-#define __DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H__
+#ifndef DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H
+#define DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -19,24 +19,21 @@
  */
 
 // EXTERNAL INCLUDES
-#include <list>
 #include <dali/public-api/actors/layer.h>
+#include <list>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/devel-api/controls/navigation-view/navigation-view.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 class NavigationView;
 
 namespace Internal
 {
-
 class NavigationBar;
 
 /**
@@ -48,7 +45,6 @@ class NavigationBar;
 class NavigationView : public Control
 {
 public:
-
   /**
    * Create an initialized NavigationView.
    * @return A handle to a newly allocated Dali resource
@@ -58,7 +54,7 @@ public:
   /**
    * @copydoc Dali::Toolkit::NavigationView::Push()
    */
-  void Push( Actor& actor );
+  void Push(Actor& actor);
 
   /**
    * @copydoc Dali::Toolkit::NavigationView::Pop()
@@ -74,13 +70,16 @@ public:
    */
   //static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& properties );
 
-
 private: // override functions from Control
+  /**
+   * @copydoc Constrol::OnInitialize
+   */
+  virtual void OnInitialize() override;
 
   /**
-   * @copydoc Control::OnStageConnection( int depth  )
+   * @copydoc Control::OnSceneConnection( int depth  )
    */
-  virtual void OnStageConnection( int depth );
+  void OnSceneConnection(int depth) override;
 
   /**
    * @copydoc Control::OnRelayout()
@@ -88,7 +87,6 @@ private: // override functions from Control
   //virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
 
 protected:
-
   /**
    * Constructor.
    * It initializes the NavigationView members
@@ -101,7 +99,6 @@ protected:
   virtual ~NavigationView();
 
 private:
-
   // Undefined
   NavigationView(const NavigationView&);
 
@@ -109,34 +106,33 @@ private:
   NavigationView& operator=(const NavigationView& rhs);
 
 private:
-
-  std::vector< Actor >         mContentStack;
+  std::vector<Actor> mContentStack;
 };
 
 } // namespace Internal
 
 // Helpers for public-api forwarding methods
 
-inline Toolkit::Internal::NavigationView& GetImpl( Toolkit::NavigationView& navigationView )
+inline Toolkit::Internal::NavigationView& GetImpl(Toolkit::NavigationView& navigationView)
 {
-  DALI_ASSERT_ALWAYS( navigationView );
+  DALI_ASSERT_ALWAYS(navigationView);
 
   Dali::RefObject& handle = navigationView.GetImplementation();
 
-  return static_cast<Toolkit::Internal::NavigationView&>( handle );
+  return static_cast<Toolkit::Internal::NavigationView&>(handle);
 }
 
-inline const Toolkit::Internal::NavigationView& GetImpl( const Toolkit::NavigationView& navigationView )
+inline const Toolkit::Internal::NavigationView& GetImpl(const Toolkit::NavigationView& navigationView)
 {
-  DALI_ASSERT_ALWAYS( navigationView );
+  DALI_ASSERT_ALWAYS(navigationView);
 
   const Dali::RefObject& handle = navigationView.GetImplementation();
 
-  return static_cast<const Toolkit::Internal::NavigationView&>( handle );
+  return static_cast<const Toolkit::Internal::NavigationView&>(handle);
 }
 
 } // namespace Toolkit
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H__ */
+#endif // DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H