X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftext-input%2Ftext-input-text-highlight-impl.h;h=b52cebb1de1850bd0708d6c0fec7c03a3ef5ddb7;hp=52e58c6cb480089e05bc8ff42e058c32ae1e7823;hb=898bb4cb04323871c9c28ce0aaf6ccb78bd0099d;hpb=a881757839b7abb008873a68c67e17b3ba39669b

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
index 52e58c6..b52cebb 100644
--- a/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
@@ -1,22 +1,21 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_TEXT_HIGHLIGHT_H__
 #define __DALI_TOOLKIT_INTERNAL_TEXT_HIGHLIGHT_H__
 
-/*
- * 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.
- *
- */
+//
+// 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.
+//
 
 // INTERNAL INCLUDES
 #include <dali/dali.h>
@@ -86,12 +85,12 @@ public:
      * @param[in] x2 right co-ordinate
      * @param[in] y2 bottom co-ordinate
      */
-    void AddQuad( float x1, float y1, float x2, float y2 ){};
+    void AddQuad( float x1, float y1, float x2, float y2 );
 
     /**
      * Clamps all quads to fit within a min -> max 2D boundary.
      */
-    void Clamp2D(const Vector2& min, const Vector2& max){};
+    void Clamp2D(const Vector2& min, const Vector2& max);
 
     QuadContainer mQuadList;                                 ///< List of quads (sub-selections that form to create complete selection)
   };
@@ -100,12 +99,12 @@ public:
    * Constructor
    * @param[in] textViewCharacterPositioning TextViewCharacterPositioning to be used for positioning information.
    */
-  TextHighlight( TextViewCharacterPositioning& textViewCharacterPositioning ):mTextViewCharacterPositioning( textViewCharacterPositioning ){};
+  TextHighlight( TextViewCharacterPositioning& textViewCharacterPositioning );
 
   /**
    * Destructor
    */
-  ~TextHighlight(){};
+  ~TextHighlight();
 
   /**
    * Gets the table of the visual text positions which has a flag
@@ -120,7 +119,7 @@ public:
    * @param[in] textLayoutInfo TextView character layout information
    */
   void GetVisualTextSelection(std::vector<bool>& selectedVisualText, std::size_t startSelection, std::size_t endSelection,
-                              Toolkit::TextView::TextLayoutInfo& textLayoutInfo){};
+                              Toolkit::TextView::TextLayoutInfo& textLayoutInfo);
 
   /**
    * Iterates between selection handles and computes the info required to build the highlight mesh
@@ -128,19 +127,18 @@ public:
    * @param[in] handlePositionEnd ending handle position
    * @return textHighlight target TextHighlight
    */
-  TextHighlight::HighlightInfo CalculateHighlightInfo( std::size_t handlePositionStart, std::size_t handlePositionEnd, Toolkit::TextView::TextLayoutInfo& textLayoutInfo )
-  { return HighlightInfo();};
+  TextHighlight::HighlightInfo CalculateHighlightInfo( std::size_t handlePositionStart, std::size_t handlePositionEnd, Toolkit::TextView::TextLayoutInfo& textLayoutInfo );
 
   /**
    * Calculates new Mesh data so highlight moves with selection handles.
    * @param[in] newHighlightInfo HighlightInfo calculated by CalculateHighlightInfo
    */
-  void UpdateHighlight( TextHighlight::HighlightInfo& newHighlightInfo ){};
+  void UpdateHighlight( TextHighlight::HighlightInfo& newHighlightInfo );
 
   /**
    * Creates the Mesh data needed by the Mesh Actor
    */
-  Mesh CreateHighLightMesh(){return Mesh();};
+  Mesh CreateHighLightMesh();
 
 private: