dali-adaptor internal folder refactoring 39/191039/5
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Thu, 11 Oct 2018 01:20:13 +0000 (10:20 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 19 Oct 2018 01:47:23 +0000 (10:47 +0900)
- Refactoring dali-adaptor/dali/internal folders
- Changed and moved the files according to Platforms

Change-Id: Id072f154c6572630874035b75ae338ab44226555
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
57 files changed:
build/tizen/adaptor/Makefile.am
dali/devel-api/adaptor-framework/color-controller.cpp
dali/internal/accessibility/common/accessibility-adaptor-impl.cpp
dali/internal/accessibility/file.list
dali/internal/accessibility/tizen-wayland/tizen-common/accessibility-adaptor-impl-tizen.cpp [moved from dali/internal/accessibility/tizen-common/accessibility-adaptor-impl-tizen.cpp with 97% similarity]
dali/internal/accessibility/tizen-wayland/tizen-ivi/accessibility-adaptor-impl-ivi.cpp [moved from dali/internal/accessibility/tizen-ivi/accessibility-adaptor-impl-ivi.cpp with 98% similarity]
dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.cpp [moved from dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.cpp with 98% similarity]
dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h [moved from dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.h with 100% similarity]
dali/internal/accessibility/tizen-wayland/tizen-tv/accessibility-adaptor-impl-tv.cpp [moved from dali/internal/accessibility/tizen-tv/accessibility-adaptor-impl-tv.cpp with 97% similarity]
dali/internal/accessibility/tizen-wayland/tizen-wearable/accessibility-adaptor-impl-wearable.cpp [moved from dali/internal/accessibility/tizen-wearable/accessibility-adaptor-impl-wearable.cpp with 98% similarity]
dali/internal/accessibility/tizen-wayland/tts-player-factory-tizen.cpp [moved from dali/internal/accessibility/tizen/tts-player-factory-tizen.cpp with 92% similarity]
dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.cpp [moved from dali/internal/accessibility/tizen/tts-player-impl-tizen.cpp with 99% similarity]
dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.h [moved from dali/internal/accessibility/tizen/tts-player-impl-tizen.h with 100% similarity]
dali/internal/adaptor/file.list
dali/internal/adaptor/tizen-wayland/adaptor-impl-tizen.cpp [moved from dali/internal/adaptor/tizen/adaptor-impl-tizen.cpp with 100% similarity]
dali/internal/adaptor/tizen-wayland/framework-ecore-wl.cpp [deleted file]
dali/internal/adaptor/tizen-wayland/framework-tizen.cpp [moved from dali/internal/adaptor/tizen/framework-tizen.cpp with 99% similarity]
dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp [moved from dali/internal/adaptor/tizen-wearable/watch-application-impl.cpp with 97% similarity]
dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h [moved from dali/internal/adaptor/tizen-wearable/watch-application-impl.h with 100% similarity]
dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application.cpp [moved from dali/internal/adaptor/tizen-wearable/watch-application.cpp with 96% similarity]
dali/internal/graphics/file.list
dali/internal/graphics/ubuntu/egl-image-extensions-ubuntu.cpp [moved from dali/internal/graphics/ubuntu-gl/egl-image-extensions.cpp with 100% similarity]
dali/internal/input/common/long-press-gesture-detector.cpp
dali/internal/input/file.list
dali/internal/input/ubuntu-x11/key-mapping-x.cpp [moved from dali/internal/input/ubuntu/key-mapping-ubuntu.cpp with 100% similarity]
dali/internal/system/common/color-controller-impl.h [moved from dali/internal/system/generic/color-controller-impl.h with 100% similarity]
dali/internal/system/common/system-settings.h [moved from dali/internal/system/generic/system-settings.h with 100% similarity]
dali/internal/system/file.list
dali/internal/system/generic/color-controller-impl.cpp [deleted file]
dali/internal/system/generic/system-settings.cpp [deleted file]
dali/internal/system/linux/callback-manager-ecore.cpp [moved from dali/internal/system/common/callback-manager-ecore.cpp with 98% similarity]
dali/internal/system/linux/callback-manager-ecore.h [moved from dali/internal/system/common/callback-manager-ecore.h with 100% similarity]
dali/internal/system/linux/file-descriptor-monitor-ecore.cpp [moved from dali/internal/system/common/file-descriptor-monitor-ecore.cpp with 100% similarity]
dali/internal/system/linux/timer-impl-ecore.cpp [moved from dali/internal/system/common/timer-impl-ecore.cpp with 100% similarity]
dali/internal/system/tizen-ivi/system-settings-ivi.cpp [deleted file]
dali/internal/system/tizen-mobile/color-controller-impl-mobile.cpp [deleted file]
dali/internal/system/tizen-tv/color-controller-impl-tv.cpp [deleted file]
dali/internal/system/tizen-tv/system-settings-tv.cpp [deleted file]
dali/internal/system/tizen-wayland/color-controller-impl-tizen.cpp [moved from dali/internal/system/tizen-ivi/color-controller-impl-ivi.cpp with 94% similarity]
dali/internal/system/tizen-wayland/system-settings-tizen.cpp [moved from dali/internal/system/tizen-mobile/system-settings-mobile.cpp with 88% similarity]
dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp [moved from dali/internal/system/tizen/capture-impl-tizen.cpp with 98% similarity]
dali/internal/system/tizen-wayland/tizen-wearable/capture-impl.h [moved from dali/internal/system/tizen/capture-impl.h with 100% similarity]
dali/internal/system/tizen-wayland/tizen-wearable/capture.cpp [moved from dali/internal/system/tizen-wearable/capture.cpp with 93% similarity]
dali/internal/system/tizen-wayland/tizen-wearable/watch-time.cpp [moved from dali/internal/system/tizen-wearable/watch-time.cpp with 100% similarity]
dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp [moved from dali/internal/system/tizen/widget-application-impl-tizen.cpp with 97% similarity]
dali/internal/system/tizen-wayland/widget-application-impl-tizen.h [moved from dali/internal/system/tizen/widget-application-impl-tizen.h with 100% similarity]
dali/internal/system/tizen-wayland/widget-controller-tizen.cpp [moved from dali/internal/system/tizen/widget-controller-tizen.cpp with 91% similarity]
dali/internal/system/tizen-wayland/widget-controller-tizen.h [moved from dali/internal/system/tizen/widget-controller-tizen.h with 100% similarity]
dali/internal/system/tizen-wearable/color-controller-impl-wearable.cpp [deleted file]
dali/internal/system/tizen-wearable/system-settings-wearable.cpp [deleted file]
dali/internal/system/ubuntu-x11/color-controller-impl-x.cpp [moved from dali/internal/system/ubuntu/color-controller-impl-ubuntu.cpp with 90% similarity]
dali/internal/system/ubuntu-x11/system-settings-x.cpp
dali/internal/system/ubuntu-x11/widget-application-impl-x.cpp [moved from dali/internal/system/ubuntu/widget-application-impl-ubuntu.cpp with 93% similarity]
dali/internal/system/ubuntu-x11/widget-application-impl-x.h [moved from dali/internal/system/ubuntu/widget-application-impl-ubuntu.h with 95% similarity]
dali/internal/system/ubuntu-x11/widget-controller-x.cpp [moved from dali/internal/system/ubuntu/widget-controller-ubuntu.cpp with 88% similarity]
dali/internal/system/ubuntu-x11/widget-controller-x.h [moved from dali/internal/system/ubuntu/widget-controller-ubuntu.h with 100% similarity]
dali/internal/system/ubuntu/system-settings-ubuntu.cpp [deleted file]

index 5a6123e..7e472e0 100644 (file)
@@ -43,13 +43,11 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
                   $(adaptor_graphics_gles20_src_files) \
-                  $(adaptor_graphics_ubuntu_gl_src_files) \
                   $(adaptor_graphics_ubuntu_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
                   $(adaptor_imaging_ubuntu_x11_src_files) \
                   $(adaptor_input_common_src_files) \
-                  $(adaptor_input_ubuntu_src_files) \
                   $(adaptor_input_ubuntu_x11_src_files) \
                   $(adaptor_legacy_common_src_files) \
                   $(adaptor_network_common_src_files) \
@@ -58,7 +56,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_ubuntu_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_ubuntu_src_files) \
+                  $(adaptor_system_linux_src_files) \
                   $(adaptor_system_ubuntu_x11_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_text_ubuntu_src_files) \
@@ -89,10 +87,9 @@ endif
 if MOBILE_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_mobile_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
@@ -113,7 +110,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_tizen_mobile_src_files) \
+                  $(adaptor_system_linux_src_files) \
+                  $(adaptor_system_tizen_wayland_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
                   $(adaptor_video_common_src_files) \
@@ -151,10 +149,9 @@ endif
 if IVI_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_ivi_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
@@ -176,7 +173,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_tizen_ivi_src_files) \
+                  $(adaptor_system_linux_src_files) \
+                  $(adaptor_system_tizen_wayland_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
                   $(adaptor_video_common_src_files) \
@@ -214,10 +212,9 @@ endif
 if TV_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_tv_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
@@ -238,7 +235,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_tizen_tv_src_files) \
+                  $(adaptor_system_linux_src_files) \
+                  $(adaptor_system_tizen_wayland_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
                   $(adaptor_video_common_src_files) \
@@ -275,10 +273,9 @@ endif
 if COMMON_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_common_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_clipboard_common_src_files) \
                   $(adaptor_clipboard_tizen_wayland_src_files) \
@@ -299,7 +296,8 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
-                  $(adaptor_system_generic_src_files) \
+                  $(adaptor_system_linux_src_files) \
+                  $(adaptor_system_tizen_wayland_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
                   $(adaptor_video_common_src_files) \
@@ -338,10 +336,9 @@ endif
 if WEARABLE_PROFILE
 LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_accessibility_common_src_files) \
-                  $(adaptor_accessibility_tizen_src_files) \
+                  $(adaptor_accessibility_tizen_wayland_src_files) \
                   $(adaptor_accessibility_tizen_wearable_src_files) \
                   $(adaptor_adaptor_common_src_files) \
-                  $(adaptor_adaptor_tizen_src_files) \
                   $(adaptor_adaptor_tizen_wayland_src_files) \
                   $(adaptor_adaptor_tizen_wearable_src_files) \
                   $(adaptor_clipboard_common_src_files) \
@@ -363,6 +360,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(adaptor_sensor_tizen_src_files) \
                   $(adaptor_styling_common_src_files) \
                   $(adaptor_system_common_src_files) \
+                  $(adaptor_system_linux_src_files) \
                   $(adaptor_system_tizen_wearable_src_files) \
                   $(adaptor_text_common_src_files) \
                   $(adaptor_resampler_src_files) \
index 580435a..ee1f7df 100644 (file)
@@ -19,7 +19,7 @@
 #include <dali/devel-api/adaptor-framework/color-controller.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/generic/color-controller-impl.h>
+#include <dali/internal/system/common/color-controller-impl.h>
 
 namespace Dali
 {
index d6d7f3b..6c6cb95 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 #include <dali/integration-api/events/gesture-requests.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 namespace Dali
 {
index 8ccdb83..01fd0aa 100644 (file)
@@ -7,30 +7,30 @@ adaptor_accessibility_common_src_files=\
     ${adaptor_accessibility_dir}/common/accessibility-adaptor-impl.cpp \
     ${adaptor_accessibility_dir}/common/accessibility-gesture-detector.cpp
 
-# module: accessibility, backend: tizen
-adaptor_accessibility_tizen_src_files=\
-    ${adaptor_accessibility_dir}/tizen/tts-player-factory-tizen.cpp \
-    ${adaptor_accessibility_dir}/tizen/tts-player-impl-tizen.cpp
+# module: accessibility, backend: tizen-wayland
+adaptor_accessibility_tizen_wayland_src_files=\
+    ${adaptor_accessibility_dir}/tizen-wayland/tts-player-factory-tizen.cpp \
+    ${adaptor_accessibility_dir}/tizen-wayland/tts-player-impl-tizen.cpp
 
 # module: accessibility, backend: tizen-common profile
 adaptor_accessibility_tizen_common_src_files=\
-    ${adaptor_accessibility_dir}/tizen-common/accessibility-adaptor-impl-tizen.cpp
+    ${adaptor_accessibility_dir}/tizen-wayland/tizen-common/accessibility-adaptor-impl-tizen.cpp
 
 # module: accessibility, backend: tizen-ivi profile
 adaptor_accessibility_tizen_ivi_src_files=\
-    ${adaptor_accessibility_dir}/tizen-ivi/accessibility-adaptor-impl-ivi.cpp
+    ${adaptor_accessibility_dir}/tizen-wayland/tizen-ivi/accessibility-adaptor-impl-ivi.cpp
 
 # module: accessibility, backend: tizen-mobile profile
 adaptor_accessibility_tizen_mobile_src_files=\
-    ${adaptor_accessibility_dir}/tizen-mobile/accessibility-adaptor-impl-mobile.cpp
+    ${adaptor_accessibility_dir}/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.cpp
 
 # module: accessibility, backend: tizen-tv profile
 adaptor_accessibility_tizen_tv_src_files=\
-    ${adaptor_accessibility_dir}/tizen-tv/accessibility-adaptor-impl-tv.cpp
+    ${adaptor_accessibility_dir}/tizen-wayland/tizen-tv/accessibility-adaptor-impl-tv.cpp
 
 # module: accessibility, backend: tizen-wearable profile
 adaptor_accessibility_tizen_wearable_src_files=\
-    ${adaptor_accessibility_dir}/tizen-wearable/accessibility-adaptor-impl-wearable.cpp
+    ${adaptor_accessibility_dir}/tizen-wayland/tizen-wearable/accessibility-adaptor-impl-wearable.cpp
 
 # module: accessibility, backend: ubuntu
 adaptor_accessibility_ubuntu_src_files=\
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/singleton-service-impl.h>
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 namespace Dali
 {
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.h>
+#include <dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h>
 
 // EXTERNAL INCLUDES
 #include <vconf.h>
@@ -35,7 +35,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/singleton-service-impl.h>
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 #ifndef WAYLAND
 #define MSG_DOMAIN_CONTROL_ACCESS static_cast< int >( ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL )
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.h>
+#include <dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h>
 
 // EXTERNAL INCLUDES
 #include <vconf.h>
@@ -35,7 +35,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/singleton-service-impl.h>
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 #ifndef WAYLAND
 #define MSG_DOMAIN_CONTROL_ACCESS static_cast< int >( ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL )
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/singleton-service-impl.h>
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 namespace Dali
 {
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.h>
+#include <dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h>
 
 // EXTERNAL INCLUDES
 #include <vconf.h>
@@ -35,7 +35,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/singleton-service-impl.h>
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 #ifndef WAYLAND
 #define MSG_DOMAIN_CONTROL_ACCESS static_cast< int >( ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL )
@@ -16,7 +16,7 @@
  */
 
 #include <dali/internal/accessibility/common/tts-player-factory.h>
-#include <dali/internal/accessibility/tizen/tts-player-impl-tizen.h>
+#include <dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.h>
 
 namespace Dali
 {
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/accessibility/tizen/tts-player-impl-tizen.h>
+#include <dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.h>
 
 // EXTERNAL INCLUDES
 #include <tts.h>
index f1a6591..fa47a4b 100644 (file)
@@ -9,21 +9,18 @@ adaptor_adaptor_common_src_files=\
     ${adaptor_adaptor_dir}/common/application-impl.cpp \
     ${adaptor_adaptor_dir}/common/combined-update-render-controller.cpp
 
-# module: adaptor, backend: tizen
-adaptor_adaptor_tizen_src_files=\
-    ${adaptor_adaptor_dir}/tizen/adaptor-impl-tizen.cpp \
-    ${adaptor_adaptor_dir}/tizen/framework-tizen.cpp
+# module: adaptor, backend: tizen-wayland
+adaptor_adaptor_tizen_wayland_src_files=\
+    ${adaptor_adaptor_dir}/tizen-wayland/adaptor-impl-tizen.cpp \
+    ${adaptor_adaptor_dir}/tizen-wayland/framework-tizen.cpp
 
 # module: adaptor, backend: tizen-wearable
 adaptor_adaptor_tizen_wearable_src_files=\
-    ${adaptor_adaptor_dir}/tizen-wearable/watch-application.cpp \
-    ${adaptor_adaptor_dir}/tizen-wearable/watch-application-impl.cpp
+    ${adaptor_adaptor_dir}/tizen-wayland/tizen-wearable/watch-application.cpp \
+    ${adaptor_adaptor_dir}/tizen-wayland/tizen-wearable/watch-application-impl.cpp
 
 # module: adaptor, backend: ubuntu
 adaptor_adaptor_ubuntu_src_files=\
     ${adaptor_adaptor_dir}/ubuntu/adaptor-impl-ubuntu.cpp \
     ${adaptor_adaptor_dir}/ubuntu/framework-ubuntu.cpp
 
-# module: adaptor, backend: tizen-wayland
-adaptor_adaptor_tizen_wayland_src_files=\
-    ${adaptor_adaptor_dir}/tizen-wayland/framework-ecore-wl.cpp
\ No newline at end of file
diff --git a/dali/internal/adaptor/tizen-wayland/framework-ecore-wl.cpp b/dali/internal/adaptor/tizen-wayland/framework-ecore-wl.cpp
deleted file mode 100644 (file)
index c8ae72e..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/adaptor/common/framework.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-void Framework::InitThreads()
-{
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -833,6 +833,10 @@ void Framework::AbortCallback( )
   }
 }
 
+void Framework::InitThreads()
+{
+}
+
 void Framework::SetLanguage( const std::string& language )
 {
   mImpl->SetLanguage( language );
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/adaptor/tizen-wearable/watch-application-impl.h>
+#include <dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h>
 
 namespace Dali
 {
@@ -22,7 +22,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/adaptor/tizen-wearable/watch-application-impl.h>
+#include <dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h>
 
 namespace Dali
 {
index 0f7d9d6..1949b28 100644 (file)
@@ -15,10 +15,7 @@ adaptor_graphics_tizen_src_files=\
     ${adaptor_graphics_dir}/tizen/egl-image-extensions-tizen.cpp \
     ${adaptor_graphics_dir}/tizen/vsync-monitor-tizen.cpp
 
-# module: graphics, backend: ubuntu-gl
-adaptor_graphics_ubuntu_gl_src_files=\
-    ${adaptor_graphics_dir}/ubuntu-gl/egl-image-extensions.cpp
-
 # module: graphics, backend: ubuntu
 adaptor_graphics_ubuntu_src_files=\
-    ${adaptor_graphics_dir}/ubuntu/vsync-monitor-ubuntu.cpp
\ No newline at end of file
+    ${adaptor_graphics_dir}/ubuntu/egl-image-extensions-ubuntu.cpp \
+    ${adaptor_graphics_dir}/ubuntu/vsync-monitor-ubuntu.cpp
index c56ead3..4d0b028 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 #include <dali/integration-api/events/long-press-gesture-event.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/core-event-interface.h>
index 1d45842..705e8ff 100755 (executable)
@@ -23,12 +23,9 @@ adaptor_input_tizen_wayland_src_files=\
     ${adaptor_input_dir}/tizen-wayland/key-mapping-ecore-wl.cpp \
     ${adaptor_input_dir}/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
 
-# module: input, backend: ubuntu
-adaptor_input_ubuntu_src_files=\
-    ${adaptor_input_dir}/ubuntu/key-mapping-ubuntu.cpp
-
 # module: input, backend: ubuntu-x11
 adaptor_input_ubuntu_x11_src_files=\
     ${adaptor_input_dir}/ubuntu-x11/input-method-context-factory-x.cpp \
     ${adaptor_input_dir}/ubuntu-x11/input-method-context-impl-x.cpp \
+    ${adaptor_input_dir}/ubuntu-x11/key-mapping-x.cpp \
     ${adaptor_input_dir}/ubuntu-x11/virtual-keyboard-impl-x.cpp
index 1b9dbd2..62798c8 100644 (file)
@@ -27,59 +27,36 @@ adaptor_system_common_src_files=\
     ${adaptor_system_dir}/common/trigger-event-factory.cpp \
     ${adaptor_system_dir}/common/update-status-logger.cpp \
     ${adaptor_system_dir}/common/widget-application-impl.cpp \
-    ${adaptor_system_dir}/common/logging.cpp \
-    ${adaptor_system_dir}/common/callback-manager-ecore.cpp \
-    ${adaptor_system_dir}/common/file-descriptor-monitor-ecore.cpp \
-    ${adaptor_system_dir}/common/timer-impl-ecore.cpp
+    ${adaptor_system_dir}/common/logging.cpp
 
-# module: system, backend: generic
-adaptor_system_generic_src_files=\
-    ${adaptor_system_dir}/generic/color-controller-impl.cpp \
-    ${adaptor_system_dir}/generic/system-settings.cpp \
-    ${adaptor_system_dir}/tizen/widget-application-impl-tizen.cpp \
-    ${adaptor_system_dir}/tizen/widget-controller-tizen.cpp
+# module: system, backend: linux
+adaptor_system_linux_src_files=\
+    ${adaptor_system_dir}/linux/callback-manager-ecore.cpp \
+    ${adaptor_system_dir}/linux/file-descriptor-monitor-ecore.cpp \
+    ${adaptor_system_dir}/linux/timer-impl-ecore.cpp
 
-# module: system, backend: tizen-ivi
-adaptor_system_tizen_ivi_src_files=\
-    ${adaptor_system_dir}/tizen-ivi/color-controller-impl-ivi.cpp \
-    ${adaptor_system_dir}/tizen-ivi/system-settings-ivi.cpp \
-    ${adaptor_system_dir}/tizen/widget-application-impl-tizen.cpp \
-    ${adaptor_system_dir}/tizen/widget-controller-tizen.cpp
-
-# module: system, backend: tizen-mobile
-adaptor_system_tizen_mobile_src_files=\
-    ${adaptor_system_dir}/tizen-mobile/color-controller-impl-mobile.cpp \
-    ${adaptor_system_dir}/tizen-mobile/system-settings-mobile.cpp \
-    ${adaptor_system_dir}/tizen/widget-application-impl-tizen.cpp \
-    ${adaptor_system_dir}/tizen/widget-controller-tizen.cpp
-
-# module: system, backend: tizen-tv
-adaptor_system_tizen_tv_src_files=\
-    ${adaptor_system_dir}/tizen-tv/color-controller-impl-tv.cpp \
-    ${adaptor_system_dir}/tizen-tv/system-settings-tv.cpp \
-    ${adaptor_system_dir}/tizen/widget-application-impl-tizen.cpp \
-    ${adaptor_system_dir}/tizen/widget-controller-tizen.cpp
+# module: system, backend: tizen-wayland
+adaptor_system_tizen_wayland_src_files=\
+    ${adaptor_system_dir}/tizen-wayland/color-controller-impl-tizen.cpp \
+    ${adaptor_system_dir}/tizen-wayland/system-settings-tizen.cpp \
+    ${adaptor_system_dir}/tizen-wayland/widget-application-impl-tizen.cpp \
+    ${adaptor_system_dir}/tizen-wayland/widget-controller-tizen.cpp
 
 # module: system, backend: tizen-wearable
 adaptor_system_tizen_wearable_src_files=\
-    ${adaptor_system_dir}/tizen-wearable/color-controller-impl-wearable.cpp \
-    ${adaptor_system_dir}/tizen-wearable/system-settings-wearable.cpp \
-    ${adaptor_system_dir}/tizen-wearable/watch-time.cpp \
-    ${adaptor_system_dir}/tizen-wearable/capture.cpp \
-    ${adaptor_system_dir}/tizen/widget-application-impl-tizen.cpp \
-    ${adaptor_system_dir}/tizen/widget-controller-tizen.cpp \
-    ${adaptor_system_dir}/tizen/capture-impl-tizen.cpp
+    ${adaptor_system_dir}/tizen-wayland/tizen-wearable/capture.cpp \
+    ${adaptor_system_dir}/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp \
+    ${adaptor_system_dir}/tizen-wayland/tizen-wearable/watch-time.cpp \
+    ${adaptor_system_dir}/tizen-wayland/color-controller-impl-tizen.cpp \
+    ${adaptor_system_dir}/tizen-wayland/system-settings-tizen.cpp \
+    ${adaptor_system_dir}/tizen-wayland/widget-application-impl-tizen.cpp \
+    ${adaptor_system_dir}/tizen-wayland/widget-controller-tizen.cpp
 
 
-# module: system, backend: ubuntu
-adaptor_system_ubuntu_src_files=\
-    ${adaptor_system_dir}/ubuntu/color-controller-impl-ubuntu.cpp \
-    ${adaptor_system_dir}/ubuntu/system-settings-ubuntu.cpp \
-    ${adaptor_system_dir}/ubuntu/widget-application-impl-ubuntu.cpp \
-    ${adaptor_system_dir}/ubuntu/widget-controller-ubuntu.cpp
-
 # module: system, backend: ubuntu-x11
 adaptor_system_ubuntu_x11_src_files=\
-    ${adaptor_system_dir}/ubuntu-x11/system-settings-x.cpp
-
+    ${adaptor_system_dir}/ubuntu-x11/color-controller-impl-x.cpp \
+    ${adaptor_system_dir}/ubuntu-x11/system-settings-x.cpp \
+    ${adaptor_system_dir}/ubuntu-x11/widget-application-impl-x.cpp \
+    ${adaptor_system_dir}/ubuntu-x11/widget-controller-x.cpp
 
diff --git a/dali/internal/system/generic/color-controller-impl.cpp b/dali/internal/system/generic/color-controller-impl.cpp
deleted file mode 100644 (file)
index 467a526..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/system/generic/color-controller-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-Dali::ColorController ColorController::Get()
-{
-  return Dali::ColorController( new ColorController() );
-}
-
-ColorController::ColorController()
-{
-}
-
-ColorController::~ColorController()
-{
-}
-
-bool ColorController::RetrieveColor( const std::string& colorCode, Vector4& colorValue )
-{
-  return false;
-}
-
-bool ColorController::RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor)
-{
-  return false;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/system/generic/system-settings.cpp b/dali/internal/system/generic/system-settings.cpp
deleted file mode 100644 (file)
index 046a538..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/system/generic/system-settings.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-int GetLongPressTime( int defaultTime )
-{
-  return defaultTime;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/system/common/callback-manager-ecore.h>
+#include <dali/internal/system/linux/callback-manager-ecore.h>
 
 // EXTERNAL INCLUDES
 // Ecore is littered with C style cast
diff --git a/dali/internal/system/tizen-ivi/system-settings-ivi.cpp b/dali/internal/system/tizen-ivi/system-settings-ivi.cpp
deleted file mode 100644 (file)
index fce3d50..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <system_settings.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/system/generic/system-settings.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-int GetLongPressTime( int defaultTime )
-{
-  return defaultTime;
-}
-
-int GetElmAccessActionOver()
-{
-  return 0;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/system/tizen-mobile/color-controller-impl-mobile.cpp b/dali/internal/system/tizen-mobile/color-controller-impl-mobile.cpp
deleted file mode 100644 (file)
index 8b8e98e..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/system/generic/color-controller-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/object/type-registry.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/system/common/singleton-service-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-Dali::ColorController ColorController::Get()
-{
-  Dali::ColorController colorController;
-
-  Dali::SingletonService service( SingletonService::Get() );
-  if ( service )
-  {
-    // Check whether the singleton is already created
-    Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::ColorController ) );
-    if(handle)
-    {
-      // If so, downcast the handle
-      colorController = Dali::ColorController( dynamic_cast< ColorController* >( handle.GetObjectPtr() ) );
-    }
-    else
-    {
-      colorController = Dali::ColorController( new ColorController( ) );
-      service.Register( typeid( colorController ), colorController );
-    }
-  }
-
-  return colorController;
-
-}
-
-ColorController::ColorController()
-{
-}
-
-ColorController::~ColorController()
-{
-}
-
-bool ColorController::RetrieveColor( const std::string& colorCode, Vector4& colorValue )
-{
-  return false;
-}
-
-bool ColorController::RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor)
-{
-  return false;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/system/tizen-tv/color-controller-impl-tv.cpp b/dali/internal/system/tizen-tv/color-controller-impl-tv.cpp
deleted file mode 100644 (file)
index 1fb8cb1..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/system/generic/color-controller-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-Dali::ColorController ColorController::Get()
-{
-  Dali::ColorController colorController;
-  return colorController;
-}
-
-ColorController::ColorController()
-{
-}
-
-ColorController::~ColorController()
-{
-}
-
-bool ColorController::RetrieveColor( const std::string& colorCode, Vector4& colorValue )
-{
-  return false;
-}
-
-bool ColorController::RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor)
-{
-  return false;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/system/tizen-tv/system-settings-tv.cpp b/dali/internal/system/tizen-tv/system-settings-tv.cpp
deleted file mode 100644 (file)
index a518503..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-int GetLongPressTime( int defaultTime )
-{
-  return defaultTime;
-}
-
-int GetElmAccessActionOver()
-{
-  return 0;
-}
-
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/system/generic/color-controller-impl.h>
+#include <dali/internal/system/common/color-controller-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #include <system_settings.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 namespace Dali
 {
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/system/tizen/capture-impl.h>
+#include <dali/internal/system/tizen-wayland/tizen-wearable/capture-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #include <dali/public-api/capture/capture.h>
 
 // INTERNAL HEADER
-#include <dali/internal/system/tizen/capture-impl.h>
+#include <dali/internal/system/tizen-wayland/tizen-wearable/capture-impl.h>
 
 namespace Dali
 {
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  */
 
 // CLASS HEADER
-#include <dali/internal/system/tizen/widget-application-impl-tizen.h>
+#include <dali/internal/system/tizen-wayland/widget-application-impl-tizen.h>
 
 // INTERNAL INCLUDE
 #include <dali/public-api/adaptor-framework/widget.h>
 #include <dali/public-api/adaptor-framework/widget-impl.h>
-#include <dali/internal/system/tizen/widget-controller-tizen.h>
+#include <dali/internal/system/tizen-wayland/widget-controller-tizen.h>
 
 #ifdef WIDGET_SUPPOERTED
 #include <bundle.h>
@@ -309,4 +309,3 @@ Dali::Internal::Adaptor::WidgetApplicationPtr Create( int* argc, char **argv[],
 } // namespace Internal
 
 } // namespace Dali
-
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/system/tizen/widget-controller-tizen.h>
+#include <dali/internal/system/tizen-wayland/widget-controller-tizen.h>
 
 // EXTERNAL INCLUDES
 #include <bundle.h>
diff --git a/dali/internal/system/tizen-wearable/color-controller-impl-wearable.cpp b/dali/internal/system/tizen-wearable/color-controller-impl-wearable.cpp
deleted file mode 100644 (file)
index 8b8e98e..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/system/generic/color-controller-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/object/type-registry.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/system/common/singleton-service-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-Dali::ColorController ColorController::Get()
-{
-  Dali::ColorController colorController;
-
-  Dali::SingletonService service( SingletonService::Get() );
-  if ( service )
-  {
-    // Check whether the singleton is already created
-    Dali::BaseHandle handle = service.GetSingleton( typeid( Dali::ColorController ) );
-    if(handle)
-    {
-      // If so, downcast the handle
-      colorController = Dali::ColorController( dynamic_cast< ColorController* >( handle.GetObjectPtr() ) );
-    }
-    else
-    {
-      colorController = Dali::ColorController( new ColorController( ) );
-      service.Register( typeid( colorController ), colorController );
-    }
-  }
-
-  return colorController;
-
-}
-
-ColorController::ColorController()
-{
-}
-
-ColorController::~ColorController()
-{
-}
-
-bool ColorController::RetrieveColor( const std::string& colorCode, Vector4& colorValue )
-{
-  return false;
-}
-
-bool ColorController::RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor)
-{
-  return false;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
diff --git a/dali/internal/system/tizen-wearable/system-settings-wearable.cpp b/dali/internal/system/tizen-wearable/system-settings-wearable.cpp
deleted file mode 100644 (file)
index fce3d50..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <system_settings.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/system/generic/system-settings.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-int GetLongPressTime( int defaultTime )
-{
-  return defaultTime;
-}
-
-int GetElmAccessActionOver()
-{
-  return 0;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/system/generic/color-controller-impl.h>
+#include <dali/internal/system/common/color-controller-impl.h>
 
 namespace Dali
 {
index 547c511..2e612e1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <Elementary.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/generic/system-settings.h>
+#include <dali/internal/system/common/system-settings.h>
 
 namespace Dali
 {
@@ -43,6 +43,11 @@ int GetElmAccessActionOver()
 #endif // DALI_PROFILE_UBUNTU
 }
 
+int GetLongPressTime( int defaultTime )
+{
+  return defaultTime;
+}
+
 } // namespace Adaptor
 
 } // namespace Internal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/system/ubuntu/widget-application-impl-ubuntu.h>
+#include <dali/internal/system/ubuntu-x11/widget-application-impl-x.h>
 #include <dali/integration-api/debug.h>
 
 namespace Dali
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_WIDGET_APPLICATION_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/adaptor/common/application-impl.h>
-#include <dali/internal/system/common//widget-application-impl.h>
+#include <dali/internal/system/common/widget-application-impl.h>
 #include <dali/public-api/adaptor-framework/widget-application.h>
 
 namespace Dali
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/system/ubuntu/widget-controller-ubuntu.h>
+#include <dali/internal/system/ubuntu-x11/widget-controller-x.h>
 
 namespace Dali
 {
diff --git a/dali/internal/system/ubuntu/system-settings-ubuntu.cpp b/dali/internal/system/ubuntu/system-settings-ubuntu.cpp
deleted file mode 100644 (file)
index 046a538..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/internal/system/generic/system-settings.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
-
-int GetLongPressTime( int defaultTime )
-{
-  return defaultTime;
-}
-
-} // namespace Adaptor
-
-} // namespace Internal
-
-} // namespace Dali