Follow the include-order coding conventions

Change-Id: Ieb8304e62161f2358de3647eea92fca4b5d36176

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h
index fe3cfdc..a749c72 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h
@@ -18,6 +18,12 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <sstream>
+#include <string>
+#include <map>
+#include <cstdio>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/core.h>
@@ -25,12 +31,6 @@
 #include <dali/integration-api/gl-defines.h>
 #include "test-trace-call-stack.h"
 
-// EXTERNAL INCLUDES
-#include <sstream>
-#include <string>
-#include <map>
-#include <cstdio>
-
 namespace Dali
 {
 

diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp
index 866897e..1c83633 100644 (file)
--- a/dali/integration-api/core.cpp
+++ b/dali/integration-api/core.cpp
@@ -18,16 +18,16 @@
 // CLASS HEADER
 #include <dali/integration-api/core.h>
 
+// EXTERNAL INCLUDES
+#include <iosfwd>
+#include <stdarg.h>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/integration-api/events/event.h>
 #include <dali/integration-api/gl-sync-abstraction.h>
 #include <dali/internal/common/core-impl.h>
 
-// EXTERNAL INCLUDES
-#include <iosfwd>
-#include <stdarg.h>
-
 namespace Dali
 {
 

diff --git a/dali/integration-api/resource-types.h b/dali/integration-api/resource-types.h
index 68ee185..6bdadcb 100644 (file)
--- a/dali/integration-api/resource-types.h
+++ b/dali/integration-api/resource-types.h
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <stdint.h>
+#include <string>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
@@ -25,10 +28,6 @@
 #include <dali/public-api/images/image-attributes.h>
 #include <dali/integration-api/resource-declarations.h>
 
-// EXTERNAL INCLUDES
-#include <stdint.h>
-#include <string>
-
 namespace Dali
 {
 

diff --git a/dali/internal/event/common/property-input-impl.h b/dali/internal/event/common/property-input-impl.h
index 64d5022..cd9f2a4 100644 (file)
--- a/dali/internal/event/common/property-input-impl.h
+++ b/dali/internal/event/common/property-input-impl.h
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <iostream>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/property-input.h>
 #include <dali/public-api/math/vector2.h>
@@ -28,9 +31,6 @@
 #include <dali/public-api/math/matrix.h>
 #include <dali/internal/common/buffer-index.h>
 
-/// External Includes
-#include <iostream>
-
 namespace Dali
 {
 

diff --git a/dali/internal/event/modeling/model-logger.cpp b/dali/internal/event/modeling/model-logger.cpp
index bed6b61..c77aa4b 100644 (file)
--- a/dali/internal/event/modeling/model-logger.cpp
+++ b/dali/internal/event/modeling/model-logger.cpp
@@ -18,6 +18,11 @@
 // CLASS HEADER
 #include <dali/internal/event/modeling/model-logger.h>
 
+// EXTERNAL INCLUDES
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/modeling/bone.h>
 #include <dali/public-api/modeling/entity.h>
@@ -32,11 +37,6 @@
 #include <dali/internal/event/animation/key-frames-impl.h>
 #include <dali/internal/event/modeling/model-impl.h>
 
-// EXTERNAL INCLUDES
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-
 using std::cout;
 using std::endl;
 using std::string;

diff --git a/dali/public-api/common/constants.cpp b/dali/public-api/common/constants.cpp
index 60781d3..73a9527 100644 (file)
--- a/dali/public-api/common/constants.cpp
+++ b/dali/public-api/common/constants.cpp
@@ -18,13 +18,13 @@
 // CLASS HEADER
 #include <dali/public-api/common/constants.h>
 
+// EXTERNAL INCLUDES
+#include <string>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/math/compile-time-math.h>
 #include <dali/public-api/math/degree.h>
 
-// EXTERNAL INCLUDES
-#include <string>
-
 namespace Dali
 {
 

diff --git a/dali/public-api/common/dali-vector.h b/dali/public-api/common/dali-vector.h
index c677b5e..466ae11 100644 (file)
--- a/dali/public-api/common/dali-vector.h
+++ b/dali/public-api/common/dali-vector.h
@@ -18,14 +18,14 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/math/math-utils.h>
-
 // EXTERNAL INCLUDES
 #include <cstddef>
 #include <algorithm>
 
+// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/math/math-utils.h>
+
 /**
  * @brief For DALi internal use asserts are enabled in debug builds.
  *

diff --git a/dali/public-api/math/matrix.cpp b/dali/public-api/math/matrix.cpp
index e2be143..7ffb393 100644 (file)
--- a/dali/public-api/math/matrix.cpp
+++ b/dali/public-api/math/matrix.cpp
@@ -18,6 +18,11 @@
 // CLASS HEADERS
 #include <dali/public-api/math/matrix.h>
 
+// EXTERNAL INCLUDES
+#include <math.h>
+#include <string.h>
+#include <iostream>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/math/vector3.h>
@@ -26,11 +31,6 @@
 #include <dali/public-api/math/math-utils.h>
 #include <dali/internal/render/common/performance-monitor.h>
 
-// EXTERNAL INCLUDES
-#include <math.h>
-#include <string.h>
-#include <iostream>
-
 namespace
 {
 const float ROTATION_EPSILON = 0.003f; // Deliberately large

diff --git a/dali/public-api/math/matrix3.cpp b/dali/public-api/math/matrix3.cpp
index bfc1a0a..fe9ec59 100644 (file)
--- a/dali/public-api/math/matrix3.cpp
+++ b/dali/public-api/math/matrix3.cpp
@@ -18,13 +18,12 @@
 // CLASS HEADER
 #include <dali/public-api/math/matrix3.h>
 
-// INTERNAL INCLUDES
-#include <dali/public-api/math/math-utils.h>
-
 // EXTERNAL INCLUDES
 #include <string.h>
 #include <iostream>
 
+// INTERNAL INCLUDES
+#include <dali/public-api/math/math-utils.h>
 
 #define S00 0
 #define S01 1

diff --git a/dali/public-api/math/vector2.cpp b/dali/public-api/math/vector2.cpp
index e50b073..d5475d0 100644 (file)
--- a/dali/public-api/math/vector2.cpp
+++ b/dali/public-api/math/vector2.cpp
@@ -18,16 +18,16 @@
 // CLASS HEADER
 #include <dali/public-api/math/vector2.h>
 
+// EXTERNAL INCLUDES
+#include <math.h>
+#include <iostream>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/math-utils.h>
 #include <dali/internal/render/common/performance-monitor.h>
 
-// EXTERNAL INCLUDES
-#include <math.h>
-#include <iostream>
-
 namespace Dali
 {
 

diff --git a/dali/public-api/math/vector2.h b/dali/public-api/math/vector2.h
index b1df40d..dd1e7ab 100644 (file)
--- a/dali/public-api/math/vector2.h
+++ b/dali/public-api/math/vector2.h
@@ -18,12 +18,12 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
 // EXTERNAL INCLUDES
 #include <iosfwd>
 
+// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+
 namespace Dali
 {
 

diff --git a/dali/public-api/math/vector3.cpp b/dali/public-api/math/vector3.cpp
index 9afb55b..dc2ef6f 100644 (file)
--- a/dali/public-api/math/vector3.cpp
+++ b/dali/public-api/math/vector3.cpp
@@ -19,6 +19,10 @@
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/quaternion.h>
 
+// EXTERNAL INCLUDES
+#include <math.h>
+#include <iostream>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/math/vector2.h>
@@ -26,10 +30,6 @@
 #include <dali/public-api/math/math-utils.h>
 #include <dali/internal/render/common/performance-monitor.h>
 
-// EXTERNAL INCLUDES
-#include <math.h>
-#include <iostream>
-
 namespace Dali
 {
 using Internal::PerformanceMonitor;

diff --git a/dali/public-api/math/vector3.h b/dali/public-api/math/vector3.h
index b6121ef..22d18bb 100644 (file)
--- a/dali/public-api/math/vector3.h
+++ b/dali/public-api/math/vector3.h
@@ -18,12 +18,12 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
 // EXTERNAL INCLUDES
 #include <iosfwd>
 
+// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+
 namespace Dali
 {
 

diff --git a/dali/public-api/math/vector4.cpp b/dali/public-api/math/vector4.cpp
index e0cbb59..d801902 100644 (file)
--- a/dali/public-api/math/vector4.cpp
+++ b/dali/public-api/math/vector4.cpp
@@ -18,6 +18,10 @@
 // CLASS HEADER
 #include <dali/public-api/math/vector4.h>
 
+// EXTERNAL INCLUDES
+#include <math.h>
+#include <iostream>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/math/vector2.h>
@@ -25,10 +29,6 @@
 #include <dali/public-api/math/math-utils.h>
 #include <dali/internal/render/common/performance-monitor.h>
 
-// EXTERNAL INCLUDES
-#include <math.h>
-#include <iostream>
-
 namespace Dali
 {
 

diff --git a/dali/public-api/math/vector4.h b/dali/public-api/math/vector4.h
index d0a5b85..6cfc206 100644 (file)
--- a/dali/public-api/math/vector4.h
+++ b/dali/public-api/math/vector4.h
@@ -18,12 +18,12 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
 // EXTERNAL INCLUDES
 #include <iosfwd>
 
+// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+
 namespace Dali
 {
 struct Vector2;

diff --git a/dali/public-api/modeling/bone.h b/dali/public-api/modeling/bone.h
index d90a7a8..07196ec 100644 (file)
--- a/dali/public-api/modeling/bone.h
+++ b/dali/public-api/modeling/bone.h
@@ -18,14 +18,13 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <string>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/math/matrix.h>
 
-// EXTERNAL INCLUDES
-#include <string>
-
 namespace Dali
 {
 

diff --git a/dali/public-api/object/any.h b/dali/public-api/object/any.h
index 3268cb3..de661e2 100644 (file)
--- a/dali/public-api/object/any.h
+++ b/dali/public-api/object/any.h
@@ -18,12 +18,12 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
 // EXTERNAL INCLUDES
 #include <typeinfo>   // operator typeid
 
+// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+
 namespace Dali
 {