From 1c3cb32385174b852b8d57b531625f733238f664 Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Tue, 24 Feb 2015 12:02:08 +0000
Subject: [PATCH] Follow the include-order coding conventions
Change-Id: I316b5d62f4c31b38740067186d29dc4cb5cf0767
---
dali-toolkit/internal/builder/builder-declarations.h | 1 +
dali-toolkit/internal/builder/builder-impl.cpp | 3 ++-
dali-toolkit/internal/builder/json-parser-impl.cpp | 4 +++-
dali-toolkit/internal/builder/json-parser-impl.h | 4 +++-
dali-toolkit/internal/builder/json-parser-state.cpp | 2 +-
dali-toolkit/internal/builder/json-parser-state.h | 2 ++
dali-toolkit/internal/builder/optional-value.h | 1 -
dali-toolkit/internal/builder/replacement.h | 3 +++
dali-toolkit/internal/builder/tree-node-manipulator.h | 4 +++-
dali-toolkit/internal/controls/alignment/alignment-impl.cpp | 1 -
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp | 2 +-
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h | 2 --
dali-toolkit/internal/controls/buttons/button-impl.cpp | 2 ++
dali-toolkit/internal/controls/buttons/button-painter-impl.h | 2 +-
.../controls/buttons/check-box-button-default-painter-impl.cpp | 4 ++--
.../controls/buttons/check-box-button-default-painter-impl.h | 5 +++--
dali-toolkit/internal/controls/buttons/check-box-button-impl.h | 3 ++-
.../internal/controls/buttons/push-button-default-painter-impl.h | 3 ++-
dali-toolkit/internal/controls/cluster/cluster-impl.h | 3 ++-
dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp | 1 +
dali-toolkit/internal/controls/cluster/cluster-style-impl.h | 4 +++-
dali-toolkit/internal/controls/navigation-frame/navigation-bar.h | 3 +--
.../internal/controls/navigation-frame/navigation-control-impl.h | 2 +-
.../internal/controls/navigation-frame/navigation-title-bar.cpp | 1 +
.../internal/controls/navigation-frame/navigation-title-bar.h | 3 ++-
.../internal/controls/navigation-frame/navigation-tool-bar.cpp | 1 +
.../internal/controls/navigation-frame/navigation-tool-bar.h | 1 +
dali-toolkit/internal/controls/navigation-frame/page-impl.cpp | 1 -
dali-toolkit/internal/controls/popup/popup-style-impl.cpp | 1 +
dali-toolkit/internal/controls/relayout-controller-impl.cpp | 3 +--
dali-toolkit/internal/controls/relayout-controller.cpp | 5 ++---
.../internal/controls/scroll-component/scroll-bar-internal.cpp | 1 +
.../internal/controls/scrollable/bouncing-effect-actor.cpp | 3 +--
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h | 2 +-
.../internal/controls/scrollable/scroll-view/scroll-base-impl.cpp | 1 +
.../scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp | 1 +
.../scrollable/scroll-view/scroll-view-carousel-effect-impl.h | 4 +++-
.../scrollable/scroll-view/scroll-view-cube-effect-impl.cpp | 1 +
.../controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h | 4 +++-
.../scrollable/scroll-view/scroll-view-depth-effect-impl.cpp | 1 +
.../scrollable/scroll-view/scroll-view-depth-effect-impl.h | 4 +++-
.../controls/scrollable/scroll-view/scroll-view-effect-impl.cpp | 1 +
.../scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h | 4 +++-
.../scrollable/scroll-view/scroll-view-page-cube-effect-impl.h | 4 +++-
.../scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h | 4 +++-
.../scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp | 1 +
.../scrollable/scroll-view/scroll-view-wobble-effect-impl.h | 4 +++-
dali-toolkit/internal/controls/slider/slider-impl.cpp | 7 +++----
.../internal/controls/super-blur-view/super-blur-view-impl.cpp | 6 +++---
dali-toolkit/internal/controls/table-view/array-2d.h | 2 +-
.../controls/text-input/textview-character-positions-impl.h | 2 --
.../internal/controls/text-view/split-by-char-policies.cpp | 4 +++-
dali-toolkit/internal/focus-manager/focus-manager-impl.cpp | 2 +-
.../internal/focus-manager/keyboard-focus-manager-impl.cpp | 2 +-
dali-toolkit/public-api/builder/json-parser.cpp | 1 +
dali-toolkit/public-api/builder/json-parser.h | 1 +
dali-toolkit/public-api/builder/tree-node.h | 1 +
dali-toolkit/public-api/controls/alignment/alignment.cpp | 4 +---
dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp | 3 ++-
dali-toolkit/public-api/controls/cluster/cluster-style.cpp | 3 +++
dali-toolkit/public-api/controls/control.cpp | 3 +++
.../public-api/controls/default-controls/check-button-factory.cpp | 1 +
.../public-api/controls/default-controls/solid-color-actor.cpp | 4 ++--
.../public-api/controls/default-controls/solid-color-actor.h | 2 +-
dali-toolkit/public-api/controls/effects-view/effects-view.cpp | 2 --
dali-toolkit/public-api/controls/magnifier/magnifier.cpp | 1 +
dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp | 1 +
.../public-api/controls/page-turn-view/page-turn-landscape-view.h | 2 +-
.../public-api/controls/page-turn-view/page-turn-portrait-view.h | 2 +-
dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp | 3 +++
dali-toolkit/public-api/controls/popup/popup.cpp | 3 +++
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp | 3 +++
72 files changed, 119 insertions(+), 63 deletions(-)
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