From f58b8383147de70affa1e3949cf1c6757d705d3c Mon Sep 17 00:00:00 2001 From: Nick Holland Date: Mon, 18 May 2015 11:49:07 +0100 Subject: [PATCH] Move more public-api headers to devel-api. PART 3 Removed the following headers from public-api and moved into devel-api public-api/builder/builder.h public-api/builder/json-parser.h public-api/builder/tree-node.cpp public-api/builder/tree-node.h public-api/controls/bloom-view/bloom-view.h public-api/controls/bubble-effect/bubble-emitter.h public-api/controls/effects-view/effects-view.h public-api/controls/magnifier/magnifier.h public-api/controls/page-turn-view/page-factory.h public-api/controls/page-turn-view/page-turn-landscape-view.h public-api/controls/page-turn-view/page-turn-portrait-view.h public-api/controls/page-turn-view/page-turn-view.h public-api/controls/popup/popup.h public-api/controls/shadow-view/shadow-view.h public-api/controls/slider/slider.cpp public-api/controls/slider/slider.h public-api/controls/super-blur-view/super-blur-view.h public-api/controls/table-view/table-view.h public-api/controls/tool-bar/tool-bar.h public-api/scripting/script-plugin.h public-api/scripting/script.h public-api/shader-effects/alpha-discard-effect.h public-api/shader-effects/bendy-effect.h public-api/shader-effects/blind-effect.h public-api/shader-effects/bouncing-effect.h public-api/shader-effects/bubble-effect/bubble-effect.h public-api/shader-effects/bubble-effect/color-adjuster.h public-api/shader-effects/carousel-effect.h public-api/shader-effects/displacement-effect.h public-api/shader-effects/dissolve-effect.h public-api/shader-effects/dissolve-local-effect.h public-api/shader-effects/distance-field-effect.h public-api/shader-effects/image-region-effect.h public-api/shader-effects/iris-effect.h public-api/shader-effects/mask-effect.h public-api/shader-effects/mirror-effect.h public-api/shader-effects/motion-blur-effect.h public-api/shader-effects/motion-stretch-effect.h public-api/shader-effects/nine-patch-mask-effect.h public-api/shader-effects/overlay-effect.h public-api/shader-effects/page-turn-book-spine-effect.h public-api/shader-effects/page-turn-effect.h public-api/shader-effects/quadratic-bezier.h public-api/shader-effects/ripple-effect.h public-api/shader-effects/ripple2d-effect.h public-api/shader-effects/shear-effect.h public-api/shader-effects/soft-button-effect.h public-api/shader-effects/spot-effect.h public-api/shader-effects/square-dissolve-effect.h public-api/shader-effects/swirl-effect.h public-api/shader-effects/water-effect.h public-api/styling/style-manager.h public-api/transition-effects/cube-transition-cross-effect.h public-api/transition-effects/cube-transition-effect.h public-api/transition-effects/cube-transition-fold-effect.h public-api/transition-effects/cube-transition-wave-effect.h Change-Id: I11a7cc81903ec6d1919b50d7310b9316279c51e5 --- .../dali-toolkit-test-utils/dummy-control.cpp | 2 +- .../src/dali-toolkit/utc-Dali-BendyEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-BlindEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-BloomView.cpp | 2 + .../src/dali-toolkit/utc-Dali-BubbleEmitter.cpp | 1 + .../src/dali-toolkit/utc-Dali-Builder.cpp | 2 +- .../src/dali-toolkit/utc-Dali-CarouselEffect.cpp | 1 + .../dali-toolkit/utc-Dali-CubeTransitionEffect.cpp | 6 + .../dali-toolkit/utc-Dali-DisplacementEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-DissolveEffect.cpp | 1 + .../dali-toolkit/utc-Dali-DistanceFieldEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-IrisEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-JsonParser.cpp | 2 +- .../dali-toolkit/utc-Dali-KeyboardFocusManager.cpp | 2 + .../src/dali-toolkit/utc-Dali-MaskEffect.cpp | 1 + .../dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-OverlayEffect.cpp | 2 + .../src/dali-toolkit/utc-Dali-PageTurnEffect.cpp | 2 +- .../src/dali-toolkit/utc-Dali-PageTurnView.cpp | 6 + .../src/dali-toolkit/utc-Dali-Popup.cpp | 1 + .../src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-RippleEffect.cpp | 2 + .../src/dali-toolkit/utc-Dali-ShadowView.cpp | 2 + .../src/dali-toolkit/utc-Dali-ShearEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-Slider.cpp | 1 + .../src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-SpotEffect.cpp | 1 + .../dali-toolkit/utc-Dali-SquareDissolveEffect.cpp | 1 + .../src/dali-toolkit/utc-Dali-StyleManager.cpp | 2 +- .../src/dali-toolkit/utc-Dali-SuperBlurView.cpp | 1 + .../src/dali-toolkit/utc-Dali-SwirlEffect.cpp | 2 + .../src/dali-toolkit/utc-Dali-TableView.cpp | 1 + .../src/dali-toolkit/utc-Dali-TextField.cpp | 1 + .../src/dali-toolkit/utc-Dali-ToolBar.cpp | 1 + .../src/dali-toolkit/utc-Dali-WaterEffect.cpp | 1 + build/tizen/dali-toolkit/Makefile.am | 148 ++++++++++----------- dali-toolkit/dali-toolkit.h | 60 --------- .../{public-api => devel-api}/builder/builder.cpp | 0 .../{public-api => devel-api}/builder/builder.h | 0 .../builder/json-parser.cpp | 2 +- .../builder/json-parser.h | 2 +- .../builder/tree-node.cpp | 2 +- .../{public-api => devel-api}/builder/tree-node.h | 0 .../controls/bloom-view/bloom-view.cpp | 2 +- .../controls/bloom-view/bloom-view.h | 0 .../controls/bubble-effect/bubble-emitter.cpp | 2 +- .../controls/bubble-effect/bubble-emitter.h | 0 .../controls/effects-view/effects-view.cpp | 2 +- .../controls/effects-view/effects-view.h | 0 .../controls/magnifier/magnifier.cpp | 2 +- .../controls/magnifier/magnifier.h | 0 .../controls/page-turn-view/page-factory.cpp | 2 +- .../controls/page-turn-view/page-factory.h | 0 .../page-turn-view/page-turn-landscape-view.cpp | 2 +- .../page-turn-view/page-turn-landscape-view.h | 2 +- .../page-turn-view/page-turn-portrait-view.cpp | 2 +- .../page-turn-view/page-turn-portrait-view.h | 2 +- .../controls/page-turn-view/page-turn-view.cpp | 2 +- .../controls/page-turn-view/page-turn-view.h | 0 .../controls/popup/popup.cpp | 2 +- .../controls/popup/popup.h | 0 .../controls/shadow-view/shadow-view.cpp | 2 +- .../controls/shadow-view/shadow-view.h | 0 .../controls/slider/slider.cpp | 2 +- .../controls/slider/slider.h | 0 .../controls/super-blur-view/super-blur-view.cpp | 2 +- .../controls/super-blur-view/super-blur-view.h | 0 .../controls/table-view/table-view.cpp | 2 +- .../controls/table-view/table-view.h | 0 .../controls/tool-bar/tool-bar.cpp | 0 .../controls/tool-bar/tool-bar.h | 0 dali-toolkit/devel-api/file.list | 148 +++++++++++++++++++++ .../scripting/script-plugin.h | 0 .../{public-api => devel-api}/scripting/script.cpp | 0 .../{public-api => devel-api}/scripting/script.h | 0 .../shader-effects/alpha-discard-effect.cpp | 2 +- .../shader-effects/alpha-discard-effect.h | 0 .../shader-effects/bendy-effect.cpp | 2 +- .../shader-effects/bendy-effect.h | 0 .../shader-effects/blind-effect.cpp | 2 +- .../shader-effects/blind-effect.h | 0 .../shader-effects/bouncing-effect.cpp | 2 +- .../shader-effects/bouncing-effect.h | 0 .../shader-effects/bubble-effect/bubble-effect.cpp | 0 .../shader-effects/bubble-effect/bubble-effect.h | 0 .../bubble-effect/color-adjuster.cpp | 0 .../shader-effects/bubble-effect/color-adjuster.h | 0 .../shader-effects/carousel-effect.cpp | 2 +- .../shader-effects/carousel-effect.h | 0 .../shader-effects/displacement-effect.cpp | 2 +- .../shader-effects/displacement-effect.h | 0 .../shader-effects/dissolve-effect.cpp | 2 +- .../shader-effects/dissolve-effect.h | 0 .../shader-effects/dissolve-local-effect.cpp | 4 +- .../shader-effects/dissolve-local-effect.h | 0 .../shader-effects/distance-field-effect.cpp | 2 +- .../shader-effects/distance-field-effect.h | 0 .../shader-effects/image-region-effect.cpp | 2 +- .../shader-effects/image-region-effect.h | 0 .../shader-effects/iris-effect.cpp | 2 +- .../shader-effects/iris-effect.h | 0 .../shader-effects/mask-effect.cpp | 2 +- .../shader-effects/mask-effect.h | 0 .../shader-effects/mirror-effect.cpp | 2 +- .../shader-effects/mirror-effect.h | 0 .../shader-effects/motion-blur-effect.cpp | 2 +- .../shader-effects/motion-blur-effect.h | 0 .../shader-effects/motion-stretch-effect.cpp | 2 +- .../shader-effects/motion-stretch-effect.h | 0 .../shader-effects/nine-patch-mask-effect.cpp | 2 +- .../shader-effects/nine-patch-mask-effect.h | 0 .../shader-effects/overlay-effect.cpp | 2 +- .../shader-effects/overlay-effect.h | 0 .../shader-effects/page-turn-book-spine-effect.cpp | 2 +- .../shader-effects/page-turn-book-spine-effect.h | 0 .../shader-effects/page-turn-effect.cpp | 2 +- .../shader-effects/page-turn-effect.h | 0 .../shader-effects/quadratic-bezier.cpp | 2 +- .../shader-effects/quadratic-bezier.h | 0 .../shader-effects/ripple-effect.cpp | 2 +- .../shader-effects/ripple-effect.h | 0 .../shader-effects/ripple2d-effect.cpp | 2 +- .../shader-effects/ripple2d-effect.h | 0 .../shader-effects/shear-effect.cpp | 2 +- .../shader-effects/shear-effect.h | 0 .../shader-effects/soft-button-effect.cpp | 2 +- .../shader-effects/soft-button-effect.h | 0 .../shader-effects/spot-effect.cpp | 2 +- .../shader-effects/spot-effect.h | 0 .../shader-effects/square-dissolve-effect.cpp | 2 +- .../shader-effects/square-dissolve-effect.h | 0 .../shader-effects/swirl-effect.cpp | 2 +- .../shader-effects/swirl-effect.h | 0 .../shader-effects/water-effect.cpp | 2 +- .../shader-effects/water-effect.h | 0 .../styling/style-manager.cpp | 2 +- .../styling/style-manager.h | 0 .../cube-transition-cross-effect.cpp | 0 .../cube-transition-cross-effect.h | 2 +- .../transition-effects/cube-transition-effect.cpp | 0 .../transition-effects/cube-transition-effect.h | 0 .../cube-transition-fold-effect.cpp | 0 .../cube-transition-fold-effect.h | 2 +- .../cube-transition-wave-effect.cpp | 0 .../cube-transition-wave-effect.h | 2 +- .../internal/builder/builder-declarations.h | 2 +- dali-toolkit/internal/builder/builder-impl.cpp | 2 +- dali-toolkit/internal/builder/builder-impl.h | 4 +- dali-toolkit/internal/builder/json-parser-impl.h | 4 +- dali-toolkit/internal/builder/json-parser-state.h | 2 +- dali-toolkit/internal/builder/replacement.h | 2 +- .../internal/builder/tree-node-manipulator.cpp | 2 +- .../internal/builder/tree-node-manipulator.h | 2 +- .../controls/bloom-view/bloom-view-impl.cpp | 2 +- .../internal/controls/bloom-view/bloom-view-impl.h | 2 +- .../controls/bubble-effect/bubble-emitter-impl.cpp | 2 +- .../controls/bubble-effect/bubble-emitter-impl.h | 4 +- .../controls/buttons/check-box-button-impl.h | 2 +- .../internal/controls/buttons/radio-button-impl.h | 2 +- .../controls/effects-view/effects-view-impl.h | 2 +- .../internal/controls/magnifier/magnifier-impl.h | 2 +- .../page-turn-view/page-turn-landscape-view-impl.h | 2 +- .../page-turn-view/page-turn-portrait-view-impl.h | 2 +- .../controls/page-turn-view/page-turn-view-impl.h | 10 +- dali-toolkit/internal/controls/popup/popup-impl.h | 4 +- .../controls/shadow-view/shadow-view-impl.h | 2 +- .../internal/controls/slider/slider-impl.h | 2 +- .../super-blur-view/super-blur-view-impl.h | 2 +- .../internal/controls/table-view/table-view-impl.h | 2 +- .../text-controls/text-selection-popup-impl.h | 2 +- .../internal/controls/tool-bar/tool-bar-impl.cpp | 2 +- .../internal/controls/tool-bar/tool-bar-impl.h | 4 +- dali-toolkit/internal/filters/image-filter.h | 2 +- dali-toolkit/internal/scripting/script-impl.h | 4 +- .../internal/scripting/script-plugin-proxy.h | 2 +- .../shader-effects/page-turn-effect-impl.h | 2 +- .../internal/shader-effects/water-effect-impl.cpp | 2 +- .../internal/shader-effects/water-effect-impl.h | 2 +- .../internal/styling/style-manager-impl.cpp | 2 +- dali-toolkit/internal/styling/style-manager-impl.h | 4 +- .../cube-transition-cross-effect-impl.h | 2 +- .../cube-transition-effect-impl.h | 2 +- .../cube-transition-fold-effect-impl.h | 2 +- .../cube-transition-wave-effect-impl.h | 2 +- dali-toolkit/public-api/controls/control-impl.cpp | 2 +- dali-toolkit/public-api/file.list | 141 -------------------- docs/content/programming-guide/shader-intro.h | 32 ----- plugins/dali-script-v8/src/dali-script-v8.h | 2 +- .../src/toolkit/builder/builder-api.h | 2 +- .../src/toolkit/builder/builder-wrapper.h | 2 +- 190 files changed, 378 insertions(+), 417 deletions(-) rename dali-toolkit/{public-api => devel-api}/builder/builder.cpp (100%) rename dali-toolkit/{public-api => devel-api}/builder/builder.h (100%) rename dali-toolkit/{public-api => devel-api}/builder/json-parser.cpp (97%) rename dali-toolkit/{public-api => devel-api}/builder/json-parser.h (98%) rename dali-toolkit/{public-api => devel-api}/builder/tree-node.cpp (98%) rename dali-toolkit/{public-api => devel-api}/builder/tree-node.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/bloom-view/bloom-view.cpp (97%) rename dali-toolkit/{public-api => devel-api}/controls/bloom-view/bloom-view.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/bubble-effect/bubble-emitter.cpp (97%) rename dali-toolkit/{public-api => devel-api}/controls/bubble-effect/bubble-emitter.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/effects-view/effects-view.cpp (97%) rename dali-toolkit/{public-api => devel-api}/controls/effects-view/effects-view.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/magnifier/magnifier.cpp (97%) rename dali-toolkit/{public-api => devel-api}/controls/magnifier/magnifier.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/page-turn-view/page-factory.cpp (96%) rename dali-toolkit/{public-api => devel-api}/controls/page-turn-view/page-factory.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/page-turn-view/page-turn-landscape-view.cpp (95%) rename dali-toolkit/{public-api => devel-api}/controls/page-turn-view/page-turn-landscape-view.h (97%) rename dali-toolkit/{public-api => devel-api}/controls/page-turn-view/page-turn-portrait-view.cpp (95%) rename dali-toolkit/{public-api => devel-api}/controls/page-turn-view/page-turn-portrait-view.h (97%) rename dali-toolkit/{public-api => devel-api}/controls/page-turn-view/page-turn-view.cpp (97%) rename dali-toolkit/{public-api => devel-api}/controls/page-turn-view/page-turn-view.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/popup/popup.cpp (97%) rename dali-toolkit/{public-api => devel-api}/controls/popup/popup.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/shadow-view/shadow-view.cpp (97%) rename dali-toolkit/{public-api => devel-api}/controls/shadow-view/shadow-view.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/slider/slider.cpp (97%) rename dali-toolkit/{public-api => devel-api}/controls/slider/slider.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/super-blur-view/super-blur-view.cpp (96%) rename dali-toolkit/{public-api => devel-api}/controls/super-blur-view/super-blur-view.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/table-view/table-view.cpp (98%) rename dali-toolkit/{public-api => devel-api}/controls/table-view/table-view.h (100%) rename dali-toolkit/{public-api => devel-api}/controls/tool-bar/tool-bar.cpp (100%) rename dali-toolkit/{public-api => devel-api}/controls/tool-bar/tool-bar.h (100%) create mode 100755 dali-toolkit/devel-api/file.list rename dali-toolkit/{public-api => devel-api}/scripting/script-plugin.h (100%) rename dali-toolkit/{public-api => devel-api}/scripting/script.cpp (100%) rename dali-toolkit/{public-api => devel-api}/scripting/script.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/alpha-discard-effect.cpp (96%) rename dali-toolkit/{public-api => devel-api}/shader-effects/alpha-discard-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/bendy-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/bendy-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/blind-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/blind-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/bouncing-effect.cpp (97%) rename dali-toolkit/{public-api => devel-api}/shader-effects/bouncing-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/bubble-effect/bubble-effect.cpp (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/bubble-effect/bubble-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/bubble-effect/color-adjuster.cpp (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/bubble-effect/color-adjuster.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/carousel-effect.cpp (97%) rename dali-toolkit/{public-api => devel-api}/shader-effects/carousel-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/displacement-effect.cpp (99%) rename dali-toolkit/{public-api => devel-api}/shader-effects/displacement-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/dissolve-effect.cpp (99%) rename dali-toolkit/{public-api => devel-api}/shader-effects/dissolve-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/dissolve-local-effect.cpp (97%) rename dali-toolkit/{public-api => devel-api}/shader-effects/dissolve-local-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/distance-field-effect.cpp (99%) rename dali-toolkit/{public-api => devel-api}/shader-effects/distance-field-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/image-region-effect.cpp (97%) rename dali-toolkit/{public-api => devel-api}/shader-effects/image-region-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/iris-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/iris-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/mask-effect.cpp (96%) rename dali-toolkit/{public-api => devel-api}/shader-effects/mask-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/mirror-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/mirror-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/motion-blur-effect.cpp (99%) rename dali-toolkit/{public-api => devel-api}/shader-effects/motion-blur-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/motion-stretch-effect.cpp (99%) rename dali-toolkit/{public-api => devel-api}/shader-effects/motion-stretch-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/nine-patch-mask-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/nine-patch-mask-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/overlay-effect.cpp (96%) rename dali-toolkit/{public-api => devel-api}/shader-effects/overlay-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/page-turn-book-spine-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/page-turn-book-spine-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/page-turn-effect.cpp (97%) rename dali-toolkit/{public-api => devel-api}/shader-effects/page-turn-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/quadratic-bezier.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/quadratic-bezier.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/ripple-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/ripple-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/ripple2d-effect.cpp (97%) rename dali-toolkit/{public-api => devel-api}/shader-effects/ripple2d-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/shear-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/shear-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/soft-button-effect.cpp (99%) rename dali-toolkit/{public-api => devel-api}/shader-effects/soft-button-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/spot-effect.cpp (97%) rename dali-toolkit/{public-api => devel-api}/shader-effects/spot-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/square-dissolve-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/square-dissolve-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/swirl-effect.cpp (98%) rename dali-toolkit/{public-api => devel-api}/shader-effects/swirl-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/shader-effects/water-effect.cpp (97%) rename dali-toolkit/{public-api => devel-api}/shader-effects/water-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/styling/style-manager.cpp (97%) rename dali-toolkit/{public-api => devel-api}/styling/style-manager.h (100%) rename dali-toolkit/{public-api => devel-api}/transition-effects/cube-transition-cross-effect.cpp (100%) rename dali-toolkit/{public-api => devel-api}/transition-effects/cube-transition-cross-effect.h (96%) rename dali-toolkit/{public-api => devel-api}/transition-effects/cube-transition-effect.cpp (100%) rename dali-toolkit/{public-api => devel-api}/transition-effects/cube-transition-effect.h (100%) rename dali-toolkit/{public-api => devel-api}/transition-effects/cube-transition-fold-effect.cpp (100%) rename dali-toolkit/{public-api => devel-api}/transition-effects/cube-transition-fold-effect.h (96%) rename dali-toolkit/{public-api => devel-api}/transition-effects/cube-transition-wave-effect.cpp (100%) rename dali-toolkit/{public-api => devel-api}/transition-effects/cube-transition-wave-effect.h (96%) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp index 3557c0d..d1d4468 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp @@ -17,7 +17,7 @@ #include "dummy-control.h" -#include +#include namespace Dali { diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp index 426afda..6d58693 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp index d9d5be4..d6756de 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp @@ -20,6 +20,7 @@ #include #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp index c6305e8..c35269a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp @@ -19,6 +19,8 @@ #include #include #include +#include + using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp index e6062f2..e25d8d5 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp index cc03bb1..5fa3d17 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp index 8d6367a..cc11a4f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp index 055b122..6e99611 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp @@ -19,6 +19,12 @@ #include #include #include +#include +#include +#include +#include + + using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp index 522a6fe..773cb14 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp index 66a3664..eebbbf2 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp @@ -24,6 +24,7 @@ #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp index 570793c..b56034a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp index 002601d..9fad2c8 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp @@ -24,6 +24,7 @@ #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp b/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp index a1ebacd..f42e16c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp index 2c866dc..e58375a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp @@ -24,6 +24,8 @@ #include #include +#include + using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp index 49c346e..ef92868 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp @@ -24,6 +24,7 @@ #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp index dccba07..7d76ab3 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp @@ -24,6 +24,7 @@ #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp index b5511ed..744af83 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp @@ -19,6 +19,8 @@ #include #include #include +#include + using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp index b1d5961..e1924c6 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp @@ -19,7 +19,7 @@ #include #include #include - +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp index c905b71..0edd638 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp @@ -22,6 +22,12 @@ #include #include #include +#include +#include +#include +#include + + using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp index 0aaf295..294bec2 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp @@ -25,6 +25,7 @@ #include #include #include +#include using namespace Dali; using namespace Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp index 1fac593..263a5d1 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp @@ -24,6 +24,7 @@ #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp index 71db67d..0ba33d7 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp @@ -24,6 +24,8 @@ #include #include +#include + using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp index edc71f3..78ff25f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp @@ -19,6 +19,8 @@ #include #include #include +#include + using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp index fc2d922..b79af6f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp index 29b1ef6..4025514 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp @@ -20,6 +20,7 @@ #include #include #include +#include using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp index ec39782..e2bcc25 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp index 99a2edb..a6aee80 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp index 9b8e194..625ffe8 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-StyleManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-StyleManager.cpp index 97ffeed..98a4d0b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-StyleManager.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-StyleManager.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp index 0e1385f..de9a7d5 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp @@ -24,6 +24,7 @@ #include #include +#include using namespace Dali; using namespace Dali::Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp index debe183..f9b6487 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp @@ -24,6 +24,8 @@ #include #include +#include + using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp index 45dd92c..6d7b2bf 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; using namespace Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp index bf3111d..026a744 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; using namespace Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp index d359334..2914311 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp @@ -20,6 +20,7 @@ #include #include #include +#include using namespace Dali; using namespace Toolkit; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp index 8f12fb6..ca77428 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 18ed54d..2b4db03 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -20,6 +20,7 @@ toolkit_images_dir = ../../../dali-toolkit/images toolkit_sounds_dir = ../../../dali-toolkit/sounds toolkit_src_dir = ../../../dali-toolkit/internal public_api_src_dir = ../../../dali-toolkit/public-api +devel_api_src_dir = ../../../dali-toolkit/devel-api if MOBILE_PROFILE toolkit_styles_dir = ../../../dali-toolkit/styles/mobile @@ -32,6 +33,7 @@ include ../../../dali-toolkit/sounds/file.list include ../../../dali-toolkit/styles/file.list include ../../../dali-toolkit/internal/file.list include ../../../dali-toolkit/public-api/file.list +include ../../../dali-toolkit/devel-api/file.list resources_dir = ../../../resources daliimagedir = ${dataReadOnlyDir}/toolkit/images/ @@ -45,7 +47,8 @@ lib_LTLIBRARIES = libdali-toolkit.la libdali_toolkit_la_SOURCES = \ $(toolkit_src_files) \ - $(public_api_src_files) + $(public_api_src_files) \ + $(devel_api_src_files) dalistyledir = ${dataReadOnlyDir}/toolkit/styles/ dalistyle_DATA = ${dali_toolkit_style_files} @@ -78,79 +81,76 @@ libdali_toolkit_la_LIBADD = \ topleveldir = $(devincludepath)/dali-toolkit toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h -publicapidir = $(topleveldir)/public-api - -publicapicontrolsdir = $(publicapidir)/controls -publicapialignmentdir = $(publicapicontrolsdir)/alignment -publicapibloomviewdir = $(publicapicontrolsdir)/bloom-view -publicapibubbleemitterdir = $(publicapicontrolsdir)/bubble-effect -publicapibuttonsdir = $(publicapicontrolsdir)/buttons -publicapiclusterdir = $(publicapicontrolsdir)/cluster -publicapidefaultcontrolsdir = $(publicapicontrolsdir)/default-controls -publicapieffectsviewdir = $(publicapicontrolsdir)/effects-view -publicapigaussianblurviewdir = $(publicapicontrolsdir)/gaussian-blur-view -publicapiimageviewdir = $(publicapicontrolsdir)/image-view -publicapiitemviewdir = $(publicapicontrolsdir)/scrollable/item-view -publicapimagnifierdir = $(publicapicontrolsdir)/magnifier -publicapinavigationframedir = $(publicapicontrolsdir)/navigation-frame -publicapipageturnviewdir = $(publicapicontrolsdir)/page-turn-view -publicapipopupdir = $(publicapicontrolsdir)/popup -publicapiscrollbardir = $(publicapicontrolsdir)/scroll-bar -publicapiscrollcomponentdir = $(publicapicontrolsdir)/scroll-component -publicapiscrollabledir = $(publicapicontrolsdir)/scrollable -publicapiscrollviewdir = $(publicapicontrolsdir)/scrollable/scroll-view -publicapiselectorsdir = $(publicapicontrolsdir)/selectors -publicapishadowviewdir = $(publicapicontrolsdir)/shadow-view -publicapisliderdir = $(publicapicontrolsdir)/slider -publicapisuperblurviewdir = $(publicapicontrolsdir)/super-blur-view -publicapitableviewdir = $(publicapicontrolsdir)/table-view -publicapitextcontrolsdir = $(publicapidir)/controls/text-controls -publicapitoolbardir = $(publicapicontrolsdir)/tool-bar -publicapiviewdir = $(publicapicontrolsdir)/view -publicapibuilderdir = $(publicapidir)/builder -publicapifocusmanagerdir = $(publicapidir)/focus-manager -publicapishadereffectsdir = $(publicapidir)/shader-effects -publicapibubbleeffectdir = $(publicapidir)/shader-effects/bubble-effect -publicapistylingdir = $(publicapidir)/styling -publicapitransitioneffectsdir = $(publicapidir)/transition-effects -publicapiscriptingdir = $(publicapidir)/scripting -publicapirenderingbackenddir = $(publicapidir)/text - -publicapi_HEADERS = $(public_api_header_files) -publicapicontrols_HEADERS = $(public_api_controls_header_files) -publicapialignment_HEADERS = $(public_api_alignment_header_files) -publicapibloomview_HEADERS = $(public_api_bloom_view_header_files) -publicapibubbleemitter_HEADERS = $(public_api_bubble_emitter_header_files) -publicapibuttons_HEADERS = $(public_api_buttons_header_files) -publicapicluster_HEADERS = $(public_api_cluster_header_files) -publicapidefaultcontrols_HEADERS = $(public_api_default_controls_header_files) -publicapieffectsview_HEADERS = $(public_api_effects_view_header_files) +# devel api +develapidir = $(topleveldir)/devel-api +develapibuilderdir = $(develapidir)/builder +develapicontrolsdir = $(develapidir)/controls +develapibloomviewdir = $(develapicontrolsdir)/bloom-view +develapibubbleemitterdir = $(develapicontrolsdir)/bubble-effect +develapieffectsviewdir = $(develapicontrolsdir)/effects-view +develapimagnifierdir = $(develapicontrolsdir)/magnifier +develapipopupdir = $(develapicontrolsdir)/popup +develapipageturnviewdir = $(develapicontrolsdir)/page-turn-view +develapisliderdir = $(develapicontrolsdir)/slider +develapishadowviewdir = $(develapicontrolsdir)/shadow-view +develapisuperblurviewdir = $(develapicontrolsdir)/super-blur-view +develapitableviewdir = $(develapicontrolsdir)/table-view +develapiscriptingdir = $(develapidir)/scripting +develapibubbleeffectdir = $(develapidir)/shader-effects/bubble-effect +develapishadereffectsdir = $(develapidir)/shader-effects +develapitransitioneffectsdir = $(develapidir)/transition-effects +develapistylingdir = $(develapidir)/styling +develapitoolbardir = $(develapicontrolsdir)/tool-bar +# devel headers + +develapibloomview_HEADERS = $(devel_api_bloom_view_header_files) +develapibubbleemitter_HEADERS = $(devel_api_bubble_emitter_header_files) +develapibubbleeffect_HEADERS = $(devel_api_bubble_effect_header_files) +develapibuilder_HEADERS = $(devel_api_builder_header_files) +develapieffectsview_HEADERS = $(devel_api_effects_view_header_files) +develapimagnifier_HEADERS = $(devel_api_magnifier_header_files) +develapipageturnview_HEADERS = $(devel_api_page_turn_view_header_files) +develapipopup_HEADERS = $(devel_api_popup_header_files) +develapiscripting_HEADERS = $(devel_api_scripting_header_files) +develapishadowview_HEADERS = $(devel_api_shadow_view_header_files) +develapishadereffects_HEADERS = $(devel_api_shader_effects_header_files) +develapislider_HEADERS = $(devel_api_slider_header_files) +develapistyling_HEADERS = $(devel_api_styling_header_files) +develapisuperblurview_HEADERS = $(devel_api_super_blur_view_header_files) +develapitableview_HEADERS = $(devel_api_table_view_header_files) +develapitoolbar_HEADERS = $(devel_api_tool_bar_header_files) +develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files) + +# public api source + +publicapidir = $(topleveldir)/public-api +publicapicontrolsdir = $(publicapidir)/controls +publicapialignmentdir = $(publicapicontrolsdir)/alignment +publicapibuttonsdir = $(publicapicontrolsdir)/buttons +publicapidefaultcontrolsdir = $(publicapicontrolsdir)/default-controls +publicapigaussianblurviewdir = $(publicapicontrolsdir)/gaussian-blur-view +publicapiimageviewdir = $(publicapicontrolsdir)/image-view +publicapiscrollbardir = $(publicapicontrolsdir)/scroll-bar +publicapiscrollabledir = $(publicapicontrolsdir)/scrollable +publicapiscrollviewdir = $(publicapicontrolsdir)/scrollable/scroll-view +publicapiitemviewdir = $(publicapicontrolsdir)/scrollable/item-view +publicapitextcontrolsdir = $(publicapicontrolsdir)/text-controls +publicapifocusmanagerdir = $(publicapidir)/focus-manager +publicapirenderingbackenddir = $(publicapidir)/text + +# public api headers +publicapi_HEADERS = $(public_api_header_files) +publicapicontrols_HEADERS = $(public_api_controls_header_files) +publicapialignment_HEADERS = $(public_api_alignment_header_files) +publicapibuttons_HEADERS = $(public_api_buttons_header_files) +publicapidefaultcontrols_HEADERS = $(public_api_default_controls_header_files) publicapigaussianblurview_HEADERS = $(public_api_gaussian_blur_view_header_files) -publicapiimageview_HEADERS = $(public_api_image_view_header_files) -publicapiitemview_HEADERS = $(public_api_item_view_header_files) -publicapimagnifier_HEADERS = $(public_api_magnifier_header_files) -publicapinavigationframe_HEADERS = $(public_api_navigation_frame_header_files) -publicapipageturnview_HEADERS = $(public_api_page_turn_view_header_files) -publicapipopup_HEADERS = $(public_api_popup_header_files) -publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files) - -publicapiscrollcomponent_HEADERS = $(public_api_scroll_component_header_files) -publicapiscrollable_HEADERS = $(public_api_scrollable_header_files) -publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files) -publicapiselectors_HEADERS = $(public_api_selectors_header_files) -publicapishadowview_HEADERS = $(public_api_shadow_view_header_files) -publicapislider_HEADERS = $(public_api_slider_header_files) -publicapisuperblurview_HEADERS = $(public_api_super_blur_view_header_files) -publicapitableview_HEADERS = $(public_api_table_view_header_files) -publicapitextcontrols_HEADERS = $(public_api_text_controls_header_files) -publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files) -publicapiview_HEADERS = $(public_api_view_header_files) -publicapibuilder_HEADERS = $(public_api_builder_header_files) -publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files) -publicapishadereffects_HEADERS = $(public_api_shader_effects_header_files) -publicapibubbleeffect_HEADERS = $(public_api_bubble_effect_header_files) -publicapistyling_HEADERS = $(public_api_styling_header_files) -publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files) -publicapiscripting_HEADERS = $(public_api_scripting_header_files) +publicapiimageview_HEADERS = $(public_api_image_view_header_files) +publicapiitemview_HEADERS = $(public_api_item_view_header_files) +publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files) +publicapiscrollable_HEADERS = $(public_api_scrollable_header_files) +publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files) +publicapitextcontrols_HEADERS = $(public_api_text_controls_header_files) +publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files) publicapirenderingbackend_HEADERS = $(public_api_rendering_backend_header_files) diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h index 7664649..9cf472b 100644 --- a/dali-toolkit/dali-toolkit.h +++ b/dali-toolkit/dali-toolkit.h @@ -21,11 +21,7 @@ #include // Toolkit -#include -#include #include -#include -#include #include #include #include @@ -35,15 +31,8 @@ #include #include #include -#include #include #include -#include -#include -#include -#include -#include -#include #include #include #include @@ -54,61 +43,12 @@ #include #include #include -#include -#include -#include -#include #include #include -#include - #include #include #include - -#include -#include - #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - #include #include diff --git a/dali-toolkit/public-api/builder/builder.cpp b/dali-toolkit/devel-api/builder/builder.cpp similarity index 100% rename from dali-toolkit/public-api/builder/builder.cpp rename to dali-toolkit/devel-api/builder/builder.cpp diff --git a/dali-toolkit/public-api/builder/builder.h b/dali-toolkit/devel-api/builder/builder.h similarity index 100% rename from dali-toolkit/public-api/builder/builder.h rename to dali-toolkit/devel-api/builder/builder.h diff --git a/dali-toolkit/public-api/builder/json-parser.cpp b/dali-toolkit/devel-api/builder/json-parser.cpp similarity index 97% rename from dali-toolkit/public-api/builder/json-parser.cpp rename to dali-toolkit/devel-api/builder/json-parser.cpp index 9ca5189..5d3838e 100644 --- a/dali-toolkit/public-api/builder/json-parser.cpp +++ b/dali-toolkit/devel-api/builder/json-parser.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/builder/json-parser.h b/dali-toolkit/devel-api/builder/json-parser.h similarity index 98% rename from dali-toolkit/public-api/builder/json-parser.h rename to dali-toolkit/devel-api/builder/json-parser.h index 0b5c515..b871948 100644 --- a/dali-toolkit/public-api/builder/json-parser.h +++ b/dali-toolkit/devel-api/builder/json-parser.h @@ -25,7 +25,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/builder/tree-node.cpp b/dali-toolkit/devel-api/builder/tree-node.cpp similarity index 98% rename from dali-toolkit/public-api/builder/tree-node.cpp rename to dali-toolkit/devel-api/builder/tree-node.cpp index cf6dacb..3ecb1d5 100644 --- a/dali-toolkit/public-api/builder/tree-node.cpp +++ b/dali-toolkit/devel-api/builder/tree-node.cpp @@ -19,7 +19,7 @@ #include // INTERNAL INCLUDES -#include "dali-toolkit/public-api/builder/tree-node.h" +#include "dali-toolkit/devel-api/builder/tree-node.h" #include "dali-toolkit/internal/builder/tree-node-manipulator.h" namespace Dali diff --git a/dali-toolkit/public-api/builder/tree-node.h b/dali-toolkit/devel-api/builder/tree-node.h similarity index 100% rename from dali-toolkit/public-api/builder/tree-node.h rename to dali-toolkit/devel-api/builder/tree-node.h diff --git a/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp similarity index 97% rename from dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp rename to dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp index 94b8170..c7cfc9e 100644 --- a/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp +++ b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/bloom-view/bloom-view.h b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h similarity index 100% rename from dali-toolkit/public-api/controls/bloom-view/bloom-view.h rename to dali-toolkit/devel-api/controls/bloom-view/bloom-view.h diff --git a/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp similarity index 97% rename from dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp rename to dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp index b719b22..c450637 100644 --- a/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp +++ b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h similarity index 100% rename from dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h rename to dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h diff --git a/dali-toolkit/public-api/controls/effects-view/effects-view.cpp b/dali-toolkit/devel-api/controls/effects-view/effects-view.cpp similarity index 97% rename from dali-toolkit/public-api/controls/effects-view/effects-view.cpp rename to dali-toolkit/devel-api/controls/effects-view/effects-view.cpp index 679a308..d1757d7 100644 --- a/dali-toolkit/public-api/controls/effects-view/effects-view.cpp +++ b/dali-toolkit/devel-api/controls/effects-view/effects-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/effects-view/effects-view.h b/dali-toolkit/devel-api/controls/effects-view/effects-view.h similarity index 100% rename from dali-toolkit/public-api/controls/effects-view/effects-view.h rename to dali-toolkit/devel-api/controls/effects-view/effects-view.h diff --git a/dali-toolkit/public-api/controls/magnifier/magnifier.cpp b/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp similarity index 97% rename from dali-toolkit/public-api/controls/magnifier/magnifier.cpp rename to dali-toolkit/devel-api/controls/magnifier/magnifier.cpp index f245dee..6dd16d1 100644 --- a/dali-toolkit/public-api/controls/magnifier/magnifier.cpp +++ b/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp @@ -16,7 +16,7 @@ */ // INTERNAL INCLUDES -#include +#include #include using namespace Dali; diff --git a/dali-toolkit/public-api/controls/magnifier/magnifier.h b/dali-toolkit/devel-api/controls/magnifier/magnifier.h similarity index 100% rename from dali-toolkit/public-api/controls/magnifier/magnifier.h rename to dali-toolkit/devel-api/controls/magnifier/magnifier.h diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.cpp similarity index 96% rename from dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp rename to dali-toolkit/devel-api/controls/page-turn-view/page-factory.cpp index 6d448d0..118ff92 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-factory.h b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h similarity index 100% rename from dali-toolkit/public-api/controls/page-turn-view/page-factory.h rename to dali-toolkit/devel-api/controls/page-turn-view/page-factory.h diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp similarity index 95% rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp index aadbffb..8a08633 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h similarity index 97% rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h index 37215a1..7430fcc 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp similarity index 95% rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp index bb30f23..86e484a 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h similarity index 97% rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h index 5da3a97..d237e50 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp similarity index 97% rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp index 2f582d3..c50b265 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h similarity index 100% rename from dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h rename to dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h diff --git a/dali-toolkit/public-api/controls/popup/popup.cpp b/dali-toolkit/devel-api/controls/popup/popup.cpp similarity index 97% rename from dali-toolkit/public-api/controls/popup/popup.cpp rename to dali-toolkit/devel-api/controls/popup/popup.cpp index 5c851b7..9b74a3d 100644 --- a/dali-toolkit/public-api/controls/popup/popup.cpp +++ b/dali-toolkit/devel-api/controls/popup/popup.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/popup/popup.h b/dali-toolkit/devel-api/controls/popup/popup.h similarity index 100% rename from dali-toolkit/public-api/controls/popup/popup.h rename to dali-toolkit/devel-api/controls/popup/popup.h diff --git a/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.cpp similarity index 97% rename from dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp rename to dali-toolkit/devel-api/controls/shadow-view/shadow-view.cpp index 461e36f..cb7ac5c 100644 --- a/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp +++ b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/shadow-view/shadow-view.h b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h similarity index 100% rename from dali-toolkit/public-api/controls/shadow-view/shadow-view.h rename to dali-toolkit/devel-api/controls/shadow-view/shadow-view.h diff --git a/dali-toolkit/public-api/controls/slider/slider.cpp b/dali-toolkit/devel-api/controls/slider/slider.cpp similarity index 97% rename from dali-toolkit/public-api/controls/slider/slider.cpp rename to dali-toolkit/devel-api/controls/slider/slider.cpp index 86de16e..a220dee 100644 --- a/dali-toolkit/public-api/controls/slider/slider.cpp +++ b/dali-toolkit/devel-api/controls/slider/slider.cpp @@ -15,7 +15,7 @@ * */ -#include +#include #include using namespace Dali; diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/devel-api/controls/slider/slider.h similarity index 100% rename from dali-toolkit/public-api/controls/slider/slider.h rename to dali-toolkit/devel-api/controls/slider/slider.h diff --git a/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp similarity index 96% rename from dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp rename to dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp index 22e347c..fda059b 100644 --- a/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp +++ b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h similarity index 100% rename from dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h rename to dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h diff --git a/dali-toolkit/public-api/controls/table-view/table-view.cpp b/dali-toolkit/devel-api/controls/table-view/table-view.cpp similarity index 98% rename from dali-toolkit/public-api/controls/table-view/table-view.cpp rename to dali-toolkit/devel-api/controls/table-view/table-view.cpp index c92f36e..959d07a 100644 --- a/dali-toolkit/public-api/controls/table-view/table-view.cpp +++ b/dali-toolkit/devel-api/controls/table-view/table-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/devel-api/controls/table-view/table-view.h similarity index 100% rename from dali-toolkit/public-api/controls/table-view/table-view.h rename to dali-toolkit/devel-api/controls/table-view/table-view.h diff --git a/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.cpp similarity index 100% rename from dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp rename to dali-toolkit/devel-api/controls/tool-bar/tool-bar.cpp diff --git a/dali-toolkit/public-api/controls/tool-bar/tool-bar.h b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h similarity index 100% rename from dali-toolkit/public-api/controls/tool-bar/tool-bar.h rename to dali-toolkit/devel-api/controls/tool-bar/tool-bar.h diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list new file mode 100755 index 0000000..766689c --- /dev/null +++ b/dali-toolkit/devel-api/file.list @@ -0,0 +1,148 @@ +# Add local source files here + +devel_api_src_files = \ + $(devel_api_src_dir)/builder/builder.cpp \ + $(devel_api_src_dir)/builder/json-parser.cpp \ + $(devel_api_src_dir)/builder/tree-node.cpp \ + $(devel_api_src_dir)/controls/bloom-view/bloom-view.cpp \ + $(devel_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \ + $(devel_api_src_dir)/controls/effects-view/effects-view.cpp \ + $(devel_api_src_dir)/controls/magnifier/magnifier.cpp \ + $(devel_api_src_dir)/controls/page-turn-view/page-factory.cpp \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \ + $(devel_api_src_dir)/controls/popup/popup.cpp \ + $(devel_api_src_dir)/controls/shadow-view/shadow-view.cpp \ + $(devel_api_src_dir)/controls/slider/slider.cpp \ + $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \ + $(devel_api_src_dir)/controls/table-view/table-view.cpp \ + $(devel_api_src_dir)/controls/tool-bar/tool-bar.cpp \ + $(devel_api_src_dir)/styling/style-manager.cpp \ + $(devel_api_src_dir)/scripting/script.cpp \ + $(devel_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \ + $(devel_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \ + $(devel_api_src_dir)/shader-effects/alpha-discard-effect.cpp \ + $(devel_api_src_dir)/shader-effects/bendy-effect.cpp \ + $(devel_api_src_dir)/shader-effects/blind-effect.cpp \ + $(devel_api_src_dir)/shader-effects/bouncing-effect.cpp \ + $(devel_api_src_dir)/shader-effects/carousel-effect.cpp \ + $(devel_api_src_dir)/shader-effects/displacement-effect.cpp \ + $(devel_api_src_dir)/shader-effects/dissolve-effect.cpp \ + $(devel_api_src_dir)/shader-effects/dissolve-local-effect.cpp \ + $(devel_api_src_dir)/shader-effects/distance-field-effect.cpp \ + $(devel_api_src_dir)/shader-effects/image-region-effect.cpp \ + $(devel_api_src_dir)/shader-effects/iris-effect.cpp \ + $(devel_api_src_dir)/shader-effects/mask-effect.cpp \ + $(devel_api_src_dir)/shader-effects/mirror-effect.cpp \ + $(devel_api_src_dir)/shader-effects/motion-blur-effect.cpp \ + $(devel_api_src_dir)/shader-effects/motion-stretch-effect.cpp \ + $(devel_api_src_dir)/shader-effects/nine-patch-mask-effect.cpp \ + $(devel_api_src_dir)/shader-effects/overlay-effect.cpp \ + $(devel_api_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \ + $(devel_api_src_dir)/shader-effects/page-turn-effect.cpp \ + $(devel_api_src_dir)/shader-effects/quadratic-bezier.cpp \ + $(devel_api_src_dir)/shader-effects/ripple-effect.cpp \ + $(devel_api_src_dir)/shader-effects/ripple2d-effect.cpp \ + $(devel_api_src_dir)/shader-effects/shear-effect.cpp \ + $(devel_api_src_dir)/shader-effects/soft-button-effect.cpp \ + $(devel_api_src_dir)/shader-effects/spot-effect.cpp \ + $(devel_api_src_dir)/shader-effects/square-dissolve-effect.cpp \ + $(devel_api_src_dir)/shader-effects/swirl-effect.cpp \ + $(devel_api_src_dir)/shader-effects/water-effect.cpp \ + $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \ + $(devel_api_src_dir)/transition-effects/cube-transition-effect.cpp \ + $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \ + $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp + +# Add devel header files here + +devel_api_bloom_view_header_files = \ + $(devel_api_src_dir)/controls/bloom-view/bloom-view.h + +devel_api_bubble_effect_header_files = \ + $(devel_api_src_dir)/shader-effects/bubble-effect/bubble-effect.h \ + $(devel_api_src_dir)/shader-effects/bubble-effect/color-adjuster.h + +devel_api_bubble_emitter_header_files = \ + $(devel_api_src_dir)/controls/bubble-effect/bubble-emitter.h + +devel_api_builder_header_files = \ + $(devel_api_src_dir)/builder/builder.h \ + $(devel_api_src_dir)/builder/json-parser.h \ + $(devel_api_src_dir)/builder/tree-node.h + +devel_api_effects_view_header_files = \ + $(devel_api_src_dir)/controls/effects-view/effects-view.h + +devel_api_magnifier_header_files = \ + $(devel_api_src_dir)/controls/magnifier/magnifier.h + +devel_api_page_turn_view_header_files = \ + $(devel_api_src_dir)/controls/page-turn-view/page-factory.h \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-view.h + +devel_api_popup_header_files = \ + $(devel_api_src_dir)/controls/popup/popup.h + +devel_api_shadow_view_header_files = \ + $(devel_api_src_dir)/controls/shadow-view/shadow-view.h + +devel_api_slider_header_files = \ + $(devel_api_src_dir)/controls/slider/slider.h + +devel_api_styling_header_files = \ + $(devel_api_src_dir)/styling/style-manager.h + +devel_api_scripting_header_files = \ + $(devel_api_src_dir)/scripting/script.h \ + $(devel_api_src_dir)/scripting/script-plugin.h + +devel_api_shader_effects_header_files = \ + $(devel_api_src_dir)/shader-effects/alpha-discard-effect.h \ + $(devel_api_src_dir)/shader-effects/bendy-effect.h \ + $(devel_api_src_dir)/shader-effects/blind-effect.h \ + $(devel_api_src_dir)/shader-effects/bouncing-effect.h \ + $(devel_api_src_dir)/shader-effects/carousel-effect.h \ + $(devel_api_src_dir)/shader-effects/displacement-effect.h \ + $(devel_api_src_dir)/shader-effects/dissolve-effect.h \ + $(devel_api_src_dir)/shader-effects/dissolve-local-effect.h \ + $(devel_api_src_dir)/shader-effects/distance-field-effect.h \ + $(devel_api_src_dir)/shader-effects/image-region-effect.h \ + $(devel_api_src_dir)/shader-effects/iris-effect.h \ + $(devel_api_src_dir)/shader-effects/mask-effect.h \ + $(devel_api_src_dir)/shader-effects/mirror-effect.h \ + $(devel_api_src_dir)/shader-effects/motion-blur-effect.h \ + $(devel_api_src_dir)/shader-effects/motion-stretch-effect.h \ + $(devel_api_src_dir)/shader-effects/nine-patch-mask-effect.h \ + $(devel_api_src_dir)/shader-effects/overlay-effect.h \ + $(devel_api_src_dir)/shader-effects/page-turn-book-spine-effect.h \ + $(devel_api_src_dir)/shader-effects/page-turn-effect.h \ + $(devel_api_src_dir)/shader-effects/quadratic-bezier.h \ + $(devel_api_src_dir)/shader-effects/ripple-effect.h \ + $(devel_api_src_dir)/shader-effects/ripple2d-effect.h \ + $(devel_api_src_dir)/shader-effects/shear-effect.h \ + $(devel_api_src_dir)/shader-effects/soft-button-effect.h \ + $(devel_api_src_dir)/shader-effects/spot-effect.h \ + $(devel_api_src_dir)/shader-effects/square-dissolve-effect.h \ + $(devel_api_src_dir)/shader-effects/swirl-effect.h \ + $(devel_api_src_dir)/shader-effects/water-effect.h + +devel_api_super_blur_view_header_files = \ + $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.h + + +devel_api_table_view_header_files = \ + $(devel_api_src_dir)/controls/table-view/table-view.h + +devel_api_tool_bar_header_files = \ + $(devel_api_src_dir)/controls/tool-bar/tool-bar.h + +devel_api_transition_effects_header_files = \ + $(devel_api_src_dir)/transition-effects/cube-transition-effect.h \ + $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.h \ + $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.h \ + $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.h + diff --git a/dali-toolkit/public-api/scripting/script-plugin.h b/dali-toolkit/devel-api/scripting/script-plugin.h similarity index 100% rename from dali-toolkit/public-api/scripting/script-plugin.h rename to dali-toolkit/devel-api/scripting/script-plugin.h diff --git a/dali-toolkit/public-api/scripting/script.cpp b/dali-toolkit/devel-api/scripting/script.cpp similarity index 100% rename from dali-toolkit/public-api/scripting/script.cpp rename to dali-toolkit/devel-api/scripting/script.cpp diff --git a/dali-toolkit/public-api/scripting/script.h b/dali-toolkit/devel-api/scripting/script.h similarity index 100% rename from dali-toolkit/public-api/scripting/script.h rename to dali-toolkit/devel-api/scripting/script.h diff --git a/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.cpp similarity index 96% rename from dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp rename to dali-toolkit/devel-api/shader-effects/alpha-discard-effect.cpp index acccbf8..1c6be01 100644 --- a/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/alpha-discard-effect.h rename to dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h diff --git a/dali-toolkit/public-api/shader-effects/bendy-effect.cpp b/dali-toolkit/devel-api/shader-effects/bendy-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/bendy-effect.cpp rename to dali-toolkit/devel-api/shader-effects/bendy-effect.cpp index 7563108..29bf267 100644 --- a/dali-toolkit/public-api/shader-effects/bendy-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/bendy-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/bendy-effect.h b/dali-toolkit/devel-api/shader-effects/bendy-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/bendy-effect.h rename to dali-toolkit/devel-api/shader-effects/bendy-effect.h diff --git a/dali-toolkit/public-api/shader-effects/blind-effect.cpp b/dali-toolkit/devel-api/shader-effects/blind-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/blind-effect.cpp rename to dali-toolkit/devel-api/shader-effects/blind-effect.cpp index f9f7945..d133283 100644 --- a/dali-toolkit/public-api/shader-effects/blind-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/blind-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/blind-effect.h b/dali-toolkit/devel-api/shader-effects/blind-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/blind-effect.h rename to dali-toolkit/devel-api/shader-effects/blind-effect.h diff --git a/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp b/dali-toolkit/devel-api/shader-effects/bouncing-effect.cpp similarity index 97% rename from dali-toolkit/public-api/shader-effects/bouncing-effect.cpp rename to dali-toolkit/devel-api/shader-effects/bouncing-effect.cpp index 4c99eb7..444aae0 100644 --- a/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/bouncing-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/bouncing-effect.h b/dali-toolkit/devel-api/shader-effects/bouncing-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/bouncing-effect.h rename to dali-toolkit/devel-api/shader-effects/bouncing-effect.h diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp b/dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.cpp similarity index 100% rename from dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp rename to dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.cpp diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h b/dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h rename to dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.h diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp b/dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.cpp similarity index 100% rename from dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp rename to dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.cpp diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h b/dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h rename to dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.h diff --git a/dali-toolkit/public-api/shader-effects/carousel-effect.cpp b/dali-toolkit/devel-api/shader-effects/carousel-effect.cpp similarity index 97% rename from dali-toolkit/public-api/shader-effects/carousel-effect.cpp rename to dali-toolkit/devel-api/shader-effects/carousel-effect.cpp index 32772ab..9f6adae 100644 --- a/dali-toolkit/public-api/shader-effects/carousel-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/carousel-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/carousel-effect.h b/dali-toolkit/devel-api/shader-effects/carousel-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/carousel-effect.h rename to dali-toolkit/devel-api/shader-effects/carousel-effect.h diff --git a/dali-toolkit/public-api/shader-effects/displacement-effect.cpp b/dali-toolkit/devel-api/shader-effects/displacement-effect.cpp similarity index 99% rename from dali-toolkit/public-api/shader-effects/displacement-effect.cpp rename to dali-toolkit/devel-api/shader-effects/displacement-effect.cpp index 523f711..8dca1b4 100644 --- a/dali-toolkit/public-api/shader-effects/displacement-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/displacement-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/displacement-effect.h b/dali-toolkit/devel-api/shader-effects/displacement-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/displacement-effect.h rename to dali-toolkit/devel-api/shader-effects/displacement-effect.h diff --git a/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp b/dali-toolkit/devel-api/shader-effects/dissolve-effect.cpp similarity index 99% rename from dali-toolkit/public-api/shader-effects/dissolve-effect.cpp rename to dali-toolkit/devel-api/shader-effects/dissolve-effect.cpp index 97709b5..6cabd7d 100644 --- a/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/dissolve-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/dissolve-effect.h b/dali-toolkit/devel-api/shader-effects/dissolve-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/dissolve-effect.h rename to dali-toolkit/devel-api/shader-effects/dissolve-effect.h diff --git a/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.cpp similarity index 97% rename from dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp rename to dali-toolkit/devel-api/shader-effects/dissolve-local-effect.cpp index 26430d0..acd6fda 100644 --- a/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.cpp @@ -17,9 +17,9 @@ #include -#include +#include -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/dissolve-local-effect.h rename to dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h diff --git a/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp b/dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp similarity index 99% rename from dali-toolkit/public-api/shader-effects/distance-field-effect.cpp rename to dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp index 9bde48e..aedd849 100644 --- a/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include #define STRINGIFY(...) #__VA_ARGS__ diff --git a/dali-toolkit/public-api/shader-effects/distance-field-effect.h b/dali-toolkit/devel-api/shader-effects/distance-field-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/distance-field-effect.h rename to dali-toolkit/devel-api/shader-effects/distance-field-effect.h diff --git a/dali-toolkit/public-api/shader-effects/image-region-effect.cpp b/dali-toolkit/devel-api/shader-effects/image-region-effect.cpp similarity index 97% rename from dali-toolkit/public-api/shader-effects/image-region-effect.cpp rename to dali-toolkit/devel-api/shader-effects/image-region-effect.cpp index 9b1b0b1..1a16481 100644 --- a/dali-toolkit/public-api/shader-effects/image-region-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/image-region-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/image-region-effect.h b/dali-toolkit/devel-api/shader-effects/image-region-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/image-region-effect.h rename to dali-toolkit/devel-api/shader-effects/image-region-effect.h diff --git a/dali-toolkit/public-api/shader-effects/iris-effect.cpp b/dali-toolkit/devel-api/shader-effects/iris-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/iris-effect.cpp rename to dali-toolkit/devel-api/shader-effects/iris-effect.cpp index 9680775..5217dda 100644 --- a/dali-toolkit/public-api/shader-effects/iris-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/iris-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/iris-effect.h b/dali-toolkit/devel-api/shader-effects/iris-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/iris-effect.h rename to dali-toolkit/devel-api/shader-effects/iris-effect.h diff --git a/dali-toolkit/public-api/shader-effects/mask-effect.cpp b/dali-toolkit/devel-api/shader-effects/mask-effect.cpp similarity index 96% rename from dali-toolkit/public-api/shader-effects/mask-effect.cpp rename to dali-toolkit/devel-api/shader-effects/mask-effect.cpp index a0a44bb..daa2672 100644 --- a/dali-toolkit/public-api/shader-effects/mask-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/mask-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/mask-effect.h b/dali-toolkit/devel-api/shader-effects/mask-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/mask-effect.h rename to dali-toolkit/devel-api/shader-effects/mask-effect.h diff --git a/dali-toolkit/public-api/shader-effects/mirror-effect.cpp b/dali-toolkit/devel-api/shader-effects/mirror-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/mirror-effect.cpp rename to dali-toolkit/devel-api/shader-effects/mirror-effect.cpp index 0464150..7ed44c74 100644 --- a/dali-toolkit/public-api/shader-effects/mirror-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/mirror-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/mirror-effect.h b/dali-toolkit/devel-api/shader-effects/mirror-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/mirror-effect.h rename to dali-toolkit/devel-api/shader-effects/mirror-effect.h diff --git a/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp similarity index 99% rename from dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp rename to dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp index 205327d..ed92e82 100644 --- a/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/shader-effects/motion-blur-effect.h b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/motion-blur-effect.h rename to dali-toolkit/devel-api/shader-effects/motion-blur-effect.h diff --git a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp b/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp similarity index 99% rename from dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp rename to dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp index 3a631bf..11c1ba8 100644 --- a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h b/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/motion-stretch-effect.h rename to dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h diff --git a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp b/dali-toolkit/devel-api/shader-effects/nine-patch-mask-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp rename to dali-toolkit/devel-api/shader-effects/nine-patch-mask-effect.cpp index c03537d..e7c69d5 100644 --- a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/nine-patch-mask-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h b/dali-toolkit/devel-api/shader-effects/nine-patch-mask-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h rename to dali-toolkit/devel-api/shader-effects/nine-patch-mask-effect.h diff --git a/dali-toolkit/public-api/shader-effects/overlay-effect.cpp b/dali-toolkit/devel-api/shader-effects/overlay-effect.cpp similarity index 96% rename from dali-toolkit/public-api/shader-effects/overlay-effect.cpp rename to dali-toolkit/devel-api/shader-effects/overlay-effect.cpp index 4479084..c5eb1fc 100644 --- a/dali-toolkit/public-api/shader-effects/overlay-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/overlay-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/overlay-effect.h b/dali-toolkit/devel-api/shader-effects/overlay-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/overlay-effect.h rename to dali-toolkit/devel-api/shader-effects/overlay-effect.h diff --git a/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp b/dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp rename to dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.cpp index 36d1849..08d77a6 100644 --- a/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h b/dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h rename to dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.h diff --git a/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp b/dali-toolkit/devel-api/shader-effects/page-turn-effect.cpp similarity index 97% rename from dali-toolkit/public-api/shader-effects/page-turn-effect.cpp rename to dali-toolkit/devel-api/shader-effects/page-turn-effect.cpp index 1a2f817..f55bce0 100644 --- a/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/page-turn-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL HEADERS #include diff --git a/dali-toolkit/public-api/shader-effects/page-turn-effect.h b/dali-toolkit/devel-api/shader-effects/page-turn-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/page-turn-effect.h rename to dali-toolkit/devel-api/shader-effects/page-turn-effect.h diff --git a/dali-toolkit/public-api/shader-effects/quadratic-bezier.cpp b/dali-toolkit/devel-api/shader-effects/quadratic-bezier.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/quadratic-bezier.cpp rename to dali-toolkit/devel-api/shader-effects/quadratic-bezier.cpp index d197be8..970fa6f 100644 --- a/dali-toolkit/public-api/shader-effects/quadratic-bezier.cpp +++ b/dali-toolkit/devel-api/shader-effects/quadratic-bezier.cpp @@ -16,7 +16,7 @@ */ //CLASS HEADER -#include +#include //EXTERNAL HEADERS #include diff --git a/dali-toolkit/public-api/shader-effects/quadratic-bezier.h b/dali-toolkit/devel-api/shader-effects/quadratic-bezier.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/quadratic-bezier.h rename to dali-toolkit/devel-api/shader-effects/quadratic-bezier.h diff --git a/dali-toolkit/public-api/shader-effects/ripple-effect.cpp b/dali-toolkit/devel-api/shader-effects/ripple-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/ripple-effect.cpp rename to dali-toolkit/devel-api/shader-effects/ripple-effect.cpp index ec354c9..f4c8a52 100644 --- a/dali-toolkit/public-api/shader-effects/ripple-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/ripple-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali diff --git a/dali-toolkit/public-api/shader-effects/ripple-effect.h b/dali-toolkit/devel-api/shader-effects/ripple-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/ripple-effect.h rename to dali-toolkit/devel-api/shader-effects/ripple-effect.h diff --git a/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp b/dali-toolkit/devel-api/shader-effects/ripple2d-effect.cpp similarity index 97% rename from dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp rename to dali-toolkit/devel-api/shader-effects/ripple2d-effect.cpp index 972631d..ffd11ac 100644 --- a/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/ripple2d-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali diff --git a/dali-toolkit/public-api/shader-effects/ripple2d-effect.h b/dali-toolkit/devel-api/shader-effects/ripple2d-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/ripple2d-effect.h rename to dali-toolkit/devel-api/shader-effects/ripple2d-effect.h diff --git a/dali-toolkit/public-api/shader-effects/shear-effect.cpp b/dali-toolkit/devel-api/shader-effects/shear-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/shear-effect.cpp rename to dali-toolkit/devel-api/shader-effects/shear-effect.cpp index 031c8aa..994d0c5 100644 --- a/dali-toolkit/public-api/shader-effects/shear-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/shear-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/shear-effect.h b/dali-toolkit/devel-api/shader-effects/shear-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/shear-effect.h rename to dali-toolkit/devel-api/shader-effects/shear-effect.h diff --git a/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp b/dali-toolkit/devel-api/shader-effects/soft-button-effect.cpp similarity index 99% rename from dali-toolkit/public-api/shader-effects/soft-button-effect.cpp rename to dali-toolkit/devel-api/shader-effects/soft-button-effect.cpp index fbf3da2..b7ed625 100644 --- a/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/soft-button-effect.cpp @@ -20,7 +20,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/soft-button-effect.h b/dali-toolkit/devel-api/shader-effects/soft-button-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/soft-button-effect.h rename to dali-toolkit/devel-api/shader-effects/soft-button-effect.h diff --git a/dali-toolkit/public-api/shader-effects/spot-effect.cpp b/dali-toolkit/devel-api/shader-effects/spot-effect.cpp similarity index 97% rename from dali-toolkit/public-api/shader-effects/spot-effect.cpp rename to dali-toolkit/devel-api/shader-effects/spot-effect.cpp index 09408fb..4400cad 100644 --- a/dali-toolkit/public-api/shader-effects/spot-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/spot-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/spot-effect.h b/dali-toolkit/devel-api/shader-effects/spot-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/spot-effect.h rename to dali-toolkit/devel-api/shader-effects/spot-effect.h diff --git a/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp b/dali-toolkit/devel-api/shader-effects/square-dissolve-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp rename to dali-toolkit/devel-api/shader-effects/square-dissolve-effect.cpp index 5a5b0a3..b60b337 100644 --- a/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/square-dissolve-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h b/dali-toolkit/devel-api/shader-effects/square-dissolve-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/square-dissolve-effect.h rename to dali-toolkit/devel-api/shader-effects/square-dissolve-effect.h diff --git a/dali-toolkit/public-api/shader-effects/swirl-effect.cpp b/dali-toolkit/devel-api/shader-effects/swirl-effect.cpp similarity index 98% rename from dali-toolkit/public-api/shader-effects/swirl-effect.cpp rename to dali-toolkit/devel-api/shader-effects/swirl-effect.cpp index 66e330b..cafeec5 100644 --- a/dali-toolkit/public-api/shader-effects/swirl-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/swirl-effect.cpp @@ -15,7 +15,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/shader-effects/swirl-effect.h b/dali-toolkit/devel-api/shader-effects/swirl-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/swirl-effect.h rename to dali-toolkit/devel-api/shader-effects/swirl-effect.h diff --git a/dali-toolkit/public-api/shader-effects/water-effect.cpp b/dali-toolkit/devel-api/shader-effects/water-effect.cpp similarity index 97% rename from dali-toolkit/public-api/shader-effects/water-effect.cpp rename to dali-toolkit/devel-api/shader-effects/water-effect.cpp index caf29ca..386c4d1 100644 --- a/dali-toolkit/public-api/shader-effects/water-effect.cpp +++ b/dali-toolkit/devel-api/shader-effects/water-effect.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/shader-effects/water-effect.h b/dali-toolkit/devel-api/shader-effects/water-effect.h similarity index 100% rename from dali-toolkit/public-api/shader-effects/water-effect.h rename to dali-toolkit/devel-api/shader-effects/water-effect.h diff --git a/dali-toolkit/public-api/styling/style-manager.cpp b/dali-toolkit/devel-api/styling/style-manager.cpp similarity index 97% rename from dali-toolkit/public-api/styling/style-manager.cpp rename to dali-toolkit/devel-api/styling/style-manager.cpp index 126c208..b3a0028 100644 --- a/dali-toolkit/public-api/styling/style-manager.cpp +++ b/dali-toolkit/devel-api/styling/style-manager.cpp @@ -16,7 +16,7 @@ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES diff --git a/dali-toolkit/public-api/styling/style-manager.h b/dali-toolkit/devel-api/styling/style-manager.h similarity index 100% rename from dali-toolkit/public-api/styling/style-manager.h rename to dali-toolkit/devel-api/styling/style-manager.h diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.cpp similarity index 100% rename from dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp rename to dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.cpp diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h similarity index 96% rename from dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h rename to dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h index 01b7bea..9d318e9 100644 --- a/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h @@ -18,7 +18,7 @@ * */ // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp b/dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp similarity index 100% rename from dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp rename to dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h similarity index 100% rename from dali-toolkit/public-api/transition-effects/cube-transition-effect.h rename to dali-toolkit/devel-api/transition-effects/cube-transition-effect.h diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp b/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.cpp similarity index 100% rename from dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp rename to dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.cpp diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h similarity index 96% rename from dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h rename to dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h index 44c9871..789a30e 100644 --- a/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h @@ -18,7 +18,7 @@ * */ // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp b/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.cpp similarity index 100% rename from dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp rename to dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.cpp diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h similarity index 96% rename from dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h rename to dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h index 7ca30ba..a3b1dc1 100644 --- a/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h @@ -18,7 +18,7 @@ * */ // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/builder/builder-declarations.h b/dali-toolkit/internal/builder/builder-declarations.h index 21c49a1..03627ba 100644 --- a/dali-toolkit/internal/builder/builder-declarations.h +++ b/dali-toolkit/internal/builder/builder-declarations.h @@ -27,7 +27,7 @@ #include // INTERNAL INCLUDES -#include +#include #include typedef Dali::Toolkit::TreeNode TreeNode; diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp index 5055061..3bf70f2 100644 --- a/dali-toolkit/internal/builder/builder-impl.cpp +++ b/dali-toolkit/internal/builder/builder-impl.cpp @@ -34,7 +34,7 @@ // INTERNAL INCLUDES #include -#include +#include #include #include diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h index af1c85c..f046504 100644 --- a/dali-toolkit/internal/builder/builder-impl.h +++ b/dali-toolkit/internal/builder/builder-impl.h @@ -30,8 +30,8 @@ #include // INTERNAL INCLUDES -#include -#include +#include +#include #include // Warning messages usually displayed diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h index 30945d7..9936974 100644 --- a/dali-toolkit/internal/builder/json-parser-impl.h +++ b/dali-toolkit/internal/builder/json-parser-impl.h @@ -25,8 +25,8 @@ #include // INTERNAL INCLUDES -#include -#include +#include +#include #include diff --git a/dali-toolkit/internal/builder/json-parser-state.h b/dali-toolkit/internal/builder/json-parser-state.h index 17ee739..76b1ecd 100644 --- a/dali-toolkit/internal/builder/json-parser-state.h +++ b/dali-toolkit/internal/builder/json-parser-state.h @@ -22,7 +22,7 @@ #include // INTERNAL INCLUDES -#include +#include #include diff --git a/dali-toolkit/internal/builder/replacement.h b/dali-toolkit/internal/builder/replacement.h index 7edd9d0..358c21c 100644 --- a/dali-toolkit/internal/builder/replacement.h +++ b/dali-toolkit/internal/builder/replacement.h @@ -22,7 +22,7 @@ #include // INTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.cpp b/dali-toolkit/internal/builder/tree-node-manipulator.cpp index 06d54cc..3e10edd 100644 --- a/dali-toolkit/internal/builder/tree-node-manipulator.cpp +++ b/dali-toolkit/internal/builder/tree-node-manipulator.cpp @@ -22,7 +22,7 @@ // INTERNAL INCLUDES #include -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h index cd5a7ad..838c2cb 100644 --- a/dali-toolkit/internal/builder/tree-node-manipulator.h +++ b/dali-toolkit/internal/builder/tree-node-manipulator.h @@ -27,7 +27,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { 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 22a131d..786bac2 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -30,7 +30,7 @@ // INTERNAL INCLUDES #include -#include +#include #include "../gaussian-blur-view/gaussian-blur-view-impl.h" namespace Dali diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h index 8cdd72c..4c92b9a 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h @@ -29,7 +29,7 @@ // INTERNAL INCLUDES #include #include -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp index ae17a0d..d19daa4 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp @@ -25,7 +25,7 @@ #include // INTERNAL INCLUDES -#include +#include 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 6b07573..8623880 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h @@ -29,8 +29,8 @@ // INTERNAL INCLUDES #include -#include -#include +#include +#include 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 7f55610..06bb1c6 100644 --- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h @@ -24,7 +24,7 @@ // INTERNAL INCLUDES #include -#include +#include #include "button-impl.h" diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h index d525a43..00b553c 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h @@ -24,7 +24,7 @@ // INTERNAL INCLUDES #include -#include +#include #include "button-impl.h" namespace Dali diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h index 497cdbe..1ee381b 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h @@ -27,7 +27,7 @@ // INTERNAL INCLUDES #include -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h index 4def324..ff1297e 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h @@ -26,7 +26,7 @@ // INTERNAL INCLUDES #include -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h index 0e9c635..eae7640 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h index cc2e5ec..f64e351 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h index dcc0b39..7dc3bb7 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h @@ -27,12 +27,12 @@ // INTERNAL INCLUDES #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Dali { diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h index 2d36e68..175705d 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.h +++ b/dali-toolkit/internal/controls/popup/popup-impl.h @@ -25,9 +25,9 @@ // INTERNAL INCLUDES #include -#include +#include #include -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h index e2afd04..cbac96e 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h @@ -27,7 +27,7 @@ #include // INTERNAL INCLUDES -#include +#include #include #include diff --git a/dali-toolkit/internal/controls/slider/slider-impl.h b/dali-toolkit/internal/controls/slider/slider-impl.h index b265d25..7020164 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.h +++ b/dali-toolkit/internal/controls/slider/slider-impl.h @@ -25,7 +25,7 @@ // INTERNAL INCLUDES #include -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h index cecc4c3..923cb8f 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h @@ -20,7 +20,7 @@ // INTERNAL INCLUDES #include -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.h b/dali-toolkit/internal/controls/table-view/table-view-impl.h index be41e47..7c773d2 100644 --- a/dali-toolkit/internal/controls/table-view/table-view-impl.h +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.h @@ -20,7 +20,7 @@ // INTERNAL INCLUDES #include -#include +#include #include "array-2d.h" namespace Dali diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h index 0753579..2ec6b58 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h @@ -20,7 +20,7 @@ // INTERNAL INCLUDES #include -#include +#include #include // EXTERNAL INCLUDES diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp index d8402d7..bfa879d 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp @@ -26,7 +26,7 @@ // INTERNAL INCLUDES #include -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h index 7fa6b3a..b435139 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h @@ -23,8 +23,8 @@ // INTERNAL INCLUDES #include -#include -#include +#include +#include namespace Dali { diff --git a/dali-toolkit/internal/filters/image-filter.h b/dali-toolkit/internal/filters/image-filter.h index 5a07ded..bc4b164 100644 --- a/dali-toolkit/internal/filters/image-filter.h +++ b/dali-toolkit/internal/filters/image-filter.h @@ -22,7 +22,7 @@ // INTERNAL INCLUDES #include -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/scripting/script-impl.h b/dali-toolkit/internal/scripting/script-impl.h index bda3721..c8d9c6d 100644 --- a/dali-toolkit/internal/scripting/script-impl.h +++ b/dali-toolkit/internal/scripting/script-impl.h @@ -21,8 +21,8 @@ #include // INTERNAL INCLUDES -#include -#include +#include +#include namespace Dali diff --git a/dali-toolkit/internal/scripting/script-plugin-proxy.h b/dali-toolkit/internal/scripting/script-plugin-proxy.h index 72f5e15..05da08f 100644 --- a/dali-toolkit/internal/scripting/script-plugin-proxy.h +++ b/dali-toolkit/internal/scripting/script-plugin-proxy.h @@ -18,7 +18,7 @@ * */ -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h b/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h index b75af2e..83f6fc0 100644 --- a/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h +++ b/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h @@ -22,7 +22,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/shader-effects/water-effect-impl.cpp b/dali-toolkit/internal/shader-effects/water-effect-impl.cpp index 8ecaf61..9c78f32 100644 --- a/dali-toolkit/internal/shader-effects/water-effect-impl.cpp +++ b/dali-toolkit/internal/shader-effects/water-effect-impl.cpp @@ -23,7 +23,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/shader-effects/water-effect-impl.h b/dali-toolkit/internal/shader-effects/water-effect-impl.h index 9aa6007..2f1e5b9 100644 --- a/dali-toolkit/internal/shader-effects/water-effect-impl.h +++ b/dali-toolkit/internal/shader-effects/water-effect-impl.h @@ -24,7 +24,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp index 16fde99..5ab410f 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.cpp +++ b/dali-toolkit/internal/styling/style-manager-impl.cpp @@ -29,7 +29,7 @@ // INTERNAL INCLUDES #include #include -#include +#include namespace { diff --git a/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h index a658707..4e3cc56 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.h +++ b/dali-toolkit/internal/styling/style-manager-impl.h @@ -27,8 +27,8 @@ #include // INTERNAL INCLUDES -#include -#include +#include +#include namespace Dali { diff --git a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h index 20610c3..d1416e4 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES // INTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h index d1efb7d..5642749 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h @@ -28,7 +28,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h index 564738c..0afee71 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES // INTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h index a99f075..baa0a14 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES // INTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 810a742..ff0a2bc 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include namespace Dali diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list index f275660..e379ad2 100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@ -1,13 +1,9 @@ # Add local source files here public_api_src_files = \ - $(public_api_src_dir)/builder/builder.cpp \ - $(public_api_src_dir)/builder/json-parser.cpp \ - $(public_api_src_dir)/builder/tree-node.cpp \ $(public_api_src_dir)/controls/control-impl.cpp \ $(public_api_src_dir)/controls/control.cpp \ $(public_api_src_dir)/controls/alignment/alignment.cpp \ - $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \ $(public_api_src_dir)/controls/buttons/button.cpp \ $(public_api_src_dir)/controls/buttons/check-box-button.cpp \ $(public_api_src_dir)/controls/buttons/push-button.cpp \ @@ -15,12 +11,6 @@ public_api_src_files = \ $(public_api_src_dir)/controls/default-controls/check-button-factory.cpp \ $(public_api_src_dir)/controls/default-controls/push-button-factory.cpp \ $(public_api_src_dir)/controls/default-controls/solid-color-actor.cpp \ - $(public_api_src_dir)/controls/magnifier/magnifier.cpp \ - $(public_api_src_dir)/controls/page-turn-view/page-factory.cpp \ - $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \ - $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \ - $(public_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \ - $(public_api_src_dir)/controls/popup/popup.cpp \ $(public_api_src_dir)/controls/scroll-bar/scroll-bar.cpp \ $(public_api_src_dir)/controls/scrollable/item-view/default-item-layout.cpp \ $(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \ @@ -31,57 +21,14 @@ public_api_src_files = \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \ $(public_api_src_dir)/controls/scrollable/scrollable.cpp \ - $(public_api_src_dir)/controls/shadow-view/shadow-view.cpp \ - $(public_api_src_dir)/controls/slider/slider.cpp \ - $(public_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \ - $(public_api_src_dir)/controls/table-view/table-view.cpp \ $(public_api_src_dir)/controls/text-controls/text-label.cpp \ $(public_api_src_dir)/controls/text-controls/text-field.cpp \ $(public_api_src_dir)/controls/text-controls/text-selection-popup.cpp \ - $(public_api_src_dir)/controls/tool-bar/tool-bar.cpp \ - $(public_api_src_dir)/controls/bloom-view/bloom-view.cpp \ - $(public_api_src_dir)/controls/effects-view/effects-view.cpp \ $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \ $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \ $(public_api_src_dir)/focus-manager/focus-manager.cpp \ $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \ $(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \ - $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \ - $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \ - $(public_api_src_dir)/shader-effects/alpha-discard-effect.cpp \ - $(public_api_src_dir)/shader-effects/bendy-effect.cpp \ - $(public_api_src_dir)/shader-effects/blind-effect.cpp \ - $(public_api_src_dir)/shader-effects/bouncing-effect.cpp \ - $(public_api_src_dir)/shader-effects/carousel-effect.cpp \ - $(public_api_src_dir)/shader-effects/displacement-effect.cpp \ - $(public_api_src_dir)/shader-effects/dissolve-effect.cpp \ - $(public_api_src_dir)/shader-effects/dissolve-local-effect.cpp \ - $(public_api_src_dir)/shader-effects/distance-field-effect.cpp \ - $(public_api_src_dir)/shader-effects/image-region-effect.cpp \ - $(public_api_src_dir)/shader-effects/iris-effect.cpp \ - $(public_api_src_dir)/shader-effects/mask-effect.cpp \ - $(public_api_src_dir)/shader-effects/mirror-effect.cpp \ - $(public_api_src_dir)/shader-effects/motion-blur-effect.cpp \ - $(public_api_src_dir)/shader-effects/motion-stretch-effect.cpp \ - $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.cpp \ - $(public_api_src_dir)/shader-effects/overlay-effect.cpp \ - $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \ - $(public_api_src_dir)/shader-effects/page-turn-effect.cpp \ - $(public_api_src_dir)/shader-effects/quadratic-bezier.cpp \ - $(public_api_src_dir)/shader-effects/ripple-effect.cpp \ - $(public_api_src_dir)/shader-effects/ripple2d-effect.cpp \ - $(public_api_src_dir)/shader-effects/shear-effect.cpp \ - $(public_api_src_dir)/shader-effects/soft-button-effect.cpp \ - $(public_api_src_dir)/shader-effects/spot-effect.cpp \ - $(public_api_src_dir)/shader-effects/square-dissolve-effect.cpp \ - $(public_api_src_dir)/shader-effects/swirl-effect.cpp \ - $(public_api_src_dir)/shader-effects/water-effect.cpp \ - $(public_api_src_dir)/styling/style-manager.cpp \ - $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \ - $(public_api_src_dir)/transition-effects/cube-transition-effect.cpp \ - $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \ - $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \ - $(public_api_src_dir)/scripting/script.cpp \ $(public_api_src_dir)/dali-toolkit-version.cpp \ $(public_api_src_dir)/enums.cpp @@ -91,11 +38,6 @@ public_api_header_files = \ $(public_api_src_dir)/dali-toolkit-version.h \ $(public_api_src_dir)/enums.h -public_api_builder_header_files = \ - $(public_api_src_dir)/builder/builder.h \ - $(public_api_src_dir)/builder/json-parser.h \ - $(public_api_src_dir)/builder/tree-node.h - public_api_controls_header_files = \ $(public_api_src_dir)/controls/control-impl.h \ $(public_api_src_dir)/controls/control.h @@ -109,20 +51,11 @@ public_api_buttons_header_files = \ $(public_api_src_dir)/controls/buttons/push-button.h \ $(public_api_src_dir)/controls/buttons/radio-button.h -public_api_bloom_view_header_files = \ - $(public_api_src_dir)/controls/bloom-view/bloom-view.h - -public_api_bubble_emitter_header_files = \ - $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.h - public_api_default_controls_header_files = \ $(public_api_src_dir)/controls/default-controls/check-button-factory.h \ $(public_api_src_dir)/controls/default-controls/push-button-factory.h \ $(public_api_src_dir)/controls/default-controls/solid-color-actor.h -public_api_effects_view_header_files = \ - $(public_api_src_dir)/controls/effects-view/effects-view.h - public_api_gaussian_blur_view_header_files = \ $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h @@ -136,18 +69,6 @@ public_api_item_view_header_files = \ $(public_api_src_dir)/controls/scrollable/item-view/item-view-declarations.h \ $(public_api_src_dir)/controls/scrollable/item-view/item-view.h -public_api_magnifier_header_files = \ - $(public_api_src_dir)/controls/magnifier/magnifier.h - -public_api_page_turn_view_header_files = \ - $(public_api_src_dir)/controls/page-turn-view/page-factory.h \ - $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h \ - $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \ - $(public_api_src_dir)/controls/page-turn-view/page-turn-view.h - -public_api_popup_header_files = \ - $(public_api_src_dir)/controls/popup/popup.h - public_api_scrollable_header_files = \ $(public_api_src_dir)/controls/scrollable/scrollable.h @@ -160,77 +81,15 @@ public_api_scroll_view_header_files = \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-path-effect.h \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.h -public_api_slider_header_files = \ - $(public_api_src_dir)/controls/slider/slider.h - -public_api_shadow_view_header_files = \ - $(public_api_src_dir)/controls/shadow-view/shadow-view.h - -public_api_super_blur_view_header_files = \ - $(public_api_src_dir)/controls/super-blur-view/super-blur-view.h - -public_api_table_view_header_files = \ - $(public_api_src_dir)/controls/table-view/table-view.h - public_api_text_controls_header_files = \ $(public_api_src_dir)/controls/text-controls/text-label.h \ $(public_api_src_dir)/controls/text-controls/text-field.h \ $(public_api_src_dir)/controls/text-controls/text-selection-popup.h -public_api_tool_bar_header_files = \ - $(public_api_src_dir)/controls/tool-bar/tool-bar.h - public_api_focus_manager_header_files = \ $(public_api_src_dir)/focus-manager/focus-manager.h \ $(public_api_src_dir)/focus-manager/keyboard-focus-manager.h \ $(public_api_src_dir)/focus-manager/keyinput-focus-manager.h -public_api_shader_effects_header_files = \ - $(public_api_src_dir)/shader-effects/alpha-discard-effect.h \ - $(public_api_src_dir)/shader-effects/bendy-effect.h \ - $(public_api_src_dir)/shader-effects/blind-effect.h \ - $(public_api_src_dir)/shader-effects/bouncing-effect.h \ - $(public_api_src_dir)/shader-effects/carousel-effect.h \ - $(public_api_src_dir)/shader-effects/displacement-effect.h \ - $(public_api_src_dir)/shader-effects/dissolve-effect.h \ - $(public_api_src_dir)/shader-effects/dissolve-local-effect.h \ - $(public_api_src_dir)/shader-effects/distance-field-effect.h \ - $(public_api_src_dir)/shader-effects/image-region-effect.h \ - $(public_api_src_dir)/shader-effects/iris-effect.h \ - $(public_api_src_dir)/shader-effects/mask-effect.h \ - $(public_api_src_dir)/shader-effects/mirror-effect.h \ - $(public_api_src_dir)/shader-effects/motion-blur-effect.h \ - $(public_api_src_dir)/shader-effects/motion-stretch-effect.h \ - $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.h \ - $(public_api_src_dir)/shader-effects/overlay-effect.h \ - $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.h \ - $(public_api_src_dir)/shader-effects/page-turn-effect.h \ - $(public_api_src_dir)/shader-effects/quadratic-bezier.h \ - $(public_api_src_dir)/shader-effects/ripple-effect.h \ - $(public_api_src_dir)/shader-effects/ripple2d-effect.h \ - $(public_api_src_dir)/shader-effects/shear-effect.h \ - $(public_api_src_dir)/shader-effects/soft-button-effect.h \ - $(public_api_src_dir)/shader-effects/spot-effect.h \ - $(public_api_src_dir)/shader-effects/square-dissolve-effect.h \ - $(public_api_src_dir)/shader-effects/swirl-effect.h \ - $(public_api_src_dir)/shader-effects/water-effect.h - -public_api_bubble_effect_header_files = \ - $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.h \ - $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.h - -public_api_styling_header_files = \ - $(public_api_src_dir)/styling/style-manager.h - -public_api_transition_effects_header_files = \ - $(public_api_src_dir)/transition-effects/cube-transition-effect.h \ - $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.h \ - $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.h \ - $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.h - -public_api_scripting_header_files = \ - $(public_api_src_dir)/scripting/script.h \ - $(public_api_src_dir)/scripting/script-plugin.h - public_api_rendering_backend_header_files = \ $(public_api_src_dir)/text/rendering-backend.h diff --git a/docs/content/programming-guide/shader-intro.h b/docs/content/programming-guide/shader-intro.h index a3868c8..75fef8f 100644 --- a/docs/content/programming-guide/shader-intro.h +++ b/docs/content/programming-guide/shader-intro.h @@ -6,38 +6,6 @@ The shader effects allow the developer to apply visual deformations on the actors. They can affect the geometry, the colors and textures of the actor. -There are some built-in shader effects in Dali Toolkit: -- \ref Dali::Toolkit::BendyEffect "Bendy", bends the geometry around a point, useful to do a page turn effect, -- \ref Dali::Toolkit::DissolveEffect "Dissolve", does a dissolve effect on the actor texture, -- \ref Dali::Toolkit::RippleEffect "Ripple", does a concentric wave effect on the actor texture. - -@image html shader-effect-ripple.png "Ripple Effect" - -
-
-

Example and Usage

-Here is an example on how to use a shader effect, using the RippleEffect. - -First create the shader effect. -@code -Dali::RippleEffect effect = Dali::RippleEffect::New(); -@endcode - -Then set the values of the uniforms. -@code -// Set the radius of the bending -effect.SetAmplitude( 45.0f ); -// Set the point around which the geometry will bend -effect.SetCenter( Vector2() ); -// Set the direction of the bending -effect.SetDirection( Vector2( 1.0f, 0.0f ) ); -@endcode - -Finally apply the shader effect to an actor: -@code -actor.SetShaderEffect( effect ); -@endcode -

diff --git a/plugins/dali-script-v8/src/dali-script-v8.h b/plugins/dali-script-v8/src/dali-script-v8.h index 4a1e891..5389612 100644 --- a/plugins/dali-script-v8/src/dali-script-v8.h +++ b/plugins/dali-script-v8/src/dali-script-v8.h @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include #include namespace Dali DALI_IMPORT_API diff --git a/plugins/dali-script-v8/src/toolkit/builder/builder-api.h b/plugins/dali-script-v8/src/toolkit/builder/builder-api.h index 00ee9a7..7a682f4 100644 --- a/plugins/dali-script-v8/src/toolkit/builder/builder-api.h +++ b/plugins/dali-script-v8/src/toolkit/builder/builder-api.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali diff --git a/plugins/dali-script-v8/src/toolkit/builder/builder-wrapper.h b/plugins/dali-script-v8/src/toolkit/builder/builder-wrapper.h index 33445d6..90ab615 100644 --- a/plugins/dali-script-v8/src/toolkit/builder/builder-wrapper.h +++ b/plugins/dali-script-v8/src/toolkit/builder/builder-wrapper.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include // INTERNAL INCLUDES #include -- 2.7.4