From: Paul Wisbey
Date: Tue, 24 Feb 2015 12:02:08 +0000 (+0000)
Subject: Follow the include-order coding conventions
X-Git-Tag: dali_1.0.31~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=1c3cb32385174b852b8d57b531625f733238f664
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
--- a/dali-toolkit/internal/builder/builder-declarations.h
+++ b/dali-toolkit/internal/builder/builder-declarations.h
@@ -21,6 +21,7 @@
// EXTERNAL INCLUDES
#include
+// INTERNAL INCLUDES
#include
#include
diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp
index 82a502f..0a13013 100644
--- a/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/dali-toolkit/internal/builder/builder-impl.cpp
@@ -23,9 +23,10 @@
#include
#include
-// INTERNAL INCLUDES
#include
+// INTERNAL INCLUDES
+
#include
#include
diff --git a/dali-toolkit/internal/builder/json-parser-impl.cpp b/dali-toolkit/internal/builder/json-parser-impl.cpp
index 5bce6fb..2cff977 100644
--- 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
-// EXTERNAL
+
+// EXTERNAL INCLUDES
#include
+// INTERNAL INCLUDES
#include
#include
diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h
index 987799e..8df13b2 100644
--- 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
#include
#include
-//
#include
+
+// INTERNAL INCLUDES
#include
#include
diff --git a/dali-toolkit/internal/builder/json-parser-state.cpp b/dali-toolkit/internal/builder/json-parser-state.cpp
index 1547156..afa9e59 100644
--- 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
-// EXTERNAL
+// EXTERNAL INCLUDES
#include
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
--- 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
+// INTERNAL INCLUDES
#include
#include
diff --git a/dali-toolkit/internal/builder/optional-value.h b/dali-toolkit/internal/builder/optional-value.h
index eca5303..afa4567 100644
--- a/dali-toolkit/internal/builder/optional-value.h
+++ b/dali-toolkit/internal/builder/optional-value.h
@@ -18,7 +18,6 @@
*
*/
-// INTERNAL INCLUDES
template
struct OptionalTypes
{
diff --git a/dali-toolkit/internal/builder/replacement.h b/dali-toolkit/internal/builder/replacement.h
index 0b54942..7edd9d0 100644
--- a/dali-toolkit/internal/builder/replacement.h
+++ b/dali-toolkit/internal/builder/replacement.h
@@ -18,7 +18,10 @@
*
*/
+// EXTERNAL INCLUDES
#include
+
+// INTERNAL INCLUDES
#include
#include
diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h
index c21f4e1..bd69537 100644
--- 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 // pair
#include
#include
#include
-// INTERNAL INCLUDES
#include
+
+// INTERNAL INCLUDES
#include
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
--- a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@ -16,7 +16,6 @@
*/
// CLASS HEADER
-
#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
--- 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"
-#include "../gaussian-blur-view/gaussian-blur-view-impl.h"
// EXTERNAL INCLUDES
#include
@@ -30,6 +29,7 @@
// INTERNAL INCLUDES
#include
#include
+#include "../gaussian-blur-view/gaussian-blur-view-impl.h"
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
--- 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
#include
-#include