Include required header files directly rather than through dali.h

Compilation is quicker as well as less is included at compile time.

Change-Id: I0bfee15503759c578b9b6f4f5de093b1ceb7c61f

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-AlbumLayout.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-AlbumLayout.cpp
index acf3285..f902dbb 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-AlbumLayout.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-AlbumLayout.cpp
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <iostream>
 #include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>

-#include <dali/dali.h>

 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;
 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DepthLayout.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DepthLayout.cpp
index e6dd30b..9462c28 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DepthLayout.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-DepthLayout.cpp
@@ -19,7 +19,6 @@
 #include <float.h>       // for FLT_MAX
 #include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <float.h>       // for FLT_MAX
 #include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>

-#include <dali/dali.h>

 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;
 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
index ef5f20f..4c847d1 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
@@ -16,7 +16,7 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>

 #include <stdarg.h>
 
 #include "dali-test-suite-utils.h"
 #include <stdarg.h>
 
 #include "dali-test-suite-utils.h"


@@ -345,7 +345,6 @@ void ConstraintAppliedCheck::CheckSignalNotReceived()
   }
 }
 
   }
 }
 

-

 BitmapImage CreateBitmapImage(int width, int height, const Vector4& color)
 {
   BitmapImage image = BitmapImage::New(width, height, Pixel::RGBA8888);
 BitmapImage CreateBitmapImage(int width, int height, const Vector4& color)
 {
   BitmapImage image = BitmapImage::New(width, height, Pixel::RGBA8888);

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
index 5590b91..571dde4 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
@@ -295,7 +295,6 @@ void DALI_TEST_EQUALS( const std::string &str1, const char* str2, const char* lo
  */
 void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* location);
 
  */
 void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* location);
 

-

 /**
  * Test whether two UTF32 strings are equal.
  * @param[in] str1 The first string
 /**
  * Test whether two UTF32 strings are equal.
  * @param[in] str1 The first string


@@ -305,18 +304,18 @@ void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* lo
 template<>
 inline void DALI_TEST_EQUALS<const Integration::TextArray&>( const Integration::TextArray& str1, const Integration::TextArray& str2, const char* location)
 {
 template<>
 inline void DALI_TEST_EQUALS<const Integration::TextArray&>( const Integration::TextArray& str1, const Integration::TextArray& str2, const char* location)
 {

-  if (!std::equal(str1.Begin(), str1.End(), str2.Begin()))
+  if( !std::equal( str1.Begin(), str1.End(), str2.Begin() ) )

   {
     fprintf(stderr, "%s, checking '", location);
 
   {
     fprintf(stderr, "%s, checking '", location);
 

-    for( unsigned int i = 0; i < str1.Count(); ++i)
+    for( unsigned int i = 0; i < str1.Count(); ++i )

     {
       fprintf(stderr, "%c", str1[i]);
     }
 
     fprintf(stderr, "' == '");
 
     {
       fprintf(stderr, "%c", str1[i]);
     }
 
     fprintf(stderr, "' == '");
 

-    for( unsigned int i = 0; i < str2.Count(); ++i)
+    for( unsigned int i = 0; i < str2.Count(); ++i )

     {
       fprintf(stderr, "%c", str2[i]);
     }
     {
       fprintf(stderr, "%c", str2[i]);
     }

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp
index 25e2d37..ace7cb9 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp
@@ -17,6 +17,8 @@
 
 #include "toolkit-accessibility-manager.h"
 
 
 #include "toolkit-accessibility-manager.h"
 

+#include <dali/public-api/object/base-object.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
index f8575a1..d965df3 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
@@ -23,8 +23,10 @@
 
 // EXTERNAL INCLUDES
 #include <string>
 
 // EXTERNAL INCLUDES
 #include <string>

-
-#include <dali/dali.h>
+#include <boost/function.hpp>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/events/touch-point.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
index 9639449..986346e 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
@@ -20,8 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <boost/bind.hpp>
 
 // EXTERNAL INCLUDES
 #include <boost/bind.hpp>

-
-#include <dali/dali.h>
+#include <dali/public-api/object/base-object.h>

 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/events/key-event-integ.h>
 

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FocusManager.cpp
index 95d849d..ae74364 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-FocusManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-FocusManager.cpp
@@ -22,7 +22,6 @@
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 

-#include <dali/dali.h>

 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;
 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
index cb506a9..6b8fdef 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
@@ -23,7 +23,6 @@
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 

-#include <dali/dali.h>

 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;
 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
index 3cec62f..66f6ab9 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
@@ -22,7 +22,6 @@
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 
 // test harness headers before dali headers.
 #include <dali-toolkit-test-suite-utils.h>
 

-#include <dali/dali.h>

 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/key-event-integ.h>
 
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/key-event-integ.h>
 

diff --git a/base/dali-toolkit/internal/builder/builder-impl.cpp b/base/dali-toolkit/internal/builder/builder-impl.cpp
index 083e804..d85fdec 100644 (file)
--- a/base/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/base/dali-toolkit/internal/builder/builder-impl.cpp
@@ -24,7 +24,6 @@
 #include <sstream>
 
 // INTERNAL INCLUDES
 #include <sstream>
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali/integration-api/debug.h>
 
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali/integration-api/debug.h>
 
 #include <dali-toolkit/public-api/controls/control.h>

diff --git a/base/dali-toolkit/internal/builder/builder-impl.h b/base/dali-toolkit/internal/builder/builder-impl.h
index 5efb772..477f1aa 100644 (file)
--- a/base/dali-toolkit/internal/builder/builder-impl.h
+++ b/base/dali-toolkit/internal/builder/builder-impl.h
@@ -22,7 +22,8 @@
 #include <string>
 #include <list>
 #include <map>
 #include <string>
 #include <list>
 #include <map>

-#include <dali/dali.h>
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/object/base-object.h>

 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES

diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index a02ef71..095b278 100644 (file)
--- a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@ -19,9 +19,10 @@
 
 #include "alignment-impl.h"
 
 
 #include "alignment-impl.h"
 

-// INTERNAL INCLUDES
-

 // EXTERNAL INCLUDES
 // EXTERNAL INCLUDES

+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 90a741a..4f4d3b3 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -16,9 +16,12 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "button-impl.h"
 
 #include "button-impl.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>
+

 namespace
 {
 const char* const PROPERTY_DIMMED = "dimmed";
 namespace
 {
 const char* const PROPERTY_DIMMED = "dimmed";

diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.h b/base/dali-toolkit/internal/controls/buttons/button-impl.h
index 2c45d7f..4ad9bd0 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/buttons/button.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include "button-painter-impl.h"
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include "button-painter-impl.h"

diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
index 29d3d0e..bbe1572 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp
@@ -16,17 +16,16 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "check-box-button-default-painter-impl.h"
 
 #include "check-box-button-default-painter-impl.h"
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>

 
 

+// INTERNAL INCLUDES

 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/object/ref-object.h>
 #include "check-box-button-impl.h"
 
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/object/ref-object.h>
 #include "check-box-button-impl.h"
 

-// EXTERNAL INCLUDES
-

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
index e252ea5..f5093a8 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
@@ -16,15 +16,14 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "check-box-button-impl.h"
 
 // EXTERNAL INCLUDES
 #include "check-box-button-impl.h"
 
 // EXTERNAL INCLUDES

-

 #include <algorithm>
 #include <algorithm>

+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/object/type-registry.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-

 #include "check-box-button-default-painter-impl.h"
 
 namespace Dali
 #include "check-box-button-default-painter-impl.h"
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp b/base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp
index 55ec87b..96587b1 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp
@@ -16,20 +16,19 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "push-button-default-painter-impl.h"
 
 #include "push-button-default-painter-impl.h"
 

-// INTERNAL INCLUDES
-
+// EXTERNAL INCLUDES

 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/image-actor.h>

-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
-#include <dali-toolkit/public-api/controls/buttons/push-button.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/animation/constraints.h>

 #include <dali/public-api/object/ref-object.h>
 
 #include <dali/public-api/object/ref-object.h>
 

+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/buttons/push-button.h>
+#include <dali-toolkit/public-api/controls/text-view/text-view.h>

 #include "push-button-impl.h"
 
 #include "push-button-impl.h"
 

-// EXTERNAL INCLUDES
-

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index 34245c2..8a28fcf 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@ -16,15 +16,15 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "push-button-impl.h"
 
 // EXTERNAL INCLUDES
 #include "push-button-impl.h"
 
 // EXTERNAL INCLUDES

-

 #include <algorithm>
 #include <algorithm>

+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/scripting/scripting.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-

 #include "push-button-default-painter-impl.h"
 
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include "push-button-default-painter-impl.h"
 
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>

diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
index a021683..873b3e7 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h
@@ -18,11 +18,12 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/timer.h>

 #include <dali/public-api/common/dali-vector.h>
 
 #include <dali/public-api/common/dali-vector.h>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>

-

 #include "button-impl.h"
 
 namespace Dali
 #include "button-impl.h"
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
index 41e4a6f..94d4ff4 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
@@ -17,9 +17,13 @@
 
 
 // CLASS HEADER
 
 
 // CLASS HEADER

-

 #include "radio-button-impl.h"
 
 #include "radio-button-impl.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/text-actor.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/scripting/scripting.h>
+

 using namespace Dali;
 using namespace Dali::Toolkit::Internal;
 
 using namespace Dali;
 using namespace Dali::Toolkit::Internal;
 

diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index 5afa145..26b4364 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -18,15 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/common/dali-vector.h>

 
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>

-

 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>
 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>

-
-#include <dali/public-api/common/dali-vector.h>
-

 #include "button-impl.h"
 
 namespace Dali
 #include "button-impl.h"
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 81e7887..173554b 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -15,17 +15,26 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/internal/controls/popup/popup-impl.h>
 
 #include <dali-toolkit/internal/controls/popup/popup-impl.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/key.h>
+#include <dali/public-api/adaptor-framework/physical-keyboard.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/events/key-event.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/buttons/button.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>

-

 #include <dali-toolkit/internal/controls/relayout-helper.h>
 #include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 #include <dali-toolkit/internal/controls/relayout-helper.h>
 #include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>

-

 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>

-#include <dali/integration-api/debug.h>

 
 using namespace Dali;
 using namespace std;
 
 using namespace Dali;
 using namespace std;

diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.h b/base/dali-toolkit/internal/controls/popup/popup-impl.h
index ccf9e8e..5adbb43 100755 (executable)
--- a/base/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/base/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -18,8 +18,12 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>
+

 // INTERNAL INCLUDES
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>
 #include <dali-toolkit/internal/controls/popup/popup-style-impl.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>
 #include <dali-toolkit/internal/controls/popup/popup-style-impl.h>

diff --git a/base/dali-toolkit/internal/controls/popup/popup-style-impl.h b/base/dali-toolkit/internal/controls/popup/popup-style-impl.h
index 51c596b..22a1831 100644 (file)
--- a/base/dali-toolkit/internal/controls/popup/popup-style-impl.h
+++ b/base/dali-toolkit/internal/controls/popup/popup-style-impl.h
@@ -18,8 +18,12 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/math/vector2.h>
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/math/vector4.h>
+#include <dali/public-api/object/ref-object.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp b/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
index e235d98..2f53b67 100644 (file)
--- a/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
+++ b/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp
@@ -20,7 +20,10 @@
 #include "relayout-controller-impl.h"
 
 // EXTERNAL INCLUDES
 #include "relayout-controller-impl.h"
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/common/stage.h>

 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/debug.h>

+

 #if defined(DEBUG_ENABLED)
 #include <sstream>
 #endif // defined(DEBUG_ENABLED)
 #if defined(DEBUG_ENABLED)
 #include <sstream>
 #endif // defined(DEBUG_ENABLED)

diff --git a/base/dali-toolkit/internal/controls/relayout-controller-impl.h b/base/dali-toolkit/internal/controls/relayout-controller-impl.h
index 8339e99..f60d5e5 100644 (file)
--- a/base/dali-toolkit/internal/controls/relayout-controller-impl.h
+++ b/base/dali-toolkit/internal/controls/relayout-controller-impl.h
@@ -19,8 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/common/vector-wrapper.h>

+#include <dali/public-api/object/base-object.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>

diff --git a/base/dali-toolkit/internal/controls/relayout-controller.cpp b/base/dali-toolkit/internal/controls/relayout-controller.cpp
index 1a3a4e6..fa9e70e 100644 (file)
--- a/base/dali-toolkit/internal/controls/relayout-controller.cpp
+++ b/base/dali-toolkit/internal/controls/relayout-controller.cpp
@@ -21,9 +21,9 @@
 #include "relayout-controller-impl.h"
 
 // EXTERNAL INCLUDES
 #include "relayout-controller-impl.h"
 
 // EXTERNAL INCLUDES

-

 #include <stack>
 #include <sstream>
 #include <stack>
 #include <sstream>

+#include <dali/public-api/adaptor-framework/singleton-service.h>

 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES

diff --git a/base/dali-toolkit/internal/controls/relayout-controller.h b/base/dali-toolkit/internal/controls/relayout-controller.h
index 7ec67b8..40438b9 100644 (file)
--- a/base/dali-toolkit/internal/controls/relayout-controller.h
+++ b/base/dali-toolkit/internal/controls/relayout-controller.h
@@ -18,7 +18,8 @@
  *
  */
 
  *
  */
 

-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-handle.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/relayout-helper.cpp b/base/dali-toolkit/internal/controls/relayout-helper.cpp
index 5315c53..6b0aeb3 100644 (file)
--- a/base/dali-toolkit/internal/controls/relayout-helper.cpp
+++ b/base/dali-toolkit/internal/controls/relayout-helper.cpp
@@ -15,8 +15,14 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include "relayout-helper.h"
 
 #include "relayout-helper.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/text-actor.h>
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/control.h>
 
 
 #include <dali-toolkit/public-api/controls/control.h>
 
 

diff --git a/base/dali-toolkit/internal/controls/relayout-helper.h b/base/dali-toolkit/internal/controls/relayout-helper.h
index 15fbfe4..c7f2372 100644 (file)
--- a/base/dali-toolkit/internal/controls/relayout-helper.h
+++ b/base/dali-toolkit/internal/controls/relayout-helper.h
@@ -18,9 +18,9 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
-
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/math/vector3.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index d7c6d8e..c7d99ce 100755 (executable)
--- a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -15,7 +15,14 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h>
 #include <dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h>

+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h>
 
 using namespace Dali;
 #include <dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h>
 
 using namespace Dali;

diff --git a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
index 0ceaf44..5cfca6a 100755 (executable)
--- a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
+++ b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
@@ -18,6 +18,12 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/property-notification.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>

diff --git a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
index c4eca74..72dccbe 100755 (executable)
--- a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
@@ -15,7 +15,13 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h>
 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h>

+
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/enums.h>
 
 using namespace Dali;
 #include <dali-toolkit/public-api/enums.h>
 
 using namespace Dali;

diff --git a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h
index 65a3033..790f596 100755 (executable)
--- a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h
+++ b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h
@@ -18,6 +18,11 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/animation/animation.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>

diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index 3baf1de..0011dff 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -20,8 +20,12 @@
 
 // EXTERNAL INCLUDES
 #include <algorithm>
 
 // EXTERNAL INCLUDES
 #include <algorithm>

-#include <dali/public-api/events/mouse-wheel-event.h>
+#include <dali/public-api/animation/constraints.h>

 #include <dali/public-api/common/set-wrapper.h>
 #include <dali/public-api/common/set-wrapper.h>

+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/events/mouse-wheel-event.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>

diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
index 94a98bb..e10c1b7 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
@@ -19,7 +19,9 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/property-notification.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
index a84a419..4f3d731 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h>
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/object/property-index.h>

 #include <dali/integration-api/debug.h>
 
 namespace Dali
 #include <dali/integration-api/debug.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
index e9d8679..fd421c7 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h
@@ -18,6 +18,10 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/signals/dali-signal-v2.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
 

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
index 3f1cf81..fa9693e 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
@@ -23,7 +23,6 @@
 #include <list>
 
 // INTERNAL INCLUDES
 #include <list>
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp
index 2662324..fd63390 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp
@@ -15,11 +15,13 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h>
 
 // EXTERNAL INCLUDES
 #include <boost/bind.hpp>
 
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h>
 
 // EXTERNAL INCLUDES
 #include <boost/bind.hpp>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h
index 7263f0c..b0e904a 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h
@@ -18,7 +18,13 @@
  *
  */
 
  *
  */
 

-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/math/vector4.h>
+#include <dali/public-api/object/property-notification.h>
+#include <dali/public-api/object/ref-object.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h
index 53b73ea..63c51be 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h
@@ -18,8 +18,11 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/signals/connection-tracker.h>
+

 // INTERNAL INCLUDES
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp
index 3f627ec..ae70701 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp
@@ -15,8 +15,12 @@
  *
  */
 
  *
  */
 

+// HEADER

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h>
 
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/math/math-utils.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h
index 2077c3c..7541825 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector3.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index 1d3b7b1..1f1f118 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -19,7 +19,11 @@
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>

 #include <dali/public-api/events/mouse-wheel-event.h>
 #include <dali/public-api/events/mouse-wheel-event.h>

+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>

 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index ad55741..84723bb 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@ -19,7 +19,9 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/property-notification.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp
index 95ecc5d..32f3bca 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.cpp
@@ -16,9 +16,15 @@
  *
  */
 
  *
  */
 

-#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
+// CLASS HEADER

 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h>
 
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/common/stage.h>
+
+// INTERNAL INCLUDES
+

 using namespace Dali;
 
 typedef Dali::Toolkit::Internal::ScrollSlideInfo ScrollSlideInfo;
 using namespace Dali;
 
 typedef Dali::Toolkit::Internal::ScrollSlideInfo ScrollSlideInfo;

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h
index 9342092..f00411a 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h
@@ -18,14 +18,17 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>

+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h>

+#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -40,8 +43,6 @@ class ScrollView;
 namespace Internal
 {
 
 namespace Internal
 {
 

-class ScrollViewEffect;
-

 class ScrollSlideInfo;
 
 typedef IntrusivePtr<ScrollSlideInfo> ScrollSlideInfoPtr;
 class ScrollSlideInfo;
 
 typedef IntrusivePtr<ScrollSlideInfo> ScrollSlideInfoPtr;

diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index 555ae70..95d22b5 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
+++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
@@ -15,6 +15,9 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/object/type-registry.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h>

diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
index 43959fd..554135b 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES

diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index ef2935d..4db1a13 100644 (file)
--- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@ -20,7 +20,12 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
 
 // EXTERNAL INCLUDES
 #include <sstream>

+#include <dali/public-api/adaptor-framework/physical-keyboard.h>
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/animation/time-period.h>

 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/ref-object.h>

+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/scripting/scripting.h>

 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
index 901e96c..a529f37 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
@@ -15,11 +15,17 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER
+#include <dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/clipboard.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/events/pan-gesture.h>
+#include <dali/public-api/object/property-notification.h>

 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES

-#include <dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h>
-

 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>
 
 using namespace Dali;
 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>
 
 using namespace Dali;

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
index 2519871..e1b3787 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
@@ -18,10 +18,16 @@
  *
  */
 
  *
  */
 

-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/geometry/mesh.h>
+#include <dali/public-api/signals/connection-tracker.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-

 #include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h>
 #include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h>


@@ -626,5 +632,3 @@ private:
 } // namespace Dali
 
 #endif // __DALI_TOOLKIT_INTERNAL_TEXT_INPUT_DECORATOR_H__
 } // namespace Dali
 
 #endif // __DALI_TOOLKIT_INTERNAL_TEXT_INPUT_DECORATOR_H__

-
-

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
index 32a4b8e..219469c 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
@@ -15,24 +15,24 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// CLASS HEADER

 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>

-#include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>

 
 

-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <math.h>
+#include <sstream>
+#include <algorithm>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/integration-api/debug.h>

 
 

+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>

 #include <dali-toolkit/internal/controls/text-input/text-input-impl.h>
 #include <dali-toolkit/internal/controls/text-view/text-processor.h>
 #include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
 #include <dali-toolkit/internal/controls/text-input/text-input-impl.h>
 #include <dali-toolkit/internal/controls/text-view/text-processor.h>
 #include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 

-#include <dali/integration-api/debug.h>
-
-#include <math.h>
-#include <sstream>
-#include <algorithm>
-

 using namespace Dali;
 using namespace std;
 
 using namespace Dali;
 using namespace std;
 

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.h
index 882409a..c5f9013 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.h
@@ -18,8 +18,13 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/events/pan-gesture-detector.h>
+#include <dali/public-api/events/tap-gesture-detector.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/images/image.h>
+#include <dali/public-api/signals/connection-tracker.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
index 0264adc..43b8217 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@ -15,19 +15,27 @@
  *
  */
 
  *
  */
 

-#include <dali/dali.h>
-
+// CLASS HEADER

 #include <dali-toolkit/internal/controls/text-input/text-input-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-impl.h>

-#include <dali-toolkit/internal/controls/text-view/text-processor.h>
-#include <dali-toolkit/public-api/controls/buttons/push-button.h>
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-
-#include <dali/integration-api/debug.h>

 
 

+// EXTERNAL INCLUDES

 #include <math.h>
 #include <sstream>
 #include <algorithm>
 #include <math.h>
 #include <sstream>
 #include <algorithm>

+#include <dali/public-api/adaptor-framework/virtual-keyboard.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/events/key-event.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/object/property-notification.h>
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-view/text-processor.h>
+#include <dali-toolkit/public-api/controls/buttons/push-button.h>
+#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>

 
 using namespace std;
 using namespace Dali;
 
 using namespace std;
 using namespace Dali;

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
index 9cd2dba..cc46e41 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
@@ -18,6 +18,15 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/adaptor-framework/clipboard.h>
+#include <dali/public-api/adaptor-framework/clipboard-event-notifier.h>
+#include <dali/public-api/adaptor-framework/imf-manager.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/geometry/mesh.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-input/text-input.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-input/text-input.h>


@@ -25,9 +34,6 @@
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-popup-impl.h>
 
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-popup-impl.h>
 

-#include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/geometry/mesh.h>
-

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
index 14f998f..046041f 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
@@ -15,14 +15,16 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <libintl.h>
+#include <dali/public-api/animation/constraints.h>

 #include <dali/integration-api/debug.h>
 
 #include <dali/integration-api/debug.h>
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/text-input/text-input-popup-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 
 #include <dali-toolkit/internal/controls/text-input/text-input-popup-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 

-#include <libintl.h>
-

 using namespace std;
 using namespace Dali;
 
 using namespace std;
 using namespace Dali;
 

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
index 4348ca8..8c951ad 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
@@ -18,9 +18,12 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>

 
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
index e16d686..ce316f2 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp
index 2ea4bd3..90a799d 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp
@@ -15,17 +15,17 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
+// CLASS HEADER

 #include <dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h>
 
 #include <dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h>
 

-#include <dali/dali.h>
-
-#include <dali/integration-api/debug.h>
-
+// EXTERNAL INCLUDES

 #include <math.h>
 #include <sstream>
 #include <algorithm>
 #include <libintl.h>
 #include <math.h>
 #include <sstream>
 #include <algorithm>
 #include <libintl.h>

+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES

 
 using namespace Dali;
 using namespace std;
 
 using namespace Dali;
 using namespace std;

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
index d0bed03..74a3421 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
@@ -18,10 +18,12 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/geometry/mesh.h>
+#include <dali/public-api/modeling/material.h>
+

 // INTERNAL INCLUDES
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
 #include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>

-

 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
index 94c263e..1bd436d 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
@@ -18,10 +18,11 @@
  *
  */
 
  *
  */
 

-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/text/text-style.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-

 #include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
 
 namespace Dali
 #include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h b/base/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
index 88a7778..b548fb8 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
@@ -22,7 +22,6 @@
 #include <dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h>
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
index c21cccf..5cd83a0 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
@@ -18,6 +18,10 @@
 // FILE HEADER
 #include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
 
 // FILE HEADER
 #include <dali-toolkit/internal/controls/text-view/relayout-utilities.h>
 

+// EXTERNAL INCLUDES
+#include <cmath>
+#include <dali/public-api/text/text-actor-parameters.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-view/text-processor.h>
 #include <dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-view/text-processor.h>
 #include <dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h>


@@ -25,9 +29,6 @@
 #include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
 #include <dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h>
 
 #include <dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h>
 #include <dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h>
 

-// EXTERNAL INCLUDES
-#include <cmath>
-

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
index 9cce54a..3e08d27 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
@@ -18,6 +18,11 @@
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/text-view/text-view-impl.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h>
 #include <dali-toolkit/internal/controls/text-view/split-by-word-policies.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h>
 #include <dali-toolkit/internal/controls/text-view/split-by-word-policies.h>

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
index 70c149a..e1cbc42 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
@@ -18,6 +18,13 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/images/glyph-image.h>
+#include <dali/public-api/render-tasks/render-task.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>

diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
index 31cb43a..d76476f 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
+++ b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
@@ -18,6 +18,14 @@
 // CLASS HEADER
 #include "focus-manager-impl.h"
 
 // CLASS HEADER
 #include "focus-manager-impl.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/adaptor-framework/accessibility-manager.h>
+#include <dali/public-api/adaptor-framework/sound-player.h>
+#include <dali/public-api/adaptor-framework/tts-player.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/events/hit-test-algorithm.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h
index e56df59..b07ae55 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h
+++ b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h
@@ -20,8 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <string>
 
 // EXTERNAL INCLUDES
 #include <string>

-#include <dali/dali.h>
+#include <dali/public-api/adaptor-framework/accessibility-action-handler.h>
+#include <dali/public-api/adaptor-framework/accessibility-gesture-handler.h>

 #include <dali/public-api/common/map-wrapper.h>
 #include <dali/public-api/common/map-wrapper.h>

+#include <dali/public-api/object/base-object.h>
+#include <dali/integration-api/events/pan-gesture-event.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>

diff --git a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 12b6748..47e2898 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -18,6 +18,15 @@
 // CLASS HEADER
 #include "keyboard-focus-manager-impl.h"
 
 // CLASS HEADER
 #include "keyboard-focus-manager-impl.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/adaptor-framework/accessibility-manager.h>
+#include <dali/public-api/adaptor-framework/singleton-service.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/events/key-event.h>
+#include <dali/public-api/object/type-registry.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
index 0a1bad5..e2e1db3 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
+++ b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
@@ -20,9 +20,10 @@
 
 // EXTERNAL INCLUDES
 #include <string>
 
 // EXTERNAL INCLUDES
 #include <string>

+#include <dali/public-api/adaptor-framework/physical-keyboard.h>
+#include <dali/public-api/object/base-object.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index de83d17..954ce3a 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@ -18,6 +18,10 @@
 // CLASS HEADER
 #include "keyinput-focus-manager-impl.h"
 
 // CLASS HEADER
 #include "keyinput-focus-manager-impl.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/common/stage.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali/integration-api/debug.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali/integration-api/debug.h>

diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
index 35cc6eb..43bd783 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
+++ b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
@@ -21,9 +21,9 @@
 // EXTERNAL INCLUDES
 #include <string>
 #include <deque>
 // EXTERNAL INCLUDES
 #include <string>
 #include <deque>

+#include <dali/public-api/object/base-object.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/public-api/controls/control.h>
 
 #include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/public-api/controls/control.h>
 

diff --git a/base/dali-toolkit/internal/styling/style-manager-impl.cpp b/base/dali-toolkit/internal/styling/style-manager-impl.cpp
index 9e5b6a1..c368a58 100644 (file)
--- a/base/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/base/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -17,17 +17,18 @@
 // CLASS HEADER
 #include "style-manager-impl.h"
 
 // CLASS HEADER
 #include "style-manager-impl.h"
 

-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/styling/style-manager.h>
-#include <dali/integration-api/debug.h>
-

 // EXTERNAL INCLUDES
 #include <fstream>
 #include <iostream>
 #include <sstream>
 // EXTERNAL INCLUDES
 #include <fstream>
 #include <iostream>
 #include <sstream>

+#include <dali/public-api/adaptor-framework/singleton-service.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/integration-api/debug.h>

 
 

+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/styling/style-manager.h>

 
 namespace
 {
 
 namespace
 {

diff --git a/base/dali-toolkit/internal/styling/style-manager-impl.h b/base/dali-toolkit/internal/styling/style-manager-impl.h
index 09a6d93..648c11d 100644 (file)
--- a/base/dali-toolkit/internal/styling/style-manager-impl.h
+++ b/base/dali-toolkit/internal/styling/style-manager-impl.h
@@ -20,10 +20,13 @@
 // EXTERNAL INCLUDES
 #include <string>
 #include <list>
 // EXTERNAL INCLUDES
 #include <string>
 #include <list>

+#include <dali/public-api/adaptor-framework/style-monitor.h>

 #include <dali/public-api/common/map-wrapper.h>
 #include <dali/public-api/common/map-wrapper.h>

+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/object/property-map.h>
+#include <dali/public-api/signals/connection-tracker.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/styling/style-manager.h>
 #include <dali-toolkit/public-api/builder/builder.h>
 
 #include <dali-toolkit/public-api/styling/style-manager.h>
 #include <dali-toolkit/public-api/builder/builder.h>
 

diff --git a/base/dali-toolkit/public-api/builder/builder.h b/base/dali-toolkit/public-api/builder/builder.h
index d703749..3819238 100644 (file)
--- a/base/dali-toolkit/public-api/builder/builder.h
+++ b/base/dali-toolkit/public-api/builder/builder.h
@@ -19,7 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/images/frame-buffer-image.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp
index 35f68c4..65e0aa8 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/control-impl.cpp
@@ -15,18 +15,24 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 #include <dali-toolkit/public-api/controls/control-impl.h>
 

+// EXTERNAL INCLUDES

 #include <stack>
 #include <stack>

-
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/geometry/mesh.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/scripting/scripting.h>

 #include <dali/integration-api/debug.h>
 
 #include <dali/integration-api/debug.h>
 

-#include "dali-toolkit/internal/controls/relayout-controller.h"
-#include "dali-toolkit/internal/controls/relayout-helper.h"
-#include "dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h"
-#include "dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h"
+#include <dali-toolkit/internal/controls/relayout-controller.h>
+#include <dali-toolkit/internal/controls/relayout-helper.h>
+#include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>

 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control.h>

-

 #include <dali-toolkit/public-api/styling/style-manager.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 
 #include <dali-toolkit/public-api/styling/style-manager.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 

diff --git a/base/dali-toolkit/public-api/controls/control-impl.h b/base/dali-toolkit/public-api/controls/control-impl.h
index d863a5d..f1dfcbe 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.h
+++ b/base/dali-toolkit/public-api/controls/control-impl.h
@@ -19,7 +19,13 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/adaptor-framework/style-change.h>

 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/common/vector-wrapper.h>

+#include <dali/public-api/events/long-press-gesture.h>
+#include <dali/public-api/events/pan-gesture.h>
+#include <dali/public-api/events/pinch-gesture.h>
+#include <dali/public-api/events/tap-gesture.h>
+#include <dali/public-api/object/property-index.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>

diff --git a/base/dali-toolkit/public-api/controls/control.h b/base/dali-toolkit/public-api/controls/control.h
index b72f20f..f41cb00 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control.h
+++ b/base/dali-toolkit/public-api/controls/control.h
@@ -18,8 +18,15 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/custom-actor.h>
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/events/long-press-gesture-detector.h>
+#include <dali/public-api/events/pan-gesture-detector.h>
+#include <dali/public-api/events/pinch-gesture-detector.h>
+#include <dali/public-api/events/tap-gesture-detector.h>
+#include <dali/public-api/events/tap-gesture-detector.h>
+#include <dali/public-api/images/image.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp b/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp
index d73b6b0..6044e5a 100644 (file)
--- a/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp
+++ b/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp
@@ -18,10 +18,10 @@
 #include "check-button-factory.h"
 
 // EXTERNAL INCLUDES
 #include "check-button-factory.h"
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/image-actor.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>

-#include <dali/dali.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h b/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h
index b019621..d197131 100644 (file)
--- a/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h
+++ b/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp b/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
index 67f16e9..a2818e8 100644 (file)
--- a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
+++ b/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp
@@ -15,12 +15,14 @@
  *
  */
 
  *
  */
 

-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+// HEADER

 #include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
 
 // EXTERNAL INCLUDES

-// INTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>

 
 

+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/alignment/alignment.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h b/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h
index 21cab7c..6677430 100644 (file)
--- a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h
+++ b/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
index 1b835e3..a4b387d 100755 (executable)
--- a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
+++ b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali/public-api/common/vector-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 
 // INTERNAL INCLUDES

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.cpp
index 2cc2859..c89ff91 100755 (executable)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.cpp
@@ -15,9 +15,14 @@
  *
  */
 
  *
  */
 

-#include <algorithm>
+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h>
 

+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/math/random.h>
+

 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp
index f8f9ef5..95ee8c3 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp
@@ -15,10 +15,13 @@
  *
  */
 
  *
  */
 

-#include <algorithm>
-
+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h>
 

+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <dali/public-api/animation/animation.h>
+

 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h
index 9af4ee8..aea3964 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
index a2fef08..2bb91e9 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
@@ -15,10 +15,13 @@
  *
  */
 
  *
  */
 

-#include <algorithm>
-
+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
 

+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <dali/public-api/animation/animation.h>
+

 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h
index 1adb9c0..3914433 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
index 7d94998..e11ef16 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
index 32aeb7a..d55ed9c 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
@@ -15,7 +15,14 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>

+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/animation/time-period.h>
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
 
 namespace
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
 
 namespace

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
index e695726..9d4775c 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali/public-api/common/vector-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 
 // INTERNAL INCLUDES

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
index 68d6bcc..5bc5c7e 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
index 8fe02cc..d94c802 100755 (executable)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp
index 57110c6..65986db 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp
@@ -15,10 +15,13 @@
  *
  */
 
  *
  */
 

-#include <algorithm>
-
+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h>
 

+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <dali/public-api/animation/animation.h>
+

 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h
index f40d2f1..e54a651 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp
index 4a8c471..80eda13 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp
@@ -15,10 +15,13 @@
  *
  */
 
  *
  */
 

-#include <algorithm>
-
+// CLASS HEADER

 #include <dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h>
 

+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <dali/public-api/animation/animation.h>
+

 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace std;

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h
index 5e76d2d..883410b 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp
index 6007e85..e9a1fa7 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
 
 // CLASS HEADER
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/object/type-registry.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h
index 2745572..db5fb61 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
index ed8bd32..7806e43 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/constrainable.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h
index dabe111..c1d6cd2 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h
@@ -18,6 +18,9 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/alpha-functions.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
index 62fa417..27aed5a 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
@@ -19,8 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/common/vector-wrapper.h>

+#include <dali/public-api/object/base-handle.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h
index a208fb0..f6b175a 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h
@@ -18,6 +18,9 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/alpha-functions.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

diff --git a/base/dali-toolkit/public-api/controls/text-input/text-input.cpp b/base/dali-toolkit/public-api/controls/text-input/text-input.cpp
index 27a5fc9..b735c76 100644 (file)
--- a/base/dali-toolkit/public-api/controls/text-input/text-input.cpp
+++ b/base/dali-toolkit/public-api/controls/text-input/text-input.cpp
@@ -15,6 +15,17 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER
+#include <dali-toolkit/public-api/controls/text-input/text-input.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/adaptor-framework/clipboard.h>
+#include <dali/public-api/adaptor-framework/clipboard-event-notifier.h>
+#include <dali/public-api/adaptor-framework/imf-manager.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/text-input/text-input.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-impl.h>
 
 #include <dali-toolkit/public-api/controls/text-input/text-input.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-impl.h>
 

diff --git a/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp
index a4cddb1..bd3bbec 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp
+++ b/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp
@@ -16,13 +16,12 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/adaptor-framework/singleton-service.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-

 #include <dali-toolkit/internal/focus-manager/focus-manager-impl.h>
 
 namespace Dali
 #include <dali-toolkit/internal/focus-manager/focus-manager-impl.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/public-api/focus-manager/focus-manager.h b/base/dali-toolkit/public-api/focus-manager/focus-manager.h
index e1c95ec..b8ca24a 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/focus-manager.h
@@ -18,8 +18,9 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/actors/image-actor.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
index 4a4082f..01a4862 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp
index b81e807..f39c81f 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp
+++ b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp
@@ -16,13 +16,12 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "keyinput-focus-manager.h"
 
 // EXTERNAL INCLUDES
 #include "keyinput-focus-manager.h"
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/adaptor-framework/singleton-service.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-

 #include <dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h>
 
 namespace Dali
 #include <dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h>
 
 namespace Dali

diff --git a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
index 5c05b3f..7d829a4 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h b/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
index a9e6280..cd95ef3 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h b/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h
index 5f15885..c308660 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/image-region-effect.h b/base/dali-toolkit/public-api/shader-effects/image-region-effect.h
index b1e2dad..fe85474 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/image-region-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/image-region-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/iris-effect.h b/base/dali-toolkit/public-api/shader-effects/iris-effect.h
index a80e920..8550e30 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/iris-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/iris-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/mask-effect.h b/base/dali-toolkit/public-api/shader-effects/mask-effect.h
index 0a753bb..c020428 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/mask-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/mask-effect.h
@@ -18,8 +18,9 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/images/image.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h b/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h
index fc40427..7199e04 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h b/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
index 9c1fe64..7e23a26 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h b/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h
index 521d930..6b3f3f1 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/ripple-effect.h b/base/dali-toolkit/public-api/shader-effects/ripple-effect.h
index 073e983..279f55e 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/ripple-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/ripple-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h b/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
index b603c74..e02327e 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/shader-effects/swirl-effect.h b/base/dali-toolkit/public-api/shader-effects/swirl-effect.h
index e09516d..8c71e80 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/swirl-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/swirl-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/base/dali-toolkit/public-api/styling/style-manager.h b/base/dali-toolkit/public-api/styling/style-manager.h
index 6ac2662..1ec2ea2 100644 (file)
--- a/base/dali-toolkit/public-api/styling/style-manager.h
+++ b/base/dali-toolkit/public-api/styling/style-manager.h
@@ -18,9 +18,10 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/adaptor-framework/orientation.h>
+#include <dali/public-api/adaptor-framework/style-change.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/optional/dali-toolkit/dali-toolkit.h b/optional/dali-toolkit/dali-toolkit.h
index 45d1566..0f49da3 100644 (file)
--- a/optional/dali-toolkit/dali-toolkit.h
+++ b/optional/dali-toolkit/dali-toolkit.h
@@ -18,6 +18,10 @@
  *
  */
 
  *
  */
 

+#include <dali/dali.h>
+
+// Toolkit
+

 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>

diff --git a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
index 0d2eb16..df4f828 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
@@ -22,6 +22,10 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <iomanip>
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <iomanip>

+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/render-tasks/render-task-list.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>

diff --git a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
index 388adec..8cdd72c 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
@@ -21,9 +21,12 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <cmath>
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <cmath>

+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 #include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 #include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>

diff --git a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
index cad5080..62ef78d 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -15,16 +15,17 @@
  *
  */
 
  *
  */
 

-//CLASS HEADER
+// CLASS HEADER

 #include "bubble-emitter-impl.h"
 
 #include "bubble-emitter-impl.h"
 

-//EXTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <cmath>
 #include <cmath>

+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/render-tasks/render-task-list.h>

 
 

-//INTERNAL INCLUDES
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h>
 
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h>
 

-

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
index d5ad2b0..f8952af 100644 (file)
--- a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
+++ b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
@@ -18,8 +18,16 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/images/frame-buffer-image.h>
+#include <dali/public-api/geometry/mesh.h>
+#include <dali/public-api/render-tasks/render-task.h>
+

 // INTERNAL INCLUDES
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h>

diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
index f5b079a..db40398 100644 (file)
--- a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp
@@ -20,6 +20,8 @@
 
 // EXTERNAL INCLUDES
 #include <algorithm>
 
 // EXTERNAL INCLUDES
 #include <algorithm>

+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/type-registry.h>

 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES

diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp b/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
index 14ff051..3440be7 100644 (file)
--- a/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
@@ -15,9 +15,12 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// CLASS HEADER

 #include <dali-toolkit/internal/controls/cluster/cluster-style-impl.h>
 #include <dali-toolkit/internal/controls/cluster/cluster-style-impl.h>

+
+// EXTERNAL INCLUDES
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/cluster/cluster.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/controls/cluster/cluster.h>
 
 namespace Dali

diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h b/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h
index 31d9d4b..df08a47 100644 (file)
--- a/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h
+++ b/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h
@@ -25,8 +25,6 @@
 namespace Dali
 {
 
 namespace Dali
 {
 

-struct Vector3;
-

 namespace Toolkit
 {
 
 namespace Toolkit
 {
 

diff --git a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
index 6eb2fa2..82c6ffe 100644 (file)
--- a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
@@ -18,6 +18,12 @@
 // CLASS HEADER
 #include "effects-view-impl.h"
 
 // CLASS HEADER
 #include "effects-view-impl.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+

 // INTERNAL INCLUDES
 #include "../../filters/blur-two-pass-filter.h"
 #include "../../filters/emboss-filter.h"
 // INTERNAL INCLUDES
 #include "../../filters/blur-two-pass-filter.h"
 #include "../../filters/emboss-filter.h"

diff --git a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
index 67b998c..497cdbe 100644 (file)
--- a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
@@ -19,10 +19,13 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>
-#include <dali/public-api/common/dali-vector.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>

diff --git a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
index 6135760..371fded 100644 (file)
--- a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
@@ -21,12 +21,15 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <iomanip>
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <iomanip>

+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+#include <dali/integration-api/debug.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 

-#include <dali/integration-api/debug.h>
-

 // TODO:
 // pixel format / size - set from JSON
 // aspect ratio property needs to be able to be constrained also for cameras, not possible currently. Therefore changing aspect ratio of GaussianBlurView won't currently work
 // TODO:
 // pixel format / size - set from JSON
 // aspect ratio property needs to be able to be constrained also for cameras, not possible currently. Therefore changing aspect ratio of GaussianBlurView won't currently work

diff --git a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
index 9727136..9420d24 100644 (file)
--- a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
@@ -23,7 +23,6 @@
 #include <cmath>
 
 // INTERNAL INCLUDES
 #include <cmath>
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 

diff --git a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 2601644..4c54138 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -15,7 +15,14 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
 #include <dali-toolkit/internal/controls/image-view/image-view-impl.h>

+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/shader-effects/distance-field-effect.h>
 
 using namespace Dali;
 #include <dali-toolkit/public-api/shader-effects/distance-field-effect.h>
 
 using namespace Dali;

diff --git a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
index 4bef6dd..69b2f1b 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -19,8 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>
+#include <dali/public-api/actors/image-actor.h>

 #include <dali/public-api/common/map-wrapper.h>
 #include <dali/public-api/common/map-wrapper.h>

+#include <dali/public-api/images/image-attributes.h>
+#include <dali/public-api/object/property-notification.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
index 10847b2..0ebdb0c 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp
@@ -15,11 +15,15 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER
+#include <dali-toolkit/internal/controls/image-view/masked-image-view-impl.h>
+

 // EXTERNAL INCLUDES
 #include <sstream>
 // EXTERNAL INCLUDES
 #include <sstream>

-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/image-view/masked-image-view-impl.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
index e5e04e3..00c0853 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
@@ -18,8 +18,12 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/images/frame-buffer-image.h>
+

 // INTERNAL INCLUDES
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
 
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
 

diff --git a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
index 3e23a8a..597a4c2 100644 (file)
--- a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
@@ -15,8 +15,15 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/internal/controls/magnifier/magnifier-impl.h>
 
 #include <dali-toolkit/internal/controls/magnifier/magnifier-impl.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+

 using namespace Dali;
 
 namespace // unnamed namespace
 using namespace Dali;
 
 namespace // unnamed namespace

diff --git a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
index 86d070a..f0c9133 100644 (file)
--- a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
+++ b/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
@@ -18,8 +18,12 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/render-tasks/render-task.h>
+

 // INTERNAL INCLUDES
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
 
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
 

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h
index 0846165..8de4edc 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h
@@ -22,7 +22,6 @@
 #include <string>
 
 // INTERNAL INCLUDES
 #include <string>
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
index 2ad6931..da5ee5b 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
@@ -18,7 +18,12 @@
 // CLASS HEADER
 #include "navigation-control-impl.h"
 
 // CLASS HEADER
 #include "navigation-control-impl.h"
 

-//INTERNAL INCLUDES
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/events/key-event.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES

 #include <dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h>
 #include <dali-toolkit/internal/controls/relayout-controller.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h>
 #include <dali-toolkit/internal/controls/relayout-controller.h>

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
index c0519cd..f722836 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h
@@ -18,12 +18,11 @@
  *
  */
 
  *
  */
 

-//EXTERNAL INCLUDES
-
+// EXTERNAL INCLUDES

 #include <list>
 #include <list>

+#include <dali/public-api/actors/layer.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
index e193c8e..0715a3d 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h
@@ -18,7 +18,6 @@
  *
  */
 
  *
  */
 

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
index 28123fe..acc8cc2 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
@@ -18,7 +18,6 @@
  *
  */
 
  *
  */
 

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h>

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
index 3a375de..ea7d405 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp
@@ -20,6 +20,7 @@
 #include "page-impl.h"
 
 // EXTERNAL INCLUDES
 #include "page-impl.h"
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/object/type-registry.h>

 
 // INTERNAL INCLUDES
 
 
 // INTERNAL INCLUDES
 

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h
index a73413d..333aada 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h
@@ -21,7 +21,6 @@
 #include <string>
 
 // INTERNAL INCLUDES
 #include <string>
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 

diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp
index d4beab2..64bac9a 100644 (file)
--- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp
@@ -15,9 +15,12 @@
  *
  */
 
  *
  */
 

-//CLASS HEADER
+// CLASS HEADER

 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h>
 
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/object/type-registry.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
index 5f169bb..cd2f91a 100644 (file)
--- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
@@ -15,9 +15,13 @@
  *
  */
 
  *
  */
 

-//CLASS HEADER
+// CLASS HEADER

 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h>
 
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/object/type-registry.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index edac01e..1c6ee40 100644 (file)
--- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@ -18,6 +18,12 @@
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
 
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/events/hit-test-algorithm.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 

diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
index d438a64..27f9778 100644 (file)
--- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
@@ -19,8 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/actors/camera-actor.h>

 #include <dali/public-api/common/map-wrapper.h>
 #include <dali/public-api/common/map-wrapper.h>

+#include <dali/public-api/images/frame-buffer-image.h>
+#include <dali/public-api/render-tasks/render-task.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp
index 6442e27..0521bec 100644 (file)
--- a/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.cpp
@@ -15,10 +15,17 @@
  *
  */
 
  *
  */
 

-#include <algorithm>
+// CLASS HEADER

 #include <dali-toolkit/internal/controls/selectors/rotating-selector-impl.h>
 
 #include <dali-toolkit/internal/controls/selectors/rotating-selector-impl.h>
 

-#include "dali-toolkit/public-api/controls/selectors/rotating-selector.h"
+// EXTERNAL INCLUDES
+#include <algorithm>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/selectors/rotating-selector.h>

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h
index 16cdf47..e4ce4f1 100644 (file)
--- a/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h
+++ b/optional/dali-toolkit/internal/controls/selectors/rotating-selector-impl.h
@@ -18,9 +18,10 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/public-api/object/ref-object.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/animation.h>

 
 

+// INTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/selectors/rotating-selector.h>
 
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/selectors/rotating-selector.h>
 

diff --git a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
index efcbce7..098e9ae 100644 (file)
--- a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
@@ -21,11 +21,14 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <iomanip>
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <iomanip>

+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+#include <dali/integration-api/debug.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h>
 #include <dali-toolkit/internal/filters/blur-two-pass-filter.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h>
 #include <dali-toolkit/internal/filters/blur-two-pass-filter.h>

-#include <dali/integration-api/debug.h>

 
 // TODO:
 // pixel format / size - set from JSON
 
 // TODO:
 // pixel format / size - set from JSON

diff --git a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
index 150d4ba..e2afd04 100644 (file)
--- a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
@@ -21,9 +21,12 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <cmath>
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <cmath>

+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/shadow-view/shadow-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/internal/filters/blur-two-pass-filter.h>
 #include <dali-toolkit/public-api/controls/shadow-view/shadow-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/internal/filters/blur-two-pass-filter.h>

diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp b/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
index 84a545b..7f82bc3 100755 (executable)
--- a/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -15,7 +15,14 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/internal/controls/slider/slider-impl.h>
 #include <dali-toolkit/internal/controls/slider/slider-impl.h>

+
+// EXTERNAL INCLUDES
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>
+
+// EXTERNAL INCLUDES

 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 #include <sstream>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 #include <sstream>

diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.h b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
index 707bac8..20ac87a 100755 (executable)
--- a/optional/dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
@@ -18,8 +18,11 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+

 // INTERNAL INCLUDES
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/slider/slider.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/slider/slider.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>

diff --git a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index 2681cbf..b1f4ae7 100644 (file)
--- a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -15,9 +15,12 @@
  *
  */
 
  *
  */
 

-//EXTERNAL INCLUDES
+// EXTERNAL INCLUDES

 #include <cmath>
 #include <cmath>

-#include <integration-api/debug.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/scripting/scripting.h>
+#include <dali/integration-api/debug.h>

 
 // CLASS HEADER
 #include "super-blur-view-impl.h"
 
 // CLASS HEADER
 #include "super-blur-view-impl.h"

diff --git a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
index 886a75b..5d4ca38 100644 (file)
--- a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>

diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
index 3a81862..ae0c35e 100644 (file)
--- a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@ -18,6 +18,11 @@
 // CLASS HEADER
 #include "tool-bar-impl.h"
 
 // CLASS HEADER
 #include "tool-bar-impl.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/renderable-actor.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/object/type-registry.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>

diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
index db2ea12..f12bf5a 100644 (file)
--- a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.cpp b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
index 8bf9811..d98fc47 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
@@ -16,10 +16,12 @@
  */
 
 // CLASS HEADER
  */
 
 // CLASS HEADER

-

 #include "view-impl.h"
 
 // EXTERNAL INCLUDES
 #include "view-impl.h"
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>

 
 // INTERNAL INCLUDES
 
 
 // INTERNAL INCLUDES
 

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h
index 447bbaf..c94dd8e 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.h
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.h
@@ -19,7 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/dali.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>

 #include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES

diff --git a/optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp
index 82ceb82..b9cd038 100644 (file)
--- a/optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp
+++ b/optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp
@@ -20,6 +20,9 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
 
 // EXTERNAL INCLUDES
 #include <sstream>

+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/render-tasks/render-task-list.h>

 
 // INTERNAL INCLUDES
 
 
 // INTERNAL INCLUDES
 

diff --git a/optional/dali-toolkit/internal/filters/blur-two-pass-filter.h b/optional/dali-toolkit/internal/filters/blur-two-pass-filter.h
index 894fa9e..2528996 100644 (file)
--- a/optional/dali-toolkit/internal/filters/blur-two-pass-filter.h
+++ b/optional/dali-toolkit/internal/filters/blur-two-pass-filter.h
@@ -19,9 +19,12 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include "image-filter.h"
 
 namespace Dali
 #include "image-filter.h"
 
 namespace Dali

diff --git a/optional/dali-toolkit/internal/filters/emboss-filter.cpp b/optional/dali-toolkit/internal/filters/emboss-filter.cpp
index 6b376c3..9601b0b 100644 (file)
--- a/optional/dali-toolkit/internal/filters/emboss-filter.cpp
+++ b/optional/dali-toolkit/internal/filters/emboss-filter.cpp
@@ -20,6 +20,10 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
 
 // EXTERNAL INCLUDES
 #include <sstream>

+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 // INTERNAL INCLUDES
 
 
 // INTERNAL INCLUDES
 

diff --git a/optional/dali-toolkit/internal/filters/emboss-filter.h b/optional/dali-toolkit/internal/filters/emboss-filter.h
index 3c33fc8..1f706b2 100644 (file)
--- a/optional/dali-toolkit/internal/filters/emboss-filter.h
+++ b/optional/dali-toolkit/internal/filters/emboss-filter.h
@@ -19,9 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/render-tasks/render-task.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include "image-filter.h"
 
 namespace Dali
 #include "image-filter.h"
 
 namespace Dali

diff --git a/optional/dali-toolkit/internal/filters/image-filter.h b/optional/dali-toolkit/internal/filters/image-filter.h
index b08fd44..8de47b0 100644 (file)
--- a/optional/dali-toolkit/internal/filters/image-filter.h
+++ b/optional/dali-toolkit/internal/filters/image-filter.h
@@ -21,7 +21,6 @@
 // EXTERNAL INCLUDES
 
 // INTERNAL INCLUDES
 // EXTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
 
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
 

diff --git a/optional/dali-toolkit/internal/filters/spread-filter.cpp b/optional/dali-toolkit/internal/filters/spread-filter.cpp
index 39e1c77..ac230cc 100644 (file)
--- a/optional/dali-toolkit/internal/filters/spread-filter.cpp
+++ b/optional/dali-toolkit/internal/filters/spread-filter.cpp
@@ -20,6 +20,9 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
 
 // EXTERNAL INCLUDES
 #include <sstream>

+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/render-tasks/render-task-list.h>

 
 // INTERNAL INCLUDES
 
 
 // INTERNAL INCLUDES
 

diff --git a/optional/dali-toolkit/internal/filters/spread-filter.h b/optional/dali-toolkit/internal/filters/spread-filter.h
index 4e7a535..e04484c 100644 (file)
--- a/optional/dali-toolkit/internal/filters/spread-filter.h
+++ b/optional/dali-toolkit/internal/filters/spread-filter.h
@@ -19,9 +19,12 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include "image-filter.h"
 
 namespace Dali
 #include "image-filter.h"
 
 namespace Dali

diff --git a/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp b/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp
index 49a9ad7..9996db4 100644 (file)
--- a/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp
+++ b/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp
@@ -20,7 +20,7 @@
 
 // EXTERNAL HEADERS
 #include <sstream>
 
 // EXTERNAL HEADERS
 #include <sstream>

-
+#include <dali/public-api/common/stage.h>

 
 namespace Dali
 {
 
 namespace Dali
 {

diff --git a/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h b/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h
index 19b7612..841d200 100644 (file)
--- a/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h
+++ b/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h
@@ -18,7 +18,6 @@
  *
  */
 // INTERNAL INCLUDES
  *
  */
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
 
 namespace Dali

diff --git a/optional/dali-toolkit/internal/shader-effects/water-effect-impl.h b/optional/dali-toolkit/internal/shader-effects/water-effect-impl.h
index 0da012b..9aa6007 100644 (file)
--- a/optional/dali-toolkit/internal/shader-effects/water-effect-impl.h
+++ b/optional/dali-toolkit/internal/shader-effects/water-effect-impl.h
@@ -21,9 +21,9 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <cmath>
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <cmath>

+#include <dali/public-api/shader-effects/shader-effect.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/shader-effects/water-effect.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/shader-effects/water-effect.h>
 
 namespace Dali

diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index 1a7adb5..0641200 100644 (file)
--- a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@ -18,6 +18,11 @@
 // CLASS HEADER
 #include "cube-transition-effect-impl.h"
 
 // CLASS HEADER
 #include "cube-transition-effect-impl.h"
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/images/image-attributes.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
index b1d3a41..bad335a 100644 (file)
--- a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
+++ b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
@@ -19,9 +19,14 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/images/bitmap-image.h>
+#include <dali/public-api/images/frame-buffer-image.h>
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 // INTERNAL INCLUDES
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 
 namespace Dali
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 
 namespace Dali

diff --git a/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h b/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h
index 15eb5ed..f44aa56 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h
+++ b/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h b/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h
index 7454797..e5924d0 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h
+++ b/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h
@@ -18,14 +18,19 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/animation/alpha-functions.h>
+#include <dali/public-api/animation/time-period.h>
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/object/base-handle.h>
+

 // INTERNAL INCLUDES
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/enums.h>
 
 namespace Dali DALI_IMPORT_API
 {
 
 #include <dali-toolkit/public-api/enums.h>
 
 namespace Dali DALI_IMPORT_API
 {
 

-struct TimePeriod;

 class Actor;
 
 namespace Toolkit
 class Actor;
 
 namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h b/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
index a742252..6dd7048 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
+++ b/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/images/frame-buffer-image.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>

diff --git a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp
index 524cc3c..c944368 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp
+++ b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp
@@ -18,6 +18,8 @@
 // CLASS HEADER
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 
 // CLASS HEADER
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 

+// EXTERNAL INCLUDES
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h>
 

diff --git a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
index ea80385..66e4ef7 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
+++ b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
@@ -18,6 +18,14 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/images/frame-buffer-image.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/shader-effects/shader-effect.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

diff --git a/optional/dali-toolkit/public-api/controls/image-view/image-view.h b/optional/dali-toolkit/public-api/controls/image-view/image-view.h
index dee9e41..0d48baa 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/optional/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -18,6 +18,9 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/camera-actor.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
index f9bf393..6b86f92 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
+++ b/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
index 747c700..882f764 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
+++ b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h b/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
index 0013ab5..4a2cb76 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
+++ b/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/image-actor.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>

diff --git a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
index 76653be..e31b315 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
+++ b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
@@ -22,7 +22,6 @@
 #include <string>
 
 // INTERNAL INCLUDES
 #include <string>
 
 // INTERNAL INCLUDES

-#include <dali/dali.h>

 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
 namespace Dali DALI_IMPORT_API
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
 namespace Dali DALI_IMPORT_API

diff --git a/optional/dali-toolkit/public-api/controls/view/view.h b/optional/dali-toolkit/public-api/controls/view/view.h
index 0371b92..e86cf8b 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/view/view.h
+++ b/optional/dali-toolkit/public-api/controls/view/view.h
@@ -18,18 +18,16 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/adaptor-framework/orientation.h>
+

 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API
 {
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali DALI_IMPORT_API
 {
 

-namespace Internal DALI_INTERNAL
-{
-// Forward declarations
-class CustomActor;
-}
-

 namespace Toolkit
 {
 
 namespace Toolkit
 {
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h b/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
index abc1f59..8d4ff5f 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h b/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
index f073fed..d097f52 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
index 6968611..79c5d8d 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp
index 94da2f4..63ee87e 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp
+++ b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp
@@ -15,12 +15,14 @@
  *
  */
 
  *
  */
 

-// EXTERNAL HEADERS
-#include <sstream>
-

 // CLASS HEADER
 #include "bubble-effect.h"
 
 // CLASS HEADER
 #include "bubble-effect.h"
 

+// EXTERNAL HEADERS
+#include <sstream>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/images/image.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
index 69a1c3a..3f39c90 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp
index e642081..c0a2b19 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp
+++ b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp
@@ -15,6 +15,7 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include "color-adjuster.h"
 
 namespace Dali
 #include "color-adjuster.h"
 
 namespace Dali


@@ -22,10 +23,12 @@ namespace Dali
 
 namespace Toolkit
 {
 
 namespace Toolkit
 {

+

 namespace
 {
 namespace
 {

-  const std::string HSVDELTA_PROPERTY_NAME("uHSVDelta");
+const std::string HSVDELTA_PROPERTY_NAME("uHSVDelta");

 }
 }

+

 ColorAdjuster::ColorAdjuster()
 {
 }
 ColorAdjuster::ColorAdjuster()
 {
 }

diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
index 0dac3e5..94fc5da 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
@@ -18,8 +18,9 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
index 9e899ef..8362574 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
index 7f7e2ec..695a076 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
index 7b01b59..86035a0 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h b/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
index 17904a2..28f966c 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h b/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
index 3e9ebab..101cc70 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp
index b6268bd..0eb84a9 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp
+++ b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp
@@ -15,7 +15,12 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/shader-effects/motion-blur-effect.h>
 #include <dali-toolkit/public-api/shader-effects/motion-blur-effect.h>

+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
index d9a5b09..5206540 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
@@ -19,9 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-
-// INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/actors/renderable-actor.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp
index ffc068b..4df2ebb 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp
+++ b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp
@@ -15,7 +15,12 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/shader-effects/motion-stretch-effect.h>
 #include <dali-toolkit/public-api/shader-effects/motion-stretch-effect.h>

+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
index ceef5ad..5353347 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
@@ -19,9 +19,8 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-
-// INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/actors/renderable-actor.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
index e1799d9..ca75378 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
+++ b/optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
 
 // CLASS HEADER
 #include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h b/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
index 1f9e41e..16ac097 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
@@ -18,8 +18,9 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/images/image.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp
index 7d932ca..e936106 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp
+++ b/optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp
@@ -15,8 +15,12 @@
  *
  */
 
  *
  */
 

+// CLASS HEADER

 #include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
 
 #include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/common/stage.h>
+

 namespace Dali
 {
 
 namespace Dali
 {
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/shear-effect.h b/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
index 780d2ce..128d1e6 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
index ae54df0..fb5512a 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
index c435dd9..b2b8280 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
index d8db126..e6c66da 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/shader-effects/water-effect.h b/optional/dali-toolkit/public-api/shader-effects/water-effect.h
index e40ea54..d71c5a6 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/water-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/water-effect.h
@@ -18,8 +18,8 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/shader-effects/shader-effect.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {

diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h
index 23062f9..96965ee 100644 (file)
--- a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h
+++ b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h
@@ -18,8 +18,9 @@
  *
  */
 
  *
  */
 

-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/actors/image-actor.h>

 
 namespace Dali DALI_IMPORT_API
 {
 
 namespace Dali DALI_IMPORT_API
 {