Merge "Remove unused FindActorByAlias" into tizen

[platform/core/uifw/dali-core.git] / dali / public-api / images / glyph-image.h

diff --git a/dali/public-api/images/glyph-image.h b/dali/public-api/images/glyph-image.h
index f936dda..a158c7d 100644 (file)
--- a/dali/public-api/images/glyph-image.h
+++ b/dali/public-api/images/glyph-image.h
@@ -1,27 +1,28 @@
 #ifndef __DALI_GLYPH_IMAGE_H__
 #define __DALI_GLYPH_IMAGE_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.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/text/font.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Character;
@@ -30,7 +31,7 @@ class TextStyle;
 /**
  * @brief A GlyphImage object is an image resource which represents a character.
  */
-class GlyphImage : public Image
+class DALI_IMPORT_API GlyphImage : public Image
 {
 public:
   /**
@@ -89,14 +90,26 @@ public:
   static bool IsColorGlyph( const Character& character );
 
   /**
-   * @brief Destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~GlyphImage();
+  ~GlyphImage();
 
   /**
-   * @copydoc Dali::BaseHandle::operator=
+   * @brief This copy constructor is required for (smart) pointer semantics.
+   *
+   * @param [in] handle A reference to the copied handle
+   */
+  GlyphImage(const GlyphImage& handle);
+
+  /**
+   * @brief This assignment operator is required for (smart) pointer semantics.
+   *
+   * @param [in] rhs  A reference to the copied handle
+   * @return A reference to this
    */
-  using BaseHandle::operator=;
+  GlyphImage& operator=(const GlyphImage& rhs);
 
 public: // Not intended for application developers