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 - 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 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -23,6 +23,8 @@ #include #include #include + +// INTERNAL INCLUDES #include 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 --- 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 #include 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 --- 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 #include +#include // INTERNAL INCLUDES -#include -#include #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 --- 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 #include #include #include -#include +// INTERNAL INCLUDES +#include #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 --- 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 +// INTERNAL INCLUDES #include #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 --- 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 #include #include #include +// INTERNAL INCLUDES #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 --- 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 +// INTERNAL INCLUDES #include #include #include 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 --- 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 + // INTERNAL INCLUDES #include 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 --- 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 #include #include #include + +// INTERNAL INCLUDES #include 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 --- 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 -#include #include #include - +#include 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 --- 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 #include #include -#include #include +#include 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 --- 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 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 --- 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 #include #include #include #include -#include 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 --- 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 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 --- 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 #include #include 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 --- 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 - #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 --- 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 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 --- 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 diff --git a/dali-toolkit/internal/controls/relayout-controller.cpp b/dali-toolkit/internal/controls/relayout-controller.cpp index fa9e70e..19b2ab0 100644 --- 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-impl.h" // EXTERNAL INCLUDES #include @@ -28,6 +26,7 @@ // 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" 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 --- 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 #include 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 --- 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 -// INTERNAL INCLUDES +// EXTERNAL INCLUDES #include #include #include #include #include -// EXTERNAL INCLUDES #include 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 --- 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 #include 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 --- 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 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 --- 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 +// INTERNAL INCLUDES #include #include 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 --- 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 #include #include #include + +// INTERNAL INCLUDES #include #include #include 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..bda70a46 100644 --- 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 +// INTERNAL INCLUDES #include #include 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 --- 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 #include #include #include + +// INTERNAL INCLUDES #include #include #include 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 --- 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 #include 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 --- 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 #include #include #include + +// INTERNAL INCLUDES #include #include #include 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 --- 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 #include 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 --- 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 #include #include #include + +// INTERNAL INCLUDES #include #include #include 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 --- 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 #include #include #include + +// INTERNAL INCLUDES #include #include #include 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 --- 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 #include #include #include + +// INTERNAL INCLUDES #include #include #include 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 --- 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 #include #include 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 --- 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 #include #include #include #include + +// INTERNAL INCLUDES #include #include #include diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index c44c9af..509a13e 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -19,14 +19,13 @@ #include // EXTERNAL INCLUDES +#include #include #include - -// EXTERNAL INCLUDES -#include #include -#include +// INTERNAL INCLUDES +#include 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 --- 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 #include @@ -22,9 +25,6 @@ #include #include -// CLASS HEADER -#include "super-blur-view-impl.h" - 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 --- 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 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 --- 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 - -// EXTERNAL INCLUDES #include 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 --- 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 -// INTERNAL INCLUDES +// EXTERNAL INCLUDES #include + +// INTERNAL INCLUDES #include #include 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 --- 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 #include #include +#include // INTERNAL INCLUDES #include #include -#include 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 --- 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 #include #include +#include // INTERNAL INCLUDES #include #include #include #include -#include 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 --- 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 +// EXTERNAL INCLUDES #include #include #include diff --git a/dali-toolkit/public-api/builder/json-parser.h b/dali-toolkit/public-api/builder/json-parser.h index 7f47be3..8abbe6a 100644 --- 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 #include #include diff --git a/dali-toolkit/public-api/builder/tree-node.h b/dali-toolkit/public-api/builder/tree-node.h index 210cb77..710e0d8 100644 --- 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 // pair #include #include diff --git a/dali-toolkit/public-api/controls/alignment/alignment.cpp b/dali-toolkit/public-api/controls/alignment/alignment.cpp index fe0e9b8..99566dc 100644 --- a/dali-toolkit/public-api/controls/alignment/alignment.cpp +++ b/dali-toolkit/public-api/controls/alignment/alignment.cpp @@ -16,14 +16,12 @@ */ // CLASS HEADER - #include // EXTERNAL INCLUDES +#include // INTERNAL INCLUDES - -#include #include 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 --- 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 -//INTERNAL INCLUDES +// INTERNAL INCLUDES #include 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 --- 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 + +// INTERNAL INCLUDES #include 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 --- a/dali-toolkit/public-api/controls/control.cpp +++ b/dali-toolkit/public-api/controls/control.cpp @@ -15,7 +15,10 @@ * */ +// CLASS HEADER #include + +// INTERNAL INCLUDES #include 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 --- 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 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 --- 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 +#include // INTERNAL INCLUDES - #include -#include + 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 --- 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 #include 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 --- 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 diff --git a/dali-toolkit/public-api/controls/magnifier/magnifier.cpp b/dali-toolkit/public-api/controls/magnifier/magnifier.cpp index 81542f0..6a18f78 100644 --- 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 #include 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 --- 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 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 --- 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 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 --- 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 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 --- 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 + +// INTERNAL INCLUDES #include using namespace Dali; diff --git a/dali-toolkit/public-api/controls/popup/popup.cpp b/dali-toolkit/public-api/controls/popup/popup.cpp index 1e375231..8e393c7 100644 --- 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 + +// INTERNAL INCLUDES #include #include 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 --- 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 + +// INTERNAL INCLUDES #include namespace Dali -- 2.7.4