ADD_DEFINITIONS( -DNON_POWER_OF_TWO_TEXTURES
-DDALI_COMPILATION
- -DDALI_ADAPTOR_COMPILATION
${DEFINITIONS} )
# from root/build/tizen, get back to root
)
ADD_EXECUTABLE( ${LINKER_TEST_NAME} ${LINKER_TEST_SOURCES} )
MESSAGE(STATUS "libs: ${DALICORE_LDFLAGS}")
-TARGET_COMPILE_OPTIONS( ${LINKER_TEST_NAME} PRIVATE -DDALI_ADAPTOR_COMPILATION -I${ROOT_SRC_DIR} ${DALICORE_CFLAGS} )
-TARGET_COMPILE_DEFINITIONS(${LINKER_TEST_NAME} PUBLIC -DDALI_ADAPTOR_COMPILATION )
+TARGET_COMPILE_OPTIONS( ${LINKER_TEST_NAME} PRIVATE -I${ROOT_SRC_DIR} ${DALICORE_CFLAGS} )
TARGET_LINK_LIBRARIES(${LINKER_TEST_NAME} ${name} ${DALICORE_LDFLAGS} ${VCONF_LDFLAGS} ${HARFBUZZ_LDFLAGS} )
TARGET_INCLUDE_DIRECTORIES( ${LINKER_TEST_NAME} PRIVATE ${DALI_TEST_SUITE_DIR} )
${UTILX_CFLAGS}
-Wall
-DDALI_COMPILATION
- -DDALI_ADAPTOR_COMPILATION
)
# Default set of linked librarires
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
*
*/
+// EXTERNAL INCLUDES
+#include <iostream>
#include <dali/public-api/dali-core.h>
-
-#include <dali/public-api/adaptor-framework/application.h>
-#include <dali/integration-api/adaptor.h>
-#include <dali/integration-api/render-surface.h>
#include <dali/devel-api/adaptor-framework/orientation.h>
+#include <dali/integration-api/render-surface.h>
+
+// INTERNAL INCLUDES
#include <dali/public-api/adaptor-framework/timer.h>
-#include <iostream>
+#include <dali/public-api/adaptor-framework/application.h>
+#include <dali/integration-api/adaptors/adaptor.h>
using namespace Dali;
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/application-devel.h>
-#include <dali/internal/adaptor/common/application-impl.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder.h>
-#else
#include <dali/integration-api/adaptors/scene-holder.h>
-#endif
+#include <dali/internal/adaptor/common/application-impl.h>
namespace Dali
{
#include <dali/public-api/adaptor-framework/window.h>
#include <dali/public-api/adaptor-framework/application-configuration.h>
#include <dali/public-api/dali-adaptor-common.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/log-factory-interface.h>
-#else
#include <dali/integration-api/adaptors/log-factory-interface.h>
-#endif
-
namespace Dali
{
#define DALI_ADAPTOR_LOG_FACTORY_INTERFACE_H
/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
// INTERNAL INCLUDES
#include <dali/public-api/dali-adaptor-common.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/render-surface-interface.h>
-#else
#include <dali/integration-api/adaptors/render-surface-interface.h>
-#endif
namespace Dali
{
#define DALI_RENDER_SURFACE_INTERFACE_H
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
#include <dali/integration-api/core-enumerations.h>
#include <dali/public-api/math/vector4.h>
-// INTERNAL INCLUDES
-
namespace Dali
{
*/
// CLASS HEADER
-#include <dali/integration-api/scene-holder-impl.h>
+#include <dali/integration-api/adaptors/scene-holder-impl.h>
-// EXTERNAL HEADERS
+// EXTERNAL INCLUDES
#include <sys/time.h>
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/layer.h>
#include <dali/integration-api/events/hover-event-integ.h>
#include <dali/integration-api/events/wheel-event-integ.h>
-// INTERNAL HEADERS
+// INTERNAL INCLUDES
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/adaptor/common/lifecycle-observer.h>
#include <dali/internal/input/common/key-impl.h>
#include <dali/integration-api/events/touch-event-combiner.h>
// INTERNAL INCLUDES
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/render-surface-interface.h>
-#include <dali/integration-api/scene-holder.h>
-#else
#include <dali/integration-api/adaptors/render-surface-interface.h>
#include <dali/integration-api/adaptors/scene-holder.h>
-#endif
namespace Dali
{
*/
// CLASS HEADER
-#include <dali/integration-api/scene-holder.h>
+#include <dali/integration-api/adaptors/scene-holder.h>
// EXTERNAL INCLUDES
#include <dali/public-api/events/wheel-event.h>
// INTERNAL INCLUDES
#include <dali/public-api/actors/layer.h>
-#include <dali/integration-api/scene-holder-impl.h>
+#include <dali/integration-api/adaptors/scene-holder-impl.h>
namespace Dali
{
#include <dali/public-api/signals/callback.h>
// INTERNAL INCLUDES
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/trigger-event-interface.h>
-#else
#include <dali/integration-api/adaptors/trigger-event-interface.h>
-#endif
namespace Dali
{
// INTERNAL INCLUDES
#include <dali/public-api/dali-adaptor-common.h>
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/trigger-event-factory-interface.h>
-#else
#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
-#endif
namespace Dali
{
SET( adaptor_integration_api_src_files
- ${adaptor_integration_api_dir}/scene-holder.cpp
- ${adaptor_integration_api_dir}/scene-holder-impl.cpp
+ ${adaptor_integration_api_dir}/adaptors/scene-holder.cpp
+ ${adaptor_integration_api_dir}/adaptors/scene-holder-impl.cpp
)
SET( adaptor_integration_api_header_files
- ${adaptor_integration_api_dir}/adaptor.h
- ${adaptor_integration_api_dir}/egl-interface.h
- ${adaptor_integration_api_dir}/log-factory-interface.h
- ${adaptor_integration_api_dir}/native-render-surface.h
- ${adaptor_integration_api_dir}/native-render-surface-factory.h
- ${adaptor_integration_api_dir}/render-surface-interface.h
- ${adaptor_integration_api_dir}/scene-holder.h
- ${adaptor_integration_api_dir}/scene-holder-impl.h
- ${adaptor_integration_api_dir}/thread-synchronization-interface.h
- ${adaptor_integration_api_dir}/trigger-event-interface.h
- ${adaptor_integration_api_dir}/trigger-event-factory-interface.h
- ${adaptor_integration_api_dir}/trigger-event-factory.h
+ ${adaptor_integration_api_dir}/adaptors/adaptor.h
+ ${adaptor_integration_api_dir}/adaptors/egl-interface.h
+ ${adaptor_integration_api_dir}/adaptors/log-factory-interface.h
+ ${adaptor_integration_api_dir}/adaptors/native-render-surface.h
+ ${adaptor_integration_api_dir}/adaptors/native-render-surface-factory.h
+ ${adaptor_integration_api_dir}/adaptors/render-surface-interface.h
+ ${adaptor_integration_api_dir}/adaptors/scene-holder.h
+ ${adaptor_integration_api_dir}/adaptors/scene-holder-impl.h
+ ${adaptor_integration_api_dir}/adaptors/thread-synchronization-interface.h
+ ${adaptor_integration_api_dir}/adaptors/trigger-event-interface.h
+ ${adaptor_integration_api_dir}/adaptors/trigger-event-factory-interface.h
+ ${adaptor_integration_api_dir}/adaptors/trigger-event-factory.h
)
#include <dali/integration-api/render-controller.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
-#include <dali/integration-api/scene.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder-impl.h>
-#else
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
-#endif
-
#include <dali/public-api/adaptor-framework/tts-player.h>
#include <dali/devel-api/adaptor-framework/clipboard.h>
-
+#include <dali/integration-api/scene.h>
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptors/scene-holder-impl.h>
+#include <dali/integration-api/adaptors/trigger-event-factory.h>
+#include <dali/internal/adaptor/common/adaptor-internal-services.h>
#include <dali/internal/graphics/common/graphics-interface.h>
-
#include <dali/internal/legacy/common/tizen-platform-abstraction.h>
-#include <dali/internal/adaptor/common/adaptor-internal-services.h>
-#include <dali/internal/system/common/environment-options.h>
+#include <dali/internal/network/common/socket-factory.h>
#include <dali/internal/system/common/core-event-interface.h>
-#include <dali/internal/window-system/common/damage-observer.h>
-#include <dali/internal/window-system/common/window-visibility-observer.h>
+#include <dali/internal/system/common/environment-options.h>
#include <dali/internal/system/common/kernel-trace.h>
#include <dali/internal/system/common/system-trace.h>
-#include <dali/integration-api/trigger-event-factory.h>
-#include <dali/internal/network/common/socket-factory.h>
-
+#include <dali/internal/window-system/common/damage-observer.h>
+#include <dali/internal/window-system/common/window-visibility-observer.h>
namespace Dali
{
#define DALI_INTERNAL_ADAPTOR_INTERNAL_SERVICES_H
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
#include <dali/integration-api/gl-abstraction.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/trigger-event-interface.h>
-#include <dali/integration-api/trigger-event-factory-interface.h>
-#include <dali/integration-api/render-surface-interface.h>
-#include <dali/internal/window-system/common/display-connection.h>
+#include <dali/integration-api/render-surface.h>
+#include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-interface.h>
#include <dali/internal/graphics/common/graphics-interface.h>
#include <dali/internal/graphics/gles/egl-factory-interface.h>
#include <dali/internal/network/common/socket-factory-interface.h>
-#include <dali/internal/system/common/performance-interface.h>
#include <dali/internal/network/common/trace-interface.h>
-#include <dali/integration-api/render-surface.h>
+#include <dali/internal/system/common/performance-interface.h>
+#include <dali/internal/window-system/common/display-connection.h>
namespace Dali
{
*/
// CLASS HEADER
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/adaptors/adaptor.h>
// EXTERNAL INCLUDES
#include <dali/integration-api/debug.h>
#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
#include <dali/devel-api/adaptor-framework/style-monitor.h>
#include <dali/integration-api/render-surface.h>
+#include <dali/integration-api/adaptors/scene-holder.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/window-system/common/window-impl.h>
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder.h>
-#else
-#include <dali/integration-api/adaptors/scene-holder.h>
-#endif
-
namespace Dali
{
#include <dali/integration-api/platform-abstraction.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/trigger-event-factory.h>
-#include <dali/internal/adaptor/common/combined-update-render-controller-debug.h>
-#include <dali/internal/system/common/environment-options.h>
-#include <dali/internal/system/common/time-service.h>
-#include <dali/internal/adaptor/common/adaptor-internal-services.h>
+#include <dali/integration-api/adaptors/trigger-event-factory.h>
#include <dali/devel-api/adaptor-framework/thread-settings.h>
+#include <dali/internal/adaptor/common/adaptor-internal-services.h>
+#include <dali/internal/adaptor/common/combined-update-render-controller-debug.h>
#include <dali/internal/graphics/gles/egl-graphics.h>
#include <dali/internal/graphics/gles/egl-implementation.h>
#include <dali/internal/graphics/common/graphics-interface.h>
+#include <dali/internal/system/common/environment-options.h>
+#include <dali/internal/system/common/time-service.h>
namespace Dali
{
#define DALI_INTERNAL_COMBINED_UPDATE_RENDER_CONTROLLER_H
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
// EXTERNAL INCLUDES
#include <semaphore.h>
#include <stdint.h>
-#include <dali/integration-api/core.h>
#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/integration-api/core.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/system/common/performance-interface.h>
-#include <dali/internal/system/common/fps-tracker.h>
+#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
#include <dali/internal/adaptor/common/thread-controller-interface.h>
+#include <dali/internal/system/common/fps-tracker.h>
+#include <dali/internal/system/common/performance-interface.h>
#include <dali/internal/system/common/update-status-logger.h>
#include <dali/internal/window-system/common/display-connection.h>
-
namespace Dali
{
*
*/
-// EXTERNAL INCLUDES
-
// INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/internal/graphics/common/egl-image-extensions.h>
#include <dali/internal/graphics/common/graphics-interface.h>
-#include <dali/internal/graphics/gles/gl-proxy-implementation.h>
#include <dali/internal/graphics/gles/gl-implementation.h>
-#include <dali/integration-api/egl-interface.h>
-
+#include <dali/internal/graphics/gles/gl-proxy-implementation.h>
+#include <dali/internal/graphics/gles/egl-context-helper-implementation.h>
#include <dali/internal/graphics/gles/egl-implementation.h>
-#include <dali/internal/graphics/common/egl-image-extensions.h>
#include <dali/internal/graphics/gles/egl-sync-implementation.h>
-#include <dali/internal/graphics/gles/egl-context-helper-implementation.h>
namespace Dali
{
#include <dali/integration-api/core-enumerations.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/egl-interface.h>
+#include <dali/integration-api/adaptors/egl-interface.h>
namespace Dali
{
-
namespace Internal
{
namespace Adaptor
// EXTERNAL INCLUDES
#include <algorithm>
-
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/internal/input/common/input-method-context-impl.h>
#include <dali/internal/input/tizen-wayland/ecore-virtual-keyboard.h>
-#include <dali/integration-api/adaptor.h>
#include <dali/internal/system/common/locale-utils.h>
-#include <dali/internal/input/common/input-method-context-impl.h>
namespace Dali
{
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
-#include <dali/integration-api/scene-holder.h>
-#include <dali/internal/system/common/locale-utils.h>
-#include <dali/internal/system/common/singleton-service-impl.h>
#include <dali/public-api/adaptor-framework/input-method.h>
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptors/scene-holder.h>
#include <dali/internal/input/common/key-impl.h>
+#include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/common/singleton-service-impl.h>
#include <dali/internal/window-system/common/window-render-surface.h>
#define TOKEN_STRING(x) #x
#include <dali/internal/input/common/virtual-keyboard-impl.h>
// EXTERNAL INCLUDES
-#include <dali/internal/system/linux/dali-ecore.h>
-#include <dali/internal/input/linux/dali-ecore-imf.h>
#include <algorithm>
-
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/internal/input/linux/dali-ecore-imf.h>
#include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/linux/dali-ecore.h>
namespace Dali
{
#include <dali/internal/input/ubuntu-x11/input-method-context-impl-x.h>
// EXTERNAL INCLUDES
-#include <dali/internal/input/linux/dali-ecore-imf.h>
-#include <dali/internal/input/ubuntu-x11/dali-ecore-input.h>
-#include <dali/internal/system/linux/dali-ecore.h>
#include <dali/public-api/events/key-event.h>
-#include <dali/public-api/adaptor-framework/key.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
+#include <dali/public-api/adaptor-framework/key.h>
+#include <dali/integration-api/adaptors/adaptor.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/internal/system/common/locale-utils.h>
-#include <dali/internal/system/common/singleton-service-impl.h>
-#include <dali/internal/input/common/virtual-keyboard-impl.h>
#include <dali/internal/input/common/key-impl.h>
+#include <dali/internal/input/common/virtual-keyboard-impl.h>
+#include <dali/internal/input/linux/dali-ecore-imf.h>
#include <dali/internal/input/tizen-wayland/ecore-virtual-keyboard.h>
+#include <dali/internal/input/ubuntu-x11/dali-ecore-input.h>
+#include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/common/singleton-service-impl.h>
+#include <dali/internal/system/linux/dali-ecore.h>
namespace Dali
{
#include <dali/internal/input/common/virtual-keyboard-impl.h>
// EXTERNAL INCLUDES
-#include <X11/Xlib.h>
-#include <dali/internal/system/linux/dali-ecore-x.h>
#include <algorithm>
-
+#include <X11/Xlib.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
-#include <dali/internal/system/common/locale-utils.h>
+#include <dali/integration-api/adaptors/adaptor.h>
#include <dali/internal/input/ubuntu-x11/input-method-context-impl-x.h>
+#include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/linux/dali-ecore-x.h>
namespace Dali
{
/*\r
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.\r
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.\r
*\r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* you may not use this file except in compliance with the License.\r
\r
// EXTERNAL INCLUDES\r
#include <dali/public-api/events/key-event.h>\r
-#include <dali/public-api/adaptor-framework/key.h>\r
#include <dali/public-api/object/type-registry.h>\r
#include <dali/integration-api/debug.h>\r
\r
// INTERNAL INCLUDES\r
-#include <dali/integration-api/adaptor.h>\r
+#include <dali/public-api/adaptor-framework/key.h>\r
+#include <dali/integration-api/adaptors/adaptor.h>\r
#include <dali/internal/adaptor/common/adaptor-impl.h>\r
+#include <dali/internal/input/common/key-impl.h>\r
+#include <dali/internal/input/common/virtual-keyboard-impl.h>\r
#include <dali/internal/system/common/locale-utils.h>\r
#include <dali/internal/system/common/singleton-service-impl.h>\r
-#include <dali/internal/input/common/virtual-keyboard-impl.h>\r
-#include <dali/internal/input/common/key-impl.h>\r
\r
namespace Dali\r
{\r
// INTERNAL INCLUDES
#include <dali/internal/system/common/performance-marker.h>
-#include <dali/integration-api/trigger-event-factory-interface.h>
#include <dali/internal/network/common/client-send-data-interface.h>
#include <dali/internal/network/common/socket-factory-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
namespace Dali
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/log-factory-interface.h>
#include <dali/internal/adaptor/common/threading-mode.h>
-#include <dali/integration-api/log-factory-interface.h>
namespace Dali
{
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
#include <dali/internal/system/common/singleton-service-impl.h>
// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
#include <dali/integration-api/core.h>
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/debug.h>
#include <dali/integration-api/processor-interface.h>
-#include <dali/internal/adaptor/common/adaptor-impl.h>
// INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
+
#if defined(DEBUG_ENABLED)
#include <dali/internal/system/common/logging.h>
Debug::Filter* gSingletonServiceLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_SINGLETON_SERVICE" );
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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/integration-api/trigger-event-factory.h>
+#include <dali/integration-api/adaptors/trigger-event-factory.h>
// INTERNAL INCLUDES
#include <dali/internal/system/common/trigger-event.h>
// EXTERNAL INCLUDES
#include <dali/public-api/signals/callback.h>
-#include <dali/internal/system/common/file-descriptor-monitor.h>
// INTERNAL INCLUDES
#include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/trigger-event-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-interface.h>
+#include <dali/internal/system/common/file-descriptor-monitor.h>
namespace Dali
{
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
#include <dali/internal/system/tizen-wayland/tizen-wearable/capture-impl.h>
// EXTERNAL INCLUDES
+#include <fstream>
+#include <string.h>
+#include <dali/public-api/common/stage.h>
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/public-api/common/stage.h>
#include <dali/integration-api/debug.h>
-#include <fstream>
-#include <string.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/adaptors/adaptor.h>
namespace
{
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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/integration-api/trigger-event-factory.h>
+#include <dali/integration-api/adaptors/trigger-event-factory.h>
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
#include <dali/internal/system/windows/trigger-event.h>
namespace Dali
*
*/
-// EXTERNAL INCLUDES\r
-#include <dali/public-api/signals/callback.h>\r
-\r
-// INTERNAL INCLUDES\r
-#include <dali/public-api/dali-adaptor-common.h>\r
-#include <dali/integration-api/trigger-event-interface.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/signals/callback.h>
+
+// INTERNAL INCLUDES
+#include <dali/public-api/dali-adaptor-common.h>
+#include <dali/integration-api/adaptors/trigger-event-interface.h>
namespace Dali
{
} // namespace Dali
-#endif // DALI_INTERNAL_TRIGGER_EVENT_IMPL_H
\ No newline at end of file
+#endif // DALI_INTERNAL_TRIGGER_EVENT_IMPL_H
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
*/
// INTERNAL INCLUDES
-#include <dali/integration-api/native-render-surface.h>
-#include <dali/internal/window-system/common/render-surface-factory.h>
+#include <dali/integration-api/adaptors/native-render-surface.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/window-system/common/render-surface-factory.h>
namespace Dali
{
#define DALI_INTERNAL_WINDOWSYSTEM_COMMON_PIXMAP_RENDER_SURFACE_H
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
*/
// INTERNAL INCLUDES
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/render-surface-interface.h>
-#include <dali/internal/graphics/common/graphics-interface.h>
-#else
#include <dali/integration-api/adaptors/render-surface-interface.h>
-#endif
-
+#include <dali/internal/graphics/common/graphics-interface.h>
namespace Dali
{
#include <dali/devel-api/adaptor-framework/orientation.h>
#include <dali/integration-api/events/touch-event-integ.h>
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/render-surface-interface.h>
-#else
-#include <dali/integration-api/adaptors/render-surface-interface.h>
-#endif
-
// INTERNAL HEADERS
+#include <dali/integration-api/adaptors/render-surface-interface.h>
#include <dali/internal/window-system/common/event-handler.h>
#include <dali/internal/window-system/common/orientation-impl.h>
#include <dali/internal/window-system/common/render-surface-factory.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/render-tasks/render-task-list.h>
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder-impl.h>
-#else
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
-#endif
-
// INTERNAL INCLUDES
-#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/public-api/adaptor-framework/window.h>
#include <dali/public-api/adaptor-framework/key-grab.h>
#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/integration-api/adaptors/scene-holder-impl.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/window-system/common/event-handler.h>
namespace Dali
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/trigger-event-factory-interface.h>
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/graphics/gles/egl-implementation.h>
+#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
+#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/adaptor/common/adaptor-internal-services.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
#include <dali/internal/window-system/common/window-base.h>
#include <dali/internal/window-system/common/window-factory.h>
#include <dali/internal/window-system/common/window-system.h>
-#include <dali/internal/graphics/gles/egl-graphics.h>
#include <dali/internal/system/common/environment-variables.h>
-
namespace Dali
{
namespace Internal
#define DALI_INTERNAL_WINDOWSYSTEM_COMMON_WINDOW_RENDER_SURFACE_H
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
*
*/
-// INTERNAL INCLUDES
-#include <dali/internal/graphics/common/graphics-interface.h>
-
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/egl-interface.h>
-#include <dali/integration-api/render-surface-interface.h>
-#else
-#include <dali/integration-api/adaptors/egl-interface.h>
-#include <dali/integration-api/adaptors/render-surface-interface.h>
-#endif
-
// EXTERNAL INCLUDES
#include <dali/public-api/signals/connection-tracker.h>
#include <dali/public-api/signals/dali-signal.h>
+// INTERNAL INCLUDES
+#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/internal/graphics/common/graphics-interface.h>
+
namespace Dali
{
#include <tbm_surface_internal.h>
// INTERNAL INCLUDES
-#include <dali/internal/system/common/trigger-event.h>
-#include <dali/internal/graphics/gles/egl-implementation.h>
+#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/adaptor/common/adaptor-internal-services.h>
#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
+#include <dali/internal/system/common/trigger-event.h>
#include <dali/internal/window-system/common/display-connection.h>
#include <dali/internal/window-system/common/window-system.h>
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/internal/adaptor/common/adaptor-internal-services.h>
namespace Dali
{
#define DALI_INTERNAL_WINDOWSYSTEM_TIZENWAYLAND_NATIVE_SURFACE_ECORE_WL_H
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
// INTERNAL INCLUDES
#include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/egl-interface.h>
-#include <dali/integration-api/native-render-surface.h>
+#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/integration-api/adaptors/native-render-surface.h>
#include <dali/internal/graphics/common/graphics-interface.h>
namespace Dali
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-
#include <X11/extensions/Xfixes.h> // for damage notify
#include <X11/extensions/Xdamage.h> // for damage notify
-
#include <dali/integration-api/gl-abstraction.h>
#include <dali/integration-api/debug.h>
#include <dali/devel-api/threading/mutex.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/system/common/trigger-event.h>
-#include <dali/internal/window-system/common/display-connection.h>
-#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/adaptor/common/adaptor-internal-services.h>
-
+#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/internal/system/common/trigger-event.h>
+#include <dali/internal/window-system/common/display-connection.h>
namespace Dali
{
*
*/
+// EXTERNAL INCLUDES
+#include <dali/devel-api/threading/conditional-wait.h>
+
// INTERNAL INCLUDES
-#include <dali/integration-api/egl-interface.h>
-#include <dali/internal/graphics/gles/egl-implementation.h>
-#include <dali/internal/window-system/common/pixmap-render-surface.h>
-#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
#include <dali/public-api/dali-adaptor-common.h>
+#include <dali/integration-api/adaptors/egl-interface.h>
#include <dali/internal/graphics/common/graphics-interface.h>
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/threading/conditional-wait.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
#include <dali/internal/system/linux/dali-ecore-x.h>
-
+#include <dali/internal/window-system/common/pixmap-render-surface.h>
+#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
namespace Dali
{
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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/window-system/ubuntu-x11/render-surface-factory-ecore-x.h>
+// EXTERNAL HEADERS
+#include <memory>
+
// INTERNAL HEADERS
+#include <dali/integration-api/adaptors/native-render-surface.h>
+#include <dali/internal/window-system/common/display-utils.h>
#include <dali/internal/window-system/common/window-render-surface.h>
#include <dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h>
-#include <dali/internal/window-system/common/display-utils.h>
-#include <dali/integration-api/native-render-surface.h>
-
-// EXTERNAL INCLUDES
-#include <memory>
namespace Dali
{
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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/window-system/windows/render-surface-factory-win.h>
+
// EXTERNAL HEADERS
#include <dali/integration-api/debug.h>
-#include <dali/integration-api/native-render-surface.h>
-#include <dali/internal/window-system/windows/render-surface-factory-win.h>
// INTERNAL HEADERS
-#include <dali/internal/window-system/common/window-render-surface.h>
-#include <dali/internal/window-system/common/pixmap-render-surface.h>
+#include <dali/integration-api/adaptors/native-render-surface.h>
#include <dali/internal/window-system/common/display-utils.h>
+#include <dali/internal/window-system/common/pixmap-render-surface.h>
+#include <dali/internal/window-system/common/window-render-surface.h>
namespace Dali
{
*/
// CLASS HEADER
-#include <third-party/glyphy/vector-font-cache.h> // Replaced from: #include <dali/internal/glyphy/vector-font-cache.h>
+#include <third-party/glyphy/vector-font-cache.h>
// EXTERNAL INCLUDES
#include <vector>
#include <math.h>
// INTERNAL INCLUDES
-#include <third-party/glyphy/glyphy.h> // Replaced from: #include "../glyphy/glyphy.h"
-#include <third-party/glyphy/glyphy-freetype.h> // Replaced from: #include "../glyphy/glyphy-freetype.h"
+#include <third-party/glyphy/glyphy.h>
+#include <third-party/glyphy/glyphy-freetype.h>
using namespace std;