Revert "[Tizen] Move Internal Widget from internal to public"

This reverts commit 296a12f1d77e525664d837ba5457907088e6f67a.

Change-Id: I3d43211cefbb5fc8c5b234d425336d90028e2189

diff --git a/dali/internal/system/common/widget-controller.h b/dali/internal/system/common/widget-controller.h
index 508463a..dcde7cc 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/public-api/adaptor-framework/widget-impl.h>
+#include <dali/internal/system/common/widget-impl.h>
 
 namespace Dali
 {

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

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

diff --git a/dali/internal/system/file.list b/dali/internal/system/file.list
index e83da20..190512f 100644 (file)
--- a/dali/internal/system/file.list
+++ b/dali/internal/system/file.list
@@ -26,6 +26,7 @@ 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 9464f42..598083a 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/public-api/adaptor-framework/widget-impl.h>
+#include <dali/internal/system/common/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 b692a9f..be60dc3 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/public-api/adaptor-framework/widget-impl.h>
+#include <dali/internal/system/common/widget-impl.h>
 #include <dali/internal/system/common/widget-controller.h>
 
 namespace Dali

diff --git a/dali/public-api/adaptor-framework/widget.cpp b/dali/public-api/adaptor-framework/widget.cpp
index bc8d070..d3c8426 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/public-api/adaptor-framework/widget-impl.h>
+#include <dali/internal/system/common/widget-impl.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/dali.h b/dali/public-api/dali.h
index c7ba45e..471e5fd 100644 (file)
--- a/dali/public-api/dali.h
+++ b/dali/public-api/dali.h
@@ -30,7 +30,6 @@
 #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 ae75497..9293dcf 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -7,7 +7,6 @@ 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
 
 
@@ -28,12 +27,11 @@ public_api_adaptor_framework_header_files = \
   $(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-impl.h
+  $(adaptor_public_api_dir)/adaptor-framework/widget-application.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
@@ -44,4 +42,4 @@ public_dali_watch_header_files = \
 
 public_dali_capture_header_files = \
   $(adaptor_public_api_dir)/capture/capture.h
-
+