From 895b73b91ff5845b16074083d0ae3f61782e7603 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Thu, 11 Oct 2018 10:20:13 +0900 Subject: [PATCH] dali-adaptor internal folder refactoring - Refactoring dali-adaptor/dali/internal folders - Changed and moved the files according to Platforms Change-Id: Id072f154c6572630874035b75ae338ab44226555 Signed-off-by: Seoyeon Kim --- build/tizen/adaptor/Makefile.am | 32 ++++----- .../adaptor-framework/color-controller.cpp | 2 +- .../common/accessibility-adaptor-impl.cpp | 4 +- dali/internal/accessibility/file.list | 18 ++--- .../accessibility-adaptor-impl-tizen.cpp | 4 +- .../tizen-ivi/accessibility-adaptor-impl-ivi.cpp | 6 +- .../accessibility-adaptor-impl-mobile.cpp | 6 +- .../accessibility-adaptor-impl-mobile.h | 0 .../tizen-tv/accessibility-adaptor-impl-tv.cpp | 4 +- .../accessibility-adaptor-impl-wearable.cpp | 6 +- .../tts-player-factory-tizen.cpp | 2 +- .../tts-player-impl-tizen.cpp | 2 +- .../tts-player-impl-tizen.h | 0 dali/internal/adaptor/file.list | 15 ++-- .../adaptor-impl-tizen.cpp | 0 .../adaptor/tizen-wayland/framework-ecore-wl.cpp | 38 ---------- .../{tizen => tizen-wayland}/framework-tizen.cpp | 6 +- .../tizen-wearable/watch-application-impl.cpp | 2 +- .../tizen-wearable/watch-application-impl.h | 0 .../tizen-wearable/watch-application.cpp | 2 +- dali/internal/graphics/file.list | 7 +- .../egl-image-extensions-ubuntu.cpp} | 0 .../input/common/long-press-gesture-detector.cpp | 4 +- dali/internal/input/file.list | 5 +- .../key-mapping-x.cpp} | 0 .../{generic => common}/color-controller-impl.h | 0 .../system/{generic => common}/system-settings.h | 0 dali/internal/system/file.list | 69 ++++++------------ .../system/generic/color-controller-impl.cpp | 57 --------------- dali/internal/system/generic/system-settings.cpp | 39 ---------- .../{common => linux}/callback-manager-ecore.cpp | 2 +- .../{common => linux}/callback-manager-ecore.h | 0 .../file-descriptor-monitor-ecore.cpp | 0 .../system/{common => linux}/timer-impl-ecore.cpp | 0 .../system/tizen-ivi/system-settings-ivi.cpp | 47 ------------ .../tizen-mobile/color-controller-impl-mobile.cpp | 84 ---------------------- .../system/tizen-tv/color-controller-impl-tv.cpp | 58 --------------- .../system/tizen-tv/system-settings-tv.cpp | 43 ----------- .../color-controller-impl-tizen.cpp} | 4 +- .../system-settings-tizen.cpp} | 4 +- .../tizen-wearable}/capture-impl-tizen.cpp | 4 +- .../tizen-wearable}/capture-impl.h | 0 .../{ => tizen-wayland}/tizen-wearable/capture.cpp | 4 +- .../tizen-wearable/watch-time.cpp | 0 .../widget-application-impl-tizen.cpp | 7 +- .../widget-application-impl-tizen.h | 0 .../widget-controller-tizen.cpp | 4 +- .../widget-controller-tizen.h | 0 .../color-controller-impl-wearable.cpp | 84 ---------------------- .../tizen-wearable/system-settings-wearable.cpp | 47 ------------ .../color-controller-impl-x.cpp} | 4 +- .../system/ubuntu-x11/system-settings-x.cpp | 9 ++- .../widget-application-impl-x.cpp} | 4 +- .../widget-application-impl-x.h} | 4 +- .../widget-controller-x.cpp} | 4 +- .../widget-controller-x.h} | 0 .../system/ubuntu/system-settings-ubuntu.cpp | 39 ---------- 57 files changed, 112 insertions(+), 674 deletions(-) rename dali/internal/accessibility/{ => tizen-wayland}/tizen-common/accessibility-adaptor-impl-tizen.cpp (97%) rename dali/internal/accessibility/{ => tizen-wayland}/tizen-ivi/accessibility-adaptor-impl-ivi.cpp (98%) rename dali/internal/accessibility/{ => tizen-wayland}/tizen-mobile/accessibility-adaptor-impl-mobile.cpp (98%) rename dali/internal/accessibility/{ => tizen-wayland}/tizen-mobile/accessibility-adaptor-impl-mobile.h (100%) rename dali/internal/accessibility/{ => tizen-wayland}/tizen-tv/accessibility-adaptor-impl-tv.cpp (97%) rename dali/internal/accessibility/{ => tizen-wayland}/tizen-wearable/accessibility-adaptor-impl-wearable.cpp (98%) rename dali/internal/accessibility/{tizen => tizen-wayland}/tts-player-factory-tizen.cpp (92%) rename dali/internal/accessibility/{tizen => tizen-wayland}/tts-player-impl-tizen.cpp (99%) rename dali/internal/accessibility/{tizen => tizen-wayland}/tts-player-impl-tizen.h (100%) rename dali/internal/adaptor/{tizen => tizen-wayland}/adaptor-impl-tizen.cpp (100%) delete mode 100644 dali/internal/adaptor/tizen-wayland/framework-ecore-wl.cpp rename dali/internal/adaptor/{tizen => tizen-wayland}/framework-tizen.cpp (99%) rename dali/internal/adaptor/{ => tizen-wayland}/tizen-wearable/watch-application-impl.cpp (97%) rename dali/internal/adaptor/{ => tizen-wayland}/tizen-wearable/watch-application-impl.h (100%) rename dali/internal/adaptor/{ => tizen-wayland}/tizen-wearable/watch-application.cpp (96%) rename dali/internal/graphics/{ubuntu-gl/egl-image-extensions.cpp => ubuntu/egl-image-extensions-ubuntu.cpp} (100%) rename dali/internal/input/{ubuntu/key-mapping-ubuntu.cpp => ubuntu-x11/key-mapping-x.cpp} (100%) rename dali/internal/system/{generic => common}/color-controller-impl.h (100%) rename dali/internal/system/{generic => common}/system-settings.h (100%) delete mode 100644 dali/internal/system/generic/color-controller-impl.cpp delete mode 100644 dali/internal/system/generic/system-settings.cpp rename dali/internal/system/{common => linux}/callback-manager-ecore.cpp (98%) rename dali/internal/system/{common => linux}/callback-manager-ecore.h (100%) rename dali/internal/system/{common => linux}/file-descriptor-monitor-ecore.cpp (100%) rename dali/internal/system/{common => linux}/timer-impl-ecore.cpp (100%) delete mode 100644 dali/internal/system/tizen-ivi/system-settings-ivi.cpp delete mode 100644 dali/internal/system/tizen-mobile/color-controller-impl-mobile.cpp delete mode 100644 dali/internal/system/tizen-tv/color-controller-impl-tv.cpp delete mode 100644 dali/internal/system/tizen-tv/system-settings-tv.cpp rename dali/internal/system/{tizen-ivi/color-controller-impl-ivi.cpp => tizen-wayland/color-controller-impl-tizen.cpp} (94%) rename dali/internal/system/{tizen-mobile/system-settings-mobile.cpp => tizen-wayland/system-settings-tizen.cpp} (88%) rename dali/internal/system/{tizen => tizen-wayland/tizen-wearable}/capture-impl-tizen.cpp (98%) rename dali/internal/system/{tizen => tizen-wayland/tizen-wearable}/capture-impl.h (100%) rename dali/internal/system/{ => tizen-wayland}/tizen-wearable/capture.cpp (93%) rename dali/internal/system/{ => tizen-wayland}/tizen-wearable/watch-time.cpp (100%) rename dali/internal/system/{tizen => tizen-wayland}/widget-application-impl-tizen.cpp (97%) rename dali/internal/system/{tizen => tizen-wayland}/widget-application-impl-tizen.h (100%) rename dali/internal/system/{tizen => tizen-wayland}/widget-controller-tizen.cpp (91%) rename dali/internal/system/{tizen => tizen-wayland}/widget-controller-tizen.h (100%) delete mode 100644 dali/internal/system/tizen-wearable/color-controller-impl-wearable.cpp delete mode 100644 dali/internal/system/tizen-wearable/system-settings-wearable.cpp rename dali/internal/system/{ubuntu/color-controller-impl-ubuntu.cpp => ubuntu-x11/color-controller-impl-x.cpp} (90%) rename dali/internal/system/{ubuntu/widget-application-impl-ubuntu.cpp => ubuntu-x11/widget-application-impl-x.cpp} (93%) rename dali/internal/system/{ubuntu/widget-application-impl-ubuntu.h => ubuntu-x11/widget-application-impl-x.h} (95%) rename dali/internal/system/{ubuntu/widget-controller-ubuntu.cpp => ubuntu-x11/widget-controller-x.cpp} (88%) rename dali/internal/system/{ubuntu/widget-controller-ubuntu.h => ubuntu-x11/widget-controller-x.h} (100%) delete mode 100644 dali/internal/system/ubuntu/system-settings-ubuntu.cpp diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index 5a6123e..7e472e0 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -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) \ diff --git a/dali/devel-api/adaptor-framework/color-controller.cpp b/dali/devel-api/adaptor-framework/color-controller.cpp index 580435a..ee1f7df 100644 --- a/dali/devel-api/adaptor-framework/color-controller.cpp +++ b/dali/devel-api/adaptor-framework/color-controller.cpp @@ -19,7 +19,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp index d6d7f3b..6c6cb95 100644 --- a/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp +++ b/dali/internal/accessibility/common/accessibility-adaptor-impl.cpp @@ -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 // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali/internal/accessibility/file.list b/dali/internal/accessibility/file.list index 8ccdb83..01fd0aa 100644 --- a/dali/internal/accessibility/file.list +++ b/dali/internal/accessibility/file.list @@ -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=\ diff --git a/dali/internal/accessibility/tizen-common/accessibility-adaptor-impl-tizen.cpp b/dali/internal/accessibility/tizen-wayland/tizen-common/accessibility-adaptor-impl-tizen.cpp similarity index 97% rename from dali/internal/accessibility/tizen-common/accessibility-adaptor-impl-tizen.cpp rename to dali/internal/accessibility/tizen-wayland/tizen-common/accessibility-adaptor-impl-tizen.cpp index e61c134..18d57df 100644 --- a/dali/internal/accessibility/tizen-common/accessibility-adaptor-impl-tizen.cpp +++ b/dali/internal/accessibility/tizen-wayland/tizen-common/accessibility-adaptor-impl-tizen.cpp @@ -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 -#include +#include namespace Dali { diff --git a/dali/internal/accessibility/tizen-ivi/accessibility-adaptor-impl-ivi.cpp b/dali/internal/accessibility/tizen-wayland/tizen-ivi/accessibility-adaptor-impl-ivi.cpp similarity index 98% rename from dali/internal/accessibility/tizen-ivi/accessibility-adaptor-impl-ivi.cpp rename to dali/internal/accessibility/tizen-wayland/tizen-ivi/accessibility-adaptor-impl-ivi.cpp index 24ed5e8..e4d56a6 100644 --- a/dali/internal/accessibility/tizen-ivi/accessibility-adaptor-impl-ivi.cpp +++ b/dali/internal/accessibility/tizen-wayland/tizen-ivi/accessibility-adaptor-impl-ivi.cpp @@ -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 +#include // EXTERNAL INCLUDES #include @@ -35,7 +35,7 @@ // INTERNAL INCLUDES #include -#include +#include #ifndef WAYLAND #define MSG_DOMAIN_CONTROL_ACCESS static_cast< int >( ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL ) diff --git a/dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.cpp b/dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.cpp similarity index 98% rename from dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.cpp rename to dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.cpp index 24ed5e8..e4d56a6 100644 --- a/dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.cpp +++ b/dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.cpp @@ -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 +#include // EXTERNAL INCLUDES #include @@ -35,7 +35,7 @@ // INTERNAL INCLUDES #include -#include +#include #ifndef WAYLAND #define MSG_DOMAIN_CONTROL_ACCESS static_cast< int >( ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL ) diff --git a/dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.h b/dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h similarity index 100% rename from dali/internal/accessibility/tizen-mobile/accessibility-adaptor-impl-mobile.h rename to dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h diff --git a/dali/internal/accessibility/tizen-tv/accessibility-adaptor-impl-tv.cpp b/dali/internal/accessibility/tizen-wayland/tizen-tv/accessibility-adaptor-impl-tv.cpp similarity index 97% rename from dali/internal/accessibility/tizen-tv/accessibility-adaptor-impl-tv.cpp rename to dali/internal/accessibility/tizen-wayland/tizen-tv/accessibility-adaptor-impl-tv.cpp index e61c134..18d57df 100644 --- a/dali/internal/accessibility/tizen-tv/accessibility-adaptor-impl-tv.cpp +++ b/dali/internal/accessibility/tizen-wayland/tizen-tv/accessibility-adaptor-impl-tv.cpp @@ -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 -#include +#include namespace Dali { diff --git a/dali/internal/accessibility/tizen-wearable/accessibility-adaptor-impl-wearable.cpp b/dali/internal/accessibility/tizen-wayland/tizen-wearable/accessibility-adaptor-impl-wearable.cpp similarity index 98% rename from dali/internal/accessibility/tizen-wearable/accessibility-adaptor-impl-wearable.cpp rename to dali/internal/accessibility/tizen-wayland/tizen-wearable/accessibility-adaptor-impl-wearable.cpp index 24ed5e8..e4d56a6 100644 --- a/dali/internal/accessibility/tizen-wearable/accessibility-adaptor-impl-wearable.cpp +++ b/dali/internal/accessibility/tizen-wayland/tizen-wearable/accessibility-adaptor-impl-wearable.cpp @@ -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 +#include // EXTERNAL INCLUDES #include @@ -35,7 +35,7 @@ // INTERNAL INCLUDES #include -#include +#include #ifndef WAYLAND #define MSG_DOMAIN_CONTROL_ACCESS static_cast< int >( ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL ) diff --git a/dali/internal/accessibility/tizen/tts-player-factory-tizen.cpp b/dali/internal/accessibility/tizen-wayland/tts-player-factory-tizen.cpp similarity index 92% rename from dali/internal/accessibility/tizen/tts-player-factory-tizen.cpp rename to dali/internal/accessibility/tizen-wayland/tts-player-factory-tizen.cpp index 22d3404..6287f4d 100644 --- a/dali/internal/accessibility/tizen/tts-player-factory-tizen.cpp +++ b/dali/internal/accessibility/tizen-wayland/tts-player-factory-tizen.cpp @@ -16,7 +16,7 @@ */ #include -#include +#include namespace Dali { diff --git a/dali/internal/accessibility/tizen/tts-player-impl-tizen.cpp b/dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.cpp similarity index 99% rename from dali/internal/accessibility/tizen/tts-player-impl-tizen.cpp rename to dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.cpp index ccb8a17..b18a74e 100644 --- a/dali/internal/accessibility/tizen/tts-player-impl-tizen.cpp +++ b/dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES #include diff --git a/dali/internal/accessibility/tizen/tts-player-impl-tizen.h b/dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.h similarity index 100% rename from dali/internal/accessibility/tizen/tts-player-impl-tizen.h rename to dali/internal/accessibility/tizen-wayland/tts-player-impl-tizen.h diff --git a/dali/internal/adaptor/file.list b/dali/internal/adaptor/file.list index f1a6591..fa47a4b 100644 --- a/dali/internal/adaptor/file.list +++ b/dali/internal/adaptor/file.list @@ -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/adaptor-impl-tizen.cpp b/dali/internal/adaptor/tizen-wayland/adaptor-impl-tizen.cpp similarity index 100% rename from dali/internal/adaptor/tizen/adaptor-impl-tizen.cpp rename to dali/internal/adaptor/tizen-wayland/adaptor-impl-tizen.cpp 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 index c8ae72e..0000000 --- a/dali/internal/adaptor/tizen-wayland/framework-ecore-wl.cpp +++ /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 - -namespace Dali -{ - -namespace Internal -{ - -namespace Adaptor -{ - -void Framework::InitThreads() -{ -} - -} // namespace Adaptor - -} // namespace Internal - -} // namespace Dali diff --git a/dali/internal/adaptor/tizen/framework-tizen.cpp b/dali/internal/adaptor/tizen-wayland/framework-tizen.cpp similarity index 99% rename from dali/internal/adaptor/tizen/framework-tizen.cpp rename to dali/internal/adaptor/tizen-wayland/framework-tizen.cpp index 4c7e03b..925db04 100644 --- a/dali/internal/adaptor/tizen/framework-tizen.cpp +++ b/dali/internal/adaptor/tizen-wayland/framework-tizen.cpp @@ -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 ); diff --git a/dali/internal/adaptor/tizen-wearable/watch-application-impl.cpp b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp similarity index 97% rename from dali/internal/adaptor/tizen-wearable/watch-application-impl.cpp rename to dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp index 468ec98..0ed2068 100644 --- a/dali/internal/adaptor/tizen-wearable/watch-application-impl.cpp +++ b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include namespace Dali { diff --git a/dali/internal/adaptor/tizen-wearable/watch-application-impl.h b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h similarity index 100% rename from dali/internal/adaptor/tizen-wearable/watch-application-impl.h rename to dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h diff --git a/dali/internal/adaptor/tizen-wearable/watch-application.cpp b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application.cpp similarity index 96% rename from dali/internal/adaptor/tizen-wearable/watch-application.cpp rename to dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application.cpp index 4ae6f95..fd5e8a0 100644 --- a/dali/internal/adaptor/tizen-wearable/watch-application.cpp +++ b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application.cpp @@ -22,7 +22,7 @@ #include // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali/internal/graphics/file.list b/dali/internal/graphics/file.list index 0f7d9d6..1949b28 100644 --- a/dali/internal/graphics/file.list +++ b/dali/internal/graphics/file.list @@ -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 diff --git a/dali/internal/graphics/ubuntu-gl/egl-image-extensions.cpp b/dali/internal/graphics/ubuntu/egl-image-extensions-ubuntu.cpp similarity index 100% rename from dali/internal/graphics/ubuntu-gl/egl-image-extensions.cpp rename to dali/internal/graphics/ubuntu/egl-image-extensions-ubuntu.cpp diff --git a/dali/internal/input/common/long-press-gesture-detector.cpp b/dali/internal/input/common/long-press-gesture-detector.cpp index c56ead3..4d0b028 100644 --- a/dali/internal/input/common/long-press-gesture-detector.cpp +++ b/dali/internal/input/common/long-press-gesture-detector.cpp @@ -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 #include -#include +#include // INTERNAL INCLUDES #include diff --git a/dali/internal/input/file.list b/dali/internal/input/file.list index 1d45842..705e8ff 100755 --- a/dali/internal/input/file.list +++ b/dali/internal/input/file.list @@ -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 diff --git a/dali/internal/input/ubuntu/key-mapping-ubuntu.cpp b/dali/internal/input/ubuntu-x11/key-mapping-x.cpp similarity index 100% rename from dali/internal/input/ubuntu/key-mapping-ubuntu.cpp rename to dali/internal/input/ubuntu-x11/key-mapping-x.cpp diff --git a/dali/internal/system/generic/color-controller-impl.h b/dali/internal/system/common/color-controller-impl.h similarity index 100% rename from dali/internal/system/generic/color-controller-impl.h rename to dali/internal/system/common/color-controller-impl.h diff --git a/dali/internal/system/generic/system-settings.h b/dali/internal/system/common/system-settings.h similarity index 100% rename from dali/internal/system/generic/system-settings.h rename to dali/internal/system/common/system-settings.h diff --git a/dali/internal/system/file.list b/dali/internal/system/file.list index 1b9dbd2..62798c8 100644 --- a/dali/internal/system/file.list +++ b/dali/internal/system/file.list @@ -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 index 467a526..0000000 --- a/dali/internal/system/generic/color-controller-impl.cpp +++ /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 - -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 index 046a538..0000000 --- a/dali/internal/system/generic/system-settings.cpp +++ /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 - -namespace Dali -{ - -namespace Internal -{ - -namespace Adaptor -{ - -int GetLongPressTime( int defaultTime ) -{ - return defaultTime; -} - -} // namespace Adaptor - -} // namespace Internal - -} // namespace Dali diff --git a/dali/internal/system/common/callback-manager-ecore.cpp b/dali/internal/system/linux/callback-manager-ecore.cpp similarity index 98% rename from dali/internal/system/common/callback-manager-ecore.cpp rename to dali/internal/system/linux/callback-manager-ecore.cpp index d04118d..fb46fb2 100644 --- a/dali/internal/system/common/callback-manager-ecore.cpp +++ b/dali/internal/system/linux/callback-manager-ecore.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // EXTERNAL INCLUDES // Ecore is littered with C style cast diff --git a/dali/internal/system/common/callback-manager-ecore.h b/dali/internal/system/linux/callback-manager-ecore.h similarity index 100% rename from dali/internal/system/common/callback-manager-ecore.h rename to dali/internal/system/linux/callback-manager-ecore.h diff --git a/dali/internal/system/common/file-descriptor-monitor-ecore.cpp b/dali/internal/system/linux/file-descriptor-monitor-ecore.cpp similarity index 100% rename from dali/internal/system/common/file-descriptor-monitor-ecore.cpp rename to dali/internal/system/linux/file-descriptor-monitor-ecore.cpp diff --git a/dali/internal/system/common/timer-impl-ecore.cpp b/dali/internal/system/linux/timer-impl-ecore.cpp similarity index 100% rename from dali/internal/system/common/timer-impl-ecore.cpp rename to dali/internal/system/linux/timer-impl-ecore.cpp 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 index fce3d50..0000000 --- a/dali/internal/system/tizen-ivi/system-settings-ivi.cpp +++ /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 - -// INTERNAL INCLUDES -#include - -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 index 8b8e98e..0000000 --- a/dali/internal/system/tizen-mobile/color-controller-impl-mobile.cpp +++ /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 - -// EXTERNAL INCLUDES -#include -#include - -// INTERNAL INCLUDES -#include - -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 index 1fb8cb1..0000000 --- a/dali/internal/system/tizen-tv/color-controller-impl-tv.cpp +++ /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 - -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 index a518503..0000000 --- a/dali/internal/system/tizen-tv/system-settings-tv.cpp +++ /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 diff --git a/dali/internal/system/tizen-ivi/color-controller-impl-ivi.cpp b/dali/internal/system/tizen-wayland/color-controller-impl-tizen.cpp similarity index 94% rename from dali/internal/system/tizen-ivi/color-controller-impl-ivi.cpp rename to dali/internal/system/tizen-wayland/color-controller-impl-tizen.cpp index 8b8e98e..f39ef1f 100644 --- a/dali/internal/system/tizen-ivi/color-controller-impl-ivi.cpp +++ b/dali/internal/system/tizen-wayland/color-controller-impl-tizen.cpp @@ -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 +#include // EXTERNAL INCLUDES #include diff --git a/dali/internal/system/tizen-mobile/system-settings-mobile.cpp b/dali/internal/system/tizen-wayland/system-settings-tizen.cpp similarity index 88% rename from dali/internal/system/tizen-mobile/system-settings-mobile.cpp rename to dali/internal/system/tizen-wayland/system-settings-tizen.cpp index fce3d50..aa1e48f 100644 --- a/dali/internal/system/tizen-mobile/system-settings-mobile.cpp +++ b/dali/internal/system/tizen-wayland/system-settings-tizen.cpp @@ -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 // INTERNAL INCLUDES -#include +#include namespace Dali { diff --git a/dali/internal/system/tizen/capture-impl-tizen.cpp b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp similarity index 98% rename from dali/internal/system/tizen/capture-impl-tizen.cpp rename to dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp index 0e0ca23..6f6b631 100755 --- a/dali/internal/system/tizen/capture-impl-tizen.cpp +++ b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp @@ -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 +#include // EXTERNAL INCLUDES #include diff --git a/dali/internal/system/tizen/capture-impl.h b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl.h similarity index 100% rename from dali/internal/system/tizen/capture-impl.h rename to dali/internal/system/tizen-wayland/tizen-wearable/capture-impl.h diff --git a/dali/internal/system/tizen-wearable/capture.cpp b/dali/internal/system/tizen-wayland/tizen-wearable/capture.cpp similarity index 93% rename from dali/internal/system/tizen-wearable/capture.cpp rename to dali/internal/system/tizen-wayland/tizen-wearable/capture.cpp index 0b5faf9..156b206 100644 --- a/dali/internal/system/tizen-wearable/capture.cpp +++ b/dali/internal/system/tizen-wayland/tizen-wearable/capture.cpp @@ -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 // INTERNAL HEADER -#include +#include namespace Dali { diff --git a/dali/internal/system/tizen-wearable/watch-time.cpp b/dali/internal/system/tizen-wayland/tizen-wearable/watch-time.cpp similarity index 100% rename from dali/internal/system/tizen-wearable/watch-time.cpp rename to dali/internal/system/tizen-wayland/tizen-wearable/watch-time.cpp diff --git a/dali/internal/system/tizen/widget-application-impl-tizen.cpp b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp similarity index 97% rename from dali/internal/system/tizen/widget-application-impl-tizen.cpp rename to dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp index b12f417..7c12ef9 100644 --- a/dali/internal/system/tizen/widget-application-impl-tizen.cpp +++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp @@ -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,12 +16,12 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDE #include #include -#include +#include #ifdef WIDGET_SUPPOERTED #include @@ -309,4 +309,3 @@ Dali::Internal::Adaptor::WidgetApplicationPtr Create( int* argc, char **argv[], } // namespace Internal } // namespace Dali - diff --git a/dali/internal/system/tizen/widget-application-impl-tizen.h b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h similarity index 100% rename from dali/internal/system/tizen/widget-application-impl-tizen.h rename to dali/internal/system/tizen-wayland/widget-application-impl-tizen.h diff --git a/dali/internal/system/tizen/widget-controller-tizen.cpp b/dali/internal/system/tizen-wayland/widget-controller-tizen.cpp similarity index 91% rename from dali/internal/system/tizen/widget-controller-tizen.cpp rename to dali/internal/system/tizen-wayland/widget-controller-tizen.cpp index 9fcc8be..b6344c2 100644 --- a/dali/internal/system/tizen/widget-controller-tizen.cpp +++ b/dali/internal/system/tizen-wayland/widget-controller-tizen.cpp @@ -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 +#include // EXTERNAL INCLUDES #include diff --git a/dali/internal/system/tizen/widget-controller-tizen.h b/dali/internal/system/tizen-wayland/widget-controller-tizen.h similarity index 100% rename from dali/internal/system/tizen/widget-controller-tizen.h rename to dali/internal/system/tizen-wayland/widget-controller-tizen.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 index 8b8e98e..0000000 --- a/dali/internal/system/tizen-wearable/color-controller-impl-wearable.cpp +++ /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 - -// EXTERNAL INCLUDES -#include -#include - -// INTERNAL INCLUDES -#include - -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 index fce3d50..0000000 --- a/dali/internal/system/tizen-wearable/system-settings-wearable.cpp +++ /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 - -// INTERNAL INCLUDES -#include - -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/ubuntu/color-controller-impl-ubuntu.cpp b/dali/internal/system/ubuntu-x11/color-controller-impl-x.cpp similarity index 90% rename from dali/internal/system/ubuntu/color-controller-impl-ubuntu.cpp rename to dali/internal/system/ubuntu-x11/color-controller-impl-x.cpp index 467a526..db2b380 100644 --- a/dali/internal/system/ubuntu/color-controller-impl-ubuntu.cpp +++ b/dali/internal/system/ubuntu-x11/color-controller-impl-x.cpp @@ -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 +#include namespace Dali { diff --git a/dali/internal/system/ubuntu-x11/system-settings-x.cpp b/dali/internal/system/ubuntu-x11/system-settings-x.cpp index 547c511..2e612e1 100644 --- a/dali/internal/system/ubuntu-x11/system-settings-x.cpp +++ b/dali/internal/system/ubuntu-x11/system-settings-x.cpp @@ -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 // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -43,6 +43,11 @@ int GetElmAccessActionOver() #endif // DALI_PROFILE_UBUNTU } +int GetLongPressTime( int defaultTime ) +{ + return defaultTime; +} + } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/system/ubuntu/widget-application-impl-ubuntu.cpp b/dali/internal/system/ubuntu-x11/widget-application-impl-x.cpp similarity index 93% rename from dali/internal/system/ubuntu/widget-application-impl-ubuntu.cpp rename to dali/internal/system/ubuntu-x11/widget-application-impl-x.cpp index a3580e7..a9738d1 100644 --- a/dali/internal/system/ubuntu/widget-application-impl-ubuntu.cpp +++ b/dali/internal/system/ubuntu-x11/widget-application-impl-x.cpp @@ -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 +#include #include namespace Dali diff --git a/dali/internal/system/ubuntu/widget-application-impl-ubuntu.h b/dali/internal/system/ubuntu-x11/widget-application-impl-x.h similarity index 95% rename from dali/internal/system/ubuntu/widget-application-impl-ubuntu.h rename to dali/internal/system/ubuntu-x11/widget-application-impl-x.h index 5c958fb..2154bc9 100644 --- a/dali/internal/system/ubuntu/widget-application-impl-ubuntu.h +++ b/dali/internal/system/ubuntu-x11/widget-application-impl-x.h @@ -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 -#include +#include #include namespace Dali diff --git a/dali/internal/system/ubuntu/widget-controller-ubuntu.cpp b/dali/internal/system/ubuntu-x11/widget-controller-x.cpp similarity index 88% rename from dali/internal/system/ubuntu/widget-controller-ubuntu.cpp rename to dali/internal/system/ubuntu-x11/widget-controller-x.cpp index ef71b4a..3c1806a 100644 --- a/dali/internal/system/ubuntu/widget-controller-ubuntu.cpp +++ b/dali/internal/system/ubuntu-x11/widget-controller-x.cpp @@ -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 +#include namespace Dali { diff --git a/dali/internal/system/ubuntu/widget-controller-ubuntu.h b/dali/internal/system/ubuntu-x11/widget-controller-x.h similarity index 100% rename from dali/internal/system/ubuntu/widget-controller-ubuntu.h rename to dali/internal/system/ubuntu-x11/widget-controller-x.h diff --git a/dali/internal/system/ubuntu/system-settings-ubuntu.cpp b/dali/internal/system/ubuntu/system-settings-ubuntu.cpp deleted file mode 100644 index 046a538..0000000 --- a/dali/internal/system/ubuntu/system-settings-ubuntu.cpp +++ /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 - -namespace Dali -{ - -namespace Internal -{ - -namespace Adaptor -{ - -int GetLongPressTime( int defaultTime ) -{ - return defaultTime; -} - -} // namespace Adaptor - -} // namespace Internal - -} // namespace Dali -- 2.7.4