From e40f95b837ab8e9f1ce9094ebf4e6ac781e7bf6f Mon Sep 17 00:00:00 2001 From: adun Date: Fri, 11 May 2018 09:58:38 +0800 Subject: [PATCH] Seperate the API macros Change-Id: I854e0627c2890799974ab3757bf67ce3bfd1950d --- .../dali-toolkit-test-utils/test-application.h | 4 +- .../dali-toolkit-test-utils/test-gesture-manager.h | 4 +- .../dali-toolkit-test-utils/test-gl-abstraction.h | 4 +- .../test-gl-sync-abstraction.h | 6 +-- .../dali-toolkit-test-utils/test-native-image.h | 8 ++-- .../test-platform-abstraction.h | 4 +- .../test-render-controller.h | 4 +- .../toolkit-application.cpp | 4 +- .../toolkit-clipboard-event-notifier.cpp | 4 +- .../dali-toolkit-test-utils/toolkit-clipboard.h | 2 +- .../toolkit-event-thread-callback.h | 6 +-- .../toolkit-file-loader.cpp | 4 +- .../toolkit-orientation.cpp | 4 +- .../toolkit-physical-keyboard.cpp | 4 +- .../toolkit-singleton-service.cpp | 4 +- .../toolkit-style-monitor.cpp | 4 +- .../dali-toolkit-test-utils/toolkit-timer.cpp | 2 +- build/tizen/docs-internal/dali-internal.doxy.in | 2 +- build/tizen/docs/dali.doxy.in | 2 +- dali-toolkit/devel-api/builder/builder.h | 7 +++- dali-toolkit/devel-api/builder/json-parser.h | 4 +- dali-toolkit/devel-api/builder/tree-node.h | 6 +-- .../devel-api/controls/bloom-view/bloom-view.h | 4 +- .../controls/bubble-effect/bubble-emitter.h | 4 +- .../devel-api/controls/buttons/toggle-button.h | 4 +- dali-toolkit/devel-api/controls/control-devel.h | 24 ++++++------ .../devel-api/controls/control-wrapper-impl.h | 4 +- dali-toolkit/devel-api/controls/control-wrapper.h | 4 +- .../devel-api/controls/effects-view/effects-view.h | 4 +- .../gaussian-blur-view/gaussian-blur-view.h | 4 +- .../devel-api/controls/magnifier/magnifier.h | 4 +- .../controls/navigation-view/navigation-view.h | 4 +- .../controls/page-turn-view/page-factory.h | 7 +++- .../page-turn-view/page-turn-landscape-view.h | 4 +- .../page-turn-view/page-turn-portrait-view.h | 4 +- .../controls/page-turn-view/page-turn-view.h | 4 +- .../devel-api/controls/popup/confirmation-popup.h | 4 +- dali-toolkit/devel-api/controls/popup/popup.h | 4 +- .../devel-api/controls/shadow-view/shadow-view.h | 4 +- .../controls/super-blur-view/super-blur-view.h | 4 +- .../controls/text-controls/text-editor-devel.h | 2 +- .../controls/text-controls/text-field-devel.h | 2 +- .../controls/text-controls/text-selection-popup.h | 4 +- .../text-controls/text-selection-toolbar.h | 4 +- .../devel-api/controls/tool-bar/tool-bar.h | 4 +- .../focus-manager/keyboard-focus-manager-devel.h | 4 +- .../focus-manager/keyinput-focus-manager.h | 4 +- .../image-loader/async-image-loader-devel.h | 4 +- .../devel-api/image-loader/atlas-upload-observer.h | 6 +-- dali-toolkit/devel-api/image-loader/image-atlas.h | 4 +- .../devel-api/image-loader/texture-manager.h | 11 ++++-- dali-toolkit/devel-api/scripting/script-plugin.h | 6 +-- dali-toolkit/devel-api/scripting/script.h | 6 +-- .../devel-api/styling/style-manager-devel.h | 4 +- .../cube-transition-cross-effect.h | 4 +- .../transition-effects/cube-transition-effect.h | 5 ++- .../cube-transition-fold-effect.h | 4 +- .../cube-transition-wave-effect.h | 4 +- .../devel-api/visual-factory/transition-data.h | 7 +++- .../devel-api/visual-factory/visual-base.h | 5 ++- .../devel-api/visual-factory/visual-factory.h | 4 +- dali-toolkit/internal/builder/builder-impl.h | 2 +- dali-toolkit/internal/builder/json-parser-state.h | 4 +- .../internal/builder/tree-node-manipulator.h | 4 +- .../controls/control/control-data-impl.cpp | 4 +- .../controls/scrollable/item-view/grid-layout.h | 4 +- .../internal/visuals/texture-upload-observer.h | 4 +- .../internal/visuals/visual-base-data-impl.cpp | 2 +- dali-toolkit/internal/visuals/visual-base-impl.cpp | 2 +- .../accessibility-manager/accessibility-manager.h | 7 +++- .../public-api/controls/alignment/alignment.h | 4 +- dali-toolkit/public-api/controls/buttons/button.h | 4 +- .../public-api/controls/buttons/check-box-button.h | 4 +- .../public-api/controls/buttons/push-button.h | 4 +- .../public-api/controls/buttons/radio-button.h | 4 +- dali-toolkit/public-api/controls/control-impl.h | 8 ++-- dali-toolkit/public-api/controls/control.h | 6 +-- .../controls/flex-container/flex-container.h | 4 +- .../public-api/controls/image-view/image-view.h | 4 +- .../controls/model3d-view/model3d-view.h | 4 +- .../controls/progress-bar/progress-bar.h | 4 +- .../public-api/controls/scroll-bar/scroll-bar.h | 4 +- .../scrollable/item-view/default-item-layout.h | 4 +- .../controls/scrollable/item-view/item-factory.h | 7 +++- .../controls/scrollable/item-view/item-layout.h | 26 ++++++------- .../controls/scrollable/item-view/item-view.h | 4 +- .../scroll-view/scroll-view-constraints.h | 9 +++-- .../scrollable/scroll-view/scroll-view-effect.h | 7 +++- .../scroll-view/scroll-view-page-path-effect.h | 7 +++- .../controls/scrollable/scroll-view/scroll-view.h | 12 +++--- .../public-api/controls/scrollable/scrollable.h | 4 +- dali-toolkit/public-api/controls/slider/slider.h | 4 +- .../public-api/controls/table-view/table-view.h | 4 +- .../controls/text-controls/text-editor.h | 4 +- .../public-api/controls/text-controls/text-field.h | 4 +- .../public-api/controls/text-controls/text-label.h | 4 +- .../public-api/controls/video-view/video-view.h | 4 +- dali-toolkit/public-api/dali-toolkit-common.h | 45 ++++++++++++++++++++++ dali-toolkit/public-api/dali-toolkit-version.h | 12 +++--- dali-toolkit/public-api/enums.h | 8 ++-- dali-toolkit/public-api/file.list | 1 + .../focus-manager/keyboard-focus-manager.h | 4 +- .../public-api/image-loader/async-image-loader.h | 7 +++- .../public-api/image-loader/sync-image-loader.h | 11 ++++-- dali-toolkit/public-api/styling/style-manager.h | 4 +- plugins/dali-script-v8/src/dali-script-v8.cpp | 6 +-- plugins/dali-script-v8/src/dali-script-v8.h | 6 +-- plugins/dali-script-v8/src/dali-wrapper.h | 4 +- 108 files changed, 334 insertions(+), 251 deletions(-) mode change 100644 => 100755 dali-toolkit/devel-api/builder/builder.h mode change 100644 => 100755 dali-toolkit/devel-api/image-loader/texture-manager.h mode change 100644 => 100755 dali-toolkit/devel-api/transition-effects/cube-transition-effect.h mode change 100644 => 100755 dali-toolkit/devel-api/visual-factory/transition-data.h mode change 100644 => 100755 dali-toolkit/devel-api/visual-factory/visual-base.h mode change 100644 => 100755 dali-toolkit/internal/builder/builder-impl.h mode change 100644 => 100755 dali-toolkit/public-api/accessibility-manager/accessibility-manager.h mode change 100644 => 100755 dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h mode change 100644 => 100755 dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h mode change 100644 => 100755 dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h create mode 100755 dali-toolkit/public-api/dali-toolkit-common.h mode change 100644 => 100755 dali-toolkit/public-api/dali-toolkit-version.h mode change 100644 => 100755 dali-toolkit/public-api/image-loader/async-image-loader.h mode change 100644 => 100755 dali-toolkit/public-api/image-loader/sync-image-loader.h diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h index 747b488..6b8b236 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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-toolkit/dali-toolkit-test-utils/test-gesture-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.h index 4c0b766..6fddd30 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h index b306c3e..c68573b 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h index 8ce96a4..979987b 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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-toolkit/dali-toolkit-test-utils/test-native-image.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h index 896ce52..5cb4b27 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h index 201e29d..f31561e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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-toolkit/dali-toolkit-test-utils/test-render-controller.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h index 3ad63d3..7c785f1 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp index ce17641..271d6ec 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.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. @@ -17,7 +17,7 @@ #include "toolkit-application.h" -#include +#include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp index a9f7956..cbfe93e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.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. @@ -17,7 +17,7 @@ #include "toolkit-clipboard-event-notifier.h" -#include +#include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h index 0f9cb42..aa13ef0 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h @@ -2,7 +2,7 @@ #define __TOOLKIT_CLIPBOARD_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. diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h index d718e10..f3dc134 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_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. @@ -20,13 +20,13 @@ #define __DALI_EVENT_THREAD_CALLBACK_H_ // EXTERNAL INCLUDES -#include +#include #include namespace Dali { -class DALI_IMPORT_API EventThreadCallback +class DALI_TOOLKIT_API EventThreadCallback { public: diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-file-loader.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-file-loader.cpp index 5cc6ad1..d1611c7 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-file-loader.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-file-loader.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. @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp index b1b5660..4018f37 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.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. @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp index de4a86e..9cb217a 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.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. @@ -17,7 +17,7 @@ #include "toolkit-physical-keyboard.h" -#include +#include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp index d8efd70..135a960 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -17,7 +17,7 @@ #include -#include +#include #include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp index a15a793..18c086f 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ #include "toolkit-style-monitor.h" // EXTERNAL INCLUDES -#include +#include #include #include #include diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp index aff00f8..f9c89da 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp @@ -18,7 +18,7 @@ #include "toolkit-timer.h" // INTERNAL INCLUDES -#include +#include #include #include diff --git a/build/tizen/docs-internal/dali-internal.doxy.in b/build/tizen/docs-internal/dali-internal.doxy.in index 7ba3d11..61264b4 100644 --- a/build/tizen/docs-internal/dali-internal.doxy.in +++ b/build/tizen/docs-internal/dali-internal.doxy.in @@ -2172,7 +2172,7 @@ INCLUDE_FILE_PATTERNS = # recursively expanded use the := operator instead of the = operator. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -PREDEFINED = DALI_IMPORT_API \ +PREDEFINED = DALI_TOOLKIT_API \ DALI_INTERNAL \ __attribute__ \ ((visibility \ diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in index 941fdbc..98106dc 100755 --- a/build/tizen/docs/dali.doxy.in +++ b/build/tizen/docs/dali.doxy.in @@ -2147,7 +2147,7 @@ INCLUDE_FILE_PATTERNS = # recursively expanded use the := operator instead of the = operator. # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. -PREDEFINED = DALI_IMPORT_API \ +PREDEFINED = DALI_TOOLKIT_API \ DALI_INTERNAL \ __attribute__ \ ((visibility \ diff --git a/dali-toolkit/devel-api/builder/builder.h b/dali-toolkit/devel-api/builder/builder.h old mode 100644 new mode 100755 index 422a517..fb76667 --- a/dali-toolkit/devel-api/builder/builder.h +++ b/dali-toolkit/devel-api/builder/builder.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_UIBUILDER_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. @@ -25,6 +25,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -118,7 +121,7 @@ class Builder; * */ -class DALI_IMPORT_API Builder : public BaseHandle +class DALI_TOOLKIT_API Builder : public BaseHandle { public: /** diff --git a/dali-toolkit/devel-api/builder/json-parser.h b/dali-toolkit/devel-api/builder/json-parser.h index 05b8e80..645b985 100644 --- a/dali-toolkit/devel-api/builder/json-parser.h +++ b/dali-toolkit/devel-api/builder/json-parser.h @@ -2,7 +2,7 @@ #define __DALI_JSON_PARSER_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. @@ -41,7 +41,7 @@ class JsonParser; /* * Parses JSON */ -class DALI_IMPORT_API JsonParser : public BaseHandle +class DALI_TOOLKIT_API JsonParser : public BaseHandle { public: diff --git a/dali-toolkit/devel-api/builder/tree-node.h b/dali-toolkit/devel-api/builder/tree-node.h index c63bf1f..0bc10cb 100644 --- a/dali-toolkit/devel-api/builder/tree-node.h +++ b/dali-toolkit/devel-api/builder/tree-node.h @@ -2,7 +2,7 @@ #define __DALI_SCRIPT_TREE_NODE_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. @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include // pair #include -#include +#include namespace Dali { @@ -42,7 +42,7 @@ class TreeNodeManipulator; * TreeNode does not own its string data which is held by a container eg JsonParser * Modification operations should be done through a container. */ -class DALI_IMPORT_API TreeNode +class DALI_TOOLKIT_API TreeNode { public: /* diff --git a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h index 23cc950..b6c3a88 100644 --- a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h +++ b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_BLOOM_VIEW_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. @@ -90,7 +90,7 @@ class BloomView; * Stage::GetCurrent().Remove(bloomView);\n * bloomView.Deactivate();\n */ -class DALI_IMPORT_API BloomView : public Control +class DALI_TOOLKIT_API BloomView : public Control { public: diff --git a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h index 3bbdce9..450d3a2 100644 --- a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h +++ b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_BUBBLE_EMMITER_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. @@ -41,7 +41,7 @@ namespace Internal DALI_INTERNAL * * This is done by applying BubbleEffect to multiple specifically created meshActors. */ -class DALI_IMPORT_API BubbleEmitter : public Control +class DALI_TOOLKIT_API BubbleEmitter : public Control { public: diff --git a/dali-toolkit/devel-api/controls/buttons/toggle-button.h b/dali-toolkit/devel-api/controls/buttons/toggle-button.h index 2e61901..4d761d7 100644 --- a/dali-toolkit/devel-api/controls/buttons/toggle-button.h +++ b/dali-toolkit/devel-api/controls/buttons/toggle-button.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TOGGLE_BUTTON_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. @@ -98,7 +98,7 @@ class ToggleButton; * * See Button for more detail on signals and modifying states via properties. */ -class DALI_IMPORT_API ToggleButton : public Button +class DALI_TOOLKIT_API ToggleButton : public Button { public: /** diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h index 1fece4f..c56f7ce 100755 --- a/dali-toolkit/devel-api/controls/control-devel.h +++ b/dali-toolkit/devel-api/controls/control-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_CONTROL_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. @@ -132,7 +132,7 @@ enum * @note If the depth-index is not set on the visual, then it is set to be above the currently registered visuals. * @note If replacing a visual, then the depth-index of the visual being replaced is used for the visual. */ -DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual ); +DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual ); /** * @brief Register a visual by Property Index with a depth index. @@ -148,7 +148,7 @@ DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property: * @see Visual::Base::GetDepthIndex() * @see Visual::Base::SetDepthIndex() */ -DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, int depthIndex ); +DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, int depthIndex ); /** * @brief Register a visual by Property Index with the option of enabling/disabling it. @@ -163,7 +163,7 @@ DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property: * * @see EnableVisual() */ -DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, bool enabled ); +DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, bool enabled ); /** * @brief Register a visual by Property Index with a depth index with the option of enabling/disabling it. @@ -178,7 +178,7 @@ DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property: * @see Visual::Base::GetDepthIndex() * @see Visual::Base::SetDepthIndex() */ -DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex ); +DALI_TOOLKIT_API void RegisterVisual( Internal::Control& control, Dali::Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex ); /** * @brief Erase the entry matching the given index from the list of registered visuals @@ -186,7 +186,7 @@ DALI_IMPORT_API void RegisterVisual( Internal::Control& control, Dali::Property: * @param[in] control The control * @param[in] index The Property index of the visual, used to reference visual */ -DALI_IMPORT_API void UnregisterVisual( Internal::Control& control, Dali::Property::Index index ); +DALI_TOOLKIT_API void UnregisterVisual( Internal::Control& control, Dali::Property::Index index ); /** * @brief Retrieve the visual associated with the given property index. @@ -196,7 +196,7 @@ DALI_IMPORT_API void UnregisterVisual( Internal::Control& control, Dali::Propert * @return The registered visual if exist, otherwise empty handle. * @note For managing object life-cycle, do not store the returned visual as a member which increments its reference count. */ -DALI_IMPORT_API Toolkit::Visual::Base GetVisual( const Internal::Control& control, Dali::Property::Index index ); +DALI_TOOLKIT_API Toolkit::Visual::Base GetVisual( const Internal::Control& control, Dali::Property::Index index ); /** * @brief Sets the given visual to be displayed or not when parent staged. @@ -205,7 +205,7 @@ DALI_IMPORT_API Toolkit::Visual::Base GetVisual( const Internal::Control& contro * @param[in] index The Property index of the visual * @param[in] enable flag to set enabled or disabled. */ -DALI_IMPORT_API void EnableVisual( Internal::Control& control, Dali::Property::Index index, bool enable ); +DALI_TOOLKIT_API void EnableVisual( Internal::Control& control, Dali::Property::Index index, bool enable ); /** * @brief Queries if the given visual is to be displayed when parent staged. @@ -214,7 +214,7 @@ DALI_IMPORT_API void EnableVisual( Internal::Control& control, Dali::Property::I * @param[in] index The Property index of the visual * @return bool whether visual is enabled or not */ -DALI_IMPORT_API bool IsVisualEnabled( const Internal::Control& control, Dali::Property::Index index ); +DALI_TOOLKIT_API bool IsVisualEnabled( const Internal::Control& control, Dali::Property::Index index ); /** * @brief Create a transition effect on the control. @@ -229,7 +229,7 @@ DALI_IMPORT_API bool IsVisualEnabled( const Internal::Control& control, Dali::Pr * @return A handle to an animation defined with the given effect, or an empty * handle if no properties match. */ -DALI_IMPORT_API Dali::Animation CreateTransition( Internal::Control& control, const Toolkit::TransitionData& transitionData ); +DALI_TOOLKIT_API Dali::Animation CreateTransition( Internal::Control& control, const Toolkit::TransitionData& transitionData ); /** * @brief Perform an action on a visual registered to this control. @@ -241,7 +241,7 @@ DALI_IMPORT_API Dali::Animation CreateTransition( Internal::Control& control, co * @param[in] actionId The action to perform. See Visual to find supported actions. * @param[in] attributes Optional attributes for the action. */ -DALI_IMPORT_API void DoAction( Control& control, Dali::Property::Index visualIndex, Dali::Property::Index actionId, const Dali::Property::Value attributes ); +DALI_TOOLKIT_API void DoAction( Control& control, Dali::Property::Index visualIndex, Dali::Property::Index actionId, const Dali::Property::Value attributes ); /** * @brief Set input method context. @@ -249,7 +249,7 @@ DALI_IMPORT_API void DoAction( Control& control, Dali::Property::Index visualInd * @param[in] control The control. * @param[in] inputMethodContext The input method context. */ -DALI_IMPORT_API void SetInputMethodContext( Internal::Control& control, InputMethodContext& inputMethodContext ); +DALI_TOOLKIT_API void SetInputMethodContext( Internal::Control& control, InputMethodContext& inputMethodContext ); } // namespace DevelControl diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.h b/dali-toolkit/devel-api/controls/control-wrapper-impl.h index e5c371d..10130f7 100755 --- a/dali-toolkit/devel-api/controls/control-wrapper-impl.h +++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_CONTROL_WRAPPER_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. @@ -45,7 +45,7 @@ typedef IntrusivePtr< ControlWrapper > ControlWrapperPtr; /** * @copydoc Toolkit::ControlWrapper */ -class DALI_IMPORT_API ControlWrapper : public Control +class DALI_TOOLKIT_API ControlWrapper : public Control { public: diff --git a/dali-toolkit/devel-api/controls/control-wrapper.h b/dali-toolkit/devel-api/controls/control-wrapper.h index b50852b..fecab4f 100644 --- a/dali-toolkit/devel-api/controls/control-wrapper.h +++ b/dali-toolkit/devel-api/controls/control-wrapper.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_CONTROL_WRAPPER_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. @@ -37,7 +37,7 @@ class ControlWrapper; * * The implementation of the ControlWrapper must be supplied; see Internal::ControlWrapper for more details. */ -class DALI_IMPORT_API ControlWrapper : public Control +class DALI_TOOLKIT_API ControlWrapper : public Control { public: diff --git a/dali-toolkit/devel-api/controls/effects-view/effects-view.h b/dali-toolkit/devel-api/controls/effects-view/effects-view.h index b734b41..6196617 100644 --- a/dali-toolkit/devel-api/controls/effects-view/effects-view.h +++ b/dali-toolkit/devel-api/controls/effects-view/effects-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_EFFECTS_VIEW_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 EffectsView; * // optionally set a clear color * effectsView.SetBackgroundColor( Vector4( 0.0f, 0.0f, 0.0f, 0.0f ) ); */ -class DALI_IMPORT_API EffectsView : public Control +class DALI_TOOLKIT_API EffectsView : public Control { public: diff --git a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h index 5364217..58894a9 100644 --- a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h +++ b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_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. @@ -103,7 +103,7 @@ class BloomView; * @remarks This is an experimental feature and might not be supported in the next release. * We do recommend not to use this class. */ -class DALI_IMPORT_API GaussianBlurView : public Control +class DALI_TOOLKIT_API GaussianBlurView : public Control { public: /** diff --git a/dali-toolkit/devel-api/controls/magnifier/magnifier.h b/dali-toolkit/devel-api/controls/magnifier/magnifier.h index e898326..ab31ba6 100644 --- a/dali-toolkit/devel-api/controls/magnifier/magnifier.h +++ b/dali-toolkit/devel-api/controls/magnifier/magnifier.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_MAGNIFIER_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. @@ -41,7 +41,7 @@ class Magnifier; * to the stage as a separate overlay. In addition to the contents, an optional frame * is displayed around the magnified contents. */ -class DALI_IMPORT_API Magnifier : public Control +class DALI_TOOLKIT_API Magnifier : public Control { public: diff --git a/dali-toolkit/devel-api/controls/navigation-view/navigation-view.h b/dali-toolkit/devel-api/controls/navigation-view/navigation-view.h index 1ff0f65..113792f 100644 --- a/dali-toolkit/devel-api/controls/navigation-view/navigation-view.h +++ b/dali-toolkit/devel-api/controls/navigation-view/navigation-view.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_NAVIGATION_VIEW_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. @@ -42,7 +42,7 @@ class NavigationView; * When pop is called on the NavigationView, the current tree of Actors are removed and the previous set added back. * If pop is called on the last set of Actors then they remain, nothing is popped. */ -class DALI_IMPORT_API NavigationView : public Control +class DALI_TOOLKIT_API NavigationView : public Control { public: diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h index 64432b4..bc6e17a 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PAGE_FACTORY_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. @@ -21,6 +21,9 @@ // EXTERNAL INCLUDES #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -33,7 +36,7 @@ namespace Toolkit * * @SINCE_1_1.4 */ -class DALI_IMPORT_API PageFactory +class DALI_TOOLKIT_API PageFactory { public: diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h index 9460b21..a170aa2 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_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. @@ -37,7 +37,7 @@ class PageTurnLandscapeView; * @brief PageTurnLandscapeView provides a page turn view in landscape mode * @SINCE_1_0.0 */ -class DALI_IMPORT_API PageTurnLandscapeView : public PageTurnView +class DALI_TOOLKIT_API PageTurnLandscapeView : public PageTurnView { public: /** diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h index 506c9ad..e28bb6c 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_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. @@ -38,7 +38,7 @@ class PageTurnPortraitView; * * @SINCE_1_1.4 */ -class DALI_IMPORT_API PageTurnPortraitView : public PageTurnView +class DALI_TOOLKIT_API PageTurnPortraitView : public PageTurnView { public: /** diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h index 2c71d32..a4705e4 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PAGE_TURN_VIEW_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. @@ -63,7 +63,7 @@ class PageTurnView; * * @SINCE_1_1.4 */ -class DALI_IMPORT_API PageTurnView : public Control +class DALI_TOOLKIT_API PageTurnView : public Control { public: diff --git a/dali-toolkit/devel-api/controls/popup/confirmation-popup.h b/dali-toolkit/devel-api/controls/popup/confirmation-popup.h index 4cd620b..940840b 100644 --- a/dali-toolkit/devel-api/controls/popup/confirmation-popup.h +++ b/dali-toolkit/devel-api/controls/popup/confirmation-popup.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_CONFIRMATION_POPUP_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. @@ -48,7 +48,7 @@ class ConfirmationPopup; * | controlSignalOk | controlOk | connectSignalOkSelected | * | controlSignalCancel | controlCancel | connectSignalCancelSelected | */ -class DALI_IMPORT_API ConfirmationPopup : public Popup +class DALI_TOOLKIT_API ConfirmationPopup : public Popup { public: diff --git a/dali-toolkit/devel-api/controls/popup/popup.h b/dali-toolkit/devel-api/controls/popup/popup.h index 3d3d915..2cc0636 100644 --- a/dali-toolkit/devel-api/controls/popup/popup.h +++ b/dali-toolkit/devel-api/controls/popup/popup.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_POPUP_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. @@ -52,7 +52,7 @@ class Popup; * | hiding | @ref HidingSignal() | * | hidden | @ref HiddenSignal() | */ -class DALI_IMPORT_API Popup : public Control +class DALI_TOOLKIT_API Popup : public Control { public: diff --git a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h index 4b43e5f..c37cfb1 100644 --- a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h +++ b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADOW_VIEW_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. @@ -99,7 +99,7 @@ class ShadowView; * shadowView.Deactivate(); * @endcode */ -class DALI_IMPORT_API ShadowView : public Control +class DALI_TOOLKIT_API ShadowView : public Control { public: diff --git a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h index f63ddd5..b82e039 100644 --- a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h +++ b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SUPER_BLUR_VIEW_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. @@ -52,7 +52,7 @@ class SuperBlurView; * blurAnimation.AnimateTo( Property( blurView, blurView.GetBlurStrengthPropertyIndex() ), ... );\n * blurAnimation.Play();\n */ -class DALI_IMPORT_API SuperBlurView : public Control +class DALI_TOOLKIT_API SuperBlurView : public Control { public: diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h index bf2b106..7bed333 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h @@ -121,7 +121,7 @@ namespace Property * @param[in] textEditor The instance of TextEditor. * @return InputMethodContext instance. */ -DALI_IMPORT_API InputMethodContext GetInputMethodContext( TextEditor textEditor ); +DALI_TOOLKIT_API InputMethodContext GetInputMethodContext( TextEditor textEditor ); } // namespace DevelTextEditor diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h index 0f99c16..dea5ded 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h @@ -110,7 +110,7 @@ namespace Property * @param[in] textField The instance of TextField. * @return InputMethodContext instance. */ -DALI_IMPORT_API InputMethodContext GetInputMethodContext( TextField textField ); +DALI_TOOLKIT_API InputMethodContext GetInputMethodContext( TextField textField ); } // namespace DevelText diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h index 31cf939..9e9ee48 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_SELECTION_POPUP_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. @@ -44,7 +44,7 @@ class TextSelectionPopup; * * */ -class DALI_IMPORT_API TextSelectionPopup : public Control +class DALI_TOOLKIT_API TextSelectionPopup : public Control { public: diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h index 6193f77..43b7c72 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_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. @@ -42,7 +42,7 @@ class TextSelectionToolbar; * * */ -class DALI_IMPORT_API TextSelectionToolbar : public Control +class DALI_TOOLKIT_API TextSelectionToolbar : public Control { public: diff --git a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h index b9f2c19..8725bb3 100644 --- a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h +++ b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TOOL_BAR_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. @@ -43,7 +43,7 @@ class ToolBar; * is not forbidden, it adds controls on the left group with a size of 10% of the total tool bar size. * Dali::Actor::Remove() method does nothing. */ -class DALI_IMPORT_API ToolBar : public Control +class DALI_TOOLKIT_API ToolBar : public Control { public: static const Toolkit::Alignment::Padding DEFAULT_PADDING; ///< Default padding space between controls. By default all values are set to 0. diff --git a/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h b/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h index 36a78d7..4aa1887 100644 --- a/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h +++ b/dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_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. @@ -69,7 +69,7 @@ public: * @param[in] interface The user's implementation of CustomAlgorithmInterface * @see DevelKeyboardFocusManager::CustomAlgorithmInterface */ -DALI_IMPORT_API void SetCustomAlgorithm(KeyboardFocusManager keyboardFocusManager, CustomAlgorithmInterface& interface); +DALI_TOOLKIT_API void SetCustomAlgorithm(KeyboardFocusManager keyboardFocusManager, CustomAlgorithmInterface& interface); } // namespace DevelKeyboardFocusManager diff --git a/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h b/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h index 3161990..dd43152 100644 --- a/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h +++ b/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_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 KeyInputFocusManager; * |----------------------|-----------------------------------| * | keyInputFocusChanged | @ref KeyInputFocusChangedSignal() | */ -class DALI_IMPORT_API KeyInputFocusManager : public BaseHandle +class DALI_TOOLKIT_API KeyInputFocusManager : public BaseHandle { public: diff --git a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h index 2af2be9..7cb64c5 100644 --- a/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h +++ b/dali-toolkit/devel-api/image-loader/async-image-loader-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_DEVEL_API_IMAGE_LOADER_ASYNC_IMAGE_LOADER_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. @@ -34,7 +34,7 @@ typedef Signal< void ( uint32_t, Devel::PixelBuffer ) > PixelBufferLoadedSignalT * Connect to this signal if you want to load a PixelBuffer instead of a PixelData. * @note Connecting to this signal prevents the emission of the ImageLoadedSignal. */ -DALI_IMPORT_API PixelBufferLoadedSignalType& PixelBufferLoadedSignal( AsyncImageLoader asyncImageLoader ); +DALI_TOOLKIT_API PixelBufferLoadedSignalType& PixelBufferLoadedSignal( AsyncImageLoader asyncImageLoader ); } } // Toolkit diff --git a/dali-toolkit/devel-api/image-loader/atlas-upload-observer.h b/dali-toolkit/devel-api/image-loader/atlas-upload-observer.h index 2688c1a..53d1c0e 100644 --- a/dali-toolkit/devel-api/image-loader/atlas-upload-observer.h +++ b/dali-toolkit/devel-api/image-loader/atlas-upload-observer.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_ATLAS_UPLOAD_OBSERVER_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,7 +18,7 @@ * */ -#include +#include #include #include @@ -39,7 +39,7 @@ class ImageAtlas; * * Derived class should implement the UploadCompleted method which would get executed once the texture is ready. */ -class DALI_IMPORT_API AtlasUploadObserver +class DALI_TOOLKIT_API AtlasUploadObserver { public: diff --git a/dali-toolkit/devel-api/image-loader/image-atlas.h b/dali-toolkit/devel-api/image-loader/image-atlas.h index a0305fd..991c624 100644 --- a/dali-toolkit/devel-api/image-loader/image-atlas.h +++ b/dali-toolkit/devel-api/image-loader/image-atlas.h @@ -1,7 +1,7 @@ #ifndef DALI_TOOLKIT_IMAGE_ATLAS_H #define DALI_TOOLKIT_IMAGE_ATLAS_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. @@ -47,7 +47,7 @@ class ImageAtlas; * Only images with url provided or pixel data are supported for uploading. * The images are loaded by a worker thread to avoid blocking the main event thread. */ -class DALI_IMPORT_API ImageAtlas : public BaseHandle +class DALI_TOOLKIT_API ImageAtlas : public BaseHandle { public: diff --git a/dali-toolkit/devel-api/image-loader/texture-manager.h b/dali-toolkit/devel-api/image-loader/texture-manager.h old mode 100644 new mode 100755 index ce4bf3d..46d3ef93 --- a/dali-toolkit/devel-api/image-loader/texture-manager.h +++ b/dali-toolkit/devel-api/image-loader/texture-manager.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_DEVEL_API_TEXTURE_MANAGER_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,9 @@ // EXTERNAL INCLUDES #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -41,7 +44,7 @@ namespace TextureManager * @param[in] texture the Texture to add * @return the Url string representing this texture */ -DALI_IMPORT_API std::string AddTexture( Texture& texture ); +DALI_TOOLKIT_API std::string AddTexture( Texture& texture ); /** * @brief Add a TextureSet to texture manager @@ -51,7 +54,7 @@ DALI_IMPORT_API std::string AddTexture( Texture& texture ); * @param[in] textureSet the TextureSet to add * @return the Url string representing this texture */ -DALI_IMPORT_API std::string AddTexture( TextureSet& textureSet ); +DALI_TOOLKIT_API std::string AddTexture( TextureSet& textureSet ); /** * @brief Removes a TextureSet from toolkit @@ -59,7 +62,7 @@ DALI_IMPORT_API std::string AddTexture( TextureSet& textureSet ); * @param[in] textureUrl to remove * @return the handle to the TextureSet or empty handle in case TextureSet is not found */ -DALI_IMPORT_API TextureSet RemoveTexture( const std::string& textureUrl ); +DALI_TOOLKIT_API TextureSet RemoveTexture( const std::string& textureUrl ); } // TextureManager diff --git a/dali-toolkit/devel-api/scripting/script-plugin.h b/dali-toolkit/devel-api/scripting/script-plugin.h index f3e049b..837a5e3 100644 --- a/dali-toolkit/devel-api/scripting/script-plugin.h +++ b/dali-toolkit/devel-api/scripting/script-plugin.h @@ -2,7 +2,7 @@ #define __DALI_SCRIPT_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. @@ -18,7 +18,7 @@ * */ -#include +#include #include namespace Dali @@ -34,7 +34,7 @@ namespace Toolkit * CreateScriptPlugin() // returns a pointer to a ScriptPlugin object * DestroyScriptPlugin() // destroys the plugin */ -class DALI_IMPORT_API ScriptPlugin +class DALI_TOOLKIT_API ScriptPlugin { public: diff --git a/dali-toolkit/devel-api/scripting/script.h b/dali-toolkit/devel-api/scripting/script.h index 8eed33b..86e2678 100644 --- a/dali-toolkit/devel-api/scripting/script.h +++ b/dali-toolkit/devel-api/scripting/script.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include #include namespace Dali @@ -49,7 +49,7 @@ class Script; * @endcode * */ -class DALI_IMPORT_API Script : public BaseHandle +class DALI_TOOLKIT_API Script : public BaseHandle { public: diff --git a/dali-toolkit/devel-api/styling/style-manager-devel.h b/dali-toolkit/devel-api/styling/style-manager-devel.h index faf3c57..ab00ee3 100644 --- a/dali-toolkit/devel-api/styling/style-manager-devel.h +++ b/dali-toolkit/devel-api/styling/style-manager-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_STYLE_MANAGER_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. @@ -38,7 +38,7 @@ namespace DevelStyleManager * @param[in] styleManager The instance of StyleManager * @return A property map to the currently defined configurations **/ -DALI_IMPORT_API const Property::Map GetConfigurations( StyleManager styleManager ); +DALI_TOOLKIT_API const Property::Map GetConfigurations( StyleManager styleManager ); } // namespace DevelStyleManager diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h index 11bcc2e..7de6dc6 100644 --- a/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_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. @@ -39,7 +39,7 @@ namespace Internal DALI_INTERNAL * SubClass of CubeTransitionEffect * Rotate the neighboring cubes in perpendicular directions to transition from one image to another */ -class DALI_IMPORT_API CubeTransitionCrossEffect : public CubeTransitionEffect +class DALI_TOOLKIT_API CubeTransitionCrossEffect : public CubeTransitionEffect { public: diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h old mode 100644 new mode 100755 index df51440..9f9efc0 --- a/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_CUBE_TRANSITION_EFFECT_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,6 +20,7 @@ // INTERNAL INCLUDES #include +#include // EXTERNAL INCLUDES #include @@ -81,7 +82,7 @@ class CubeTransitionEffect; * |---------------------|----------------------------------| * | transitionCompleted | @ref TransitionCompletedSignal() | */ -class DALI_IMPORT_API CubeTransitionEffect : public Control +class DALI_TOOLKIT_API CubeTransitionEffect : public Control { public: diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h index 0543d27..04a375e 100644 --- a/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_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. @@ -39,7 +39,7 @@ namespace Internal DALI_INTERNAL * SubClass of CubeTransitionEffect * Rotate the neighboring cubes in opposite directions to transition from one image to another */ -class DALI_IMPORT_API CubeTransitionFoldEffect : public CubeTransitionEffect +class DALI_TOOLKIT_API CubeTransitionFoldEffect : public CubeTransitionEffect { public: diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h index b8a5c4f..89abc2c 100644 --- a/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_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. @@ -39,7 +39,7 @@ namespace Internal DALI_INTERNAL * SubClass of CubeTransitionEffect * Rotate the cubes successively according to the finger movement to achieve wave-like transition effect */ -class DALI_IMPORT_API CubeTransitionWaveEffect : public CubeTransitionEffect +class DALI_TOOLKIT_API CubeTransitionWaveEffect : public CubeTransitionEffect { public: diff --git a/dali-toolkit/devel-api/visual-factory/transition-data.h b/dali-toolkit/devel-api/visual-factory/transition-data.h old mode 100644 new mode 100755 index 23dfb2c..8d662cf --- a/dali-toolkit/devel-api/visual-factory/transition-data.h +++ b/dali-toolkit/devel-api/visual-factory/transition-data.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TRANSITION_DATA_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,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -67,7 +70,7 @@ class TransitionData; * ] * */ -class DALI_IMPORT_API TransitionData : public BaseHandle +class DALI_TOOLKIT_API TransitionData : public BaseHandle { public: /** diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.h b/dali-toolkit/devel-api/visual-factory/visual-base.h old mode 100644 new mode 100755 index 74af0cb..94db5c4 --- a/dali-toolkit/devel-api/visual-factory/visual-base.h +++ b/dali-toolkit/devel-api/visual-factory/visual-base.h @@ -21,6 +21,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -77,7 +80,7 @@ namespace Visual * Absolute means that the component describes world units (equivalent to pixels) * */ -class DALI_IMPORT_API Base : public BaseHandle +class DALI_TOOLKIT_API Base : public BaseHandle { public: diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.h b/dali-toolkit/devel-api/visual-factory/visual-factory.h index 856360b..454919a 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-factory.h +++ b/dali-toolkit/devel-api/visual-factory/visual-factory.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_VISUAL_FACTORY_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. @@ -51,7 +51,7 @@ class VisualFactory; * | visualType | INTEGER or STRING | * | shader | MAP | */ -class DALI_IMPORT_API VisualFactory : public BaseHandle +class DALI_TOOLKIT_API VisualFactory : public BaseHandle { public: diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h old mode 100644 new mode 100755 index 8a90b03..692e0d8 --- a/dali-toolkit/internal/builder/builder-impl.h +++ b/dali-toolkit/internal/builder/builder-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_BUILDER_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. diff --git a/dali-toolkit/internal/builder/json-parser-state.h b/dali-toolkit/internal/builder/json-parser-state.h index 76b1ecd..2a7badc 100644 --- a/dali-toolkit/internal/builder/json-parser-state.h +++ b/dali-toolkit/internal/builder/json-parser-state.h @@ -2,7 +2,7 @@ #define __DALI_JSON_PARSE_STATE_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 @@ */ // EXTERNAL INCLUDES -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h index f900350..ea37e62 100644 --- a/dali-toolkit/internal/builder/tree-node-manipulator.h +++ b/dali-toolkit/internal/builder/tree-node-manipulator.h @@ -2,7 +2,7 @@ #define __DALI_SCRIPT_TREE_NODE_MANIPULATOR_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. @@ -23,7 +23,7 @@ #include #include -#include +#include #include // INTERNAL INCLUDES diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index 5619cd9..1b5f65f 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ #include "control-data-impl.h" // EXTERNAL INCLUDES -#include +#include #include #include #include diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h index 13e68bc..58476a8 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_GRID_LAYOUT_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,7 +22,7 @@ #include -#include +#include namespace Dali diff --git a/dali-toolkit/internal/visuals/texture-upload-observer.h b/dali-toolkit/internal/visuals/texture-upload-observer.h index a8623f0..1bf9944 100644 --- a/dali-toolkit/internal/visuals/texture-upload-observer.h +++ b/dali-toolkit/internal/visuals/texture-upload-observer.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXTURE_UPLOAD_OBSERVER_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. @@ -18,7 +18,7 @@ * */ -#include +#include #include namespace Dali diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp index 90dcd32..0e7f396 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp @@ -19,7 +19,7 @@ #include // EXTERNAL INCLUDES -#include +#include #include #include #include diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index 3dad561..8d2158f 100755 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -19,7 +19,7 @@ #include "visual-base-impl.h" // EXTERNAL HEADER -#include +#include #include #include #include diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h old mode 100644 new mode 100755 index fe9b11e..e3903e3 --- a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h +++ b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_ACCESSIBILITY_MANAGER_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 { @@ -55,7 +58,7 @@ class AccessibilityManager; * | focusedActorActivated | @ref FocusedActorActivatedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API AccessibilityManager : public BaseHandle +class DALI_TOOLKIT_API AccessibilityManager : public BaseHandle { public: diff --git a/dali-toolkit/public-api/controls/alignment/alignment.h b/dali-toolkit/public-api/controls/alignment/alignment.h index 48e2c8e..039e6c6 100644 --- a/dali-toolkit/public-api/controls/alignment/alignment.h +++ b/dali-toolkit/public-api/controls/alignment/alignment.h @@ -2,7 +2,7 @@ #define __DALI_ALIGNMENT_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. @@ -46,7 +46,7 @@ class Alignment; * All actors added to an alignment are going to be set with the same anchor point and parent origin. And if the scaling property is set to a value * different than ScaleNone, constraints as well. */ -class DALI_IMPORT_API Alignment : public Control +class DALI_TOOLKIT_API Alignment : public Control { public: /** diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h index d9fc769..848644f 100644 --- a/dali-toolkit/public-api/controls/buttons/button.h +++ b/dali-toolkit/public-api/controls/buttons/button.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_BUTTON_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. @@ -85,7 +85,7 @@ class Button; * | buttonClick | Doesn't have attributes | Simulates a button click. See @ref DoAction() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API Button : public Control +class DALI_TOOLKIT_API Button : public Control { public: diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.h b/dali-toolkit/public-api/controls/buttons/check-box-button.h index 301a810..7e83432 100644 --- a/dali-toolkit/public-api/controls/buttons/check-box-button.h +++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_CHECK_BOX_BUTTON_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. @@ -78,7 +78,7 @@ class CheckBoxButton; * @endcode * @SINCE_1_0.0 */ -class DALI_IMPORT_API CheckBoxButton : public Button +class DALI_TOOLKIT_API CheckBoxButton : public Button { public: diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h index f3cbea8..13784dd 100644 --- a/dali-toolkit/public-api/controls/buttons/push-button.h +++ b/dali-toolkit/public-api/controls/buttons/push-button.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_PUSH_BUTTON_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. @@ -85,7 +85,7 @@ class PushButton; * See Button for more details on signals and modifying appearance via properties. * @SINCE_1_0.0 */ -class DALI_IMPORT_API PushButton : public Button +class DALI_TOOLKIT_API PushButton : public Button { public: diff --git a/dali-toolkit/public-api/controls/buttons/radio-button.h b/dali-toolkit/public-api/controls/buttons/radio-button.h index 58b8604..8d4b4cb 100644 --- a/dali-toolkit/public-api/controls/buttons/radio-button.h +++ b/dali-toolkit/public-api/controls/buttons/radio-button.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_RADIO_BUTTON_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. @@ -84,7 +84,7 @@ class RadioButton; * @endcode * @SINCE_1_0.0 */ -class DALI_IMPORT_API RadioButton: public Button +class DALI_TOOLKIT_API RadioButton: public Button { public: /** diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 9a1e560..b7b2bd4 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_CONTROL_IMPL_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. @@ -53,7 +53,7 @@ namespace Internal * be disconnected automatically when the control is destroyed. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Control : public CustomActorImpl, public ConnectionTrackerInterface +class DALI_TOOLKIT_API Control : public CustomActorImpl, public ConnectionTrackerInterface { public: @@ -701,7 +701,7 @@ private: * @return Implementation * @pre handle is initialized and points to a control */ -DALI_IMPORT_API Internal::Control& GetImplementation( Dali::Toolkit::Control& handle ); +DALI_TOOLKIT_API Internal::Control& GetImplementation( Dali::Toolkit::Control& handle ); /** * @brief Gets implementation from the handle. @@ -711,7 +711,7 @@ DALI_IMPORT_API Internal::Control& GetImplementation( Dali::Toolkit::Control& ha * @return Implementation * @pre Handle is initialized and points to a control. */ -DALI_IMPORT_API const Internal::Control& GetImplementation( const Dali::Toolkit::Control& handle ); +DALI_TOOLKIT_API const Internal::Control& GetImplementation( const Dali::Toolkit::Control& handle ); } // namespace Internal diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 8e522a2..f418372 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_CONTROL_H__ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include #include #include #include @@ -72,7 +72,7 @@ class Control; * |------------------------|----------------------------------------------------| * | accessibilityActivated | %OnAccessibilityActivated() | */ -class DALI_IMPORT_API Control : public CustomActor +class DALI_TOOLKIT_API Control : public CustomActor { public: diff --git a/dali-toolkit/public-api/controls/flex-container/flex-container.h b/dali-toolkit/public-api/controls/flex-container/flex-container.h index 94ef744..ac564b9 100644 --- a/dali-toolkit/public-api/controls/flex-container/flex-container.h +++ b/dali-toolkit/public-api/controls/flex-container/flex-container.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_FLEX_CONTAINER_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. @@ -101,7 +101,7 @@ class FlexContainer; * @SINCE_1_1.35 */ -class DALI_IMPORT_API FlexContainer : public Control +class DALI_TOOLKIT_API FlexContainer : public Control { public: diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h index 7c99a5f..7a8fc9e 100644 --- a/dali-toolkit/public-api/controls/image-view/image-view.h +++ b/dali-toolkit/public-api/controls/image-view/image-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_IMAGE_VIEW_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. @@ -73,7 +73,7 @@ class ImageView; * @SINCE_1_0.0 * */ -class DALI_IMPORT_API ImageView : public Control +class DALI_TOOLKIT_API ImageView : public Control { public: diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h index 9ef0d46..60d6d4b 100755 --- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h +++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_MODEL3D_VIEW_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 Model3dView; * * @SINCE_1_1.4 */ -class DALI_IMPORT_API Model3dView : public Control +class DALI_TOOLKIT_API Model3dView : public Control { public: diff --git a/dali-toolkit/public-api/controls/progress-bar/progress-bar.h b/dali-toolkit/public-api/controls/progress-bar/progress-bar.h index ed4ceb2..a7b87c2 100644 --- a/dali-toolkit/public-api/controls/progress-bar/progress-bar.h +++ b/dali-toolkit/public-api/controls/progress-bar/progress-bar.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_PROGRESS_BAR_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. @@ -47,7 +47,7 @@ class ProgressBar; * @SINCE_1_2.60 */ -class DALI_IMPORT_API ProgressBar : public Control +class DALI_TOOLKIT_API ProgressBar : public Control { public: diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h index 2a9df0d..2285e68 100755 --- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h +++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SCROLL_BAR_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 @@ class ScrollBar; * | scrollPositionIntervalReached | @ref ScrollPositionIntervalReachedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API ScrollBar : public Control +class DALI_TOOLKIT_API ScrollBar : public Control { public: diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h index 8a880ac..04bc8e6 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_DEFAULT_ITEM_LAYOUT_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. @@ -57,7 +57,7 @@ enum Type * @param[in] type The type of layout required * @return An ItemLayoutPtr to the newly created layout */ -DALI_IMPORT_API ItemLayoutPtr New( Type type ); +DALI_TOOLKIT_API ItemLayoutPtr New( Type type ); } // namespace DefaultItemLayout diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h index db4825a..69fe4aa 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_ITEM_FACTORY_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 { @@ -47,7 +50,7 @@ public: * @brief Virtual destructor. * @SINCE_1_0.0 */ - DALI_EXPORT_API virtual ~ItemFactory() {}; + DALI_TOOLKIT_API virtual ~ItemFactory() {}; /** * @brief Queries the number of items available from the factory. diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h index e81c787..2ffcdcc 100755 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_ITEM_LAYOUT_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. @@ -138,7 +138,7 @@ struct ItemRange * Whilst scrolling, the layout provides a range of items that are within a layout-area (3D bounding volume). * @SINCE_1_0.0 */ -class DALI_IMPORT_API ItemLayout : public RefObject +class DALI_TOOLKIT_API ItemLayout : public RefObject { public: @@ -148,7 +148,7 @@ public: * @brief Virtual destructor. * @SINCE_1_0.0 */ - DALI_IMPORT_API virtual ~ItemLayout(); + virtual ~ItemLayout(); /** * @brief Set the orientation of the layout. @@ -156,7 +156,7 @@ public: * @SINCE_1_0.0 * @param[in] orientation The orientation of the layout. */ - DALI_IMPORT_API void SetOrientation(ControlOrientation::Type orientation); + void SetOrientation(ControlOrientation::Type orientation); /** * @brief Query the orientation of the layout. @@ -164,7 +164,7 @@ public: * @SINCE_1_0.0 * @return the orientation of the layout. */ - DALI_IMPORT_API ControlOrientation::Type GetOrientation() const; + ControlOrientation::Type GetOrientation() const; /** * @brief Apply the layout Properties. @@ -192,7 +192,7 @@ public: * @note layout-position is not provided as a parameter, since applying size constraints is not recommended. * Animating to target-sizes is preferable, since this allows controls to perform layouting without constraints. */ - DALI_IMPORT_API void GetItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const; + void GetItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const; /** * @brief Overrides the default size for the layout. @@ -200,7 +200,7 @@ public: * @SINCE_1_0.0 * @param[in] itemSize The size of each item. */ - DALI_IMPORT_API void SetItemSize( const Vector3& itemSize ); + void SetItemSize( const Vector3& itemSize ); /** * @brief Query the minimum valid layout position; this is a negative value. @@ -261,7 +261,7 @@ public: * @param[in] layoutSize the current size of the item view instance * @return The layout position */ - DALI_IMPORT_API virtual float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize); + virtual float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize); /** * @brief Query the number of items that should be reserved, for scrolling purposes. @@ -340,7 +340,7 @@ public: * @param[in] loopEnabled Whether the KeyboardFocusManager is set to wrap around between first and last item * @return The next item ID. */ - DALI_IMPORT_API virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled); + virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled); /** * @brief Query the flick speed factor of the layout while swipping. @@ -355,7 +355,7 @@ public: * @SINCE_1_0.0 * @return The scroll speed factor of the layout. */ - DALI_IMPORT_API virtual float GetFlickSpeedFactor() const; + virtual float GetFlickSpeedFactor() const; /** * @brief Applies constraints defined by the layout to an actor. @@ -365,7 +365,7 @@ public: * @param[in] layoutSize The current size of the item view instance. * @param[in] itemViewActor The item view instance which requests the application of constraints. */ - DALI_IMPORT_API virtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor ) = 0; + virtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor ) = 0; /** * @brief Gets the position of a given item @@ -376,7 +376,7 @@ public: * @param[in] layoutSize The current size of the item view instance * @return The item position (x,y,z) */ - DALI_IMPORT_API virtual Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const = 0; + virtual Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const = 0; /** * @brief Retrieve the extension for this layout. @@ -395,7 +395,7 @@ protected: * @brief Create a new ItemLayout; Only derived versions are instantiatable. * @SINCE_1_0.0 */ - DALI_IMPORT_API ItemLayout(); + ItemLayout(); private: diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h index 191ef46..b2e99f5 100755 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_ITEM_VIEW_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. @@ -64,7 +64,7 @@ typedef IntrusivePtr ItemLayoutPtr; * @SINCE_1_1.33 */ -class DALI_IMPORT_API ItemView : public Scrollable +class DALI_TOOLKIT_API ItemView : public Scrollable { public: diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h old mode 100644 new mode 100755 index 2e2c2b2..0805ba6 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SCROLL_VIEW_CONSTRAINTS_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 { @@ -49,7 +52,7 @@ namespace Toolkit * @param[in] current Current position * @param[in] inputs The position input that Actor will move */ -DALI_IMPORT_API void MoveActorConstraint( Vector3& current, const PropertyInputContainer& inputs ); +DALI_TOOLKIT_API void MoveActorConstraint( Vector3& current, const PropertyInputContainer& inputs ); /** * @brief Wraps an Actor's position in accordance with the min/max bounds of domain. @@ -58,7 +61,7 @@ DALI_IMPORT_API void MoveActorConstraint( Vector3& current, const PropertyInputC * @param[in] position Position to be wrapped * @param[in] inputs The input that Actor's position will be wrapped */ -DALI_IMPORT_API void WrapActorConstraint( Vector3& position, const PropertyInputContainer& inputs ); +DALI_TOOLKIT_API void WrapActorConstraint( Vector3& position, const PropertyInputContainer& inputs ); /** * @} diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h old mode 100644 new mode 100755 index 049e2ab..639ae75 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SCROLL_VIEW_EFFECT_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 { @@ -55,7 +58,7 @@ class ScrollViewEffect; * properties as inputs. * @SINCE_1_0.0 */ -class DALI_IMPORT_API ScrollViewEffect : public Dali::BaseHandle +class DALI_TOOLKIT_API ScrollViewEffect : public Dali::BaseHandle { public: diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h old mode 100644 new mode 100755 index dc23694..e18eff4 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_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 @@ // INTERNAL INCLUDES #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -62,7 +65,7 @@ class ScrollViewPagePathEffect; * not implemented. * @SINCE_1_0.0 */ -class DALI_IMPORT_API ScrollViewPagePathEffect : public ScrollViewEffect +class DALI_TOOLKIT_API ScrollViewPagePathEffect : public ScrollViewEffect { public: diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h index 594e6da..4bed510 100755 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SCROLL_VIEW_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. @@ -85,7 +85,7 @@ enum DirectionBias * @brief Used for specifying minimum/maximum extents of a ruler. * @SINCE_1_0.0 */ -class DALI_IMPORT_API RulerDomain +class DALI_TOOLKIT_API RulerDomain { public: @@ -154,7 +154,7 @@ class RulerExtension; * where their snap points are and their domain. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Ruler : public RefObject +class DALI_TOOLKIT_API Ruler : public RefObject { public: /** @@ -372,7 +372,7 @@ typedef IntrusivePtr RulerPtr; ///< Pointer to Dali::Toolkit::Ruler objec * @brief Concrete implementation of Ruler that has no snapping and has one single page. * @SINCE_1_0.0 */ -class DALI_IMPORT_API DefaultRuler : public Ruler +class DALI_TOOLKIT_API DefaultRuler : public Ruler { public: /** @@ -406,7 +406,7 @@ public: * @brief Concrete implementation of Ruler that has fixed snapping. * @SINCE_1_0.0 */ -class DALI_IMPORT_API FixedRuler : public Ruler +class DALI_TOOLKIT_API FixedRuler : public Ruler { public: /** @@ -454,7 +454,7 @@ class ScrollView; * | snap-started | @ref SnapStartedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API ScrollView : public Scrollable +class DALI_TOOLKIT_API ScrollView : public Scrollable { public: diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h index 44f1b26..b369321 100644 --- a/dali-toolkit/public-api/controls/scrollable/scrollable.h +++ b/dali-toolkit/public-api/controls/scrollable/scrollable.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SCROLLABLE_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. @@ -50,7 +50,7 @@ class Scrollable; * | scrollUpdated | @ref ScrollUpdatedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API Scrollable : public Control +class DALI_TOOLKIT_API Scrollable : public Control { public: diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h index 83e2b5c..e2c529e 100644 --- a/dali-toolkit/public-api/controls/slider/slider.h +++ b/dali-toolkit/public-api/controls/slider/slider.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SLIDER_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. @@ -47,7 +47,7 @@ class Slider; * | slidingFinished | @ref SlidingFinishedSignal() | * @SINCE_1_1.39 */ -class DALI_IMPORT_API Slider : public Control +class DALI_TOOLKIT_API Slider : public Control { public: diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/public-api/controls/table-view/table-view.h index 9674dc9..61da392 100644 --- a/dali-toolkit/public-api/controls/table-view/table-view.h +++ b/dali-toolkit/public-api/controls/table-view/table-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TABLE_VIEW_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. @@ -83,7 +83,7 @@ class TableView; * @endcode * @SINCE_1_0.0 */ -class DALI_IMPORT_API TableView : public Control +class DALI_TOOLKIT_API TableView : public Control { public: diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.h b/dali-toolkit/public-api/controls/text-controls/text-editor.h index f633f45..5260ffe 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-editor.h +++ b/dali-toolkit/public-api/controls/text-controls/text-editor.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_EDITOR_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. @@ -46,7 +46,7 @@ class TextEditor; * | inputStyleChanged | @ref InputStyleChangedSignal() | @SINCE_1_2_2 | * */ -class DALI_IMPORT_API TextEditor : public Control +class DALI_TOOLKIT_API TextEditor : public Control { public: diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h index 7f7fd86..8940fe8 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-field.h +++ b/dali-toolkit/public-api/controls/text-controls/text-field.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_FIELD_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. @@ -46,7 +46,7 @@ class TextField; * | maxLengthReached | @ref MaxLengthReachedSignal() | @SINCE_1_0.0 | * | inputStyleChanged | @ref InputStyleChangedSignal() | @SINCE_1_2_2 | */ -class DALI_IMPORT_API TextField : public Control +class DALI_TOOLKIT_API TextField : public Control { public: diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h index 13a9738..be95d30 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.h +++ b/dali-toolkit/public-api/controls/text-controls/text-label.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_LABEL_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. @@ -63,7 +63,7 @@ class TextLabel; * * @SINCE_1_0.0 */ -class DALI_IMPORT_API TextLabel : public Control +class DALI_TOOLKIT_API TextLabel : public Control { public: diff --git a/dali-toolkit/public-api/controls/video-view/video-view.h b/dali-toolkit/public-api/controls/video-view/video-view.h index 85fbd8d..87ade91 100755 --- a/dali-toolkit/public-api/controls/video-view/video-view.h +++ b/dali-toolkit/public-api/controls/video-view/video-view.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_VIDEO_VIEW_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. @@ -59,7 +59,7 @@ namespace Internal DALI_INTERNAL * @SINCE_1_1.38 * */ -class DALI_IMPORT_API VideoView: public Control +class DALI_TOOLKIT_API VideoView: public Control { public: diff --git a/dali-toolkit/public-api/dali-toolkit-common.h b/dali-toolkit/public-api/dali-toolkit-common.h new file mode 100755 index 0000000..56f3927 --- /dev/null +++ b/dali-toolkit/public-api/dali-toolkit-common.h @@ -0,0 +1,45 @@ +#ifndef DALI_TOOLKIT_COMMON_H +#define DALI_TOOLKIT_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_TOOLKIT_API +# else +# define DALI_TOOLKIT_API __attribute__ ((visibility ("default"))) +# endif +#else +/** Visibility attribute to show declarations */ +# define DALI_TOOLKIT_API +#endif + +#endif // DALI_TOOLKIT_COMMON_H diff --git a/dali-toolkit/public-api/dali-toolkit-version.h b/dali-toolkit/public-api/dali-toolkit-version.h old mode 100644 new mode 100755 index 9c59162..617fdcb --- a/dali-toolkit/public-api/dali-toolkit-version.h +++ b/dali-toolkit/public-api/dali-toolkit-version.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_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. @@ -19,16 +19,16 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { namespace Toolkit { -DALI_IMPORT_API extern const unsigned int TOOLKIT_MAJOR_VERSION; ///< The major version number of the Toolkit. -DALI_IMPORT_API extern const unsigned int TOOLKIT_MINOR_VERSION; ///< The minor version number of the Toolkit. -DALI_IMPORT_API extern const unsigned int TOOLKIT_MICRO_VERSION; ///< The micro version number of the Toolkit. -DALI_IMPORT_API extern const char * const TOOLKIT_BUILD_DATE; ///< The date/time the Toolkit library was built. +DALI_TOOLKIT_API extern const unsigned int TOOLKIT_MAJOR_VERSION; ///< The major version number of the Toolkit. +DALI_TOOLKIT_API extern const unsigned int TOOLKIT_MINOR_VERSION; ///< The minor version number of the Toolkit. +DALI_TOOLKIT_API extern const unsigned int TOOLKIT_MICRO_VERSION; ///< The micro version number of the Toolkit. +DALI_TOOLKIT_API extern const char * const TOOLKIT_BUILD_DATE; ///< The date/time the Toolkit library was built. } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/public-api/enums.h b/dali-toolkit/public-api/enums.h index 84b1176..08c922f 100644 --- a/dali-toolkit/public-api/enums.h +++ b/dali-toolkit/public-api/enums.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_ENUMS_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 @@ */ // INTERNAL INCLUDES -#include +#include namespace Dali { @@ -61,7 +61,7 @@ enum Type * @param[in] orientation The orientation * @return true if the orientation is vertical */ -DALI_IMPORT_API bool IsVertical(ControlOrientation::Type orientation); +DALI_TOOLKIT_API bool IsVertical(ControlOrientation::Type orientation); /** * @brief Queries whether an orientation is horizontal. @@ -70,7 +70,7 @@ DALI_IMPORT_API bool IsVertical(ControlOrientation::Type orientation); * @param[in] orientation The orientation * @return true if the orientation is horizontal */ -DALI_IMPORT_API bool IsHorizontal(ControlOrientation::Type orientation); +DALI_TOOLKIT_API bool IsHorizontal(ControlOrientation::Type orientation); /** * @} diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list index e490f79..7cce0ee 100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@ -39,6 +39,7 @@ public_api_src_files = \ public_api_header_files = \ $(public_api_src_dir)/dali-toolkit-version.h \ + $(public_api_src_dir)/dali-toolkit-common.h \ $(public_api_src_dir)/enums.h \ $(public_api_src_dir)/align-enumerations.h \ $(public_api_src_dir)/toolkit-property-index-ranges.h diff --git a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h index e5a6409..caed557 100644 --- a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h +++ b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_KEYBOARD_FOCUS_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. @@ -54,7 +54,7 @@ class KeyboardFocusManager; * | keyboardFocusedActorEnterKey | @ref FocusedActorEnterKeySignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API KeyboardFocusManager : public BaseHandle +class DALI_TOOLKIT_API KeyboardFocusManager : public BaseHandle { public: diff --git a/dali-toolkit/public-api/image-loader/async-image-loader.h b/dali-toolkit/public-api/image-loader/async-image-loader.h old mode 100644 new mode 100755 index 9c021b5..8d4c629 --- a/dali-toolkit/public-api/image-loader/async-image-loader.h +++ b/dali-toolkit/public-api/image-loader/async-image-loader.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_ASYNC_IMAGE_LOADER_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,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { class PixelData; @@ -87,7 +90,7 @@ class AsyncImageLoader; * * @endcode */ -class DALI_IMPORT_API AsyncImageLoader : public BaseHandle +class DALI_TOOLKIT_API AsyncImageLoader : public BaseHandle { public: diff --git a/dali-toolkit/public-api/image-loader/sync-image-loader.h b/dali-toolkit/public-api/image-loader/sync-image-loader.h old mode 100644 new mode 100755 index 9d0a820..732c937 --- a/dali-toolkit/public-api/image-loader/sync-image-loader.h +++ b/dali-toolkit/public-api/image-loader/sync-image-loader.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_SYNC_IMAGE_LOADER_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. @@ -22,6 +22,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -61,7 +64,7 @@ namespace SyncImageLoader * @param[in] url The URL of the image file to load * @return A PixelData object containing the image, or an invalid object on failure */ -DALI_IMPORT_API PixelData Load( const std::string& url ); +DALI_TOOLKIT_API PixelData Load( const std::string& url ); /** * @brief Loads an image synchronously by specifying the target dimensions. @@ -77,7 +80,7 @@ DALI_IMPORT_API PixelData Load( const std::string& url ); * @param[in] dimensions The width and height to fit the loaded image to * @return A PixelData object containing the image, or an invalid object on failure */ -DALI_IMPORT_API PixelData Load( const std::string& url, ImageDimensions dimensions ); +DALI_TOOLKIT_API PixelData Load( const std::string& url, ImageDimensions dimensions ); /** * @brief Loads an image synchronously by specifying the target dimensions and options. @@ -91,7 +94,7 @@ DALI_IMPORT_API PixelData Load( const std::string& url, ImageDimensions dimensio * @param[in] orientationCorrection Reorient the image to respect any orientation metadata in its header * @return A PixelData object containing the image, or an invalid object on failure */ -DALI_IMPORT_API PixelData Load( const std::string& url, +DALI_TOOLKIT_API PixelData Load( const std::string& url, ImageDimensions dimensions, FittingMode::Type fittingMode, SamplingMode::Type samplingMode, diff --git a/dali-toolkit/public-api/styling/style-manager.h b/dali-toolkit/public-api/styling/style-manager.h index 7f52d85..de6bfb1 100644 --- a/dali-toolkit/public-api/styling/style-manager.h +++ b/dali-toolkit/public-api/styling/style-manager.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_STYLE_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. @@ -65,7 +65,7 @@ class StyleManager; * | styleChanged | @ref StyleChangedSignal() | * @SINCE_1_1.32 */ -class DALI_IMPORT_API StyleManager : public BaseHandle +class DALI_TOOLKIT_API StyleManager : public BaseHandle { public: diff --git a/plugins/dali-script-v8/src/dali-script-v8.cpp b/plugins/dali-script-v8/src/dali-script-v8.cpp index dc7641b..b93b605 100644 --- a/plugins/dali-script-v8/src/dali-script-v8.cpp +++ b/plugins/dali-script-v8/src/dali-script-v8.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. @@ -27,12 +27,12 @@ #include // The plugin factories -extern "C" DALI_EXPORT_API Dali::Toolkit::ScriptPlugin* CreateScriptPlugin(void) +extern "C" DALI_TOOLKIT_API Dali::Toolkit::ScriptPlugin* CreateScriptPlugin(void) { return new Dali::V8Plugin::DaliScriptV8; } -extern "C" DALI_EXPORT_API void DestroyScriptPlugin(Dali::Toolkit::ScriptPlugin* plugin) +extern "C" DALI_TOOLKIT_API void DestroyScriptPlugin(Dali::Toolkit::ScriptPlugin* plugin) { delete plugin; } diff --git a/plugins/dali-script-v8/src/dali-script-v8.h b/plugins/dali-script-v8/src/dali-script-v8.h index 61d265b..8177f3b 100644 --- a/plugins/dali-script-v8/src/dali-script-v8.h +++ b/plugins/dali-script-v8/src/dali-script-v8.h @@ -2,7 +2,7 @@ #define __DALI_V8PLUGIN_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. @@ -20,9 +20,9 @@ // EXTERNAL INCLUDES #include -#include +#include -namespace Dali DALI_IMPORT_API +namespace Dali DALI_TOOLKIT_API { namespace V8Plugin diff --git a/plugins/dali-script-v8/src/dali-wrapper.h b/plugins/dali-script-v8/src/dali-wrapper.h index f1767e4..c1013fe 100644 --- a/plugins/dali-script-v8/src/dali-wrapper.h +++ b/plugins/dali-script-v8/src/dali-wrapper.h @@ -2,7 +2,7 @@ #define __DALI_V8PLUGIN_DALI_WRAP_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,9 +20,9 @@ // EXTERNAL INCLUDES #include -#include // INTERNAL INCLUDES +#include #include #include -- 2.7.4