X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Fdali-toolkit-test-utils%2Ftoolkit-text-utils.h;h=eb0dd4065f00b9377bc42956eafc2e9475ff7ce1;hb=a4fa71ebecb9ed103fa3e64004e99b728f9190c2;hp=8ba73068fadf0bfc815a02b8ca5bb8020544a8fd;hpb=1143e3d6b82789fae32f897d3a416b32fdbf0ef3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
index 8ba7306..eb0dd40 100644
--- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
+++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEXT_UTILS_H__
-#define __DALI_TOOLKIT_TEXT_UTILS_H__
+#ifndef DALI_TOOLKIT_TEXT_UTILS_H
+#define DALI_TOOLKIT_TEXT_UTILS_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -19,10 +19,9 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/logical-model-impl.h>
 #include <dali-toolkit/internal/text/metrics.h>
-#include <dali-toolkit/internal/text/visual-model-impl.h>
 #include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/text-model.h>
 
 namespace Dali
 {
@@ -39,11 +38,9 @@ namespace Text
 struct LayoutOptions
 {
   LayoutOptions()
-  : reorder( true ),
-    align( true )
+  : align{ true }
   {}
 
-  bool reorder : 1; ///< Whether to reorder the bidirectional lines.
   bool align   : 1; ///< Whether to align the lines.
 };
 
@@ -56,8 +53,7 @@ struct LayoutOptions
  * @param[in] fontDescriptions The fonts to be used.
  * @param[in] options Layout options.
  * @param[out] layoutSize The laid-out size.
- * @param[out] logicalModel Pointer to a logical text model instance.
- * @param[out] visualModel Pointer to a visual text model instance.
+ * @param[out] textModel Pointer to a text model instance.
  * @param[out] metrics Pointer to a wrapper around FontClient used to get metrics.
  * @param[in] markupProcessorEnabled Enable markup processor to use markup text.
  */
@@ -66,8 +62,7 @@ void CreateTextModel( const std::string& text,
                       const Vector<FontDescriptionRun>& fontDescriptions,
                       const LayoutOptions& options,
                       Size& layoutSize,
-                      LogicalModelPtr& logicalModel,
-                      VisualModelPtr& visualModel,
+                      ModelPtr& textModel,
                       MetricsPtr& metrics,
                       bool markupProcessorEnabled );
 
@@ -98,4 +93,4 @@ void ConfigureTextEditor( ControllerPtr controller );
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_UTILS_H__
+#endif // DALI_TOOLKIT_TEXT_UTILS_H