From 5c20957f93fefc2c9d7ec3698521b2ee4b854300 Mon Sep 17 00:00:00 2001 From: adun Date: Fri, 11 May 2018 09:58:15 +0800 Subject: [PATCH] Seperate the API macros Change-Id: I964672703e6b2439212598a41072cce6bbe54476 --- .../dali-test-suite-utils/test-application.h | 4 +- .../dali-test-suite-utils/test-gesture-manager.h | 4 +- .../dali-test-suite-utils/test-gl-abstraction.h | 4 +- .../test-gl-sync-abstraction.h | 6 +-- .../dali-test-suite-utils/test-native-image.h | 8 ++-- .../test-platform-abstraction.h | 4 +- .../dali-test-suite-utils/test-render-controller.h | 4 +- .../accessibility-action-handler.h | 4 +- .../adaptor-framework/accessibility-adaptor.h | 5 ++- .../adaptor-framework/application-devel.h | 4 +- .../adaptor-framework/application-extensions.h | 8 ++-- dali/devel-api/adaptor-framework/bitmap-saver.h | 7 +++- .../adaptor-framework/clipboard-event-notifier.h | 7 +++- dali/devel-api/adaptor-framework/clipboard.h | 6 ++- .../devel-api/adaptor-framework/color-controller.h | 7 +++- .../adaptor-framework/drag-and-drop-detector.h | 7 +++- .../adaptor-framework/environment-variable.h | 7 ++-- dali/devel-api/adaptor-framework/event-feeder.h | 12 +++--- .../adaptor-framework/event-thread-callback.h | 8 ++-- dali/devel-api/adaptor-framework/feedback-player.h | 7 +++- dali/devel-api/adaptor-framework/feedback-plugin.h | 6 ++- dali/devel-api/adaptor-framework/file-loader.h | 13 ++++--- dali/devel-api/adaptor-framework/gif-loading.h | 5 ++- dali/devel-api/adaptor-framework/image-loading.h | 18 +++++---- .../adaptor-framework/input-method-context.h | 2 +- .../adaptor-framework/input-method-options.h | 2 +- .../adaptor-framework/lifecycle-controller.h | 7 +++- dali/devel-api/adaptor-framework/orientation.h | 7 +++- .../adaptor-framework/performance-logger.h | 7 +++- .../adaptor-framework/physical-keyboard.h | 7 +++- dali/devel-api/adaptor-framework/pixel-buffer.h | 7 +++- .../adaptor-framework/singleton-service.h | 7 +++- dali/devel-api/adaptor-framework/sound-player.h | 7 +++- dali/devel-api/adaptor-framework/style-monitor.h | 4 +- dali/devel-api/adaptor-framework/tilt-sensor.h | 7 +++- dali/devel-api/adaptor-framework/video-player.h | 5 ++- .../devel-api/adaptor-framework/virtual-keyboard.h | 22 +++++------ .../text-abstraction/bidirectional-support.h | 7 +++- dali/devel-api/text-abstraction/font-client.h | 7 ++-- dali/devel-api/text-abstraction/font-list.cpp | 4 +- dali/devel-api/text-abstraction/font-list.h | 7 +++- dali/devel-api/text-abstraction/font-metrics.h | 8 ++-- dali/devel-api/text-abstraction/glyph-info.h | 8 ++-- dali/devel-api/text-abstraction/script.h | 30 +++++++-------- dali/devel-api/text-abstraction/segmentation.h | 5 ++- dali/devel-api/text-abstraction/shaping.h | 4 +- dali/integration-api/adaptor.h | 5 ++- .../native-render-surface-factory.h | 6 ++- dali/integration-api/native-render-surface.h | 6 +-- dali/integration-api/render-surface.h | 4 +- dali/integration-api/trigger-event-factory.h | 6 +-- dali/internal/adaptor/common/adaptor-impl.cpp | 2 +- .../common/clipboard-event-notifier-impl.h | 3 +- .../graphics/gles20/egl-implementation.cpp | 5 ++- .../graphics/gles20/egl-sync-implementation.h | 6 ++- .../legacy/common/tizen-platform-abstraction.h | 8 ++-- dali/internal/system/common/callback-manager.h | 6 ++- dali/internal/system/common/timer-impl-ecore.cpp | 6 +-- dali/internal/system/common/timer-impl.h | 4 +- dali/internal/system/common/trigger-event.h | 4 +- dali/internal/system/tizen/capture-impl.h | 4 +- .../common/native-render-surface-factory.cpp | 2 +- .../tizen-wayland/native-render-surface-ecore-wl.h | 2 +- .../tizen-wayland/window-render-surface-ecore-wl.h | 2 +- .../ubuntu-x11/pixmap-render-surface-ecore-x.h | 2 +- dali/public-api/adaptor-framework/application.h | 4 +- dali/public-api/adaptor-framework/input-method.h | 4 +- dali/public-api/adaptor-framework/key-grab.h | 18 +++++---- dali/public-api/adaptor-framework/key.h | 8 ++-- .../adaptor-framework/native-image-source.h | 7 +++- dali/public-api/adaptor-framework/style-change.h | 6 ++- dali/public-api/adaptor-framework/timer.cpp | 6 +-- dali/public-api/adaptor-framework/timer.h | 7 +++- dali/public-api/adaptor-framework/tts-player.h | 7 +++- .../adaptor-framework/widget-application.h | 4 +- dali/public-api/adaptor-framework/widget-impl.h | 8 ++-- dali/public-api/adaptor-framework/widget.h | 7 +++- dali/public-api/adaptor-framework/window.h | 7 +++- dali/public-api/capture/capture.h | 7 ++-- dali/public-api/dali-adaptor-common.h | 45 ++++++++++++++++++++++ dali/public-api/dali-adaptor-version.h | 14 +++---- dali/public-api/file.list | 3 +- dali/public-api/watch/watch-application.h | 7 ++-- dali/public-api/watch/watch-time.h | 7 ++-- plugins/dali-feedback.cpp | 4 +- 85 files changed, 367 insertions(+), 232 deletions(-) mode change 100644 => 100755 dali/devel-api/adaptor-framework/accessibility-adaptor.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/bitmap-saver.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/clipboard-event-notifier.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/clipboard.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/color-controller.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/drag-and-drop-detector.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/feedback-player.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/image-loading.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/lifecycle-controller.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/orientation.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/performance-logger.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/physical-keyboard.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/pixel-buffer.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/singleton-service.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/sound-player.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/tilt-sensor.h mode change 100644 => 100755 dali/devel-api/text-abstraction/bidirectional-support.h mode change 100644 => 100755 dali/devel-api/text-abstraction/font-client.h mode change 100644 => 100755 dali/devel-api/text-abstraction/font-list.h mode change 100644 => 100755 dali/devel-api/text-abstraction/segmentation.h mode change 100644 => 100755 dali/integration-api/adaptor.h mode change 100644 => 100755 dali/internal/clipboard/common/clipboard-event-notifier-impl.h mode change 100644 => 100755 dali/public-api/adaptor-framework/key.h mode change 100644 => 100755 dali/public-api/adaptor-framework/timer.h mode change 100644 => 100755 dali/public-api/adaptor-framework/tts-player.h mode change 100644 => 100755 dali/public-api/adaptor-framework/widget.h mode change 100644 => 100755 dali/public-api/adaptor-framework/window.h create mode 100755 dali/public-api/dali-adaptor-common.h mode change 100644 => 100755 dali/public-api/dali-adaptor-version.h mode change 100644 => 100755 dali/public-api/file.list mode change 100644 => 100755 dali/public-api/watch/watch-application.h mode change 100644 => 100755 dali/public-api/watch/watch-time.h diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h index 747b488..6b8b236 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h @@ -2,7 +2,7 @@ #define __DALI_TEST_APPLICATION_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. @@ -31,7 +31,7 @@ namespace Dali { -class DALI_IMPORT_API TestApplication : public ConnectionTracker +class DALI_CORE_API TestApplication : public ConnectionTracker { public: diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-manager.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-manager.h index 4c0b766..6fddd30 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-manager.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gesture-manager.h @@ -2,7 +2,7 @@ #define __DALI_TEST_GESTURE_MANAGER_H__ /* - * 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 @@ namespace Dali /** * Concrete implementation of the gesture manager class. */ -class DALI_IMPORT_API TestGestureManager : public Dali::Integration::GestureManager +class DALI_CORE_API TestGestureManager : public Dali::Integration::GestureManager { public: diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h index b306c3e..c68573b 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h @@ -2,7 +2,7 @@ #define TEST_GL_ABSTRACTION_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. @@ -49,7 +49,7 @@ static const char *mStdAttribs[MAX_ATTRIBUTE_CACHE_SIZE] = "aBoneIndices" // ATTRIB_BONE_INDICES }; -class DALI_IMPORT_API TestGlAbstraction: public Dali::Integration::GlAbstraction +class DALI_CORE_API TestGlAbstraction: public Dali::Integration::GlAbstraction { public: TestGlAbstraction(); diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h index 8ce96a4..979987b 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h @@ -2,7 +2,7 @@ #define __TEST_GL_SYNC_ABSTRACTION_H__ /* - * Copyright (c) 2016 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. @@ -31,7 +31,7 @@ namespace Dali { -class DALI_IMPORT_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject +class DALI_CORE_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject { public: TestSyncObject(TraceCallStack& trace); @@ -44,7 +44,7 @@ public: /** * Class to emulate the GL sync functions with tracing */ -class DALI_IMPORT_API TestGlSyncAbstraction: public Integration::GlSyncAbstraction +class DALI_CORE_API TestGlSyncAbstraction: public Integration::GlSyncAbstraction { public: /** diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h index 896ce52..5cb4b27 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h @@ -2,7 +2,7 @@ #define __TEST_NATIVE_IMAGE_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. @@ -30,7 +30,7 @@ class TestNativeImageNoExt; typedef IntrusivePtr TestNativeImagePointer; typedef IntrusivePtr TestNativeImageNoExtPointer; -class DALI_IMPORT_API TestNativeImageExtension: public Dali::NativeImageInterface::Extension +class DALI_CORE_API TestNativeImageExtension: public Dali::NativeImageInterface::Extension { public: inline const char* GetCustomFragmentPreFix(){return "#extension GL_OES_EGL_image_external:require\n";} @@ -40,7 +40,7 @@ public: }; -class DALI_IMPORT_API TestNativeImage : public Dali::NativeImageInterface +class DALI_CORE_API TestNativeImage : public Dali::NativeImageInterface { public: static TestNativeImagePointer New(int width, int height); @@ -71,7 +71,7 @@ public: }; -class DALI_IMPORT_API TestNativeImageNoExt : public Dali::NativeImageInterface +class DALI_CORE_API TestNativeImageNoExt : public Dali::NativeImageInterface { public: static TestNativeImageNoExtPointer New(int width, int height); diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h index 201e29d..f31561e 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h @@ -2,7 +2,7 @@ #define __DALI_TEST_PLATFORM_ABSTRACTION_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. @@ -36,7 +36,7 @@ namespace Dali /** * Concrete implementation of the platform abstraction class. */ -class DALI_IMPORT_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction +class DALI_CORE_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction { public: diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h index 3ad63d3..7c785f1 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h @@ -2,7 +2,7 @@ #define __TEST_RENDER_CONTROLLER_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. @@ -25,7 +25,7 @@ namespace Dali { -class DALI_IMPORT_API TestRenderController : public Dali::Integration::RenderController +class DALI_CORE_API TestRenderController : public Dali::Integration::RenderController { public: TestRenderController(); diff --git a/dali/devel-api/adaptor-framework/accessibility-action-handler.h b/dali/devel-api/adaptor-framework/accessibility-action-handler.h index 85a3af2..141867e 100644 --- a/dali/devel-api/adaptor-framework/accessibility-action-handler.h +++ b/dali/devel-api/adaptor-framework/accessibility-action-handler.h @@ -2,7 +2,7 @@ #define __DALI_ACCESSIBILITY_ACTION_HANDLER_H__ /* - * 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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali/devel-api/adaptor-framework/accessibility-adaptor.h b/dali/devel-api/adaptor-framework/accessibility-adaptor.h old mode 100644 new mode 100755 index 7b81b56..a8a5d75 --- a/dali/devel-api/adaptor-framework/accessibility-adaptor.h +++ b/dali/devel-api/adaptor-framework/accessibility-adaptor.h @@ -2,7 +2,7 @@ #define __DALI_ACCESSIBILITY_ADAPTOR_H__ /* - * 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. @@ -22,6 +22,7 @@ // EXTERNAL INCLUDES #include #include +#include namespace Dali { @@ -42,7 +43,7 @@ class TouchPoint; * @brief The AccessibilityAdaptor provides communication to the indicator and the accessibility manager interface (implemented in toolkit). * */ -class DALI_IMPORT_API AccessibilityAdaptor : public BaseHandle +class DALI_ADAPTOR_API AccessibilityAdaptor : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/application-devel.h b/dali/devel-api/adaptor-framework/application-devel.h index 97aa553..05bc65a 100644 --- a/dali/devel-api/adaptor-framework/application-devel.h +++ b/dali/devel-api/adaptor-framework/application-devel.h @@ -2,7 +2,7 @@ #define DALI_APPLICATION_DEVEL_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. @@ -33,7 +33,7 @@ namespace DevelApplication * @param[in,out] argc A pointer to the number of arguments * @param[in,out] argv A pointer to the argument list */ -DALI_IMPORT_API void PreInitialize( int* argc, char** argv[] ); +DALI_ADAPTOR_API void PreInitialize( int* argc, char** argv[] ); } // namespace DevelApplication diff --git a/dali/devel-api/adaptor-framework/application-extensions.h b/dali/devel-api/adaptor-framework/application-extensions.h index 51f55a2..31056b0 100755 --- a/dali/devel-api/adaptor-framework/application-extensions.h +++ b/dali/devel-api/adaptor-framework/application-extensions.h @@ -2,7 +2,7 @@ #define __DALI_APPLICATION_EXTENSIONS_H__ /* - * 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. @@ -18,8 +18,8 @@ * */ -// EXTERNAL INCLUDES -#include +// INTERNAL INCLUDES +#include namespace Dali { @@ -31,7 +31,7 @@ class Application; * It provides some extension methods to DaliApplication. * */ -class DALI_IMPORT_API ApplicationExtensions +class DALI_ADAPTOR_API ApplicationExtensions { public: diff --git a/dali/devel-api/adaptor-framework/bitmap-saver.h b/dali/devel-api/adaptor-framework/bitmap-saver.h old mode 100644 new mode 100755 index b8e67be..0e0e6b6 --- a/dali/devel-api/adaptor-framework/bitmap-saver.h +++ b/dali/devel-api/adaptor-framework/bitmap-saver.h @@ -2,7 +2,7 @@ #define __DALI_ADAPTOR_BITMAP_SAVER_H__ /* - * 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. @@ -21,6 +21,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -37,7 +40,7 @@ namespace Dali * * @return true if the file was saved */ -DALI_IMPORT_API bool EncodeToFile(const unsigned char* const pixelBuffer, +DALI_ADAPTOR_API bool EncodeToFile(const unsigned char* const pixelBuffer, const std::string& filename, const Pixel::Format pixelFormat, const std::size_t width, diff --git a/dali/devel-api/adaptor-framework/clipboard-event-notifier.h b/dali/devel-api/adaptor-framework/clipboard-event-notifier.h old mode 100644 new mode 100755 index fd5cfc4..4e2d43a --- a/dali/devel-api/adaptor-framework/clipboard-event-notifier.h +++ b/dali/devel-api/adaptor-framework/clipboard-event-notifier.h @@ -2,7 +2,7 @@ #define __DALI_CLIPBOARD_EVENT_NOTIFIER_H__ /* - * 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -36,7 +39,7 @@ class ClipboardEventNotifier; /** * @brief The ClipboardEventNotifier provides signals when clipboard events are received from the device. */ -class DALI_IMPORT_API ClipboardEventNotifier : public BaseHandle +class DALI_ADAPTOR_API ClipboardEventNotifier : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/clipboard.h b/dali/devel-api/adaptor-framework/clipboard.h old mode 100644 new mode 100755 index 5d84c8f..db8ab47 --- a/dali/devel-api/adaptor-framework/clipboard.h +++ b/dali/devel-api/adaptor-framework/clipboard.h @@ -2,7 +2,7 @@ #define __DALI_CLIPBOARD_H__ /* - * Copyright (c) 2016 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. @@ -23,6 +23,8 @@ #include #include +// INTERNAL INCLUDES +#include namespace Dali { @@ -42,7 +44,7 @@ class Clipboard; * Clipboard can manage it's item and set show / hide status. */ -class DALI_IMPORT_API Clipboard : public BaseHandle +class DALI_ADAPTOR_API Clipboard : public BaseHandle { public: /** diff --git a/dali/devel-api/adaptor-framework/color-controller.h b/dali/devel-api/adaptor-framework/color-controller.h old mode 100644 new mode 100755 index 8508880..aa43e30 --- a/dali/devel-api/adaptor-framework/color-controller.h +++ b/dali/devel-api/adaptor-framework/color-controller.h @@ -2,7 +2,7 @@ #define __DALI_COLOR_CONTROLLER_H__ /* - * 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. @@ -23,6 +23,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -39,7 +42,7 @@ class ColorController; * * It provides the functionality of retrieving a RGBA color by passing in the color code string. */ -class DALI_IMPORT_API ColorController : public BaseHandle +class DALI_ADAPTOR_API ColorController : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/drag-and-drop-detector.h b/dali/devel-api/adaptor-framework/drag-and-drop-detector.h old mode 100644 new mode 100755 index 46b8517..21232ee --- a/dali/devel-api/adaptor-framework/drag-and-drop-detector.h +++ b/dali/devel-api/adaptor-framework/drag-and-drop-detector.h @@ -2,7 +2,7 @@ #define __DALI_DRAG_AND_DROP_DETECTOR_H__ /* - * 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. @@ -23,6 +23,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -85,7 +88,7 @@ class DragAndDropDetector; * * @endcode */ -class DALI_IMPORT_API DragAndDropDetector : public BaseHandle +class DALI_ADAPTOR_API DragAndDropDetector : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/environment-variable.h b/dali/devel-api/adaptor-framework/environment-variable.h index 96b0c4a..b258d31 100644 --- a/dali/devel-api/adaptor-framework/environment-variable.h +++ b/dali/devel-api/adaptor-framework/environment-variable.h @@ -2,7 +2,7 @@ #define __DALI_ENVIRONMENT_VARIABLE_H__ /* - * 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. @@ -17,7 +17,8 @@ * limitations under the License. */ -#include +// INTERNAL INCLUDES +#include namespace Dali { @@ -31,7 +32,7 @@ namespace EnvironmentVariable * @param[in] variable Null-terminated character string identifying the name of the environmental variable to look for. * @return A C-string containing the value of the specified environment variable. */ -DALI_IMPORT_API const char * GetEnvironmentVariable( const char * variable ); +DALI_ADAPTOR_API const char * GetEnvironmentVariable( const char * variable ); } // namespace EnvironmentVariable diff --git a/dali/devel-api/adaptor-framework/event-feeder.h b/dali/devel-api/adaptor-framework/event-feeder.h index 2a10220..8bc3782 100644 --- a/dali/devel-api/adaptor-framework/event-feeder.h +++ b/dali/devel-api/adaptor-framework/event-feeder.h @@ -2,7 +2,7 @@ #define __DALI_EVENT_FEEDER_H_ /* - * 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. @@ -18,8 +18,8 @@ * */ -// EXTERNAL INCLUDES -#include +// INTERNAL INCLUDES +#include namespace Dali { @@ -39,7 +39,7 @@ namespace EventFeeder * * @note For testing/automation purposes only. */ -DALI_IMPORT_API void FeedTouchPoint( TouchPoint& point, int timeStamp ); +DALI_ADAPTOR_API void FeedTouchPoint( TouchPoint& point, int timeStamp ); /** * Feed a wheel event to the adaptor. @@ -48,7 +48,7 @@ DALI_IMPORT_API void FeedTouchPoint( TouchPoint& point, int timeStamp ); * * @note For testing/automation purposes only. */ -DALI_IMPORT_API void FeedWheelEvent( WheelEvent& wheelEvent ); +DALI_ADAPTOR_API void FeedWheelEvent( WheelEvent& wheelEvent ); /** * Feed a key event to the adaptor. @@ -57,7 +57,7 @@ DALI_IMPORT_API void FeedWheelEvent( WheelEvent& wheelEvent ); * * @note For testing/automation purposes only. */ -DALI_IMPORT_API void FeedKeyEvent( KeyEvent& keyEvent ); +DALI_ADAPTOR_API void FeedKeyEvent( KeyEvent& keyEvent ); } // namespace EventFeeder diff --git a/dali/devel-api/adaptor-framework/event-thread-callback.h b/dali/devel-api/adaptor-framework/event-thread-callback.h index f15cf07..1c4f4d6 100644 --- a/dali/devel-api/adaptor-framework/event-thread-callback.h +++ b/dali/devel-api/adaptor-framework/event-thread-callback.h @@ -2,7 +2,7 @@ #define __DALI_EVENT_THREAD_CALLBACK_H_ /* - * 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. @@ -19,9 +19,11 @@ */ // EXTERNAL INCLUDES -#include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -30,7 +32,7 @@ namespace Dali * * @note The EventThreadCallback object should only be created in the main thread. */ -class DALI_IMPORT_API EventThreadCallback +class DALI_ADAPTOR_API EventThreadCallback { public: diff --git a/dali/devel-api/adaptor-framework/feedback-player.h b/dali/devel-api/adaptor-framework/feedback-player.h old mode 100644 new mode 100755 index 0069df1..d78d511 --- a/dali/devel-api/adaptor-framework/feedback-player.h +++ b/dali/devel-api/adaptor-framework/feedback-player.h @@ -2,7 +2,7 @@ #define __DALI_FEEDBACK_PLAYER_H__ /* - * 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. @@ -21,6 +21,9 @@ // EXTERNAL INCLUDES #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -35,7 +38,7 @@ class FeedbackPlayer; /** * @brief Plays feedback effects. */ -class DALI_IMPORT_API FeedbackPlayer : public BaseHandle +class DALI_ADAPTOR_API FeedbackPlayer : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/feedback-plugin.h b/dali/devel-api/adaptor-framework/feedback-plugin.h index 007ac1c..56c0212 100644 --- a/dali/devel-api/adaptor-framework/feedback-plugin.h +++ b/dali/devel-api/adaptor-framework/feedback-plugin.h @@ -2,7 +2,7 @@ #define __DALI_FEEDBACK_PLUGIN_H__ /* - * 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. @@ -20,7 +20,9 @@ // EXTERNAL INCLUDES #include -#include + +// INTERNAL INCLUDES +#include namespace Dali { diff --git a/dali/devel-api/adaptor-framework/file-loader.h b/dali/devel-api/adaptor-framework/file-loader.h index dc979cf..591a4ce 100644 --- a/dali/devel-api/adaptor-framework/file-loader.h +++ b/dali/devel-api/adaptor-framework/file-loader.h @@ -2,7 +2,7 @@ #define __DALI_FILE_LOADER_H__ /* - * 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. @@ -17,10 +17,13 @@ * limitations under the License. */ +// EXTERNAL INCLUDES #include -#include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -46,7 +49,7 @@ enum FileType ///< FileType format * * */ -DALI_IMPORT_API int ReadFile(const std::string& filename, Dali::Vector & memblock, FileLoader::FileType fileType = BINARY); +DALI_ADAPTOR_API int ReadFile(const std::string& filename, Dali::Vector & memblock, FileLoader::FileType fileType = BINARY); /** * @brief Load the file. It will load it either as a binary or as a text @@ -58,7 +61,7 @@ DALI_IMPORT_API int ReadFile(const std::string& filename, Dali::Vector & m * @return error code. 0 - Error, 1 - Ok * */ -DALI_IMPORT_API int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector & memblock, FileLoader::FileType fileType = BINARY); +DALI_ADAPTOR_API int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector & memblock, FileLoader::FileType fileType = BINARY); /** * @brief Get the file size of a file @@ -66,7 +69,7 @@ DALI_IMPORT_API int ReadFile(const std::string& filename, std::streampos& fileSi * @param[in] filename Filename of the file to load. * @return the size of the file or 0 if file not found */ -DALI_IMPORT_API std::streampos GetFileSize(const std::string& filename); +DALI_ADAPTOR_API std::streampos GetFileSize(const std::string& filename); }; } // Dali diff --git a/dali/devel-api/adaptor-framework/gif-loading.h b/dali/devel-api/adaptor-framework/gif-loading.h index 0b8deec..50c1769 100755 --- a/dali/devel-api/adaptor-framework/gif-loading.h +++ b/dali/devel-api/adaptor-framework/gif-loading.h @@ -25,6 +25,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { class PixelData; @@ -37,7 +40,7 @@ typedef Dali::Uint16Pair ImageDimensions; * is released. (This is to speed up frame loads, which would otherwise have to re-acquire the * data from disk) */ -class DALI_IMPORT_API GifLoading +class DALI_ADAPTOR_API GifLoading { public: diff --git a/dali/devel-api/adaptor-framework/image-loading.h b/dali/devel-api/adaptor-framework/image-loading.h old mode 100644 new mode 100755 index 4149e12..3c19be0 --- a/dali/devel-api/adaptor-framework/image-loading.h +++ b/dali/devel-api/adaptor-framework/image-loading.h @@ -2,7 +2,7 @@ #define DALI_IMAGE_LOADING_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. @@ -19,11 +19,13 @@ // EXTERNAL INCLUDES #include -#include #include - #include +// INTERNAL INCLUDES +#include + + namespace Dali { @@ -39,7 +41,7 @@ namespace Dali * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header. * @return handle to the loaded PixelBuffer object or an empty handle in case loading failed. */ -DALI_IMPORT_API Devel::PixelBuffer LoadImageFromFile( +DALI_ADAPTOR_API Devel::PixelBuffer LoadImageFromFile( const std::string& url, ImageDimensions size = ImageDimensions( 0, 0 ), FittingMode::Type fittingMode = FittingMode::DEFAULT, @@ -62,7 +64,7 @@ DALI_IMPORT_API Devel::PixelBuffer LoadImageFromFile( * flip the image, e.g., from portrait to landscape. * @return dimensions that image will have if it is loaded with given parameters. */ -DALI_IMPORT_API ImageDimensions GetClosestImageSize( +DALI_ADAPTOR_API ImageDimensions GetClosestImageSize( const std::string& filename, ImageDimensions size = ImageDimensions(0, 0), FittingMode::Type fittingMode = FittingMode::DEFAULT, @@ -80,7 +82,7 @@ DALI_IMPORT_API ImageDimensions GetClosestImageSize( * * @return handle to the loaded PixelBuffer object or an empty handle in case downloading or decoding failed. */ -DALI_IMPORT_API Devel::PixelBuffer DownloadImageSynchronously( +DALI_ADAPTOR_API Devel::PixelBuffer DownloadImageSynchronously( const std::string& url, ImageDimensions size = ImageDimensions( 0, 0 ), FittingMode::Type fittingMode = FittingMode::DEFAULT, @@ -92,14 +94,14 @@ DALI_IMPORT_API Devel::PixelBuffer DownloadImageSynchronously( * * @param [in] size The maximum texture size to set */ -void SetMaxTextureSize( unsigned int size ); +DALI_ADAPTOR_API void SetMaxTextureSize( unsigned int size ); /** * @brief get the maximum texture size. * * @return The maximum texture size */ -DALI_IMPORT_API unsigned int GetMaxTextureSize(); +DALI_ADAPTOR_API unsigned int GetMaxTextureSize(); } // Dali diff --git a/dali/devel-api/adaptor-framework/input-method-context.h b/dali/devel-api/adaptor-framework/input-method-context.h index 3c427c2..49901a1 100755 --- a/dali/devel-api/adaptor-framework/input-method-context.h +++ b/dali/devel-api/adaptor-framework/input-method-context.h @@ -43,7 +43,7 @@ class InputMethodContext; * Specifically manages the ecore input method framework which enables the virtual or hardware keyboards. */ -class DALI_IMPORT_API InputMethodContext : public BaseHandle +class DALI_ADAPTOR_API InputMethodContext : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/input-method-options.h b/dali/devel-api/adaptor-framework/input-method-options.h index 477be33..27f93e8 100644 --- a/dali/devel-api/adaptor-framework/input-method-options.h +++ b/dali/devel-api/adaptor-framework/input-method-options.h @@ -32,7 +32,7 @@ namespace Dali /** * Class to handle the Input Method options */ -class DALI_IMPORT_API InputMethodOptions +class DALI_ADAPTOR_API InputMethodOptions { public: diff --git a/dali/devel-api/adaptor-framework/lifecycle-controller.h b/dali/devel-api/adaptor-framework/lifecycle-controller.h old mode 100644 new mode 100755 index a818f54..8bcf52b --- a/dali/devel-api/adaptor-framework/lifecycle-controller.h +++ b/dali/devel-api/adaptor-framework/lifecycle-controller.h @@ -2,7 +2,7 @@ #define __DALI_LIFECYCLE_CONTROLLER_H__ /* - * 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -53,7 +56,7 @@ class LifecycleController; * } * @endcode */ -class DALI_IMPORT_API LifecycleController : public BaseHandle +class DALI_ADAPTOR_API LifecycleController : public BaseHandle { public: // Typedefs diff --git a/dali/devel-api/adaptor-framework/orientation.h b/dali/devel-api/adaptor-framework/orientation.h old mode 100644 new mode 100755 index 603063a..3c6edb0 --- a/dali/devel-api/adaptor-framework/orientation.h +++ b/dali/devel-api/adaptor-framework/orientation.h @@ -2,7 +2,7 @@ #define __DALI_ORIENTATION_H__ /* - * 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -40,7 +43,7 @@ class Orientation; * Dali applications have full control over visual layout when the device is rotated * i.e. the application developer decides which UI controls to rotate, if any. */ -class DALI_IMPORT_API Orientation : public BaseHandle +class DALI_ADAPTOR_API Orientation : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/performance-logger.h b/dali/devel-api/adaptor-framework/performance-logger.h old mode 100644 new mode 100755 index 30992d0..7b104d0 --- a/dali/devel-api/adaptor-framework/performance-logger.h +++ b/dali/devel-api/adaptor-framework/performance-logger.h @@ -2,7 +2,7 @@ #define __DALI_PERFORMANCE_LOGGER_H__ /* - * 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. @@ -21,6 +21,9 @@ // EXTERNAL INCLUDES #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -35,7 +38,7 @@ class PerformanceLogger; /** * @brief Performance logger class */ -class DALI_IMPORT_API PerformanceLogger : public BaseHandle +class DALI_ADAPTOR_API PerformanceLogger : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/physical-keyboard.h b/dali/devel-api/adaptor-framework/physical-keyboard.h old mode 100644 new mode 100755 index 3d53913..362966e --- a/dali/devel-api/adaptor-framework/physical-keyboard.h +++ b/dali/devel-api/adaptor-framework/physical-keyboard.h @@ -2,7 +2,7 @@ #define __DALI_PHYSICAL_KEYBOARD_H__ /* - * 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -36,7 +39,7 @@ class PhysicalKeyboard; /** * This is a handle to a physical keyboard connected to the device. */ -class DALI_IMPORT_API PhysicalKeyboard : public BaseHandle +class DALI_ADAPTOR_API PhysicalKeyboard : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/pixel-buffer.h b/dali/devel-api/adaptor-framework/pixel-buffer.h old mode 100644 new mode 100755 index 4da7620..35dc777 --- a/dali/devel-api/adaptor-framework/pixel-buffer.h +++ b/dali/devel-api/adaptor-framework/pixel-buffer.h @@ -2,7 +2,7 @@ #define DALI_PIXEL_BUFFER_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. @@ -23,6 +23,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -55,7 +58,7 @@ namespace Devel * * @SINCE_1_2.46 */ -class DALI_IMPORT_API PixelBuffer : public BaseHandle +class DALI_ADAPTOR_API PixelBuffer : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/singleton-service.h b/dali/devel-api/adaptor-framework/singleton-service.h old mode 100644 new mode 100755 index 5156f45..cb1ac4c --- a/dali/devel-api/adaptor-framework/singleton-service.h +++ b/dali/devel-api/adaptor-framework/singleton-service.h @@ -2,7 +2,7 @@ #define __DALI_SINGELTON_SERVICE_H__ /* - * 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -40,7 +43,7 @@ class SingletonService; * * @see Application */ -class DALI_IMPORT_API SingletonService : public BaseHandle +class DALI_ADAPTOR_API SingletonService : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/sound-player.h b/dali/devel-api/adaptor-framework/sound-player.h old mode 100644 new mode 100755 index 9d63bd6..154c429 --- a/dali/devel-api/adaptor-framework/sound-player.h +++ b/dali/devel-api/adaptor-framework/sound-player.h @@ -2,7 +2,7 @@ #define __DALI_SOUND_PLAYER_H__ /* - * 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -36,7 +39,7 @@ class SoundPlayer; /** * @brief Plays sound effects. */ -class DALI_IMPORT_API SoundPlayer : public BaseHandle +class DALI_ADAPTOR_API SoundPlayer : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/style-monitor.h b/dali/devel-api/adaptor-framework/style-monitor.h index c9cffab..ebf754e 100644 --- a/dali/devel-api/adaptor-framework/style-monitor.h +++ b/dali/devel-api/adaptor-framework/style-monitor.h @@ -2,7 +2,7 @@ #define __DALI_STYLE_MONITOR_H__ /* - * 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. @@ -45,7 +45,7 @@ class StyleMonitor; * It provides a signal when any aspect of the default style changes on the device. * @see Adaptor::GetStyleMonitor */ -class DALI_IMPORT_API StyleMonitor : public BaseHandle +class DALI_ADAPTOR_API StyleMonitor : public BaseHandle { public: // Typedefs diff --git a/dali/devel-api/adaptor-framework/tilt-sensor.h b/dali/devel-api/adaptor-framework/tilt-sensor.h old mode 100644 new mode 100755 index e24b910..e435ecb --- a/dali/devel-api/adaptor-framework/tilt-sensor.h +++ b/dali/devel-api/adaptor-framework/tilt-sensor.h @@ -2,7 +2,7 @@ #define __DALI_TILT_SENSOR_H__ /* - * 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -75,7 +78,7 @@ class TiltSensor; * * @endcode */ -class DALI_IMPORT_API TiltSensor : public BaseHandle +class DALI_ADAPTOR_API TiltSensor : public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/video-player.h b/dali/devel-api/adaptor-framework/video-player.h index 2186250..842718f 100755 --- a/dali/devel-api/adaptor-framework/video-player.h +++ b/dali/devel-api/adaptor-framework/video-player.h @@ -2,7 +2,7 @@ #define __DALI_VIDEO_PLAYER_H__ /* - * Copyright (c) 2016 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. @@ -23,6 +23,7 @@ //INTERNAL INCLUDES #include +#include namespace Dali { @@ -43,7 +44,7 @@ namespace Adaptor * @brief VideoPlayer class is used for video playback. * @SINCE_1_1.38 */ -class DALI_IMPORT_API VideoPlayer: public BaseHandle +class DALI_ADAPTOR_API VideoPlayer: public BaseHandle { public: diff --git a/dali/devel-api/adaptor-framework/virtual-keyboard.h b/dali/devel-api/adaptor-framework/virtual-keyboard.h index dbe2276..fa3a469 100755 --- a/dali/devel-api/adaptor-framework/virtual-keyboard.h +++ b/dali/devel-api/adaptor-framework/virtual-keyboard.h @@ -75,36 +75,36 @@ enum ReturnKeyType /** * @brief Show the virtual keyboard. */ -DALI_IMPORT_API void Show(); +DALI_ADAPTOR_API void Show(); /** * @brief Hide the virtual keyboard. */ -DALI_IMPORT_API void Hide(); +DALI_ADAPTOR_API void Hide(); /** * @brief Returns whether the virtual keyboard is visible or not. * @return true if visible, false otherwise. */ -DALI_IMPORT_API bool IsVisible(); +DALI_ADAPTOR_API bool IsVisible(); /** * @brief Set one or more of the Input Method Settings * @param[in] settingsMap Map of Settings to be applied. */ -DALI_IMPORT_API void ApplySettings( const Property::Map& settingsMap ); +DALI_ADAPTOR_API void ApplySettings( const Property::Map& settingsMap ); /** * @brief Set the specific return key into the virtual keyboard. * @param[in] type the kind of return key types. */ -DALI_IMPORT_API void SetReturnKeyType( const InputMethod::ButtonAction::Type type ); +DALI_ADAPTOR_API void SetReturnKeyType( const InputMethod::ButtonAction::Type type ); /** * @brief Retrieve the current return key type. * @return the type of retun key. */ -DALI_IMPORT_API InputMethod::ButtonAction::Type GetReturnKeyType(); +DALI_ADAPTOR_API InputMethod::ButtonAction::Type GetReturnKeyType(); /** * @brief Enable/disable prediction (predictive text). @@ -113,13 +113,13 @@ DALI_IMPORT_API InputMethod::ButtonAction::Type GetReturnKeyType(); * @param[in] enable true or false to enable or disable * Prediction can not be changed while the keyboard is visible. It must be set in advance of showing keyboard. */ -DALI_IMPORT_API void EnablePrediction(const bool enable); +DALI_ADAPTOR_API void EnablePrediction(const bool enable); /** * @brief Returns whether prediction is enabled in the virtual keyboard * @return true if predictive text enabled, false otherwise. */ -DALI_IMPORT_API bool IsPredictionEnabled(); +DALI_ADAPTOR_API bool IsPredictionEnabled(); /** * @brief Provides size and position of keyboard. @@ -130,7 +130,7 @@ DALI_IMPORT_API bool IsPredictionEnabled(); * the values then taken down. So ideally GetSizeAndPosition() should be called after Show(). * @return rect which is keyboard panel x, y, width, height */ -DALI_IMPORT_API Dali::Rect GetSizeAndPosition(); +DALI_ADAPTOR_API Dali::Rect GetSizeAndPosition(); /** * @brief Rotates the keyboard orientation to the given angle. @@ -139,13 +139,13 @@ DALI_IMPORT_API Dali::Rect GetSizeAndPosition(); * Other valid values are 90, 180, 270. * @param angle the angle is in degrees. */ -DALI_IMPORT_API void RotateTo(int angle); +DALI_ADAPTOR_API void RotateTo(int angle); /** * @brief Returns text direction of the keyboard's current input language. * @return The direction of the text. */ -DALI_IMPORT_API TextDirection GetTextDirection(); +DALI_ADAPTOR_API TextDirection GetTextDirection(); } // namespace VirtualKeyboard diff --git a/dali/devel-api/text-abstraction/bidirectional-support.h b/dali/devel-api/text-abstraction/bidirectional-support.h old mode 100644 new mode 100755 index 5ebeafd..55ba1f9 --- a/dali/devel-api/text-abstraction/bidirectional-support.h +++ b/dali/devel-api/text-abstraction/bidirectional-support.h @@ -2,7 +2,7 @@ #define __DALI_PLATFORM_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_H__ /* - * 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. @@ -24,6 +24,9 @@ // EXTERNAL INCLUDES #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -41,7 +44,7 @@ class BidirectionalSupport; * BidirectionalSupport API * */ -class DALI_IMPORT_API BidirectionalSupport : public BaseHandle +class DALI_ADAPTOR_API BidirectionalSupport : public BaseHandle { public: diff --git a/dali/devel-api/text-abstraction/font-client.h b/dali/devel-api/text-abstraction/font-client.h old mode 100644 new mode 100755 index 8c8cfca..6411b16 --- a/dali/devel-api/text-abstraction/font-client.h +++ b/dali/devel-api/text-abstraction/font-client.h @@ -2,7 +2,7 @@ #define DALI_PLATFORM_TEXT_ABSTRACTION_FONT_CLIENT_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. @@ -25,6 +25,7 @@ #include #include #include +#include namespace Dali { @@ -59,7 +60,7 @@ class FontClient; * @endcode * Glyph metrics and bitmap resources can then be retrieved using the FontId. */ -class DALI_IMPORT_API FontClient : public BaseHandle +class DALI_ADAPTOR_API FontClient : public BaseHandle { public: static const PointSize26Dot6 DEFAULT_POINT_SIZE; ///< The default point size. @@ -67,7 +68,7 @@ public: /** * @brief Struct used to retrieve the glyph's bitmap. */ - struct GlyphBufferData + struct DALI_ADAPTOR_API GlyphBufferData { /** * @brief Constructor. diff --git a/dali/devel-api/text-abstraction/font-list.cpp b/dali/devel-api/text-abstraction/font-list.cpp index 8118f99..7053174 100644 --- a/dali/devel-api/text-abstraction/font-list.cpp +++ b/dali/devel-api/text-abstraction/font-list.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. @@ -24,7 +24,7 @@ namespace Dali namespace TextAbstraction { -DALI_IMPORT_API std::ostream& operator<<( std::ostream& o, const FontList& fontList ) +DALI_ADAPTOR_API std::ostream& operator<<( std::ostream& o, const FontList& fontList ) { for( unsigned int i=0; i #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -156,7 +159,7 @@ struct FontDescription typedef std::vector FontList; -DALI_IMPORT_API std::ostream& operator<<( std::ostream& o, const FontList& fontList ); +DALI_ADAPTOR_API std::ostream& operator<<( std::ostream& o, const FontList& fontList ); } // namespace TextAbstraction diff --git a/dali/devel-api/text-abstraction/font-metrics.h b/dali/devel-api/text-abstraction/font-metrics.h index 3649dab..0edbce2 100644 --- a/dali/devel-api/text-abstraction/font-metrics.h +++ b/dali/devel-api/text-abstraction/font-metrics.h @@ -2,7 +2,7 @@ #define __DALI_TEXT_ABSTRACTION_FONT_METRICS_H__ /* - * 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. @@ -18,8 +18,8 @@ * */ -// EXTERNAL INCLUDES -#include +// INTERNAL INCLUDES +#include namespace Dali { @@ -30,7 +30,7 @@ namespace TextAbstraction /** * The metrics for a Font expressed in pixels. */ -struct DALI_IMPORT_API FontMetrics +struct DALI_ADAPTOR_API FontMetrics { /** * @brief Default constructor. diff --git a/dali/devel-api/text-abstraction/glyph-info.h b/dali/devel-api/text-abstraction/glyph-info.h index 952a302..79e1996 100644 --- a/dali/devel-api/text-abstraction/glyph-info.h +++ b/dali/devel-api/text-abstraction/glyph-info.h @@ -2,7 +2,7 @@ #define __DALI_TEXT_ABSTRACTION_GLYPH_INFO_H__ /* - * 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. @@ -19,9 +19,7 @@ */ // EXTERNAL INCLUDES -#include - -// INTERNAL INCLUDES +#include #include namespace Dali @@ -34,7 +32,7 @@ namespace TextAbstraction * The information describing a glyph (font ID, index, metrics) * The metrics are in pixels. */ -struct DALI_IMPORT_API GlyphInfo +struct DALI_ADAPTOR_API GlyphInfo { /** * @brief Default constructor. diff --git a/dali/devel-api/text-abstraction/script.h b/dali/devel-api/text-abstraction/script.h index 93d1021..dff94ea 100644 --- a/dali/devel-api/text-abstraction/script.h +++ b/dali/devel-api/text-abstraction/script.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_ABSTRACTION_SCRIPT_H__ /* - * 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. @@ -18,10 +18,8 @@ * */ -// EXTERNAL INCLUDES -#include - // INTERNAL INCLUDES +#include #include namespace Dali @@ -187,7 +185,7 @@ const char* const ScriptName[] = * * @return @e true if the script is right to left. */ -DALI_IMPORT_API bool IsRightToLeftScript( Script script ); +DALI_ADAPTOR_API bool IsRightToLeftScript( Script script ); /** * @brief Retrieves a character's script. @@ -196,7 +194,7 @@ DALI_IMPORT_API bool IsRightToLeftScript( Script script ); * * @return The chraracter's script. */ -DALI_IMPORT_API Script GetCharacterScript( Character character ); +DALI_ADAPTOR_API Script GetCharacterScript( Character character ); /** * @brief Whether the character is a white space. @@ -205,7 +203,7 @@ DALI_IMPORT_API Script GetCharacterScript( Character character ); * * @return @e true if the character is a white space. */ -DALI_IMPORT_API bool IsWhiteSpace( Character character ); +DALI_ADAPTOR_API bool IsWhiteSpace( Character character ); /** * @brief Whether the character is a new paragraph character. @@ -214,7 +212,7 @@ DALI_IMPORT_API bool IsWhiteSpace( Character character ); * * @return @e true if the character is a new paragraph character. */ -DALI_IMPORT_API bool IsNewParagraph( Character character ); +DALI_ADAPTOR_API bool IsNewParagraph( Character character ); /** * @brief Whether the character is a zero width non joiner. @@ -223,7 +221,7 @@ DALI_IMPORT_API bool IsNewParagraph( Character character ); * * @return @e true if the character is a zero width non joiner. */ -DALI_IMPORT_API bool IsZeroWidthNonJoiner( Character character ); +DALI_ADAPTOR_API bool IsZeroWidthNonJoiner( Character character ); /** * @brief Whether the character is a zero width joiner. @@ -232,7 +230,7 @@ DALI_IMPORT_API bool IsZeroWidthNonJoiner( Character character ); * * @return @e true if the character is a zero width joiner. */ -DALI_IMPORT_API bool IsZeroWidthJoiner( Character character ); +DALI_ADAPTOR_API bool IsZeroWidthJoiner( Character character ); /** * @brief Whether the character is a zero width space. @@ -241,7 +239,7 @@ DALI_IMPORT_API bool IsZeroWidthJoiner( Character character ); * * @return @e true if the character is a zero width space. */ -DALI_IMPORT_API bool IsZeroWidthSpace( Character character ); +DALI_ADAPTOR_API bool IsZeroWidthSpace( Character character ); /** * @brief Whether the character is a left to right mark. @@ -250,7 +248,7 @@ DALI_IMPORT_API bool IsZeroWidthSpace( Character character ); * * @return @e true if the character is a left to right mark. */ -DALI_IMPORT_API bool IsLeftToRightMark( Character character ); +DALI_ADAPTOR_API bool IsLeftToRightMark( Character character ); /** * @brief Whether the character is a right to left mark. @@ -259,7 +257,7 @@ DALI_IMPORT_API bool IsLeftToRightMark( Character character ); * * @return @e true if the character is a right to left mark. */ -DALI_IMPORT_API bool IsRightToLeftMark( Character character ); +DALI_ADAPTOR_API bool IsRightToLeftMark( Character character ); /** * @brief Whether the character is a thin space. @@ -268,7 +266,7 @@ DALI_IMPORT_API bool IsRightToLeftMark( Character character ); * * @return @e true if the character is a thin space. */ -DALI_IMPORT_API bool IsThinSpace( Character character ); +DALI_ADAPTOR_API bool IsThinSpace( Character character ); /** * @brief Whether the character is common within all scripts. @@ -277,7 +275,7 @@ DALI_IMPORT_API bool IsThinSpace( Character character ); * * @return @e true if the character is common within all scripts. */ -DALI_IMPORT_API bool IsCommonScript( Character character ); +DALI_ADAPTOR_API bool IsCommonScript( Character character ); /** * @brief Whether the script contains ligatures that must be 'broken' for selection or cursor position. @@ -289,7 +287,7 @@ DALI_IMPORT_API bool IsCommonScript( Character character ); * * @return @e true if the script has ligatures that must be 'broken'. */ -DALI_IMPORT_API bool HasLigatureMustBreak( Script script ); +DALI_ADAPTOR_API bool HasLigatureMustBreak( Script script ); } // namespace TextAbstraction } // namespace Dali diff --git a/dali/devel-api/text-abstraction/segmentation.h b/dali/devel-api/text-abstraction/segmentation.h old mode 100644 new mode 100755 index c9a2282..a56fa89 --- a/dali/devel-api/text-abstraction/segmentation.h +++ b/dali/devel-api/text-abstraction/segmentation.h @@ -2,7 +2,7 @@ #define __DALI_PLATFORM_TEXT_ABSTRACTION_SEGMENTATION_H__ /* - * 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. @@ -20,6 +20,7 @@ // INTERNAL INCLUDES #include +#include // EXTERNAL INCLUDES #include @@ -46,7 +47,7 @@ namespace TextAbstraction * Segmentation API * */ -class DALI_IMPORT_API Segmentation : public BaseHandle +class DALI_ADAPTOR_API Segmentation : public BaseHandle { public: diff --git a/dali/devel-api/text-abstraction/shaping.h b/dali/devel-api/text-abstraction/shaping.h index 9d72142..9c8e278 100644 --- a/dali/devel-api/text-abstraction/shaping.h +++ b/dali/devel-api/text-abstraction/shaping.h @@ -2,7 +2,7 @@ #define __DALI_PLATFORM_TEXT_ABSTRACTION_SHAPING_H__ /* - * 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. @@ -60,7 +60,7 @@ class Shaping; * shaping.GetGlyphs( glyphInfo, glyphToCharacterMap ); * @endcode */ -class DALI_IMPORT_API Shaping : public BaseHandle +class DALI_ADAPTOR_API Shaping : public BaseHandle { public: diff --git a/dali/integration-api/adaptor.h b/dali/integration-api/adaptor.h old mode 100644 new mode 100755 index 3a9e690..e3a2115 --- a/dali/integration-api/adaptor.h +++ b/dali/integration-api/adaptor.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_ADAPTOR_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. @@ -28,6 +28,7 @@ // INTERNAL INCLUDES #include #include +#include #ifdef DALI_ADAPTOR_COMPILATION #include @@ -107,7 +108,7 @@ class Adaptor; * * @see RenderSurface */ -class DALI_IMPORT_API Adaptor +class DALI_ADAPTOR_API Adaptor { public: diff --git a/dali/integration-api/native-render-surface-factory.h b/dali/integration-api/native-render-surface-factory.h index eb69e8b..6a752a1 100644 --- a/dali/integration-api/native-render-surface-factory.h +++ b/dali/integration-api/native-render-surface-factory.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_NATIVE_RENDER_SURFACE_FACTORY_H__ /* - * 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. @@ -20,7 +20,9 @@ // EXTERNAL INCLUDES #include -#include + +// INTERNAL INCLUDES +#include // INTERNAL INCLUDES diff --git a/dali/integration-api/native-render-surface.h b/dali/integration-api/native-render-surface.h index 796967f..bbd5e9b 100644 --- a/dali/integration-api/native-render-surface.h +++ b/dali/integration-api/native-render-surface.h @@ -18,10 +18,8 @@ * */ -// EXTERNAL INCLUDES -#include - // INTERNAL INCLUDES +#include #ifdef DALI_ADAPTOR_COMPILATION #include #include @@ -38,7 +36,7 @@ class TriggerEventInterface; /** * Native interface of render surface. */ -class DALI_IMPORT_API NativeRenderSurface : public Dali::RenderSurface +class DALI_ADAPTOR_API NativeRenderSurface : public Dali::RenderSurface { public: diff --git a/dali/integration-api/render-surface.h b/dali/integration-api/render-surface.h index ee891a0..ceca9d3 100644 --- a/dali/integration-api/render-surface.h +++ b/dali/integration-api/render-surface.h @@ -2,7 +2,7 @@ #define __DALI_RENDER_SURFACE_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. @@ -21,10 +21,10 @@ // EXTERNAL INCLUDES #include #include -#include #include // INTERNAL INCLUDES +#include namespace Dali { diff --git a/dali/integration-api/trigger-event-factory.h b/dali/integration-api/trigger-event-factory.h index 62f4a7a..44efc42 100644 --- a/dali/integration-api/trigger-event-factory.h +++ b/dali/integration-api/trigger-event-factory.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_H__ /* - * 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 @@ */ // INTERNAL INCLUDES -#include +#include #ifdef DALI_ADAPTOR_COMPILATION #include #else @@ -33,7 +33,7 @@ namespace Dali * @brief Trigger interface factory class * */ -class DALI_IMPORT_API TriggerEventFactory : public TriggerEventFactoryInterface +class DALI_ADAPTOR_API TriggerEventFactory : public TriggerEventFactoryInterface { public: diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index 843b8ee..af8a13e 100755 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -19,7 +19,6 @@ #include // EXTERNAL INCLUDES -#include #include #include #include @@ -31,6 +30,7 @@ #include // INTERNAL INCLUDES +#include #include #include #include diff --git a/dali/internal/clipboard/common/clipboard-event-notifier-impl.h b/dali/internal/clipboard/common/clipboard-event-notifier-impl.h old mode 100644 new mode 100755 index c564117..a3eb57d --- a/dali/internal/clipboard/common/clipboard-event-notifier-impl.h +++ b/dali/internal/clipboard/common/clipboard-event-notifier-impl.h @@ -2,7 +2,7 @@ #define __DALI_INTERNAL_CLIPBOARD_EVENT_NOTIFIER_H__ /* - * 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. @@ -25,6 +25,7 @@ // INTERNAL INCLUDES #include +#include namespace Dali { diff --git a/dali/internal/graphics/gles20/egl-implementation.cpp b/dali/internal/graphics/gles20/egl-implementation.cpp index c0ad117..647087b 100755 --- a/dali/internal/graphics/gles20/egl-implementation.cpp +++ b/dali/internal/graphics/gles20/egl-implementation.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. @@ -21,10 +21,11 @@ // EXTERNAL INCLUDES #include -#include + #include // INTERNAL INCLUDES +#include #include #include diff --git a/dali/internal/graphics/gles20/egl-sync-implementation.h b/dali/internal/graphics/gles20/egl-sync-implementation.h index 616f156..932a3fe 100644 --- a/dali/internal/graphics/gles20/egl-sync-implementation.h +++ b/dali/internal/graphics/gles20/egl-sync-implementation.h @@ -2,7 +2,7 @@ #define __DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_H__ /* - * 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. @@ -21,10 +21,12 @@ // EXTERNAL INCLUDES #include #include -#include #include #include +// INTERNAL INCLUDES +#include + namespace Dali { namespace Internal diff --git a/dali/internal/legacy/common/tizen-platform-abstraction.h b/dali/internal/legacy/common/tizen-platform-abstraction.h index 13db481..67b9a56 100644 --- a/dali/internal/legacy/common/tizen-platform-abstraction.h +++ b/dali/internal/legacy/common/tizen-platform-abstraction.h @@ -2,7 +2,7 @@ #define __DALI_TIZEN_PLATFORM_ABSTRACTION_H__ /* - * Copyright (c) 2016 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. @@ -18,10 +18,12 @@ * */ -#include -#include +// INTERNAL INCLUDES +#include +// EXTERNAL INCLUDES #include +#include namespace Dali { diff --git a/dali/internal/system/common/callback-manager.h b/dali/internal/system/common/callback-manager.h index fc16aca..63870f0 100644 --- a/dali/internal/system/common/callback-manager.h +++ b/dali/internal/system/common/callback-manager.h @@ -2,7 +2,7 @@ #define __DALI_INTERNAL_CALLBACK_MANAGER_H__ /* - * Copyright (c) 2016 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,9 +19,11 @@ */ // EXTERNAL INCLUDES -#include #include +// INTERNAL INCLUDES +#include + namespace Dali { diff --git a/dali/internal/system/common/timer-impl-ecore.cpp b/dali/internal/system/common/timer-impl-ecore.cpp index d4938fd..1c3e541 100644 --- a/dali/internal/system/common/timer-impl-ecore.cpp +++ b/dali/internal/system/common/timer-impl-ecore.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. @@ -20,9 +20,7 @@ // INTERNAL INCLUDES #include - -// EXTERNAL INCLUDES -#include +#include // Ecore is littered with C style cast #pragma GCC diagnostic push diff --git a/dali/internal/system/common/timer-impl.h b/dali/internal/system/common/timer-impl.h index 2689d35..a382d8f 100644 --- a/dali/internal/system/common/timer-impl.h +++ b/dali/internal/system/common/timer-impl.h @@ -2,7 +2,7 @@ #define __DALI_INTERNAL_TIMER_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. @@ -19,10 +19,10 @@ */ // EXTERNAL INCLUDES -#include #include // INTERNAL INCLUDES +#include #include #include diff --git a/dali/internal/system/common/trigger-event.h b/dali/internal/system/common/trigger-event.h index 437283c..8d0d5c8 100644 --- a/dali/internal/system/common/trigger-event.h +++ b/dali/internal/system/common/trigger-event.h @@ -2,7 +2,7 @@ #define __DALI_INTERNAL_TRIGGER_EVENT_H__ /* - * 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,11 +19,11 @@ */ // EXTERNAL INCLUDES -#include #include #include // INTERNAL INCLUDES +#include #include namespace Dali diff --git a/dali/internal/system/tizen/capture-impl.h b/dali/internal/system/tizen/capture-impl.h index 4f124c8..4b36c1f 100755 --- a/dali/internal/system/tizen/capture-impl.h +++ b/dali/internal/system/tizen/capture-impl.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_CAPTURE_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. @@ -24,12 +24,12 @@ #include #include #include -#include #include #include #include // INTERNAL INCLUDES +#include #include #include #include diff --git a/dali/internal/window-system/common/native-render-surface-factory.cpp b/dali/internal/window-system/common/native-render-surface-factory.cpp index 60d22b9..069ee0a 100644 --- a/dali/internal/window-system/common/native-render-surface-factory.cpp +++ b/dali/internal/window-system/common/native-render-surface-factory.cpp @@ -22,7 +22,7 @@ namespace Dali { -DALI_EXPORT_API NativeRenderSurface* CreateNativeSurface( +DALI_ADAPTOR_API NativeRenderSurface* CreateNativeSurface( PositionSize positionSize, const std::string& name, bool isTransparent) diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h index 782d16d..ae52443 100644 --- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h +++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h @@ -21,10 +21,10 @@ // EXTERNAL INCLUDES #include #include -#include #include // INTERNAL INCLUDES +#include #include namespace Dali diff --git a/dali/internal/window-system/tizen-wayland/window-render-surface-ecore-wl.h b/dali/internal/window-system/tizen-wayland/window-render-surface-ecore-wl.h index e95d8b1..420bc92 100644 --- a/dali/internal/window-system/tizen-wayland/window-render-surface-ecore-wl.h +++ b/dali/internal/window-system/tizen-wayland/window-render-surface-ecore-wl.h @@ -21,9 +21,9 @@ // EXTERNAL INCLUDES #include #include -#include // INTERNAL INCLUDES +#include #include #include #include diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h index 364d170..d52e793 100644 --- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h +++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h @@ -23,9 +23,9 @@ #include #include #include +#include // EXTERNAL INCLUDES -#include #include #include diff --git a/dali/public-api/adaptor-framework/application.h b/dali/public-api/adaptor-framework/application.h index 5757300..638b9be 100644 --- a/dali/public-api/adaptor-framework/application.h +++ b/dali/public-api/adaptor-framework/application.h @@ -2,7 +2,7 @@ #define __DALI_APPLICATION_H__ /* - * 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. @@ -104,7 +104,7 @@ class Application; * When the above options are found, they are stripped from argv, and argc is updated appropriately. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Application : public BaseHandle +class DALI_ADAPTOR_API Application : public BaseHandle { public: diff --git a/dali/public-api/adaptor-framework/input-method.h b/dali/public-api/adaptor-framework/input-method.h index f5caaa3..9f76e6c 100644 --- a/dali/public-api/adaptor-framework/input-method.h +++ b/dali/public-api/adaptor-framework/input-method.h @@ -18,8 +18,8 @@ * */ -// EXTERNAL INCLUDES -#include +// INTERNAL INCLUDES +#include namespace Dali { diff --git a/dali/public-api/adaptor-framework/key-grab.h b/dali/public-api/adaptor-framework/key-grab.h index dd6e82c..9e0a297 100755 --- a/dali/public-api/adaptor-framework/key-grab.h +++ b/dali/public-api/adaptor-framework/key-grab.h @@ -2,7 +2,7 @@ #define __DALI_KEY_GRAB_H__ /* - * Copyright (c) 2016 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,8 +19,10 @@ */ // INTERNAL INCLUDES -#include +#include #include + +// EXTERNAL INCLUDES #include namespace Dali @@ -50,7 +52,7 @@ namespace KeyGrab * @param[in] daliKey The key code to grab (defined in key.h) * @return true if the grab succeeds */ -DALI_IMPORT_API bool GrabKeyTopmost( Window window, Dali::KEY daliKey ); +DALI_ADAPTOR_API bool GrabKeyTopmost( Window window, Dali::KEY daliKey ); /** * @brief Ungrabs the key specified by @a key for @a window. @@ -62,7 +64,7 @@ DALI_IMPORT_API bool GrabKeyTopmost( Window window, Dali::KEY daliKey ); * @note If this function is called between key down and up events of a grabbed key, * an application doesn't receive the key up event. */ -DALI_IMPORT_API bool UngrabKeyTopmost( Window window, Dali::KEY daliKey ); +DALI_ADAPTOR_API bool UngrabKeyTopmost( Window window, Dali::KEY daliKey ); /** * @brief Enumeration for key grab mode for platform-level APIs. @@ -93,7 +95,7 @@ enum KeyGrabMode * @param[in] grabMode The grab mode for the key * @return true if the grab succeeds */ -DALI_IMPORT_API bool GrabKey( Window window, Dali::KEY daliKey, KeyGrabMode grabMode ); +DALI_ADAPTOR_API bool GrabKey( Window window, Dali::KEY daliKey, KeyGrabMode grabMode ); /** * @PLATFORM @@ -108,7 +110,7 @@ DALI_IMPORT_API bool GrabKey( Window window, Dali::KEY daliKey, KeyGrabMode grab * @note If this function is called between key down and up events of a grabbed key, * an application doesn't receive the key up event. */ -DALI_IMPORT_API bool UngrabKey( Window window, Dali::KEY daliKey ); +DALI_ADAPTOR_API bool UngrabKey( Window window, Dali::KEY daliKey ); /** @@ -129,7 +131,7 @@ DALI_IMPORT_API bool UngrabKey( Window window, Dali::KEY daliKey ); * @param[in] returnVector The Dali::Vector of return boolean values for the results of multiple grab succeeds/fails * @return bool false when error occurs */ -DALI_IMPORT_API bool GrabKeyList( Window window, const Dali::Vector& daliKeyVector, const Dali::Vector& grabModeVector, Dali::Vector& returnVector); +DALI_ADAPTOR_API bool GrabKeyList( Window window, const Dali::Vector& daliKeyVector, const Dali::Vector& grabModeVector, Dali::Vector& returnVector); /** @@ -146,7 +148,7 @@ DALI_IMPORT_API bool GrabKeyList( Window window, const Dali::Vector& * @note If this function is called between key down and up events of a grabbed key, * an application doesn't receive the key up event. */ -DALI_IMPORT_API bool UngrabKeyList( Window window, const Dali::Vector& daliKeyVector, Dali::Vector& returnVector); +DALI_ADAPTOR_API bool UngrabKeyList( Window window, const Dali::Vector& daliKeyVector, Dali::Vector& returnVector); } // namespace KeyGrab diff --git a/dali/public-api/adaptor-framework/key.h b/dali/public-api/adaptor-framework/key.h old mode 100644 new mode 100755 index 76ab11e..fb9427f --- a/dali/public-api/adaptor-framework/key.h +++ b/dali/public-api/adaptor-framework/key.h @@ -2,7 +2,7 @@ #define __DALI_KEY_H__ /* - * 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. @@ -19,9 +19,11 @@ */ // EXTERNAL INCLUDES - #include +// INTERNAL INCLUDES +#include + namespace Dali { /** @@ -88,7 +90,7 @@ enum KEY * @param daliKey Dali key enum * @return @c true if the key is matched, @c false if not */ -DALI_IMPORT_API bool IsKey( const Dali::KeyEvent& keyEvent, Dali::KEY daliKey); +DALI_ADAPTOR_API bool IsKey( const Dali::KeyEvent& keyEvent, Dali::KEY daliKey); /** * @} diff --git a/dali/public-api/adaptor-framework/native-image-source.h b/dali/public-api/adaptor-framework/native-image-source.h index 26d79ef..c69e70d 100755 --- a/dali/public-api/adaptor-framework/native-image-source.h +++ b/dali/public-api/adaptor-framework/native-image-source.h @@ -2,7 +2,7 @@ #define __DALI_NATIVE_IMAGE_SOURCE_H__ /* - * 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,6 +26,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { /** @@ -59,7 +62,7 @@ typedef Dali::IntrusivePtr NativeImageSourcePtr; * @SINCE_1_1.4 * @see NativeImage */ -class DALI_IMPORT_API NativeImageSource : public NativeImageInterface +class DALI_ADAPTOR_API NativeImageSource : public NativeImageInterface { public: diff --git a/dali/public-api/adaptor-framework/style-change.h b/dali/public-api/adaptor-framework/style-change.h index e38bf63..e12d6e2 100644 --- a/dali/public-api/adaptor-framework/style-change.h +++ b/dali/public-api/adaptor-framework/style-change.h @@ -2,7 +2,7 @@ #define __DALI_STYLE_CHANGE_H__ /* - * 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. @@ -20,7 +20,9 @@ // EXTERNAL INCLUDES #include -#include + +// INTERNAL INCLUDES +#include namespace Dali { diff --git a/dali/public-api/adaptor-framework/timer.cpp b/dali/public-api/adaptor-framework/timer.cpp index 85642f2..244aa26 100644 --- a/dali/public-api/adaptor-framework/timer.cpp +++ b/dali/public-api/adaptor-framework/timer.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. @@ -18,10 +18,8 @@ // CLASS HEADER #include -// EXTERNAL INCLUDES -#include - // INTERNAL INCLUDES +#include #include namespace Dali diff --git a/dali/public-api/adaptor-framework/timer.h b/dali/public-api/adaptor-framework/timer.h old mode 100644 new mode 100755 index 472ae02..9e9beac --- a/dali/public-api/adaptor-framework/timer.h +++ b/dali/public-api/adaptor-framework/timer.h @@ -2,7 +2,7 @@ #define __DALI_TIMER_H__ /* - * 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. @@ -23,6 +23,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { /** @@ -51,7 +54,7 @@ class Timer; * as a member. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Timer : public BaseHandle +class DALI_ADAPTOR_API Timer : public BaseHandle { public: // Signal typedefs diff --git a/dali/public-api/adaptor-framework/tts-player.h b/dali/public-api/adaptor-framework/tts-player.h old mode 100644 new mode 100755 index 7412791..93fda5a --- a/dali/public-api/adaptor-framework/tts-player.h +++ b/dali/public-api/adaptor-framework/tts-player.h @@ -2,7 +2,7 @@ #define __DALI_TTS_PLAYER_H__ /* - * 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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { /** @@ -41,7 +44,7 @@ class TtsPlayer; * @brief The Text-to-speech (TTS) Player. * @SINCE_1_0.0 */ -class DALI_IMPORT_API TtsPlayer : public BaseHandle +class DALI_ADAPTOR_API TtsPlayer : public BaseHandle { public: // ENUMs diff --git a/dali/public-api/adaptor-framework/widget-application.h b/dali/public-api/adaptor-framework/widget-application.h index a0d639f..b496b6c 100644 --- a/dali/public-api/adaptor-framework/widget-application.h +++ b/dali/public-api/adaptor-framework/widget-application.h @@ -2,7 +2,7 @@ #define DALI_WIDGET_APPLICATION_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. @@ -96,7 +96,7 @@ class Widget; * * @SINCE_1_3_5 */ -class DALI_IMPORT_API WidgetApplication : public Application +class DALI_ADAPTOR_API WidgetApplication : public Application { public: diff --git a/dali/public-api/adaptor-framework/widget-impl.h b/dali/public-api/adaptor-framework/widget-impl.h index c7e6979..c30ddc6 100644 --- a/dali/public-api/adaptor-framework/widget-impl.h +++ b/dali/public-api/adaptor-framework/widget-impl.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_WIDGET_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. @@ -56,7 +56,7 @@ typedef IntrusivePtr WidgetPtr; * * @SINCE_1_3_5 */ -class DALI_IMPORT_API Widget : public BaseObject, public ConnectionTrackerInterface +class DALI_ADAPTOR_API Widget : public BaseObject, public ConnectionTrackerInterface { public: @@ -175,7 +175,7 @@ private: * @return Implementation * @pre handle is initialized and points to a widget */ -DALI_IMPORT_API Internal::Adaptor::Widget& GetImplementation( Dali::Widget& widget ); +DALI_ADAPTOR_API Internal::Adaptor::Widget& GetImplementation( Dali::Widget& widget ); /** * @brief Gets implementation from the handle. @@ -185,7 +185,7 @@ DALI_IMPORT_API Internal::Adaptor::Widget& GetImplementation( Dali::Widget& widg * @return Implementation * @pre Handle is initialized and points to a widget. */ -DALI_IMPORT_API const Internal::Adaptor::Widget& GetImplementation( const Dali::Widget& widget ); +DALI_ADAPTOR_API const Internal::Adaptor::Widget& GetImplementation( const Dali::Widget& widget ); } // namespace Adaptor diff --git a/dali/public-api/adaptor-framework/widget.h b/dali/public-api/adaptor-framework/widget.h old mode 100644 new mode 100755 index c22245e..a0f6991 --- a/dali/public-api/adaptor-framework/widget.h +++ b/dali/public-api/adaptor-framework/widget.h @@ -2,7 +2,7 @@ #define DALI_WIDGET_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. @@ -21,6 +21,9 @@ // EXTERNAL INCLUDES #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -48,7 +51,7 @@ class Window; * * @SINCE_1_3_5 */ -class DALI_IMPORT_API Widget : public BaseHandle +class DALI_ADAPTOR_API Widget : public BaseHandle { public: diff --git a/dali/public-api/adaptor-framework/window.h b/dali/public-api/adaptor-framework/window.h old mode 100644 new mode 100755 index 07a5548..098f569 --- a/dali/public-api/adaptor-framework/window.h +++ b/dali/public-api/adaptor-framework/window.h @@ -2,7 +2,7 @@ #define __DALI_WINDOW_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. @@ -27,6 +27,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { /** @@ -54,7 +57,7 @@ class Orientation; * You can get a valid Window handle by calling Dali::Application::GetWindow(). * @SINCE_1_0.0 */ -class DALI_IMPORT_API Window : public BaseHandle +class DALI_ADAPTOR_API Window : public BaseHandle { public: diff --git a/dali/public-api/capture/capture.h b/dali/public-api/capture/capture.h index 5596994..5119203 100755 --- a/dali/public-api/capture/capture.h +++ b/dali/public-api/capture/capture.h @@ -2,7 +2,7 @@ #define DALI_CAPTURE_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. @@ -23,7 +23,8 @@ #include #include -// INTERNAL HEADERS +// INTERNAL INCLUDES +#include namespace Dali { @@ -74,7 +75,7 @@ class Capture; * } * @endcode */ -class DALI_IMPORT_API Capture : public BaseHandle +class DALI_ADAPTOR_API Capture : public BaseHandle { public: diff --git a/dali/public-api/dali-adaptor-common.h b/dali/public-api/dali-adaptor-common.h new file mode 100755 index 0000000..18239f2 --- /dev/null +++ b/dali/public-api/dali-adaptor-common.h @@ -0,0 +1,45 @@ +#ifndef DALI_ADAPTOR_COMMON_H +#define DALI_ADAPTOR_COMMON_H + +/* + * 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. + * 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 + +/* + * Definitions for shared library support. + * + * If a library is configured with --enable-exportall or --enable-debug + * then HIDE_DALI_INTERNALS is not defined, and nothing is hidden. + * If it is configured without these options (the default), then HIDE_INTERNALS + * is defined when building the library, visibility is automatically hidden, and the explicit + * defines below come into use. + * When building a library that uses DALI, HIDE_DALI_INTERNALS. + */ +#if __GNUC__ >= 4 +# ifndef HIDE_DALI_INTERNALS +# define DALI_ADAPTOR_API +# else +# define DALI_ADAPTOR_API __attribute__ ((visibility ("default"))) +# endif +#else +/** Visibility attribute to show declarations */ +# define DALI_ADAPTOR_API +#endif + +#endif // DALI_ADAPTOR_COMMON_H diff --git a/dali/public-api/dali-adaptor-version.h b/dali/public-api/dali-adaptor-version.h old mode 100644 new mode 100755 index 643b020..7567495 --- a/dali/public-api/dali-adaptor-version.h +++ b/dali/public-api/dali-adaptor-version.h @@ -2,7 +2,7 @@ #define __DALI_ADAPTOR_VERSION_H__ /* - * 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. @@ -18,15 +18,15 @@ * */ -// EXTERNAL INCLUDES -#include +// INTERNAL INCLUDES +#include namespace Dali { -DALI_IMPORT_API extern const unsigned int ADAPTOR_MAJOR_VERSION; ///< The major version number of the Adaptor. -DALI_IMPORT_API extern const unsigned int ADAPTOR_MINOR_VERSION; ///< The minor version number of the Adaptor. -DALI_IMPORT_API extern const unsigned int ADAPTOR_MICRO_VERSION; ///< The micro version number of the Adaptor. -DALI_IMPORT_API extern const char * const ADAPTOR_BUILD_DATE; ///< The date/time the Adaptor library was built. +DALI_ADAPTOR_API extern const unsigned int ADAPTOR_MAJOR_VERSION; ///< The major version number of the Adaptor. +DALI_ADAPTOR_API extern const unsigned int ADAPTOR_MINOR_VERSION; ///< The minor version number of the Adaptor. +DALI_ADAPTOR_API extern const unsigned int ADAPTOR_MICRO_VERSION; ///< The micro version number of the Adaptor. +DALI_ADAPTOR_API extern const char * const ADAPTOR_BUILD_DATE; ///< The date/time the Adaptor library was built. } // namespace Dali #endif // __DALI_ADAPTOR_VERSION_H__ diff --git a/dali/public-api/file.list b/dali/public-api/file.list old mode 100644 new mode 100755 index 2f1471d..cf91bee --- a/dali/public-api/file.list +++ b/dali/public-api/file.list @@ -12,7 +12,8 @@ adaptor_public_api_src_files = \ public_api_header_files = \ - $(adaptor_public_api_dir)/dali-adaptor-version.h + $(adaptor_public_api_dir)/dali-adaptor-version.h \ + $(adaptor_public_api_dir)/dali-adaptor-common.h public_api_adaptor_framework_header_files = \ diff --git a/dali/public-api/watch/watch-application.h b/dali/public-api/watch/watch-application.h old mode 100644 new mode 100755 index fbe438c..e69ada6 --- a/dali/public-api/watch/watch-application.h +++ b/dali/public-api/watch/watch-application.h @@ -2,7 +2,7 @@ #define __DALI_WATCH_APPLICATION_H__ /* - * Copyright (c) 2016 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. @@ -24,6 +24,7 @@ #include // INTERNAL INCLUDES +#include #include #include @@ -74,7 +75,7 @@ class WatchApplication; * WatchApplication& mApplication; * }; * - * int DALI_EXPORT_API main (int argc, char **argv) + * int DALI_ADAPTOR_API main (int argc, char **argv) * { * WatchApplication app = WatchApplication::New(&argc, &argv); * ExampleController example( app ); @@ -93,7 +94,7 @@ class WatchApplication; * @SINCE_1_1.37 */ -class DALI_IMPORT_API WatchApplication : public Application +class DALI_ADAPTOR_API WatchApplication : public Application { public: typedef Signal< void (Application&, const WatchTime&) > WatchTimeSignal; ///< Watch pointer signal callback type @SINCE_1_1.37 diff --git a/dali/public-api/watch/watch-time.h b/dali/public-api/watch/watch-time.h old mode 100644 new mode 100755 index df2d907..2805a10 --- a/dali/public-api/watch/watch-time.h +++ b/dali/public-api/watch/watch-time.h @@ -2,7 +2,7 @@ #define __DALI_WATCH_TIME_H__ /* - * Copyright (c) 2016 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,9 +20,10 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -39,7 +40,7 @@ namespace Dali * on receiving timeTick signal. * @SINCE_1_1.37 */ -class DALI_IMPORT_API WatchTime +class DALI_ADAPTOR_API WatchTime { public: diff --git a/plugins/dali-feedback.cpp b/plugins/dali-feedback.cpp index 99fb1be..c53935f 100644 --- a/plugins/dali-feedback.cpp +++ b/plugins/dali-feedback.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. @@ -35,7 +35,7 @@ using std::string; using namespace Dali; // The plugin factories -extern "C" DALI_EXPORT_API Dali::FeedbackPlugin* CreateFeedbackPlugin(void) +extern "C" DALI_ADAPTOR_API Dali::FeedbackPlugin* CreateFeedbackPlugin(void) { return new Dali::Plugin::DaliFeedback; } -- 2.7.4