Merge branch 'tizen' into new_text

[platform/core/uifw/dali-core.git] / dali / internal / event / text / text-format.h

diff --git a/dali/internal/event/text/text-format.h b/dali/internal/event/text/text-format.h
index 15bd453..13323bc 100644 (file)
--- a/dali/internal/event/text/text-format.h
+++ b/dali/internal/event/text/text-format.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_INTERNAL_TEXT_FORMAT_H__
 #define __DALI_INTERNAL_TEXT_FORMAT_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/math/radian.h>
@@ -46,13 +47,11 @@ struct TextFormat
   /**
    * Constructor
    * @param[in] underline whether to underline the text
-   * @param[in] leftToRight whether text is rendered left to right
    * @param[in] italics whether italics is enabled
    * @param[in] italicsAngle italics angle
    * @param[in] pointSize the point size
    */
   TextFormat( bool underline,
-              bool leftToRight,
               bool italics,
               Dali::Radian italicsAngle,
               float pointSize,
@@ -85,12 +84,6 @@ struct TextFormat
   bool IsUnderLined() const;
 
   /**
-   * Whether left to right character layout is enabled
-   * @return true if left to right is true
-   */
-  bool IsLeftToRight() const;
-
-  /**
    * whether italics are enabled
    * @return true if italics enabled
    */
@@ -127,7 +120,6 @@ struct TextFormat
 private:
 
   bool mUnderline:1;              ///< whether to underline the text
-  bool mLeftToRight:1;            ///< Whether text is displayed left to right
   bool mItalics:1;                ///< whether to apply italics
   Dali::Radian mItalicsAngle;     ///< italics angle if applied
   float mPointSize;               ///< Point size. Used to scale the vertices by this amount.