Fix header inclusion in an integration api header

For external use of scene-holder-impl.h

* Add DALI_ADAPTOR_COMPILATION conditional path (scene-holder.h)
* Move internal header (adaptor-impl.h)

Change-Id: Ia1b1c1abf4a3861f5638546285d436d1553d876f
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/dali/integration-api/scene-holder-impl.cpp b/dali/integration-api/scene-holder-impl.cpp
index efa8291..b228452 100644 (file)
--- a/dali/integration-api/scene-holder-impl.cpp
+++ b/dali/integration-api/scene-holder-impl.cpp
@@ -23,6 +23,7 @@
 #include <dali/public-api/actors/layer.h>
 
 // INTERNAL HEADERS
+#include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/adaptor/common/lifecycle-observer.h>
 
 namespace Dali

diff --git a/dali/integration-api/scene-holder-impl.h b/dali/integration-api/scene-holder-impl.h
index 6b283ad..97e4512 100644 (file)
--- a/dali/integration-api/scene-holder-impl.h
+++ b/dali/integration-api/scene-holder-impl.h
@@ -20,21 +20,21 @@
 
 // EXTERNAL INCLUDES
 #include <memory>
+#include <vector>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/integration-api/scene.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/scene-holder.h>
-#include <dali/integration-api/scene.h>
 
 #ifdef DALI_ADAPTOR_COMPILATION
 #include <dali/integration-api/render-surface-interface.h>
+#include <dali/integration-api/scene-holder.h>
 #else
 #include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/integration-api/adaptors/scene-holder.h>
 #endif
 
-#include <dali/internal/adaptor/common/adaptor-impl.h>
-
 namespace Dali
 {
 
@@ -59,6 +59,7 @@ namespace Internal
 namespace Adaptor
 {
 
+class Adaptor;
 class SceneHolder;
 using SceneHolderPtr = IntrusivePtr< SceneHolder >;
 

diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
index 6f58fba..2a7fc31 100755 (executable)
--- a/dali/internal/adaptor/common/application-impl.cpp
+++ b/dali/internal/adaptor/common/application-impl.cpp
@@ -24,6 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/style-monitor.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/system/common/command-line-options.h>
 #include <dali/internal/adaptor/common/framework.h>
 #include <dali/internal/system/common/singleton-service-impl.h>

diff --git a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp
index 5f8ca8e..9393dd8 100644 (file)
--- a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp
+++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp
@@ -21,6 +21,7 @@
 // INTERNAL INCLUDE
 #include <dali/public-api/adaptor-framework/widget.h>
 #include <dali/public-api/adaptor-framework/widget-impl.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/system/common/environment-variables.h>
 #include <dali/internal/system/tizen-wayland/widget-controller-tizen.h>
 

diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
index 1249b3e..85f5a8f 100644 (file)
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -31,6 +31,7 @@
 #endif
 
 // INTERNAL INCLUDES
+#include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/public-api/adaptor-framework/window.h>
 #include <dali/public-api/adaptor-framework/key-grab.h>
 #include <dali/devel-api/adaptor-framework/window-devel.h>

diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp
index 2e6a28c..4fc941b 100644 (file)
--- a/dali/public-api/adaptor-framework/window.cpp
+++ b/dali/public-api/adaptor-framework/window.cpp
@@ -23,6 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/window-system/common/window-impl.h>
 #include <dali/internal/window-system/common/orientation-impl.h>