From acbfb8bba3f98b42d7ca96887091fa8391bccca8 Mon Sep 17 00:00:00 2001
From: Nick Holland <nick.holland@partner.samsung.com>
Date: Tue, 19 May 2015 08:46:24 +0100
Subject: [PATCH] Move more public-api headers to devel-api. PART 3

---
 builder/dali-builder.cpp                                                     | 4 ++--
 demo/dali-table-view.cpp                                                     | 2 ++
 demo/dali-table-view.h                                                       | 2 ++
 examples/animated-shapes/animated-shapes-example.cpp                         | 1 +
 examples/bubble-effect/bubble-effect-example.cpp                             | 1 +
 examples/builder/examples.cpp                                                | 7 ++++---
 examples/buttons/buttons-example.cpp                                         | 1 +
 examples/cluster/cluster-example.cpp                                         | 3 +++
 examples/cube-transition-effect/cube-transition-effect-example.cpp           | 5 +++++
 examples/dissolve-effect/dissolve-effect-example.cpp                         | 1 +
 examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp | 2 ++
 examples/logging/logging-example.cpp                                         | 3 ++-
 examples/magnifier/magnifier-example.cpp                                     | 2 +-
 examples/motion-blur/motion-blur-example.cpp                                 | 2 ++
 examples/motion-stretch/motion-stretch-example.cpp                           | 1 +
 examples/new-window/new-window-example.cpp                                   | 3 +++
 examples/page-turn-view/page-turn-view-example.cpp                           | 6 ++++++
 examples/path-animation/path-animation.cpp                                   | 4 +++-
 examples/scripting/launcher.h                                                | 2 ++
 examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp               | 2 ++
 examples/size-negotiation/size-negotiation-example.cpp                       | 2 ++
 examples/text-label-emojis/text-label-emojis.cpp                             | 1 +
 examples/text-label-multi-language/text-label-multi-language-example.cpp     | 1 +
 shared/view.h                                                                | 3 +++
 24 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp
index 1ce2ec4..d423d85 100644
--- a/builder/dali-builder.cpp
+++ b/builder/dali-builder.cpp
@@ -28,8 +28,8 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/public-api/builder/builder.h>
-#include <dali-toolkit/public-api/builder/tree-node.h>
+#include <dali-toolkit/devel-api/builder/builder.h>
+#include <dali-toolkit/devel-api/builder/tree-node.h>
 #include <iostream>
 #include <map>
 #include <string>
diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index 2e6ec48..e24f46a 100644
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -23,6 +23,8 @@
 #include <sstream>
 #include <unistd.h>
 #include <dali/devel-api/images/distance-field.h>
+#include <dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h>
+#include <dali-toolkit/devel-api/shader-effects/distance-field-effect.h>
 
 // INTERNAL INCLUDES
 #include "shared/view.h"
diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h
index 163b52d..d1e66b1 100644
--- a/demo/dali-table-view.h
+++ b/demo/dali-table-view.h
@@ -22,6 +22,8 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
 
 class Example;
 
diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp
index 5b52031..29e03bb 100644
--- a/examples/animated-shapes/animated-shapes-example.cpp
+++ b/examples/animated-shapes/animated-shapes-example.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/devel-api/actors/mesh-actor.h>
 #include <dali/devel-api/geometry/mesh.h>
+#include <dali-toolkit/devel-api/shader-effects/quadratic-bezier.h>
 
 #include "shared/view.h"
 
diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp
index 4575ee2..c5d8c4e 100644
--- a/examples/bubble-effect/bubble-effect-example.cpp
+++ b/examples/bubble-effect/bubble-effect-example.cpp
@@ -17,6 +17,7 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
 #include "shared/view.h"
 
 using namespace Dali;
diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index e958659..de2e0d1 100644
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -22,9 +22,10 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/public-api/builder/builder.h>
-#include <dali-toolkit/public-api/builder/tree-node.h>
-#include <dali-toolkit/public-api/builder/json-parser.h>
+#include <dali-toolkit/devel-api/builder/builder.h>
+#include <dali-toolkit/devel-api/builder/tree-node.h>
+#include <dali-toolkit/devel-api/builder/json-parser.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
 #include <map>
 #include <string>
 #include <fstream>
diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp
index 739d357..1dfdce1 100644
--- a/examples/buttons/buttons-example.cpp
+++ b/examples/buttons/buttons-example.cpp
@@ -18,6 +18,7 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 using namespace Dali;
 
diff --git a/examples/cluster/cluster-example.cpp b/examples/cluster/cluster-example.cpp
index 8f49325..11e66ef 100644
--- a/examples/cluster/cluster-example.cpp
+++ b/examples/cluster/cluster-example.cpp
@@ -21,6 +21,9 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/motion-blur-effect.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/devel-api/shader-effects/carousel-effect.h>
 
 #include "cluster.h"
 #include "cluster-style.h"
diff --git a/examples/cube-transition-effect/cube-transition-effect-example.cpp b/examples/cube-transition-effect/cube-transition-effect-example.cpp
index 5961390..782ceaf 100644
--- a/examples/cube-transition-effect/cube-transition-effect-example.cpp
+++ b/examples/cube-transition-effect/cube-transition-effect-example.cpp
@@ -23,6 +23,11 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h>
+
 
 using namespace Dali;
 
diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp
index ebbe4c9..edbe3d9 100644
--- a/examples/dissolve-effect/dissolve-effect-example.cpp
+++ b/examples/dissolve-effect/dissolve-effect-example.cpp
@@ -23,6 +23,7 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/dissolve-effect.h>
 
 using namespace Dali;
 
diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index 882687a..1a8d409 100644
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
@@ -17,6 +17,8 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include "shared/view.h"
 #include <iostream>
 
diff --git a/examples/logging/logging-example.cpp b/examples/logging/logging-example.cpp
index aa8d0ae..949332a 100644
--- a/examples/logging/logging-example.cpp
+++ b/examples/logging/logging-example.cpp
@@ -18,7 +18,8 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <devel-api/adaptor-framework/performance-logger.h>
+#include <dali/devel-api/adaptor-framework/performance-logger.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <sstream>
 
 using namespace Dali;
diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp
index 08c107e..d20cd6b 100644
--- a/examples/magnifier/magnifier-example.cpp
+++ b/examples/magnifier/magnifier-example.cpp
@@ -21,7 +21,7 @@
 #include "shared/view.h"
 
 #include <dali-toolkit/dali-toolkit.h>
-
+#include <dali-toolkit/devel-api/controls/magnifier/magnifier.h>
 using namespace Dali;
 
 namespace
diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp
index ccc056c..068ab31 100644
--- a/examples/motion-blur/motion-blur-example.cpp
+++ b/examples/motion-blur/motion-blur-example.cpp
@@ -21,6 +21,8 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/motion-blur-effect.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp
index b9c4a75..f32f750 100644
--- a/examples/motion-stretch/motion-stretch-example.cpp
+++ b/examples/motion-stretch/motion-stretch-example.cpp
@@ -21,6 +21,7 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp
index 76aed27..dcb2e64 100644
--- a/examples/new-window/new-window-example.cpp
+++ b/examples/new-window/new-window-example.cpp
@@ -18,6 +18,9 @@
 #include <dali/devel-api/actors/mesh-actor.h>
 #include <dali/devel-api/modeling/material.h>
 #include <dali/devel-api/geometry/mesh.h>
+#include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
+#include <dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.h>
+
 
 #include "shared/view.h"
 #include <cstdio>
diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp
index 3596034..4d2d7d7 100644
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -17,6 +17,12 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/page-turn-effect.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+
 #include <assert.h>
 #include <cstdlib>
 #include <string.h>
diff --git a/examples/path-animation/path-animation.cpp b/examples/path-animation/path-animation.cpp
index 3490330..ba4ee5b 100644
--- a/examples/path-animation/path-animation.cpp
+++ b/examples/path-animation/path-animation.cpp
@@ -24,6 +24,8 @@
 #include <dali/devel-api/actors/mesh-actor.h>
 #include <dali/devel-api/geometry/mesh.h>
 #include <dali/devel-api/geometry/mesh-factory.h>
+#include <dali-toolkit/devel-api/controls/slider/slider.h>
+
 
 
 // INTERNAL INCLUDES
@@ -66,7 +68,7 @@ public:
    * @param[in] size The size of the slider
    * @param[in] callback Pointer to the callback function to be called when user moves the slider
   */
-  Actor CreateVectorComponentControl( const std::string& label, const Vector3& size, bool(PathController::*callback)(Slider,float) )
+  Actor CreateVectorComponentControl( const std::string& label, const Vector3& size, bool(PathController::*callback)(Dali::Toolkit::Slider,float) )
   {
     TextLabel text = TextLabel::New(label);
     text.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
diff --git a/examples/scripting/launcher.h b/examples/scripting/launcher.h
index dc56b42..0b5f97f 100644
--- a/examples/scripting/launcher.h
+++ b/examples/scripting/launcher.h
@@ -21,6 +21,8 @@
 // EXTERNAL INCLUDES
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/scripting/script.h>
+#include <dali-toolkit/devel-api/builder/builder.h>
 
 /**
  * Example app that can load both JSON and JavaScript files from command line
diff --git a/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp b/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
index 7e3a22a..c1efad4 100644
--- a/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
+++ b/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
@@ -20,6 +20,8 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/shadow-view/shadow-view.h>
+
 #include <iostream>
 
 using namespace Dali;
diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp
index af19e24..2fdb979 100644
--- a/examples/size-negotiation/size-negotiation-example.cpp
+++ b/examples/size-negotiation/size-negotiation-example.cpp
@@ -18,6 +18,8 @@
 #include "shared/view.h"
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 using namespace Dali;
 
diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp
index bb1703b..a727b54 100644
--- a/examples/text-label-emojis/text-label-emojis.cpp
+++ b/examples/text-label-emojis/text-label-emojis.cpp
@@ -17,6 +17,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <iostream>
 
 // INTERNAL INCLUDES
diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp
index 6c30eb9..8395487 100644
--- a/examples/text-label-multi-language/text-label-multi-language-example.cpp
+++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp
@@ -22,6 +22,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 // INTERNAL INCLUDES
 #include "shared/multi-language-strings.h"
diff --git a/shared/view.h b/shared/view.h
index 44b6663..1da219d 100644
--- a/shared/view.h
+++ b/shared/view.h
@@ -19,6 +19,9 @@
  */
 
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
+#include <dali-toolkit/devel-api/styling/style-manager.h>
+
 
 namespace DemoHelper
 {
--
libgit2 0.21.4