Prepare for Tizen 2.4 API freeze

Change-Id: I109eec1cae19f0cf4c01aa8bfac8a10d54a9750f

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 802a755..d5567eb 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -100,12 +100,6 @@ publicapisliderdir = $(publicapicontrolsdir)/slider
 publicapisuperblurviewdir = $(publicapicontrolsdir)/super-blur-view
 publicapitableviewdir = $(publicapicontrolsdir)/table-view
 publicapitextcontrolsdir = $(publicapidir)/controls/text-controls
-publicapitextdir = $(publicapidir)/text
-publicapitextdecoratordir = $(publicapidir)/text/decorator
-publicapitextlayoutsdir = $(publicapidir)/text/layouts
-publicapitextrenderingdir = $(publicapidir)/text/rendering
-publicapitextrenderingbasicdir = $(publicapidir)/text/rendering/basic
-publicapitextrenderingshadersdir = $(publicapidir)/text/rendering/shaders
 publicapitoolbardir = $(publicapicontrolsdir)/tool-bar
 publicapiviewdir = $(publicapicontrolsdir)/view
 publicapibuilderdir = $(publicapidir)/builder
@@ -143,12 +137,6 @@ publicapislider_HEADERS = $(public_api_slider_header_files)
 publicapisuperblurview_HEADERS = $(public_api_super_blur_view_header_files)
 publicapitableview_HEADERS = $(public_api_table_view_header_files)
 publicapitextcontrols_HEADERS = $(public_api_text_controls_header_files)
-publicapitext_HEADERS = $(public_api_text_header_files)
-publicapitextdecorator_HEADERS = $(public_api_text_decorator_header_files)
-publicapitextlayouts_HEADERS = $(public_api_text_layouts_header_files)
-publicapitextrendering_HEADERS = $(public_api_text_rendering_header_files)
-publicapitextrenderingbasic_HEADERS = $(public_api_text_rendering_basic_header_files)
-publicapitextrenderingshaders_HEADERS = $(public_api_text_rendering_shaders_header_files)
 publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files)
 publicapiview_HEADERS = $(public_api_view_header_files)
 publicapibuilder_HEADERS = $(public_api_builder_header_files)

diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h
index 844fe87..11ab4e0 100644 (file)
--- a/dali-toolkit/dali-toolkit.h
+++ b/dali-toolkit/dali-toolkit.h
@@ -118,30 +118,6 @@
 #include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
 #include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
 
-#include <dali-toolkit/public-api/text/bidirectional-line-info-run.h>
-#include <dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h>
-#include <dali-toolkit/public-api/text/bidirectional-support.h>
-#include <dali-toolkit/public-api/text/character-run.h>
-#include <dali-toolkit/public-api/text/character-set-conversion.h>
-#include <dali-toolkit/public-api/text/font-run.h>
-#include <dali-toolkit/public-api/text/line-run.h>
-#include <dali-toolkit/public-api/text/logical-model.h>
-#include <dali-toolkit/public-api/text/multi-language-support.h>
-#include <dali-toolkit/public-api/text/script.h>
-#include <dali-toolkit/public-api/text/script-run.h>
-#include <dali-toolkit/public-api/text/segmentation.h>
-#include <dali-toolkit/public-api/text/shaper.h>
-#include <dali-toolkit/public-api/text/text-controller.h>
-#include <dali-toolkit/public-api/text/text-definitions.h>
-#include <dali-toolkit/public-api/text/text-view.h>
-#include <dali-toolkit/public-api/text/text-view-interface.h>
-#include <dali-toolkit/public-api/text/visual-model.h>
-#include <dali-toolkit/public-api/text/decorator/text-decorator.h>
-#include <dali-toolkit/public-api/text/layouts/layout-engine.h>
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
-#include <dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h>
-#include <dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h>
-
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 #include <dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h>
 #include <dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h>

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index 3603a6f..55d1823 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -25,8 +25,8 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/layouts/layout-engine.h>
-#include <dali-toolkit/public-api/text/rendering/text-backend.h>
+#include <dali-toolkit/internal/text/layouts/layout-engine.h>
+#include <dali-toolkit/internal/text/rendering/text-backend.h>
 
 using namespace Dali::Toolkit::Text;
 

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index 0f6cf84..3f98cbd 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -21,9 +21,10 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-field.h>
-#include <dali-toolkit/public-api/text/decorator/text-decorator.h>
-#include <dali-toolkit/public-api/text/text-control-interface.h>
-#include <dali-toolkit/public-api/text/text-controller.h>
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
+#include <dali-toolkit/internal/text/text-control-interface.h>
+#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index 7c7de29..9e20046 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -23,8 +23,8 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/layouts/layout-engine.h>
-#include <dali-toolkit/public-api/text/rendering/text-backend.h>
+#include <dali-toolkit/internal/text/layouts/layout-engine.h>
+#include <dali-toolkit/internal/text/rendering/text-backend.h>
 
 using Dali::Toolkit::Text::LayoutEngine;
 using Dali::Toolkit::Text::Backend;

diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index 073d1ac..b0c2232 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@ -21,8 +21,8 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-#include <dali-toolkit/public-api/text/text-controller.h>
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index 24854fa..171f529 100644 (file)
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -73,8 +73,26 @@ toolkit_src_files = \
    $(toolkit_src_dir)/shader-effects/page-turn-effect-impl.cpp \
    $(toolkit_src_dir)/shader-effects/water-effect-impl.cpp \
    $(toolkit_src_dir)/styling/style-manager-impl.cpp \
-   $(toolkit_src_dir)/text/rendering/text-backend-impl.cpp \
+   $(toolkit_src_dir)/text/bidirectional-support.cpp \
+   $(toolkit_src_dir)/text/character-set-conversion.cpp \
+   $(toolkit_src_dir)/text/logical-model.cpp \
+   $(toolkit_src_dir)/text/multi-language-support.cpp \
+   $(toolkit_src_dir)/text/text-script.cpp \
+   $(toolkit_src_dir)/text/segmentation.cpp \
+   $(toolkit_src_dir)/text/shaper.cpp \
+   $(toolkit_src_dir)/text/text-control-interface.cpp \
+   $(toolkit_src_dir)/text/text-controller.cpp \
+   $(toolkit_src_dir)/text/text-view.cpp \
+   $(toolkit_src_dir)/text/text-view-interface.cpp \
+   $(toolkit_src_dir)/text/visual-model.cpp \
+   $(toolkit_src_dir)/text/decorator/text-decorator.cpp \
+   $(toolkit_src_dir)/text/layouts/layout-engine.cpp \
    $(toolkit_src_dir)/text/multi-language-support-impl.cpp \
+   $(toolkit_src_dir)/text/rendering/text-backend.cpp \
+   $(toolkit_src_dir)/text/rendering/text-renderer.cpp \
+   $(toolkit_src_dir)/text/rendering/basic/text-basic-renderer.cpp \
+   $(toolkit_src_dir)/text/rendering/shaders/text-basic-shader.cpp \
+   $(toolkit_src_dir)/text/rendering/text-backend-impl.cpp \
    $(toolkit_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
    $(toolkit_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
    $(toolkit_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \

diff --git a/dali-toolkit/public-api/text/bidirectional-line-info-run.h b/dali-toolkit/internal/text/bidirectional-line-info-run.h
similarity index 95%
rename from dali-toolkit/public-api/text/bidirectional-line-info-run.h
rename to dali-toolkit/internal/text/bidirectional-line-info-run.h
index 46e2fa3..90c8514 100644 (file)
--- a/dali-toolkit/public-api/text/bidirectional-line-info-run.h
+++ b/dali-toolkit/internal/text/bidirectional-line-info-run.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/character-run.h>
+#include <dali-toolkit/internal/text/character-run.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h b/dali-toolkit/internal/text/bidirectional-paragraph-info-run.h
similarity index 96%
rename from dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h
rename to dali-toolkit/internal/text/bidirectional-paragraph-info-run.h
index 055df82..feefa84 100644 (file)
--- a/dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h
+++ b/dali-toolkit/internal/text/bidirectional-paragraph-info-run.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/character-run.h>
+#include <dali-toolkit/internal/text/character-run.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/bidirectional-support.cpp b/dali-toolkit/internal/text/bidirectional-support.cpp
similarity index 96%
rename from dali-toolkit/public-api/text/bidirectional-support.cpp
rename to dali-toolkit/internal/text/bidirectional-support.cpp
index 02645f4..5cf1ffb 100644 (file)
--- a/dali-toolkit/public-api/text/bidirectional-support.cpp
+++ b/dali-toolkit/internal/text/bidirectional-support.cpp
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/public-api/text/bidirectional-support.h>
+#include <dali-toolkit/internal/text/bidirectional-support.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/bidirectional-support.h b/dali-toolkit/internal/text/bidirectional-support.h
similarity index 96%
rename from dali-toolkit/public-api/text/bidirectional-support.h
rename to dali-toolkit/internal/text/bidirectional-support.h
index e45fc06..a54bc19 100644 (file)
--- a/dali-toolkit/public-api/text/bidirectional-support.h
+++ b/dali-toolkit/internal/text/bidirectional-support.h
@@ -20,8 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali-toolkit/public-api/text/bidirectional-line-info-run.h>
-#include <dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h>
+#include <dali-toolkit/internal/text/bidirectional-line-info-run.h>
+#include <dali-toolkit/internal/text/bidirectional-paragraph-info-run.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/character-run.h b/dali-toolkit/internal/text/character-run.h
similarity index 95%
rename from dali-toolkit/public-api/text/character-run.h
rename to dali-toolkit/internal/text/character-run.h
index b0d648e..221ecbd 100644 (file)
--- a/dali-toolkit/public-api/text/character-run.h
+++ b/dali-toolkit/internal/text/character-run.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/character-set-conversion.cpp b/dali-toolkit/internal/text/character-set-conversion.cpp
similarity index 98%
rename from dali-toolkit/public-api/text/character-set-conversion.cpp
rename to dali-toolkit/internal/text/character-set-conversion.cpp
index 88356f4..abda102 100644 (file)
--- a/dali-toolkit/public-api/text/character-set-conversion.cpp
+++ b/dali-toolkit/internal/text/character-set-conversion.cpp
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/public-api/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/character-set-conversion.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/character-set-conversion.h b/dali-toolkit/internal/text/character-set-conversion.h
similarity index 100%
rename from dali-toolkit/public-api/text/character-set-conversion.h
rename to dali-toolkit/internal/text/character-set-conversion.h

diff --git a/dali-toolkit/public-api/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp
similarity index 99%
rename from dali-toolkit/public-api/text/decorator/text-decorator.cpp
rename to dali-toolkit/internal/text/decorator/text-decorator.cpp
index 0b15b49..5b5ba83 100644 (file)
--- a/dali-toolkit/public-api/text/decorator/text-decorator.cpp
+++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/decorator/text-decorator.h>
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>

diff --git a/dali-toolkit/public-api/text/decorator/text-decorator.h b/dali-toolkit/internal/text/decorator/text-decorator.h
similarity index 100%
rename from dali-toolkit/public-api/text/decorator/text-decorator.h
rename to dali-toolkit/internal/text/decorator/text-decorator.h

diff --git a/dali-toolkit/public-api/text/font-run.h b/dali-toolkit/internal/text/font-run.h
similarity index 95%
rename from dali-toolkit/public-api/text/font-run.h
rename to dali-toolkit/internal/text/font-run.h
index 3a1d455..2a9680a 100644 (file)
--- a/dali-toolkit/public-api/text/font-run.h
+++ b/dali-toolkit/internal/text/font-run.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/character-run.h>
+#include <dali-toolkit/internal/text/character-run.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp
similarity index 97%
rename from dali-toolkit/public-api/text/layouts/layout-engine.cpp
rename to dali-toolkit/internal/text/layouts/layout-engine.cpp
index e6a3a63..ac2c53f 100644 (file)
--- a/dali-toolkit/public-api/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@ -16,15 +16,15 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/layouts/layout-engine.h>
+#include <dali-toolkit/internal/text/layouts/layout-engine.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/text-abstraction/font-client.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/logical-model.h>
-#include <dali-toolkit/public-api/text/visual-model.h>
+#include <dali-toolkit/internal/text/logical-model.h>
+#include <dali-toolkit/internal/text/visual-model.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/layouts/layout-engine.h b/dali-toolkit/internal/text/layouts/layout-engine.h
similarity index 97%
rename from dali-toolkit/public-api/text/layouts/layout-engine.h
rename to dali-toolkit/internal/text/layouts/layout-engine.h
index bc328c1..d3ae55a 100644 (file)
--- a/dali-toolkit/public-api/text/layouts/layout-engine.h
+++ b/dali-toolkit/internal/text/layouts/layout-engine.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDE
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 // EXTERNAL INCLUDE
 #include <dali/public-api/common/dali-vector.h>

diff --git a/dali-toolkit/public-api/text/line-run.h b/dali-toolkit/internal/text/line-run.h
similarity index 94%
rename from dali-toolkit/public-api/text/line-run.h
rename to dali-toolkit/internal/text/line-run.h
index 22582d3..ad25d59 100644 (file)
--- a/dali-toolkit/public-api/text/line-run.h
+++ b/dali-toolkit/internal/text/line-run.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/logical-model.cpp b/dali-toolkit/internal/text/logical-model.cpp
similarity index 97%
rename from dali-toolkit/public-api/text/logical-model.cpp
rename to dali-toolkit/internal/text/logical-model.cpp
index 09a590c..d4746f1 100644 (file)
--- a/dali-toolkit/public-api/text/logical-model.cpp
+++ b/dali-toolkit/internal/text/logical-model.cpp
@@ -16,13 +16,13 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/logical-model.h>
+#include <dali-toolkit/internal/text/logical-model.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/bidirectional-line-info-run.h>
-#include <dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h>
-#include <dali-toolkit/public-api/text/font-run.h>
-#include <dali-toolkit/public-api/text/script-run.h>
+#include <dali-toolkit/internal/text/bidirectional-line-info-run.h>
+#include <dali-toolkit/internal/text/bidirectional-paragraph-info-run.h>
+#include <dali-toolkit/internal/text/font-run.h>
+#include <dali-toolkit/internal/text/script-run.h>
 
 // EXTERNAL INCLUDES
 #include <memory.h>

diff --git a/dali-toolkit/public-api/text/logical-model.h b/dali-toolkit/internal/text/logical-model.h
similarity index 99%
rename from dali-toolkit/public-api/text/logical-model.h
rename to dali-toolkit/internal/text/logical-model.h
index 059a38b..b80e9b2 100644 (file)
--- a/dali-toolkit/public-api/text/logical-model.h
+++ b/dali-toolkit/internal/text/logical-model.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/object/ref-object.h>
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index 051b35a..42c9e84 100644 (file)
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -25,10 +25,10 @@
 #include <dali/public-api/text-abstraction/font-client.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/logical-model.h>
-#include <dali-toolkit/public-api/text/font-run.h>
-#include <dali-toolkit/public-api/text/script.h>
-#include <dali-toolkit/public-api/text/script-run.h>
+#include <dali-toolkit/internal/text/logical-model.h>
+#include <dali-toolkit/internal/text/font-run.h>
+#include <dali-toolkit/internal/text/script.h>
+#include <dali-toolkit/internal/text/script-run.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.h b/dali-toolkit/internal/text/multi-language-support-impl.h
index 65933b5..bcf0a6b 100644 (file)
--- a/dali-toolkit/internal/text/multi-language-support-impl.h
+++ b/dali-toolkit/internal/text/multi-language-support-impl.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/multi-language-support.h>
+#include <dali-toolkit/internal/text/multi-language-support.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>

diff --git a/dali-toolkit/public-api/text/multi-language-support.cpp b/dali-toolkit/internal/text/multi-language-support.cpp
similarity index 97%
rename from dali-toolkit/public-api/text/multi-language-support.cpp
rename to dali-toolkit/internal/text/multi-language-support.cpp
index 1d43f37..4416dba 100644 (file)
--- a/dali-toolkit/public-api/text/multi-language-support.cpp
+++ b/dali-toolkit/internal/text/multi-language-support.cpp
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/public-api/text/multi-language-support.h>
+#include <dali-toolkit/internal/text/multi-language-support.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/multi-language-support-impl.h>

diff --git a/dali-toolkit/public-api/text/multi-language-support.h b/dali-toolkit/internal/text/multi-language-support.h
similarity index 98%
rename from dali-toolkit/public-api/text/multi-language-support.h
rename to dali-toolkit/internal/text/multi-language-support.h
index 36eb349..b0873d9 100644 (file)
--- a/dali-toolkit/public-api/text/multi-language-support.h
+++ b/dali-toolkit/internal/text/multi-language-support.h
@@ -21,8 +21,8 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/object/base-handle.h>
-#include <dali-toolkit/public-api/text/font-run.h>
-#include <dali-toolkit/public-api/text/script-run.h>
+#include <dali-toolkit/internal/text/font-run.h>
+#include <dali-toolkit/internal/text/script-run.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp b/dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp
similarity index 98%
rename from dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp
rename to dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp
index b4b8515..4521d94 100644 (file)
--- a/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp
@@ -16,14 +16,14 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h>
+#include <dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/text-abstraction/font-client.h>
 #include <dali/public-api/actors/mesh-actor.h>
 #include <dali/public-api/images/atlas.h>
 #include <dali/public-api/geometry/mesh.h>
-#include <dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h>
+#include <dali-toolkit/internal/text/rendering/shaders/text-basic-shader.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;

diff --git a/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h b/dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h
similarity index 93%
rename from dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h
rename to dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h
index 3133c6d..1cf8469 100644 (file)
--- a/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h
+++ b/dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.cpp b/dali-toolkit/internal/text/rendering/shaders/text-basic-shader.cpp
similarity index 96%
rename from dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.cpp
rename to dali-toolkit/internal/text/rendering/shaders/text-basic-shader.cpp
index f3a9004..0afddbb 100644 (file)
--- a/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.cpp
+++ b/dali-toolkit/internal/text/rendering/shaders/text-basic-shader.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h b/dali-toolkit/internal/text/rendering/shaders/text-basic-shader.h
similarity index 100%
rename from dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h
rename to dali-toolkit/internal/text/rendering/shaders/text-basic-shader.h

diff --git a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
index 87b8e6a..74b80f1 100644 (file)
--- a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
+++ b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
@@ -23,7 +23,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h>
+#include <dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/text/rendering/text-backend-impl.h b/dali-toolkit/internal/text/rendering/text-backend-impl.h
index 6e0390b..a185ee2 100644 (file)
--- a/dali-toolkit/internal/text/rendering/text-backend-impl.h
+++ b/dali-toolkit/internal/text/rendering/text-backend-impl.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/rendering/text-backend.h>
+#include <dali-toolkit/internal/text/rendering/text-backend.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/rendering/text-backend.cpp b/dali-toolkit/internal/text/rendering/text-backend.cpp
similarity index 95%
rename from dali-toolkit/public-api/text/rendering/text-backend.cpp
rename to dali-toolkit/internal/text/rendering/text-backend.cpp
index ae80da6..ee48026 100644 (file)
--- a/dali-toolkit/public-api/text/rendering/text-backend.cpp
+++ b/dali-toolkit/internal/text/rendering/text-backend.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/rendering/text-backend.h>
+#include <dali-toolkit/internal/text/rendering/text-backend.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/rendering/text-backend-impl.h>

diff --git a/dali-toolkit/public-api/text/rendering/text-backend.h b/dali-toolkit/internal/text/rendering/text-backend.h
similarity index 97%
rename from dali-toolkit/public-api/text/rendering/text-backend.h
rename to dali-toolkit/internal/text/rendering/text-backend.h
index ca54fa1..62b9f86 100644 (file)
--- a/dali-toolkit/public-api/text/rendering/text-backend.h
+++ b/dali-toolkit/internal/text/rendering/text-backend.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/rendering/text-renderer.cpp b/dali-toolkit/internal/text/rendering/text-renderer.cpp
similarity index 92%
rename from dali-toolkit/public-api/text/rendering/text-renderer.cpp
rename to dali-toolkit/internal/text/rendering/text-renderer.cpp
index fb7c7cb..4d74934 100644 (file)
--- a/dali-toolkit/public-api/text/rendering/text-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/text-renderer.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/rendering/text-renderer.h b/dali-toolkit/internal/text/rendering/text-renderer.h
similarity index 96%
rename from dali-toolkit/public-api/text/rendering/text-renderer.h
rename to dali-toolkit/internal/text/rendering/text-renderer.h
index 283439a..3485f16 100644 (file)
--- a/dali-toolkit/public-api/text/rendering/text-renderer.h
+++ b/dali-toolkit/internal/text/rendering/text-renderer.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/object/ref-object.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/text-view-interface.h>
+#include <dali-toolkit/internal/text/text-view-interface.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/script-run.h b/dali-toolkit/internal/text/script-run.h
similarity index 95%
rename from dali-toolkit/public-api/text/script-run.h
rename to dali-toolkit/internal/text/script-run.h
index c5dd698..3533df6 100644 (file)
--- a/dali-toolkit/public-api/text/script-run.h
+++ b/dali-toolkit/internal/text/script-run.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/character-run.h>
+#include <dali-toolkit/internal/text/character-run.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/script.h b/dali-toolkit/internal/text/script.h
similarity index 97%
rename from dali-toolkit/public-api/text/script.h
rename to dali-toolkit/internal/text/script.h
index 7ab8d89..c7a3efa 100644 (file)
--- a/dali-toolkit/public-api/text/script.h
+++ b/dali-toolkit/internal/text/script.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/segmentation.cpp b/dali-toolkit/internal/text/segmentation.cpp
similarity index 97%
rename from dali-toolkit/public-api/text/segmentation.cpp
rename to dali-toolkit/internal/text/segmentation.cpp
index 91a2e5d..efac834 100644 (file)
--- a/dali-toolkit/public-api/text/segmentation.cpp
+++ b/dali-toolkit/internal/text/segmentation.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/segmentation.h>
+#include <dali-toolkit/internal/text/segmentation.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/text-abstraction/segmentation.h>

diff --git a/dali-toolkit/public-api/text/segmentation.h b/dali-toolkit/internal/text/segmentation.h
similarity index 98%
rename from dali-toolkit/public-api/text/segmentation.h
rename to dali-toolkit/internal/text/segmentation.h
index 1c0c489..27fb85d 100644 (file)
--- a/dali-toolkit/public-api/text/segmentation.h
+++ b/dali-toolkit/internal/text/segmentation.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/shaper.cpp b/dali-toolkit/internal/text/shaper.cpp
similarity index 95%
rename from dali-toolkit/public-api/text/shaper.cpp
rename to dali-toolkit/internal/text/shaper.cpp
index 376a1b7..e70750c 100644 (file)
--- a/dali-toolkit/public-api/text/shaper.cpp
+++ b/dali-toolkit/internal/text/shaper.cpp
@@ -16,17 +16,17 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/shaper.h>
+#include <dali-toolkit/internal/text/shaper.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/text-abstraction/shaping.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/font-run.h>
-#include <dali-toolkit/public-api/text/logical-model.h>
-#include <dali-toolkit/public-api/text/script.h>
-#include <dali-toolkit/public-api/text/script-run.h>
-#include <dali-toolkit/public-api/text/visual-model.h>
+#include <dali-toolkit/internal/text/font-run.h>
+#include <dali-toolkit/internal/text/logical-model.h>
+#include <dali-toolkit/internal/text/script.h>
+#include <dali-toolkit/internal/text/script-run.h>
+#include <dali-toolkit/internal/text/visual-model.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/shaper.h b/dali-toolkit/internal/text/shaper.h
similarity index 96%
rename from dali-toolkit/public-api/text/shaper.h
rename to dali-toolkit/internal/text/shaper.h
index e18fd76..441465c 100644 (file)
--- a/dali-toolkit/public-api/text/shaper.h
+++ b/dali-toolkit/internal/text/shaper.h
@@ -20,8 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali-toolkit/public-api/text/font-run.h>
-#include <dali-toolkit/public-api/text/script-run.h>
+#include <dali-toolkit/internal/text/font-run.h>
+#include <dali-toolkit/internal/text/script-run.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/text-control-interface.cpp b/dali-toolkit/internal/text/text-control-interface.cpp
similarity index 92%
rename from dali-toolkit/public-api/text/text-control-interface.cpp
rename to dali-toolkit/internal/text/text-control-interface.cpp
index 79ddca1..8ac77d1 100644 (file)
--- a/dali-toolkit/public-api/text/text-control-interface.cpp
+++ b/dali-toolkit/internal/text/text-control-interface.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/text-control-interface.h>
+#include <dali-toolkit/internal/text/text-control-interface.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/text-control-interface.h b/dali-toolkit/internal/text/text-control-interface.h
similarity index 100%
rename from dali-toolkit/public-api/text/text-control-interface.h
rename to dali-toolkit/internal/text/text-control-interface.h

diff --git a/dali-toolkit/public-api/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
similarity index 96%
rename from dali-toolkit/public-api/text/text-controller.cpp
rename to dali-toolkit/internal/text/text-controller.cpp
index 58fd536..2b90bc3 100644 (file)
--- a/dali-toolkit/public-api/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -16,18 +16,18 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/text-controller.h>
+#include <dali-toolkit/internal/text/text-controller.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/character-set-conversion.h>
-#include <dali-toolkit/public-api/text/layouts/layout-engine.h>
-#include <dali-toolkit/public-api/text/logical-model.h>
-#include <dali-toolkit/public-api/text/multi-language-support.h>
-#include <dali-toolkit/public-api/text/script-run.h>
-#include <dali-toolkit/public-api/text/segmentation.h>
-#include <dali-toolkit/public-api/text/shaper.h>
-#include <dali-toolkit/public-api/text/text-view.h>
-#include <dali-toolkit/public-api/text/visual-model.h>
+#include <dali-toolkit/internal/text/character-set-conversion.h>
+#include <dali-toolkit/internal/text/layouts/layout-engine.h>
+#include <dali-toolkit/internal/text/logical-model.h>
+#include <dali-toolkit/internal/text/multi-language-support.h>
+#include <dali-toolkit/internal/text/script-run.h>
+#include <dali-toolkit/internal/text/segmentation.h>
+#include <dali-toolkit/internal/text/shaper.h>
+#include <dali-toolkit/internal/text/text-view.h>
+#include <dali-toolkit/internal/text/visual-model.h>
 
 // EXTERNAL INCLUDES
 #include <limits>

diff --git a/dali-toolkit/public-api/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h
similarity index 96%
rename from dali-toolkit/public-api/text/text-controller.h
rename to dali-toolkit/internal/text/text-controller.h
index 8133451..f5ae6ba 100644 (file)
--- a/dali-toolkit/public-api/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h
@@ -19,9 +19,9 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/decorator/text-decorator.h>
-#include <dali-toolkit/public-api/text/text-control-interface.h>
-#include <dali-toolkit/public-api/text/text-view.h>
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
+#include <dali-toolkit/internal/text/text-control-interface.h>
+#include <dali-toolkit/internal/text/text-view.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/intrusive-ptr.h>

diff --git a/dali-toolkit/public-api/text/text-definitions.h b/dali-toolkit/internal/text/text-definitions.h
similarity index 100%
rename from dali-toolkit/public-api/text/text-definitions.h
rename to dali-toolkit/internal/text/text-definitions.h

diff --git a/dali-toolkit/public-api/text/text-script.cpp b/dali-toolkit/internal/text/text-script.cpp
similarity index 99%
rename from dali-toolkit/public-api/text/text-script.cpp
rename to dali-toolkit/internal/text/text-script.cpp
index c320a7e..fbbd5c0 100644 (file)
--- a/dali-toolkit/public-api/text/text-script.cpp
+++ b/dali-toolkit/internal/text/text-script.cpp
@@ -16,7 +16,7 @@
  */
 
 // FILE HEADER
-#include <dali-toolkit/public-api/text/script.h>
+#include <dali-toolkit/internal/text/script.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/text-view-interface.cpp b/dali-toolkit/internal/text/text-view-interface.cpp
similarity index 93%
rename from dali-toolkit/public-api/text/text-view-interface.cpp
rename to dali-toolkit/internal/text/text-view-interface.cpp
index 9bf1fb3..54d1589 100644 (file)
--- a/dali-toolkit/public-api/text/text-view-interface.cpp
+++ b/dali-toolkit/internal/text/text-view-interface.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/text-view-interface.h>
+#include <dali-toolkit/internal/text/text-view-interface.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/text-view-interface.h b/dali-toolkit/internal/text/text-view-interface.h
similarity index 97%
rename from dali-toolkit/public-api/text/text-view-interface.h
rename to dali-toolkit/internal/text/text-view-interface.h
index c15cda1..d005a4a 100644 (file)
--- a/dali-toolkit/public-api/text/text-view-interface.h
+++ b/dali-toolkit/internal/text/text-view-interface.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/text-view.cpp b/dali-toolkit/internal/text/text-view.cpp
similarity index 97%
rename from dali-toolkit/public-api/text/text-view.cpp
rename to dali-toolkit/internal/text/text-view.cpp
index 01e7531..235f534 100644 (file)
--- a/dali-toolkit/public-api/text/text-view.cpp
+++ b/dali-toolkit/internal/text/text-view.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/text-view.h>
+#include <dali-toolkit/internal/text/text-view.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/math/vector2.h>

diff --git a/dali-toolkit/public-api/text/text-view.h b/dali-toolkit/internal/text/text-view.h
similarity index 94%
rename from dali-toolkit/public-api/text/text-view.h
rename to dali-toolkit/internal/text/text-view.h
index 432f5c5..c3d033e 100644 (file)
--- a/dali-toolkit/public-api/text/text-view.h
+++ b/dali-toolkit/internal/text/text-view.h
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/text-view-interface.h>
-#include <dali-toolkit/public-api/text/visual-model.h>
+#include <dali-toolkit/internal/text/text-view-interface.h>
+#include <dali-toolkit/internal/text/visual-model.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/text/visual-model.cpp b/dali-toolkit/internal/text/visual-model.cpp
similarity index 98%
rename from dali-toolkit/public-api/text/visual-model.cpp
rename to dali-toolkit/internal/text/visual-model.cpp
index b75005d..975a70e 100644 (file)
--- a/dali-toolkit/public-api/text/visual-model.cpp
+++ b/dali-toolkit/internal/text/visual-model.cpp
@@ -16,12 +16,12 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/text/visual-model.h>
+#include <dali-toolkit/internal/text/visual-model.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/math/vector2.h>
-#include <dali-toolkit/public-api/text/line-run.h>
+#include <dali-toolkit/internal/text/line-run.h>
 
 // EXTERNAL INCLUDES
 #include <memory.h>

diff --git a/dali-toolkit/public-api/text/visual-model.h b/dali-toolkit/internal/text/visual-model.h
similarity index 99%
rename from dali-toolkit/public-api/text/visual-model.h
rename to dali-toolkit/internal/text/visual-model.h
index 0cfa4b5..ad2a137 100644 (file)
--- a/dali-toolkit/public-api/text/visual-model.h
+++ b/dali-toolkit/internal/text/visual-model.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/object/ref-object.h>
-#include <dali-toolkit/public-api/text/text-definitions.h>
+#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h
index 0f1b4fd..cc2166e 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-field.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-field.h
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h
index e1f69c0..a1c3716 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.h
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/text/rendering/text-renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
index 483fb87..34774ac 100755 (executable)
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@ -94,24 +94,6 @@ public_api_src_files = \
   $(public_api_src_dir)/shader-effects/swirl-effect.cpp \
   $(public_api_src_dir)/shader-effects/water-effect.cpp \
   $(public_api_src_dir)/styling/style-manager.cpp \
-  $(public_api_src_dir)/text/bidirectional-support.cpp \
-  $(public_api_src_dir)/text/character-set-conversion.cpp \
-  $(public_api_src_dir)/text/logical-model.cpp \
-  $(public_api_src_dir)/text/multi-language-support.cpp \
-  $(public_api_src_dir)/text/text-script.cpp \
-  $(public_api_src_dir)/text/segmentation.cpp \
-  $(public_api_src_dir)/text/shaper.cpp \
-  $(public_api_src_dir)/text/text-control-interface.cpp \
-  $(public_api_src_dir)/text/text-controller.cpp \
-  $(public_api_src_dir)/text/text-view.cpp \
-  $(public_api_src_dir)/text/text-view-interface.cpp \
-  $(public_api_src_dir)/text/visual-model.cpp \
-  $(public_api_src_dir)/text/decorator/text-decorator.cpp \
-  $(public_api_src_dir)/text/layouts/layout-engine.cpp \
-  $(public_api_src_dir)/text/rendering/text-backend.cpp \
-  $(public_api_src_dir)/text/rendering/text-renderer.cpp \
-  $(public_api_src_dir)/text/rendering/basic/text-basic-renderer.cpp \
-  $(public_api_src_dir)/text/rendering/shaders/text-basic-shader.cpp \
   $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
   $(public_api_src_dir)/transition-effects/cube-transition-effect.cpp \
   $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
@@ -228,49 +210,6 @@ public_api_text_controls_header_files = \
   $(public_api_src_dir)/controls/text-controls/text-label.h \
   $(public_api_src_dir)/controls/text-controls/text-field.h
 
-public_api_text_header_files = \
-  $(public_api_src_dir)/text/bidirectional-line-info-run.h \
-  $(public_api_src_dir)/text/bidirectional-paragraph-info-run.h \
-  $(public_api_src_dir)/text/bidirectional-support.h \
-  $(public_api_src_dir)/text/character-run.h \
-  $(public_api_src_dir)/text/character-set-conversion.h \
-  $(public_api_src_dir)/text/font-run.h \
-  $(public_api_src_dir)/text/line-run.h \
-  $(public_api_src_dir)/text/logical-model.h \
-  $(public_api_src_dir)/text/multi-language-support.h \
-  $(public_api_src_dir)/text/script.h \
-  $(public_api_src_dir)/text/script-run.h \
-  $(public_api_src_dir)/text/segmentation.h \
-  $(public_api_src_dir)/text/shaper.h \
-  $(public_api_src_dir)/text/text-control-interface.h \
-  $(public_api_src_dir)/text/text-controller.h \
-  $(public_api_src_dir)/text/text-definitions.h \
-  $(public_api_src_dir)/text/text-view.h \
-  $(public_api_src_dir)/text/text-view-interface.h \
-  $(public_api_src_dir)/text/visual-model.h
-
-public_api_text_decorator_header_files = \
-  $(public_api_src_dir)/text/decorator/text-decorator.h
-
-public_api_text_layouts_header_files = \
-  $(public_api_src_dir)/text/layouts/layout-engine.h
-
-public_api_text_rendering_header_files = \
-  $(public_api_src_dir)/text/rendering/text-backend.h \
-  $(public_api_src_dir)/text/rendering/text-renderer.h
-
-public_api_text_rendering_basic_header_files = \
-  $(public_api_src_dir)/text/rendering/basic/text-basic-renderer.h
-
-public_api_text_rendering_shaders_header_files = \
-  $(public_api_src_dir)/text/rendering/shaders/text-basic-shader.h
-
-public_api_text_input_header_files = \
-  $(public_api_src_dir)/controls/text-input/text-input.h
-
-public_api_text_view_header_files = \
-  $(public_api_src_dir)/controls/text-view/text-view.h
-
 public_api_tool_bar_header_files = \
   $(public_api_src_dir)/controls/tool-bar/tool-bar.h