Move KeyGrab and Internal Widget from internal to public

- KeyGrab and Internal Widget APIs were originally public APIs,
  but they moved to internal folder while dali-adaptor refactoring.
- So, moved key-grab.h, widget-impl.h, and widget-impl.cpp files
  from internal API to public API.

Change-Id: I12015967b083efcdf78757a2300433d42f52c4bc
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/dali/internal/input/tizen-wayland/key-grab-ecore-wl.cpp b/dali/internal/input/tizen-wayland/key-grab-ecore-wl.cpp
index 520782d..842210e 100644 (file)
--- a/dali/internal/input/tizen-wayland/key-grab-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/key-grab-ecore-wl.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/input/tizen/key-grab.h>
+#include <dali/public-api/adaptor-framework/key-grab.h>
 
 // EXTERNAL INCLUDES
 #include <Ecore_Wayland.h>

diff --git a/dali/internal/system/common/widget-controller.h b/dali/internal/system/common/widget-controller.h
index dcde7cc..508463a 100644 (file)
--- a/dali/internal/system/common/widget-controller.h
+++ b/dali/internal/system/common/widget-controller.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/signals/connection-tracker.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 
 namespace Dali
 {

diff --git a/dali/internal/system/file.list b/dali/internal/system/file.list
index 190512f..e83da20 100644 (file)
--- a/dali/internal/system/file.list
+++ b/dali/internal/system/file.list
@@ -26,7 +26,6 @@ adaptor_system_common_src_files=\
     ${adaptor_system_dir}/common/trigger-event.cpp \
     ${adaptor_system_dir}/common/trigger-event-factory.cpp \
     ${adaptor_system_dir}/common/update-status-logger.cpp \
-    ${adaptor_system_dir}/common/widget-impl.cpp \
     ${adaptor_system_dir}/common/widget-application-impl.cpp \
     ${adaptor_system_dir}/common/logging.cpp \
     ${adaptor_system_dir}/common/callback-manager-ecore.cpp \

diff --git a/dali/internal/system/tizen/widget-application-impl-tizen.cpp b/dali/internal/system/tizen/widget-application-impl-tizen.cpp
index 598083a..9464f42 100644 (file)
--- a/dali/internal/system/tizen/widget-application-impl-tizen.cpp
+++ b/dali/internal/system/tizen/widget-application-impl-tizen.cpp
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDE
 #include <dali/public-api/adaptor-framework/widget.h>
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 #include <dali/internal/system/tizen/widget-controller-tizen.h>
 
 #ifdef WIDGET_SUPPOERTED

diff --git a/dali/internal/system/tizen/widget-controller-tizen.h b/dali/internal/system/tizen/widget-controller-tizen.h
index be60dc3..b692a9f 100644 (file)
--- a/dali/internal/system/tizen/widget-controller-tizen.h
+++ b/dali/internal/system/tizen/widget-controller-tizen.h
@@ -25,7 +25,7 @@
 #ifdef WIDGET_SUPPOERTED
 #include <widget_base.h>
 #endif
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 #include <dali/internal/system/common/widget-controller.h>
 
 namespace Dali

diff --git a/dali/internal/input/tizen/key-grab.h b/dali/public-api/adaptor-framework/key-grab.h
similarity index 100%
rename from dali/internal/input/tizen/key-grab.h
rename to dali/public-api/adaptor-framework/key-grab.h

diff --git a/dali/internal/system/common/widget-impl.cpp b/dali/public-api/adaptor-framework/widget-impl.cpp
similarity index 100%
rename from dali/internal/system/common/widget-impl.cpp
rename to dali/public-api/adaptor-framework/widget-impl.cpp

diff --git a/dali/internal/system/common/widget-impl.h b/dali/public-api/adaptor-framework/widget-impl.h
similarity index 100%
rename from dali/internal/system/common/widget-impl.h
rename to dali/public-api/adaptor-framework/widget-impl.h

diff --git a/dali/public-api/adaptor-framework/widget.cpp b/dali/public-api/adaptor-framework/widget.cpp
index d3c8426..bc8d070 100644 (file)
--- a/dali/public-api/adaptor-framework/widget.cpp
+++ b/dali/public-api/adaptor-framework/widget.cpp
@@ -19,7 +19,7 @@
 #include <dali/public-api/adaptor-framework/widget.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/dali.h b/dali/public-api/dali.h
index 24d9a13..c7ba45e 100644 (file)
--- a/dali/public-api/dali.h
+++ b/dali/public-api/dali.h
@@ -25,10 +25,12 @@
 #include <dali/public-api/adaptor-framework/device-status.h>
 #include <dali/public-api/adaptor-framework/input-method.h>
 #include <dali/public-api/adaptor-framework/key.h>
+#include <dali/public-api/adaptor-framework/key-grab.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/adaptor-framework/tts-player.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/adaptor-framework/widget-application.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 #include <dali/public-api/adaptor-framework/widget.h>
 #include <dali/public-api/dali-adaptor-version.h>
 

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index 2d69439..ae75497 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -7,6 +7,7 @@ adaptor_public_api_src_files = \
   $(adaptor_public_api_dir)/adaptor-framework/native-image-source.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/widget.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/widget-application.cpp \
+  $(adaptor_public_api_dir)/adaptor-framework/widget-impl.cpp \
   $(adaptor_public_api_dir)/dali-adaptor-version.cpp
 
 
@@ -20,17 +21,19 @@ public_api_adaptor_framework_header_files = \
   $(adaptor_public_api_dir)/adaptor-framework/device-status.h \
   $(adaptor_public_api_dir)/adaptor-framework/input-method.h \
   $(adaptor_public_api_dir)/adaptor-framework/key.h \
+  $(adaptor_public_api_dir)/adaptor-framework/key-grab.h \
   $(adaptor_public_api_dir)/adaptor-framework/style-change.h \
   $(adaptor_public_api_dir)/adaptor-framework/timer.h \
   $(adaptor_public_api_dir)/adaptor-framework/tts-player.h \
   $(adaptor_public_api_dir)/adaptor-framework/native-image-source.h \
   $(adaptor_public_api_dir)/adaptor-framework/window.h \
   $(adaptor_public_api_dir)/adaptor-framework/widget.h \
-  $(adaptor_public_api_dir)/adaptor-framework/widget-application.h
+  $(adaptor_public_api_dir)/adaptor-framework/widget-application.h \
+  $(adaptor_public_api_dir)/adaptor-framework/widget-impl.h
 
 adaptor_dali_header_file = \
   $(adaptor_public_api_dir)/dali.h
-  
+
 # wearable and watch extra public headers
 adaptor_dali_wearable_header_file = \
   $(adaptor_public_api_dir)/watch/dali-wearable.h
@@ -41,4 +44,4 @@ public_dali_watch_header_files = \
 
 public_dali_capture_header_files = \
   $(adaptor_public_api_dir)/capture/capture.h
-  
+