Commit acbfb8bba3f98b42d7ca96887091fa8391bccca8
1 parent
c4e1aa0b
Move more public-api headers to devel-api. PART 3
Support for changes to dali-toolkit Change-Id: I887617b627fccb1e24e5bcff9644e21cf9f01cde
Showing
24 changed files
with
53 additions
and
8 deletions
builder/dali-builder.cpp
| ... | ... | @@ -28,8 +28,8 @@ |
| 28 | 28 | |
| 29 | 29 | #include <dali/dali.h> |
| 30 | 30 | #include <dali-toolkit/dali-toolkit.h> |
| 31 | -#include <dali-toolkit/public-api/builder/builder.h> | |
| 32 | -#include <dali-toolkit/public-api/builder/tree-node.h> | |
| 31 | +#include <dali-toolkit/devel-api/builder/builder.h> | |
| 32 | +#include <dali-toolkit/devel-api/builder/tree-node.h> | |
| 33 | 33 | #include <iostream> |
| 34 | 34 | #include <map> |
| 35 | 35 | #include <string> | ... | ... |
demo/dali-table-view.cpp
| ... | ... | @@ -23,6 +23,8 @@ |
| 23 | 23 | #include <sstream> |
| 24 | 24 | #include <unistd.h> |
| 25 | 25 | #include <dali/devel-api/images/distance-field.h> |
| 26 | +#include <dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h> | |
| 27 | +#include <dali-toolkit/devel-api/shader-effects/distance-field-effect.h> | |
| 26 | 28 | |
| 27 | 29 | // INTERNAL INCLUDES |
| 28 | 30 | #include "shared/view.h" | ... | ... |
demo/dali-table-view.h
examples/animated-shapes/animated-shapes-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/builder/examples.cpp
| ... | ... | @@ -22,9 +22,10 @@ |
| 22 | 22 | |
| 23 | 23 | #include <dali/dali.h> |
| 24 | 24 | #include <dali-toolkit/dali-toolkit.h> |
| 25 | -#include <dali-toolkit/public-api/builder/builder.h> | |
| 26 | -#include <dali-toolkit/public-api/builder/tree-node.h> | |
| 27 | -#include <dali-toolkit/public-api/builder/json-parser.h> | |
| 25 | +#include <dali-toolkit/devel-api/builder/builder.h> | |
| 26 | +#include <dali-toolkit/devel-api/builder/tree-node.h> | |
| 27 | +#include <dali-toolkit/devel-api/builder/json-parser.h> | |
| 28 | +#include <dali-toolkit/devel-api/controls/popup/popup.h> | |
| 28 | 29 | #include <map> |
| 29 | 30 | #include <string> |
| 30 | 31 | #include <fstream> | ... | ... |
examples/buttons/buttons-example.cpp
examples/cluster/cluster-example.cpp
| ... | ... | @@ -21,6 +21,9 @@ |
| 21 | 21 | #include "shared/view.h" |
| 22 | 22 | #include <dali/dali.h> |
| 23 | 23 | #include <dali-toolkit/dali-toolkit.h> |
| 24 | +#include <dali-toolkit/devel-api/shader-effects/motion-blur-effect.h> | |
| 25 | +#include <dali-toolkit/devel-api/controls/popup/popup.h> | |
| 26 | +#include <dali-toolkit/devel-api/shader-effects/carousel-effect.h> | |
| 24 | 27 | |
| 25 | 28 | #include "cluster.h" |
| 26 | 29 | #include "cluster-style.h" | ... | ... |
examples/cube-transition-effect/cube-transition-effect-example.cpp
| ... | ... | @@ -23,6 +23,11 @@ |
| 23 | 23 | |
| 24 | 24 | #include <dali/dali.h> |
| 25 | 25 | #include <dali-toolkit/dali-toolkit.h> |
| 26 | +#include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h> | |
| 27 | +#include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h> | |
| 28 | +#include <dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h> | |
| 29 | +#include <dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h> | |
| 30 | + | |
| 26 | 31 | |
| 27 | 32 | using namespace Dali; |
| 28 | 33 | ... | ... |
examples/dissolve-effect/dissolve-effect-example.cpp
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
| ... | ... | @@ -17,6 +17,8 @@ |
| 17 | 17 | |
| 18 | 18 | #include <dali/dali.h> |
| 19 | 19 | #include <dali-toolkit/dali-toolkit.h> |
| 20 | +#include <dali-toolkit/devel-api/controls/popup/popup.h> | |
| 21 | +#include <dali-toolkit/devel-api/controls/table-view/table-view.h> | |
| 20 | 22 | #include "shared/view.h" |
| 21 | 23 | #include <iostream> |
| 22 | 24 | ... | ... |
examples/logging/logging-example.cpp
| ... | ... | @@ -18,7 +18,8 @@ |
| 18 | 18 | #include "shared/view.h" |
| 19 | 19 | #include <dali/dali.h> |
| 20 | 20 | #include <dali-toolkit/dali-toolkit.h> |
| 21 | -#include <devel-api/adaptor-framework/performance-logger.h> | |
| 21 | +#include <dali/devel-api/adaptor-framework/performance-logger.h> | |
| 22 | +#include <dali-toolkit/devel-api/controls/table-view/table-view.h> | |
| 22 | 23 | #include <sstream> |
| 23 | 24 | |
| 24 | 25 | using namespace Dali; | ... | ... |
examples/magnifier/magnifier-example.cpp
examples/motion-blur/motion-blur-example.cpp
| ... | ... | @@ -21,6 +21,8 @@ |
| 21 | 21 | #include "shared/view.h" |
| 22 | 22 | #include <dali/dali.h> |
| 23 | 23 | #include <dali-toolkit/dali-toolkit.h> |
| 24 | +#include <dali-toolkit/devel-api/shader-effects/motion-blur-effect.h> | |
| 25 | +#include <dali-toolkit/devel-api/controls/popup/popup.h> | |
| 24 | 26 | |
| 25 | 27 | using namespace Dali; |
| 26 | 28 | using namespace Dali::Toolkit; | ... | ... |
examples/motion-stretch/motion-stretch-example.cpp
examples/new-window/new-window-example.cpp
| ... | ... | @@ -18,6 +18,9 @@ |
| 18 | 18 | #include <dali/devel-api/actors/mesh-actor.h> |
| 19 | 19 | #include <dali/devel-api/modeling/material.h> |
| 20 | 20 | #include <dali/devel-api/geometry/mesh.h> |
| 21 | +#include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h> | |
| 22 | +#include <dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.h> | |
| 23 | + | |
| 21 | 24 | |
| 22 | 25 | #include "shared/view.h" |
| 23 | 26 | #include <cstdio> | ... | ... |
examples/page-turn-view/page-turn-view-example.cpp
| ... | ... | @@ -17,6 +17,12 @@ |
| 17 | 17 | |
| 18 | 18 | #include <dali/dali.h> |
| 19 | 19 | #include <dali-toolkit/dali-toolkit.h> |
| 20 | +#include <dali-toolkit/devel-api/shader-effects/page-turn-effect.h> | |
| 21 | +#include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h> | |
| 22 | +#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h> | |
| 23 | +#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h> | |
| 24 | +#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h> | |
| 25 | + | |
| 20 | 26 | #include <assert.h> |
| 21 | 27 | #include <cstdlib> |
| 22 | 28 | #include <string.h> | ... | ... |
examples/path-animation/path-animation.cpp
| ... | ... | @@ -24,6 +24,8 @@ |
| 24 | 24 | #include <dali/devel-api/actors/mesh-actor.h> |
| 25 | 25 | #include <dali/devel-api/geometry/mesh.h> |
| 26 | 26 | #include <dali/devel-api/geometry/mesh-factory.h> |
| 27 | +#include <dali-toolkit/devel-api/controls/slider/slider.h> | |
| 28 | + | |
| 27 | 29 | |
| 28 | 30 | |
| 29 | 31 | // INTERNAL INCLUDES |
| ... | ... | @@ -66,7 +68,7 @@ public: |
| 66 | 68 | * @param[in] size The size of the slider |
| 67 | 69 | * @param[in] callback Pointer to the callback function to be called when user moves the slider |
| 68 | 70 | */ |
| 69 | - Actor CreateVectorComponentControl( const std::string& label, const Vector3& size, bool(PathController::*callback)(Slider,float) ) | |
| 71 | + Actor CreateVectorComponentControl( const std::string& label, const Vector3& size, bool(PathController::*callback)(Dali::Toolkit::Slider,float) ) | |
| 70 | 72 | { |
| 71 | 73 | TextLabel text = TextLabel::New(label); |
| 72 | 74 | text.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH ); | ... | ... |
examples/scripting/launcher.h
| ... | ... | @@ -21,6 +21,8 @@ |
| 21 | 21 | // EXTERNAL INCLUDES |
| 22 | 22 | #include <dali/dali.h> |
| 23 | 23 | #include <dali-toolkit/dali-toolkit.h> |
| 24 | +#include <dali-toolkit/devel-api/scripting/script.h> | |
| 25 | +#include <dali-toolkit/devel-api/builder/builder.h> | |
| 24 | 26 | |
| 25 | 27 | /** |
| 26 | 28 | * Example app that can load both JSON and JavaScript files from command line | ... | ... |
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
examples/size-negotiation/size-negotiation-example.cpp
| ... | ... | @@ -18,6 +18,8 @@ |
| 18 | 18 | #include "shared/view.h" |
| 19 | 19 | #include <dali/dali.h> |
| 20 | 20 | #include <dali-toolkit/dali-toolkit.h> |
| 21 | +#include <dali-toolkit/devel-api/controls/popup/popup.h> | |
| 22 | +#include <dali-toolkit/devel-api/controls/table-view/table-view.h> | |
| 21 | 23 | |
| 22 | 24 | using namespace Dali; |
| 23 | 25 | ... | ... |
examples/text-label-emojis/text-label-emojis.cpp
examples/text-label-multi-language/text-label-multi-language-example.cpp
shared/view.h