Follow the include-order coding conventions

Change-Id: I316b5d62f4c31b38740067186d29dc4cb5cf0767

diff --git a/dali-toolkit/internal/builder/builder-declarations.h b/dali-toolkit/internal/builder/builder-declarations.h
index eabfb29..766e1bf 100644 (file)
--- a/dali-toolkit/internal/builder/builder-declarations.h
+++ b/dali-toolkit/internal/builder/builder-declarations.h
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali.h>
 
 // EXTERNAL INCLUDES
 #include <dali.h>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/builder/tree-node.h>
 #include <dali-toolkit/internal/builder/optional-value.h>
 
 #include <dali-toolkit/public-api/builder/tree-node.h>
 #include <dali-toolkit/internal/builder/optional-value.h>
 

diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp
index 82a502f..0a13013 100644 (file)
--- a/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/dali-toolkit/internal/builder/builder-impl.cpp
@@ -23,9 +23,10 @@
 #include <boost/function.hpp>
 #include <sstream>
 
 #include <boost/function.hpp>
 #include <sstream>
 

-// INTERNAL INCLUDES

 #include <dali/integration-api/debug.h>
 
 #include <dali/integration-api/debug.h>
 

+// INTERNAL INCLUDES
+

 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/builder/json-parser.h>
 
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/builder/json-parser.h>
 

diff --git a/dali-toolkit/internal/builder/json-parser-impl.cpp b/dali-toolkit/internal/builder/json-parser-impl.cpp
index 5bce6fb..2cff977 100644 (file)
--- a/dali-toolkit/internal/builder/json-parser-impl.cpp
+++ b/dali-toolkit/internal/builder/json-parser-impl.cpp
@@ -17,9 +17,11 @@
 
 // CLASS HEADER
 #include <dali-toolkit/internal/builder/json-parser-impl.h>
 
 // CLASS HEADER
 #include <dali-toolkit/internal/builder/json-parser-impl.h>

-// EXTERNAL
+
+// EXTERNAL INCLUDES

 #include <cstring>
 
 #include <cstring>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/builder/tree-node-manipulator.h>
 #include <dali-toolkit/internal/builder/json-parser-state.h>
 
 #include <dali-toolkit/internal/builder/tree-node-manipulator.h>
 #include <dali-toolkit/internal/builder/json-parser-state.h>
 

diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h
index 987799e..8df13b2 100644 (file)
--- a/dali-toolkit/internal/builder/json-parser-impl.h
+++ b/dali-toolkit/internal/builder/json-parser-impl.h
@@ -18,12 +18,14 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES

 #include <string>
 #include <vector>
 #include <list>
 
 #include <string>
 #include <vector>
 #include <list>
 

-//

 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/base-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/builder/json-parser.h>
 #include <dali-toolkit/public-api/builder/tree-node.h>
 
 #include <dali-toolkit/public-api/builder/json-parser.h>
 #include <dali-toolkit/public-api/builder/tree-node.h>
 

diff --git a/dali-toolkit/internal/builder/json-parser-state.cpp b/dali-toolkit/internal/builder/json-parser-state.cpp
index 1547156..afa9e59 100644 (file)
--- a/dali-toolkit/internal/builder/json-parser-state.cpp
+++ b/dali-toolkit/internal/builder/json-parser-state.cpp
@@ -18,7 +18,7 @@
 // CLASS HEADER
 #include <dali-toolkit/internal/builder/json-parser-state.h>
 
 // CLASS HEADER
 #include <dali-toolkit/internal/builder/json-parser-state.h>
 

-// EXTERNAL
+// EXTERNAL INCLUDES

 #include <algorithm>
 
 namespace Dali
 #include <algorithm>
 
 namespace Dali

diff --git a/dali-toolkit/internal/builder/json-parser-state.h b/dali-toolkit/internal/builder/json-parser-state.h
index 44b911e..17ee739 100644 (file)
--- a/dali-toolkit/internal/builder/json-parser-state.h
+++ b/dali-toolkit/internal/builder/json-parser-state.h
@@ -18,8 +18,10 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES

 #include <dali/public-api/common/dali-common.h>
 
 #include <dali/public-api/common/dali-common.h>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/builder/tree-node.h>
 
 #include <dali-toolkit/internal/builder/tree-node-manipulator.h>
 #include <dali-toolkit/public-api/builder/tree-node.h>
 
 #include <dali-toolkit/internal/builder/tree-node-manipulator.h>

diff --git a/dali-toolkit/internal/builder/optional-value.h b/dali-toolkit/internal/builder/optional-value.h
index eca5303..afa4567 100644 (file)
--- a/dali-toolkit/internal/builder/optional-value.h
+++ b/dali-toolkit/internal/builder/optional-value.h
@@ -18,7 +18,6 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES

 template <typename T>
 struct OptionalTypes
 {
 template <typename T>
 struct OptionalTypes
 {

diff --git a/dali-toolkit/internal/builder/replacement.h b/dali-toolkit/internal/builder/replacement.h
index 0b54942..7edd9d0 100644 (file)
--- a/dali-toolkit/internal/builder/replacement.h
+++ b/dali-toolkit/internal/builder/replacement.h
@@ -18,7 +18,10 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES

 #include <dali/public-api/object/property-value.h>
 #include <dali/public-api/object/property-value.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/builder/builder.h>
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
 
 #include <dali-toolkit/public-api/builder/builder.h>
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
 

diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h
index c21f4e1..bd69537 100644 (file)
--- a/dali-toolkit/internal/builder/tree-node-manipulator.h
+++ b/dali-toolkit/internal/builder/tree-node-manipulator.h
@@ -18,13 +18,15 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES

 #include <utility> // pair
 #include <iterator>
 #include <vector>
 #include <cstring>
 
 #include <utility> // pair
 #include <iterator>
 #include <vector>
 #include <cstring>
 

-// INTERNAL INCLUDES

 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/dali-common.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/builder/tree-node.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/builder/tree-node.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index 97b6f64..0f409f6 100644 (file)
--- a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@ -16,7 +16,6 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "alignment-impl.h"
 
 // EXTERNAL INCLUDES
 #include "alignment-impl.h"
 
 // EXTERNAL INCLUDES

diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
index 1d514dc..cf24627 100644 (file)
--- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
+++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
@@ -17,7 +17,6 @@
 
 // CLASS HEADER
 #include "bloom-view-impl.h"
 
 // CLASS HEADER
 #include "bloom-view-impl.h"

-#include "../gaussian-blur-view/gaussian-blur-view-impl.h"

 
 // EXTERNAL INCLUDES
 #include <sstream>
 
 // EXTERNAL INCLUDES
 #include <sstream>


@@ -30,6 +29,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 #include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 #include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>

+#include "../gaussian-blur-view/gaussian-blur-view-impl.h"

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
index 30ed0a0..3ae36a1 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
@@ -32,8 +32,6 @@
 #include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h>
 
 #include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h>
 

-#include <map>
-

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index fb61723..fdecbba 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -23,6 +23,8 @@
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/scripting/scripting.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/scripting/scripting.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/buttons/button-painter-impl.h b/dali-toolkit/internal/controls/buttons/button-painter-impl.h
index 3014a75..3a91aef 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/button-painter-impl.h
+++ b/dali-toolkit/internal/controls/buttons/button-painter-impl.h
@@ -18,7 +18,7 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/signals/connection-tracker.h>
 
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/signals/connection-tracker.h>
 

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
index d18afb5..40ee650 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
@@ -19,11 +19,11 @@
 #include "check-box-button-default-painter-impl.h"
 
 // EXTERNAL INCLUDES
 #include "check-box-button-default-painter-impl.h"
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/image-actor.h>

 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/animation/constraints.h>

+#include <dali/public-api/object/ref-object.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/public-api/actors/image-actor.h>
-#include <dali/public-api/object/ref-object.h>

 #include "check-box-button-impl.h"
 
 namespace Dali
 #include "check-box-button-impl.h"
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h
index a5b5a29..7985942 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h
@@ -18,13 +18,14 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/images/image.h>
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/animation/animation.h>

-#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>

 
 

+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>

 #include "check-box-button-painter-impl.h"
 
 namespace Dali
 #include "check-box-button-painter-impl.h"
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
index 619a571..aa60871 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -18,9 +18,10 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/common/dali-vector.h>
 
 #include <dali/public-api/common/dali-vector.h>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 
 #include "button-impl.h"
 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 
 #include "button-impl.h"

diff --git a/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h b/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h
index ed13641..312a43c 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h
+++ b/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h
@@ -18,12 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/images/image.h>
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/animation/animation.h>
 
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/animation/animation.h>
 

+// INTERNAL INCLUDES

 #include "push-button-painter-impl.h"
 
 namespace Dali
 #include "push-button-painter-impl.h"
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/cluster/cluster-impl.h b/dali-toolkit/internal/controls/cluster/cluster-impl.h
index a7a30e0..17585fe 100644 (file)
--- a/dali-toolkit/internal/controls/cluster/cluster-impl.h
+++ b/dali-toolkit/internal/controls/cluster/cluster-impl.h
@@ -18,9 +18,10 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/object/ref-object.h>
 
 #include <dali/public-api/object/ref-object.h>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/cluster/cluster.h>
 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/cluster/cluster.h>
 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp b/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
index e53b378..18a5e9d 100644 (file)
--- a/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
+++ b/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/animation/animation.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/animation/animation.h>

+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/cluster/cluster.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/cluster/cluster.h>
 

diff --git a/dali-toolkit/internal/controls/cluster/cluster-style-impl.h b/dali-toolkit/internal/controls/cluster/cluster-style-impl.h
index a7f3468..bf7b75d 100644 (file)
--- a/dali-toolkit/internal/controls/cluster/cluster-style-impl.h
+++ b/dali-toolkit/internal/controls/cluster/cluster-style-impl.h
@@ -15,11 +15,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/object/base-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h
index 8de4edc..bf26399 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h
@@ -23,10 +23,9 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>

-#include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>

 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h>

-
+#include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h b/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
index 1962246..41990a2 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
@@ -26,8 +26,8 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>

-#include <dali-toolkit/internal/controls/navigation-frame/navigation-bar.h>

 #include <dali-toolkit/public-api/controls/popup/popup.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>

+#include <dali-toolkit/internal/controls/navigation-frame/navigation-bar.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp
index 38c2e95..4e486ba 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include "navigation-title-bar.h"
 
 namespace Dali
 #include "navigation-title-bar.h"
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
index 0715a3d..0377a2e 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
@@ -18,11 +18,12 @@
  *
  */
 
  *
  */
 

+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/navigation-frame/page.h>

 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-bar.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-bar.h>

-#include <dali-toolkit/public-api/controls/navigation-frame/page.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp b/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp
index 6a2d328..aad04b7 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include "navigation-tool-bar.h"
 
 namespace Dali
 #include "navigation-tool-bar.h"
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
index acc8cc2..ecb3d3b 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
+++ b/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
@@ -18,6 +18,7 @@
  *
  */
 
  *
  */
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>

diff --git a/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp b/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
index 615f3a6..a484d64 100644 (file)
--- a/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
+++ b/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
@@ -16,7 +16,6 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "page-impl.h"
 
 // EXTERNAL INCLUDES
 #include "page-impl.h"
 
 // EXTERNAL INCLUDES

diff --git a/dali-toolkit/internal/controls/popup/popup-style-impl.cpp b/dali-toolkit/internal/controls/popup/popup-style-impl.cpp
index 7a97456..2a94eff 100644 (file)
--- a/dali-toolkit/internal/controls/popup/popup-style-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-style-impl.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/popup/popup-style-impl.h>
 
 using namespace Dali;
 #include <dali-toolkit/internal/controls/popup/popup-style-impl.h>
 
 using namespace Dali;

diff --git a/dali-toolkit/internal/controls/relayout-controller-impl.cpp b/dali-toolkit/internal/controls/relayout-controller-impl.cpp
index 2f53b67..09b7fcf 100644 (file)
--- a/dali-toolkit/internal/controls/relayout-controller-impl.cpp
+++ b/dali-toolkit/internal/controls/relayout-controller-impl.cpp
@@ -15,8 +15,7 @@
  *
  */
 
  *
  */
 

-// FILE HEADER
-
+// CLASS HEADER

 #include "relayout-controller-impl.h"
 
 // EXTERNAL INCLUDES
 #include "relayout-controller-impl.h"
 
 // EXTERNAL INCLUDES

diff --git a/dali-toolkit/internal/controls/relayout-controller.cpp b/dali-toolkit/internal/controls/relayout-controller.cpp
index fa9e70e..19b2ab0 100644 (file)
--- a/dali-toolkit/internal/controls/relayout-controller.cpp
+++ b/dali-toolkit/internal/controls/relayout-controller.cpp
@@ -15,10 +15,8 @@
  *
  */
 
  *
  */
 

-// FILE HEADER
-
+// CLASS HEADER

 #include "relayout-controller.h"
 #include "relayout-controller.h"

-#include "relayout-controller-impl.h"

 
 // EXTERNAL INCLUDES
 #include <stack>
 
 // EXTERNAL INCLUDES
 #include <stack>


@@ -28,6 +26,7 @@
 
 // INTERNAL INCLUDES
 
 
 // INTERNAL INCLUDES
 

+#include "relayout-controller-impl.h"

 #include "dali-toolkit/public-api/controls/control.h"
 #include "dali-toolkit/public-api/controls/control-impl.h"
 #include "dali-toolkit/public-api/controls/text-view/text-view.h"
 #include "dali-toolkit/public-api/controls/control.h"
 #include "dali-toolkit/public-api/controls/control-impl.h"
 #include "dali-toolkit/public-api/controls/text-view/text-view.h"

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp
index bb1e629..4728f81 100755 (executable)
--- a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h>
 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h>
 
 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h>
 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h>
 

diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
index 7301a8b..4e3bb67 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
+++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
@@ -18,14 +18,13 @@
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
 
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/actors/mesh-actor.h>
 #include <dali/public-api/geometry/animatable-mesh.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 #include <dali/public-api/math/vector3.h>
 
 #include <dali/public-api/actors/mesh-actor.h>
 #include <dali/public-api/geometry/animatable-mesh.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 #include <dali/public-api/math/vector3.h>
 

-// EXTERNAL INCLUDES

 #include <math.h>
 
 namespace Dali
 #include <math.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
index b374df5..0fd1b69 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
+++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
@@ -18,7 +18,7 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/object/property.h>
 
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/object/property.h>
 

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
index e346ccb..cc61cba 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h>
 
 using namespace Dali;
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h>
 
 using namespace Dali;

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
index fd352cb..f396645 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
@@ -18,6 +18,7 @@
 // EXTERNAL INCLUDES
 #include <boost/bind.hpp>
 
 // EXTERNAL INCLUDES
 #include <boost/bind.hpp>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h>
 
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h>
 

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h
index ccd08b2..bf13222 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h
@@ -18,11 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp
index d2803f1..bda70a4 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp
@@ -18,6 +18,7 @@
 // EXTERNAL INCLUDES
 #include <boost/bind.hpp>
 
 // EXTERNAL INCLUDES
 #include <boost/bind.hpp>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h>
 
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h>
 

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h
index e747c69..ecfce55 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h
@@ -18,11 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp
index f48e4c2..f058f16 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h>
 
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h>
 

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h
index c1d6f9c..8625530 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h
@@ -18,11 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp
index fa4d89c..82bc58f 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
 
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
 

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h
index d33aca8..6f6cab6 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h
@@ -18,11 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h
index eb6dfbe..b0c74c1 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h
@@ -18,11 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h
index 0415bc5..405223d 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h
@@ -18,11 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp
index faa2275..e21ef87 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h
index 22ba237..e8bf3b5 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h
@@ -18,12 +18,14 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/actors/custom-actor.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/actors/custom-actor.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h>

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
index c44c9af..509a13e 100755 (executable)
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -19,14 +19,13 @@
 #include <dali-toolkit/internal/controls/slider/slider-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/slider/slider-impl.h>
 
 // EXTERNAL INCLUDES

+#include <sstream>

 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>

-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control-impl.h>

 #include <dali/public-api/images/resource-image.h>
 
 #include <dali/public-api/images/resource-image.h>
 

-#include <sstream>
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control-impl.h>

 
 using namespace Dali;
 
 
 using namespace Dali;
 

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index aa27cb5..d189ed6 100644 (file)
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -15,6 +15,9 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER
+#include "super-blur-view-impl.h"
+

 // EXTERNAL INCLUDES
 #include <cmath>
 #include <dali/public-api/common/stage.h>
 // EXTERNAL INCLUDES
 #include <cmath>
 #include <dali/public-api/common/stage.h>


@@ -22,9 +25,6 @@
 #include <dali/public-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
 
 #include <dali/public-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
 

-// CLASS HEADER
-#include "super-blur-view-impl.h"
-

 namespace //unnamed namespace
 {
 
 namespace //unnamed namespace
 {
 

diff --git a/dali-toolkit/internal/controls/table-view/array-2d.h b/dali-toolkit/internal/controls/table-view/array-2d.h
index 371db0f..fe9ecd7 100644 (file)
--- a/dali-toolkit/internal/controls/table-view/array-2d.h
+++ b/dali-toolkit/internal/controls/table-view/array-2d.h
@@ -19,7 +19,7 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/common/dali-vector.h>
 
 namespace Dali
 #include <dali/public-api/common/dali-vector.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h b/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
index b548fb8..3f754bf 100644 (file)
--- a/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
+++ b/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
@@ -20,8 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h>

-
-// EXTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp b/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
index 613b0a6..5eb829f 100644 (file)
--- a/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
+++ b/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
@@ -18,8 +18,10 @@
 // FILE HEADER
 #include <dali-toolkit/internal/controls/text-view/split-by-char-policies.h>
 
 // FILE HEADER
 #include <dali-toolkit/internal/controls/text-view/split-by-char-policies.h>
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/debug.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
 #include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
 
 #include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
 #include <dali-toolkit/internal/controls/text-view/text-view-processor.h>
 

diff --git a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
index 4173e59..0b48ecb 100644 (file)
--- a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
@@ -26,11 +26,11 @@
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/events/hit-test-algorithm.h>
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/events/hit-test-algorithm.h>
 #include <dali/public-api/images/resource-image.h>

+#include <dali/integration-api/debug.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>

-#include <dali/integration-api/debug.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 05208e3..4e26bc7 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -27,13 +27,13 @@
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/images/resource-image.h>

+#include <dali/integration-api/debug.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
 #include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
 #include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>

-#include <dali/integration-api/debug.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/builder/json-parser.cpp b/dali-toolkit/public-api/builder/json-parser.cpp
index 70aea59..acffb9d 100644 (file)
--- a/dali-toolkit/public-api/builder/json-parser.cpp
+++ b/dali-toolkit/public-api/builder/json-parser.cpp
@@ -18,6 +18,7 @@
 // CLASS HEADER
 #include <dali-toolkit/public-api/builder/json-parser.h>
 
 // CLASS HEADER
 #include <dali-toolkit/public-api/builder/json-parser.h>
 

+// EXTERNAL INCLUDES

 #include <memory.h>
 #include <functional>
 #include <iostream>
 #include <memory.h>
 #include <functional>
 #include <iostream>

diff --git a/dali-toolkit/public-api/builder/json-parser.h b/dali-toolkit/public-api/builder/json-parser.h
index 7f47be3..8abbe6a 100644 (file)
--- a/dali-toolkit/public-api/builder/json-parser.h
+++ b/dali-toolkit/public-api/builder/json-parser.h
@@ -18,6 +18,7 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES

 #include <string>
 #include <vector>
 #include <list>
 #include <string>
 #include <vector>
 #include <list>

diff --git a/dali-toolkit/public-api/builder/tree-node.h b/dali-toolkit/public-api/builder/tree-node.h
index 210cb77..710e0d8 100644 (file)
--- a/dali-toolkit/public-api/builder/tree-node.h
+++ b/dali-toolkit/public-api/builder/tree-node.h
@@ -18,6 +18,7 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES

 #include <utility> // pair
 #include <iterator>
 #include <vector>
 #include <utility> // pair
 #include <iterator>
 #include <vector>

diff --git a/dali-toolkit/public-api/controls/alignment/alignment.cpp b/dali-toolkit/public-api/controls/alignment/alignment.cpp
index fe0e9b8..99566dc 100644 (file)
--- a/dali-toolkit/public-api/controls/alignment/alignment.cpp
+++ b/dali-toolkit/public-api/controls/alignment/alignment.cpp
@@ -16,14 +16,12 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
 // EXTERNAL INCLUDES

+#include <dali/integration-api/debug.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-
-#include <dali/integration-api/debug.h>

 #include <dali-toolkit/internal/controls/alignment/alignment-impl.h>
 
 namespace Dali
 #include <dali-toolkit/internal/controls/alignment/alignment-impl.h>
 
 namespace Dali

diff --git a/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp b/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp
index f867d01..62389fa 100644 (file)
--- a/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp
+++ b/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp
@@ -15,9 +15,10 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
 
 #include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
 

-//INTERNAL INCLUDES
+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h>
 
 
 #include <dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h>
 
 

diff --git a/dali-toolkit/public-api/controls/cluster/cluster-style.cpp b/dali-toolkit/public-api/controls/cluster/cluster-style.cpp
index bdeac18..6ef28a6 100644 (file)
--- a/dali-toolkit/public-api/controls/cluster/cluster-style.cpp
+++ b/dali-toolkit/public-api/controls/cluster/cluster-style.cpp
@@ -15,7 +15,10 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/cluster/cluster-style-impl.h>
 
 using namespace Dali;
 #include <dali-toolkit/internal/controls/cluster/cluster-style-impl.h>
 
 using namespace Dali;

diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp
index 6f75dfc..b987ade 100644 (file)
--- a/dali-toolkit/public-api/controls/control.cpp
+++ b/dali-toolkit/public-api/controls/control.cpp
@@ -15,7 +15,10 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 namespace Dali

diff --git a/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp b/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp
index 326d7c9..d803317 100644 (file)
--- a/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp
+++ b/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include "check-button-factory.h"
 
 // EXTERNAL INCLUDES
 #include "check-button-factory.h"
 
 // EXTERNAL INCLUDES

diff --git a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
index 5e1b62b..d122d48 100644 (file)
--- a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
+++ b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
@@ -16,11 +16,11 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/images/bitmap-image.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-

 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>

-#include <dali/public-api/images/bitmap-image.h>
+

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h
index 8e307ce..1949a60 100644 (file)
--- a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h
+++ b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h
@@ -18,7 +18,7 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/math/vector4.h>
 #include <dali/public-api/actors/image-actor.h>
 
 #include <dali/public-api/math/vector4.h>
 #include <dali/public-api/actors/image-actor.h>
 

diff --git a/dali-toolkit/public-api/controls/effects-view/effects-view.cpp b/dali-toolkit/public-api/controls/effects-view/effects-view.cpp
index ad44243..1925c62 100644 (file)
--- a/dali-toolkit/public-api/controls/effects-view/effects-view.cpp
+++ b/dali-toolkit/public-api/controls/effects-view/effects-view.cpp
@@ -15,8 +15,6 @@
  *
  */
 
  *
  */
 

-// EXTERNAL INCLUDES
-

 // CLASS HEADER
 #include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
 
 // CLASS HEADER
 #include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
 

diff --git a/dali-toolkit/public-api/controls/magnifier/magnifier.cpp b/dali-toolkit/public-api/controls/magnifier/magnifier.cpp
index 81542f0..6a18f78 100644 (file)
--- a/dali-toolkit/public-api/controls/magnifier/magnifier.cpp
+++ b/dali-toolkit/public-api/controls/magnifier/magnifier.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
 #include <dali-toolkit/internal/controls/magnifier/magnifier-impl.h>
 
 #include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
 #include <dali-toolkit/internal/controls/magnifier/magnifier-impl.h>
 

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp
index 8bde850..60bfce9 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
 
 namespace Dali

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
index 0c4d0b0..4d6c877 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
@@ -18,7 +18,7 @@
  *
  */
 
  *
  */
 

-//INTERNAL INCLUDES
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 
 namespace Dali

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
index 7df18f0..124913f 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
@@ -18,7 +18,7 @@
  *
  */
 
  *
  */
 

-//INTERNAL INCLUDES
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 
 namespace Dali

diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp
index 9d60a19..c2c44a5 100644 (file)
--- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp
+++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp
@@ -15,7 +15,10 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
 
 using namespace Dali;
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
 
 using namespace Dali;

diff --git a/dali-toolkit/public-api/controls/popup/popup.cpp b/dali-toolkit/public-api/controls/popup/popup.cpp
index 1e37523..8e393c7 100644 (file)
--- a/dali-toolkit/public-api/controls/popup/popup.cpp
+++ b/dali-toolkit/public-api/controls/popup/popup.cpp
@@ -15,7 +15,10 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/popup/popup.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/popup/popup-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 
 #include <dali-toolkit/internal/controls/popup/popup-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 

diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
index 8683c02..8475482 100755 (executable)
--- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
+++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
@@ -15,7 +15,10 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h>
 
 namespace Dali
 #include <dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h>
 
 namespace Dali