X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fmagnifier%2Fmagnifier.h;h=4538f81421faa910441109432ce2c1809dc2efe0;hp=df02af4989778137244a69c855a352feaca99407;hb=42eeffaa69044c2236996eb543416486ae92335c;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e

diff --git a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
index df02af4..4538f81 100644
--- a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
+++ b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
@@ -1,28 +1,29 @@
 #ifndef __DALI_TOOLKIT_MAGNIFIER_H__
 #define __DALI_TOOLKIT_MAGNIFIER_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) 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.
+ *
+ */
 
 // EXTERNAL INCLUDES
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -40,7 +41,7 @@ class Magnifier;
  * to the stage as a separate overlay. In addition to the contents, an optional frame
  * is displayed around the magnified contents.
  */
-class Magnifier : public Control
+class DALI_IMPORT_API Magnifier : public Control
 {
 public:
 
@@ -67,10 +68,11 @@ public:
   Magnifier& operator=( const Magnifier& handle );
 
   /**
-   * Virtual destructor.
-   * Dali::Object derived classes typically do not contain member data.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~Magnifier();
+  ~Magnifier();
 
   /**
    * Create the Poup control
@@ -141,7 +143,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 Magnifier(Dali::Internal::CustomActor* internal);
+  explicit DALI_INTERNAL Magnifier(Dali::Internal::CustomActor* internal);
 };
 
 } // namespace Toolkit