Merge "Fixes TextView's includes." into tizen

diff --git a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
index 6c7dd1c..17c9534 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
@@ -16,19 +16,14 @@
  */
 
 // FILE HEADER
-#include "relayout-utilities.h"
+#include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
 
 // EXTERNAL INCLUDES
 #include <cmath>
 
-// INTERNAL INCLUDES
-#include <dali/dali.h>
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
-#include "text-view-line-processor.h"
-#include "text-view-word-processor.h"
-#include "text-view-processor-helper-functions.h"
-#include "text-view-processor-dbg.h"
-
 namespace Dali
 {
 

diff --git a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.h b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.h
index cb14524..ad288ce 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.h
+++ b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.h
@@ -19,11 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
-
-#include "text-view-impl.h"
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-types.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
index 43c0690..5563ff5 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
@@ -16,16 +16,12 @@
  */
 
 // FILE HEADER
-
-#include "split-by-char-policies.h"
-
-// EXTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-view/split-by-char-policies.h>
 
 // INTERNAL INCLUDES
-
-#include "relayout-utilities.h"
-#include "text-view-processor.h"
 #include <dali/integration-api/debug.h>
+#include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h b/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h
index c5b079a..a0624ca 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h
+++ b/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-impl.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
index 7d803c2..7e9020a 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
@@ -16,16 +16,12 @@
  */
 
 // FILE HEADER
-
-#include "split-by-new-line-char-policies.h"
-
-// EXTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h>
 
 // INTERNAL INCLUDES
-
-#include "relayout-utilities.h"
-#include "text-view-processor.h"
 #include <dali/integration-api/debug.h>
+#include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h
index c923e8f..4869d60 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h
+++ b/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h
@@ -19,8 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-impl.h"
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp b/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
index ad64236..0cfcfa1 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
@@ -16,16 +16,12 @@
  */
 
 // FILE HEADER
-
-#include "split-by-word-policies.h"
-
-// EXTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-view/split-by-word-policies.h>
 
 // INTERNAL INCLUDES
-
-#include "relayout-utilities.h"
-#include "text-view-processor.h"
 #include <dali/integration-api/debug.h>
+#include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h b/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h
index f7a10ba..df4ce3a 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h
+++ b/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-impl.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-processor.cpp
index 1baeda0..7d36205 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-processor.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-processor.cpp
@@ -15,13 +15,12 @@
  *
  */
 
+// FILE HEADER
+#include <dali-toolkit/internal/controls/text-view/text-processor.h>
+
 // EXTERNAL INCLUDES
 #include <fribidi/fribidi.h>
 
-// INTERNAL INCLUDES
-
-#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
-
 namespace Dali
 {
 

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp
index e6eed65..c94db79 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp
@@ -16,7 +16,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-types.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
index 3919c6d..ddf6cd7 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
@@ -16,16 +16,15 @@
  */
 
 // CLASS HEADER
-#include "text-view-impl.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 // INTERNAL INCLUDES
-#include "split-by-new-line-char-policies.h"
-#include "split-by-word-policies.h"
-#include "split-by-char-policies.h"
-#include "text-view-processor.h"
-#include "text-view-word-processor.h"
-#include "relayout-utilities.h"
-#include "text-view-processor-dbg.h"
+#include <dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h>
+#include <dali-toolkit/internal/controls/text-view/split-by-word-policies.h>
+#include <dali-toolkit/internal/controls/text-view/split-by-char-policies.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-word-processor.h>
+#include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
index 8d76347..85db821 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
@@ -19,13 +19,10 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/dali-vector.h>
-
-#include <dali/public-api/actors/text-actor.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
-#include "text-actor-cache.h"
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-actor-cache.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-types.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.cpp
index bf4efe5..18f670f 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.cpp
@@ -15,12 +15,14 @@
  *
  */
 
+// FILE HEADER
+#include <dali-toolkit/internal/controls/text-view/text-view-line-processor.h>
+
 // INTERNAL INCLUDES
-#include "text-view-line-processor.h"
-#include "text-view-word-group-processor.h"
-#include "text-view-word-processor.h"
-#include "text-view-processor-helper-functions.h"
-#include "text-processor.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-word-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
+#include <dali-toolkit/internal/controls/text-view/text-processor.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.h
index a7732e1..4fa5185 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-line-processor.h
@@ -19,8 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-impl.h"
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
index 100c570..8e36603 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
@@ -15,8 +15,11 @@
  *
  */
 
+// FILE HEADER
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h>
+
 // INTERNAL INCLUDES
-#include "text-view-processor-dbg.h"
+#include <dali/public-api/actors/text-actor.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h
index 96cf037..c471341 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h
@@ -19,8 +19,9 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-processor-types.h"
 #include <dali/integration-api/debug.h>
+#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-types.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp
index 541ccfe..0533cb4 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp
@@ -15,9 +15,11 @@
  *
  */
 
+// FILE HEADER
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
+
 // INTERNAL INCLUDES
-#include "text-view-processor-helper-functions.h"
-#include "text-view-processor-dbg.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h
index c841409..3affae1 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h
@@ -19,7 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-processor-types.h"
+#include <dali/public-api/actors/text-actor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-types.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h
index 7bc3e4f..55be5a8 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/actors/renderable-actor.h>
 #include <dali-toolkit/public-api/markup-processor/markup-processor.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
index 8d33877..0c3f074 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp
@@ -15,15 +15,15 @@
  *
  */
 
+// FILE HEADER
+#include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
+
 // INTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include "text-view-processor.h"
-#include "text-view-word-processor.h"
-#include "text-view-word-group-processor.h"
-#include "text-view-line-processor.h"
-#include "text-view-processor-helper-functions.h"
-#include "text-processor.h"
-#include "text-view-processor-dbg.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-word-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-line-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
+#include <dali-toolkit/internal/controls/text-view/text-processor.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-processor.h
index 5ca4160..bd31fd1 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-processor.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-processor.h
@@ -19,8 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-impl.h"
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.cpp
index cb58f37..e5c2804 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.cpp
@@ -15,11 +15,13 @@
  *
  */
 
+// FILE HEADER
+#include <dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h>
+
 // INTERNAL INCLUDES
-#include "text-view-word-group-processor.h"
-#include "text-view-word-processor.h"
-#include "text-view-processor-helper-functions.h"
-#include "text-processor.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-word-processor.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
+#include <dali-toolkit/internal/controls/text-view/text-processor.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h
index 3fe7d09..f790d3d 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-word-group-processor.h
@@ -19,8 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-impl.h"
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
index c21c5c0..6e3f8cc 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
@@ -16,12 +16,11 @@
  */
 
 // FILE HEADER
-#include "text-view-word-processor.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-word-processor.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
-#include "text-view-processor-helper-functions.h"
-#include "text-view-processor-dbg.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
+#include <dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h b/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h
index ab03c6b..a9ef345 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h
@@ -19,8 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "text-view-impl.h"
-#include "text-view-processor-types.h"
+#include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/public-api/controls/text-view/text-view.cpp b/base/dali-toolkit/public-api/controls/text-view/text-view.cpp
index b4f0d80..2221ebd 100644 (file)
--- a/base/dali-toolkit/public-api/controls/text-view/text-view.cpp
+++ b/base/dali-toolkit/public-api/controls/text-view/text-view.cpp
@@ -16,11 +16,9 @@
  */
 
 // CLASS HEADER
-
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 // INTERNAL INCLUDES
-
 #include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp b/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp
index 5d50c03..83359fd 100644 (file)
--- a/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp
+++ b/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp
@@ -18,10 +18,6 @@
 // HEADER INCLUDE
 #include <dali-toolkit/public-api/markup-processor/markup-processor.h>
 
-// INTERNAL INCLUDES
-#include <dali/public-api/text/text.h>
-
-
 // EXTERNAL INCLUDES
 #include <stack>
 #include <sstream>