(Page) Using registered properties

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / navigation-frame / navigation-control.cpp

diff --git a/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp b/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp
index d4f4afd..747847a 100644 (file)
--- a/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp
+++ b/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp
@@ -1,18 +1,19 @@
-//
-// 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.
-//
+/*
+ * Copyright (c) 2015 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.
+ *
+ */
 
 // CLASS HEADER
 #include "navigation-control.h"
@@ -28,9 +29,6 @@ namespace Dali
 namespace Toolkit
 {
 
-const char* const NavigationControl::ACTION_PUSH = "push";
-const char* const NavigationControl::ACTION_POP = "pop";
-
 NavigationControl::NavigationControl()
 {
 }
@@ -125,12 +123,12 @@ void NavigationControl::SetOrientationRotateAnimation( float duration, AlphaFunc
   GetImpl( *this ).SetOrientationRotateAnimation( duration, alphaFunc );
 }
 
-NavigationControl::ItemPushedSignalV2& NavigationControl::ItemPushedSignal()
+NavigationControl::ItemPushedSignalType& NavigationControl::ItemPushedSignal()
 {
   return GetImpl( *this ).ItemPushedSignal();
 }
 
-NavigationControl::ItemPoppedSignalV2& NavigationControl::ItemPoppedSignal()
+NavigationControl::ItemPoppedSignalType& NavigationControl::ItemPoppedSignal()
 {
   return GetImpl( *this ).ItemPoppedSignal();
 }