Move view-mode.h from unmanaged to managed api

[Issue#] (N/A)

[Problem] Causes build bream with core-api test

[Cause] view-mode.h was not in capi

[Solution] move view-mode.h to capi

Change-Id: I3acdc090a5d05c3e80ee5299233cce75c2c6b3e9
Signed-off-by: Javon Prince <javon.prince@samsung.com>

diff --git a/dali/public-api/common/view-mode.h b/capi/dali/public-api/common/view-mode.h
similarity index 100%
rename from dali/public-api/common/view-mode.h
rename to capi/dali/public-api/common/view-mode.h

diff --git a/capi/dali/public-api/dali-core-capi-internal.h b/capi/dali/public-api/dali-core-capi-internal.h
index 6e12260..bbedc12 100644 (file)
--- a/capi/dali/public-api/dali-core-capi-internal.h
+++ b/capi/dali/public-api/dali-core-capi-internal.h
@@ -48,6 +48,7 @@
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/common/view-mode.h>
 
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/events/gesture.h>

diff --git a/capi/dali/public-api/file.list b/capi/dali/public-api/file.list
index eb96160..5942449 100644 (file)
--- a/capi/dali/public-api/file.list
+++ b/capi/dali/public-api/file.list
@@ -33,7 +33,8 @@ capi_devel_common_header_files = \
   $(capi_devel_src_dir)/common/loading-state.h \
   $(capi_devel_src_dir)/common/intrusive-ptr.h \
   $(capi_devel_src_dir)/common/stage.h \
-  $(capi_devel_src_dir)/common/vector-wrapper.h
+  $(capi_devel_src_dir)/common/vector-wrapper.h \
+  $(capi_devel_src_dir)/common/view-mode.h
 
 capi_devel_events_header_files = \
   $(capi_devel_src_dir)/events/gesture.h \

diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index a176d1c..d6f8ae2 100644 (file)
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -29,7 +29,6 @@
 #include <dali/public-api/common/map-wrapper.h>
 #include <dali/public-api/common/set-wrapper.h>
 #include <dali/public-api/common/light.h>
-#include <dali/public-api/common/view-mode.h>
 
 #include <dali/public-api/dynamics/dynamics-body.h>
 #include <dali/public-api/dynamics/dynamics-body-config.h>

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index 3135b90..93ff1c8 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -131,8 +131,7 @@ public_api_core_common_header_files = \
   $(public_api_src_dir)/common/map-wrapper.h \
   $(public_api_src_dir)/common/set-wrapper.h \
   $(public_api_src_dir)/common/ref-counted-dali-vector.h \
-  $(public_api_src_dir)/common/light.h \
-  $(public_api_src_dir)/common/view-mode.h
+  $(public_api_src_dir)/common/light.h
 
 public_api_core_dynamics_header_files = \
   $(public_api_src_dir)/dynamics/dynamics-body.h \