Update copyright year to 2015 for public api: toolkit

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / tool-bar / tool-bar.h

diff --git a/dali-toolkit/public-api/controls/tool-bar/tool-bar.h b/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
index b05439e..17f9a63 100644 (file)
--- a/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
+++ b/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
@@ -1,30 +1,30 @@
 #ifndef __DALI_TOOLKIT_TOOL_BAR_H__
 #define __DALI_TOOLKIT_TOOL_BAR_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.
-//
+/*
+ * 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.
+ *
+ */
 
 // EXTERNAL INCLUDES
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -43,7 +43,7 @@ class ToolBar;
  * is not forbidden, it adds controls on the left group with a size of 10% of the total tool bar size.
  * Dali::Actor::Remove() method does nothing.
  */
-class ToolBar : public Control
+class DALI_IMPORT_API ToolBar : public Control
 {
 public:
   static const Toolkit::Alignment::Padding DEFAULT_PADDING; ///< Default padding space between controls. By default all values are set to 0.
@@ -67,9 +67,11 @@ public:
   ToolBar& operator=( const ToolBar& handle );
 
   /**
-   * virtual Destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ToolBar();
+  ~ToolBar();
 
   /**
    * Create an initialized ToolBar.
@@ -115,13 +117,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
-  ToolBar( Internal::ToolBar& implementation );
+  DALI_INTERNAL ToolBar( Internal::ToolBar& implementation );
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  ToolBar( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ToolBar( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit