X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fnavigation-view%2Fnavigation-view-impl.cpp;h=9eab2906bea941c83706e2ceccb55cb6df0a111b;hp=4573b4c0be9484cecdf1e0e8204725bec6de9b48;hb=980728a7e35b8ddd28f70c090243e8076e21536e;hpb=f546dd5d83a968e573f8f053a01ce43df32c71a0

diff --git a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
index 4573b4c..9eab290 100644
--- a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
+++ b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 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.
@@ -22,32 +22,28 @@
 #include <dali/public-api/object/type-registry-helper.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 namespace // to register type
 {
-
 BaseHandle Create()
 {
   return Toolkit::NavigationView::New();
 }
 
-DALI_TYPE_REGISTRATION_BEGIN( Toolkit::NavigationView, Toolkit::Control, Create )
+DALI_TYPE_REGISTRATION_BEGIN(Toolkit::NavigationView, Toolkit::Control, Create)
 DALI_TYPE_REGISTRATION_END()
 
 } // namespace
 
 NavigationView::NavigationView()
-: Control(ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) )
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT))
 {
 }
 
@@ -60,10 +56,10 @@ NavigationView::~NavigationView()
 Toolkit::NavigationView NavigationView::New()
 {
   // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr< NavigationView > internalNavigationView = new NavigationView();
+  IntrusivePtr<NavigationView> internalNavigationView = new NavigationView();
 
   // Pass ownership to CustomActor handle
-  Toolkit::NavigationView navigationView( *internalNavigationView );
+  Toolkit::NavigationView navigationView(*internalNavigationView);
 
   // Second-phase init of the implementation
   // This can only be done after the CustomActor connection has been made...
@@ -74,31 +70,31 @@ Toolkit::NavigationView NavigationView::New()
 
 void NavigationView::OnInitialize()
 {
-  DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
-    return std::unique_ptr< Dali::Accessibility::Accessible >(
-      new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::FILLER ) );
-  } );
+  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
+    return std::unique_ptr<Dali::Accessibility::Accessible>(
+      new DevelControl::ControlAccessible(actor, Dali::Accessibility::Role::FILLER));
+  });
 }
 
-void NavigationView::OnSceneConnection( int depth )
+void NavigationView::OnSceneConnection(int depth)
 {
-  Self().SetProperty( Actor::Property::SENSITIVE,true);
+  Self().SetProperty(Actor::Property::SENSITIVE, true);
 
-  Control::OnSceneConnection( depth );
+  Control::OnSceneConnection(depth);
 }
 
-void NavigationView::Push( Actor& actor )
+void NavigationView::Push(Actor& actor)
 {
   // check the uninitialized item
   // check the duplicated push for the top item
-  if(!actor )
+  if(!actor)
   {
     return;
   }
 
-  if( mContentStack.size() > 0 )
+  if(mContentStack.size() > 0)
   {
-    Self().Remove( mContentStack.back()  );
+    Self().Remove(mContentStack.back());
   }
 
   //push the new item into the stack and show it
@@ -110,7 +106,7 @@ Actor NavigationView::Pop()
 {
   // cannot pop out the bottom-most item
   Actor poppedItem;
-  if( mContentStack.size() > 1 )
+  if(mContentStack.size() > 1)
   {
     // pop out the top item of the stack and show the new item right under the old one.
     Self().Remove(mContentStack.back());