Update copyright year to 2015 for public api: toolkit

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / page-turn-view / page-turn-view.h

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
index 91aa276..6b4ee7e 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
@@ -1,29 +1,27 @@
 #ifndef __DALI_TOOLKIT_PAGE_TURN_VIEW_H__
 #define __DALI_TOOLKIT_PAGE_TURN_VIEW_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) 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.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -54,7 +52,7 @@ class PageTurnView;
  * Pan with no animation will occur when the user touches the page in an area that does not start the
  * page turning.
  */
-class PageTurnView : public Control
+class DALI_IMPORT_API PageTurnView : public Control
 {
 public:
 
@@ -76,9 +74,11 @@ public:
   PageTurnView& operator=( const PageTurnView& handle );
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~PageTurnView();
+  ~PageTurnView();
 
   /**
    * Downcast an Object handle to PageTurnView.
@@ -153,8 +153,8 @@ public:
 public: //Signal
 
   // Page Turned signal, with page index and boolean turning direction (true = forward, false = backward)
-  typedef SignalV2< void ( PageTurnView, unsigned int, bool ) > PageTurnSignal;
-  typedef SignalV2< void ( PageTurnView ) > PagePanSignal;
+  typedef Signal< void ( PageTurnView, unsigned int, bool ) > PageTurnSignal;
+  typedef Signal< void ( PageTurnView ) > PagePanSignal;
 
   /**
    * Signal emitted when a page has started to turn over.
@@ -208,7 +208,7 @@ public: // Not intended for application developers
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  DALI_INTERNAL PageTurnView(Dali::Internal::CustomActor* internal);
+  explicit DALI_INTERNAL PageTurnView(Dali::Internal::CustomActor* internal);
 };
 
 } // namespace Toolkit