DALi signals refactor to remove V2 naming

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

diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
index 6275e43..7ebaf8d 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
+++ b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
@@ -1,31 +1,29 @@
 #ifndef __DALI_TOOLKIT_NAVIGATION_CONTROL_H__
 #define __DALI_TOOLKIT_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
-#include <boost/function.hpp>
+/*
+ * 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.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -77,7 +75,7 @@ class NavigationControl;
  *                 +----------------------------------------+
  */
 
-class NavigationControl : public Control
+class DALI_IMPORT_API NavigationControl : public Control
 {
 
 public:
@@ -104,9 +102,11 @@ public:
   NavigationControl& operator=( const NavigationControl& handle );
 
   /**
-   * virtual Destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~NavigationControl();
+  ~NavigationControl();
 
   /**
    * Create an initialized NavigationControl.
@@ -196,8 +196,8 @@ public:
 
 public: //Signal
 
-  typedef SignalV2< void( NavigationControl, Page ) > ItemPushedSignalV2;
-  typedef SignalV2< void( NavigationControl, Page ) > ItemPoppedSignalV2;
+  typedef Signal< void( NavigationControl, Page ) > ItemPushedSignalType;
+  typedef Signal< void( NavigationControl, Page ) > ItemPoppedSignalType;
 
   /**
    * Signal emitted right after a new item is pushed into the navigation stack.
@@ -207,7 +207,7 @@ public: //Signal
    * @endcode
    * @return The signal to connect to.
    */
-  ItemPushedSignalV2& ItemPushedSignal();
+  ItemPushedSignalType& ItemPushedSignal();
 
   /**
    * Signal emitted right after an item is popped out from the navigation stack.
@@ -219,7 +219,7 @@ public: //Signal
    * The app can use this signal and check the poppedItem to be uninitialized to know the app window should be lower
    * @return The signal to connect to.
    */
-  ItemPoppedSignalV2& ItemPoppedSignal();
+  ItemPoppedSignalType& ItemPoppedSignal();
 
 
 
@@ -229,13 +229,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
-  NavigationControl( Internal::NavigationControl& implementation );
+  DALI_INTERNAL NavigationControl( Internal::NavigationControl& implementation );
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  NavigationControl( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL NavigationControl( Dali::Internal::CustomActor* internal );
 
 }; // class NavigationControl