From 8bccadc96b3773fb10c562a5ccdf1b071b2efe8e Mon Sep 17 00:00:00 2001 From: adun Date: Fri, 11 May 2018 09:57:59 +0800 Subject: [PATCH] Seperate the API macros Change-Id: If42263c0ba8972919fc4d7a5581c5ad06c18a9d6 --- .../dali/dali-test-suite-utils/test-application.h | 4 +- .../dali-test-suite-utils/test-gesture-manager.h | 4 +- .../dali-test-suite-utils/test-gl-abstraction.h | 4 +- .../test-gl-sync-abstraction.h | 6 +- .../dali/dali-test-suite-utils/test-native-image.h | 8 +-- .../test-platform-abstraction.h | 4 +- .../dali-test-suite-utils/test-render-controller.h | 4 +- .../src/dali/utc-Dali-PropertyTypes.cpp | 4 +- dali/devel-api/actors/actor-devel.h | 6 +- dali/devel-api/actors/custom-actor-devel.h | 4 +- dali/devel-api/animation/animation-data.h | 4 +- dali/devel-api/animation/animation-devel.h | 8 +-- dali/devel-api/animation/path-constrainer.h | 4 +- dali/devel-api/common/hash.h | 6 +- dali/devel-api/common/stage-devel.h | 4 +- dali/devel-api/events/hit-test-algorithm.h | 6 +- dali/devel-api/images/distance-field.h | 4 +- dali/devel-api/images/nine-patch-image.h | 4 +- dali/devel-api/images/texture-set-image.h | 4 +- dali/devel-api/object/csharp-type-registry.h | 6 +- dali/devel-api/object/handle-devel.h | 12 ++-- dali/devel-api/scripting/scripting.h | 16 ++--- dali/devel-api/signals/signal-delegate.h | 4 +- dali/devel-api/threading/conditional-wait.h | 4 +- dali/devel-api/threading/mutex.h | 4 +- dali/devel-api/threading/thread.h | 4 +- dali/integration-api/bitmap.h | 6 +- dali/integration-api/core.h | 4 +- dali/integration-api/debug.h | 24 ++++---- dali/integration-api/events/event.h | 6 +- dali/integration-api/events/gesture-event.h | 6 +- dali/integration-api/events/gesture-requests.h | 14 ++--- dali/integration-api/events/hover-event-integ.h | 6 +- dali/integration-api/events/key-event-integ.h | 6 +- .../events/long-press-gesture-event.h | 6 +- .../events/multi-point-event-integ.h | 6 +- dali/integration-api/events/pan-gesture-event.h | 6 +- dali/integration-api/events/pinch-gesture-event.h | 6 +- dali/integration-api/events/point.h | 4 +- dali/integration-api/events/tap-gesture-event.h | 6 +- dali/integration-api/events/touch-event-combiner.h | 4 +- dali/integration-api/events/touch-event-integ.h | 6 +- dali/integration-api/events/wheel-event-integ.h | 6 +- dali/integration-api/gesture-manager.h | 4 +- dali/integration-api/input-options.h | 32 +++++----- dali/integration-api/lockless-buffer.h | 4 +- dali/integration-api/profiling.h | 30 +++++----- dali/integration-api/system-overlay.h | 4 +- dali/integration-api/trace.h | 8 +-- dali/public-api/actors/actor.h | 4 +- dali/public-api/actors/camera-actor.h | 4 +- dali/public-api/actors/custom-actor-impl.h | 4 +- dali/public-api/actors/custom-actor.h | 4 +- dali/public-api/actors/layer.h | 4 +- dali/public-api/animation/alpha-function.h | 4 +- dali/public-api/animation/animation.h | 4 +- dali/public-api/animation/constraint-source.h | 10 ++-- dali/public-api/animation/constraint.h | 4 +- dali/public-api/animation/key-frames.h | 4 +- dali/public-api/animation/linear-constrainer.h | 4 +- dali/public-api/animation/path.h | 4 +- dali/public-api/animation/time-period.h | 4 +- dali/public-api/common/constants.h | 68 +++++++++++----------- dali/public-api/common/dali-common.cpp | 8 +-- dali/public-api/common/dali-common.h | 10 +++- dali/public-api/common/dali-vector.h | 4 +- dali/public-api/common/extents.h | 6 +- dali/public-api/common/stage.h | 4 +- dali/public-api/dali-core-version.h | 10 ++-- dali/public-api/events/gesture-detector.h | 4 +- dali/public-api/events/gesture.h | 4 +- dali/public-api/events/hover-event.h | 4 +- dali/public-api/events/key-event.h | 4 +- .../events/long-press-gesture-detector.h | 4 +- dali/public-api/events/long-press-gesture.h | 4 +- dali/public-api/events/pan-gesture-detector.h | 4 +- dali/public-api/events/pan-gesture.h | 4 +- dali/public-api/events/pinch-gesture-detector.h | 4 +- dali/public-api/events/pinch-gesture.h | 4 +- dali/public-api/events/tap-gesture-detector.h | 4 +- dali/public-api/events/tap-gesture.h | 4 +- dali/public-api/events/touch-data.h | 4 +- dali/public-api/events/touch-event.h | 4 +- dali/public-api/events/touch-point.h | 4 +- dali/public-api/events/wheel-event.h | 4 +- dali/public-api/images/buffer-image.h | 4 +- dali/public-api/images/encoded-buffer-image.h | 4 +- dali/public-api/images/frame-buffer-image.h | 4 +- dali/public-api/images/image.h | 4 +- dali/public-api/images/native-image.h | 4 +- dali/public-api/images/pixel-data.h | 4 +- dali/public-api/images/pixel.h | 8 +-- dali/public-api/images/resource-image.h | 4 +- dali/public-api/math/degree.h | 28 ++++----- dali/public-api/math/matrix.h | 6 +- dali/public-api/math/matrix3.h | 6 +- dali/public-api/math/quaternion.h | 6 +- dali/public-api/math/vector2.h | 8 +-- dali/public-api/math/vector3.h | 8 +-- dali/public-api/math/vector4.h | 8 +-- dali/public-api/object/any.h | 12 ++-- dali/public-api/object/base-handle.h | 4 +- dali/public-api/object/base-object.h | 4 +- dali/public-api/object/handle.h | 6 +- dali/public-api/object/object-registry.h | 4 +- dali/public-api/object/property-array.h | 6 +- dali/public-api/object/property-conditions.h | 16 ++--- dali/public-api/object/property-input.h | 4 +- dali/public-api/object/property-key.h | 6 +- dali/public-api/object/property-map.h | 6 +- dali/public-api/object/property-notification.h | 4 +- dali/public-api/object/property-types.cpp | 4 +- dali/public-api/object/property-types.h | 4 +- dali/public-api/object/property-value.h | 6 +- dali/public-api/object/property.h | 4 +- dali/public-api/object/ref-object.h | 4 +- dali/public-api/object/type-info.h | 2 +- dali/public-api/object/type-registry.h | 16 ++--- dali/public-api/object/weak-handle.h | 4 +- dali/public-api/render-tasks/render-task-list.h | 4 +- dali/public-api/render-tasks/render-task.h | 4 +- dali/public-api/rendering/frame-buffer.h | 4 +- dali/public-api/rendering/geometry.h | 4 +- dali/public-api/rendering/property-buffer.h | 4 +- dali/public-api/rendering/renderer.h | 4 +- dali/public-api/rendering/sampler.h | 4 +- dali/public-api/rendering/shader.h | 4 +- dali/public-api/rendering/texture-set.h | 4 +- dali/public-api/rendering/texture.h | 4 +- dali/public-api/signals/base-signal.h | 4 +- dali/public-api/signals/callback.h | 4 +- .../signals/connection-tracker-interface.h | 4 +- dali/public-api/signals/connection-tracker.h | 4 +- dali/public-api/signals/functor-delegate.h | 4 +- dali/public-api/signals/signal-slot-connections.h | 6 +- dali/public-api/signals/signal-slot-observers.h | 6 +- 136 files changed, 437 insertions(+), 435 deletions(-) mode change 100644 => 100755 dali/public-api/common/dali-common.h diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-application.h b/automated-tests/src/dali/dali-test-suite-utils/test-application.h index 747b488..6b8b236 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-application.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-application.h @@ -2,7 +2,7 @@ #define __DALI_TEST_APPLICATION_H__ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ namespace Dali { -class DALI_IMPORT_API TestApplication : public ConnectionTracker +class DALI_CORE_API TestApplication : public ConnectionTracker { public: diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-gesture-manager.h b/automated-tests/src/dali/dali-test-suite-utils/test-gesture-manager.h index 4c0b766..6fddd30 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-gesture-manager.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-gesture-manager.h @@ -2,7 +2,7 @@ #define __DALI_TEST_GESTURE_MANAGER_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ namespace Dali /** * Concrete implementation of the gesture manager class. */ -class DALI_IMPORT_API TestGestureManager : public Dali::Integration::GestureManager +class DALI_CORE_API TestGestureManager : public Dali::Integration::GestureManager { public: diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h index b306c3e..c68573b 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h @@ -2,7 +2,7 @@ #define TEST_GL_ABSTRACTION_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ static const char *mStdAttribs[MAX_ATTRIBUTE_CACHE_SIZE] = "aBoneIndices" // ATTRIB_BONE_INDICES }; -class DALI_IMPORT_API TestGlAbstraction: public Dali::Integration::GlAbstraction +class DALI_CORE_API TestGlAbstraction: public Dali::Integration::GlAbstraction { public: TestGlAbstraction(); diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.h index 8ce96a4..979987b 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-gl-sync-abstraction.h @@ -2,7 +2,7 @@ #define __TEST_GL_SYNC_ABSTRACTION_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ namespace Dali { -class DALI_IMPORT_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject +class DALI_CORE_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject { public: TestSyncObject(TraceCallStack& trace); @@ -44,7 +44,7 @@ public: /** * Class to emulate the GL sync functions with tracing */ -class DALI_IMPORT_API TestGlSyncAbstraction: public Integration::GlSyncAbstraction +class DALI_CORE_API TestGlSyncAbstraction: public Integration::GlSyncAbstraction { public: /** diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h index 896ce52..5cb4b27 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h @@ -2,7 +2,7 @@ #define __TEST_NATIVE_IMAGE_H__ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ class TestNativeImageNoExt; typedef IntrusivePtr TestNativeImagePointer; typedef IntrusivePtr TestNativeImageNoExtPointer; -class DALI_IMPORT_API TestNativeImageExtension: public Dali::NativeImageInterface::Extension +class DALI_CORE_API TestNativeImageExtension: public Dali::NativeImageInterface::Extension { public: inline const char* GetCustomFragmentPreFix(){return "#extension GL_OES_EGL_image_external:require\n";} @@ -40,7 +40,7 @@ public: }; -class DALI_IMPORT_API TestNativeImage : public Dali::NativeImageInterface +class DALI_CORE_API TestNativeImage : public Dali::NativeImageInterface { public: static TestNativeImagePointer New(int width, int height); @@ -71,7 +71,7 @@ public: }; -class DALI_IMPORT_API TestNativeImageNoExt : public Dali::NativeImageInterface +class DALI_CORE_API TestNativeImageNoExt : public Dali::NativeImageInterface { public: static TestNativeImageNoExtPointer New(int width, int height); diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h index 201e29d..f31561e 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h @@ -2,7 +2,7 @@ #define __DALI_TEST_PLATFORM_ABSTRACTION_H__ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ namespace Dali /** * Concrete implementation of the platform abstraction class. */ -class DALI_IMPORT_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction +class DALI_CORE_API TestPlatformAbstraction : public Dali::Integration::PlatformAbstraction { public: diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h b/automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h index 3ad63d3..7c785f1 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-render-controller.h @@ -2,7 +2,7 @@ #define __TEST_RENDER_CONTROLLER_H__ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ namespace Dali { -class DALI_IMPORT_API TestRenderController : public Dali::Integration::RenderController +class DALI_CORE_API TestRenderController : public Dali::Integration::RenderController { public: TestRenderController(); diff --git a/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp b/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp index c5b6252..97c433d 100644 --- a/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp +++ b/automated-tests/src/dali/utc-Dali-PropertyTypes.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. @@ -23,8 +23,6 @@ using namespace Dali; -DALI_IMPORT_API const char* const GetName(Property::Type type); - int UtcDaliPropertyTypesGetNameP(void) { DALI_TEST_EQUALS( "NONE", Dali::PropertyTypes::GetName(Property::NONE ), TEST_LOCATION ); diff --git a/dali/devel-api/actors/actor-devel.h b/dali/devel-api/actors/actor-devel.h index 054fe3e..84a712e 100644 --- a/dali/devel-api/actors/actor-devel.h +++ b/dali/devel-api/actors/actor-devel.h @@ -150,7 +150,7 @@ typedef Signal< void ( Actor, bool, VisibilityChange::Type ) > VisibilityChanged * @pre The Actor has been initialized. * @note This signal is NOT emitted if the actor becomes transparent (or the reverse), it's only linked with Actor::Property::VISIBLE. */ -DALI_IMPORT_API VisibilityChangedSignalType& VisibilityChangedSignal( Actor actor ); +DALI_CORE_API VisibilityChangedSignalType& VisibilityChangedSignal( Actor actor ); typedef Signal< void (Actor) > ChildChangedSignalType; ///< Called when the actor has a child added or removed @@ -171,7 +171,7 @@ typedef Signal< void (Actor) > ChildChangedSignalType; ///< Called when the acto * @return The signal to connect to * @pre The Actor has been initialized */ -DALI_IMPORT_API ChildChangedSignalType& ChildAddedSignal( Actor actor ); +DALI_CORE_API ChildChangedSignalType& ChildAddedSignal( Actor actor ); /** * @brief This signal is emitted when a child is removed from this actor. @@ -193,7 +193,7 @@ DALI_IMPORT_API ChildChangedSignalType& ChildAddedSignal( Actor actor ); * @return The signal to connect to * @pre The Actor has been initialized */ -DALI_IMPORT_API ChildChangedSignalType& ChildRemovedSignal( Actor actor ); +DALI_CORE_API ChildChangedSignalType& ChildRemovedSignal( Actor actor ); } // namespace DevelActor diff --git a/dali/devel-api/actors/custom-actor-devel.h b/dali/devel-api/actors/custom-actor-devel.h index f5906af..674acc4 100644 --- a/dali/devel-api/actors/custom-actor-devel.h +++ b/dali/devel-api/actors/custom-actor-devel.h @@ -2,7 +2,7 @@ #define DALI_CUSTOM_ACTOR_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 @@ namespace DevelCustomActor * @param[in] actor The custom actor of which to get the type information * @return the TypeInfo of this actor */ -DALI_IMPORT_API const Dali::TypeInfo GetTypeInfo( CustomActor actor ); +DALI_CORE_API const Dali::TypeInfo GetTypeInfo( CustomActor actor ); } // namespace DevelCustomActor diff --git a/dali/devel-api/animation/animation-data.h b/dali/devel-api/animation/animation-data.h index ebdad5a..6138d4e 100644 --- a/dali/devel-api/animation/animation-data.h +++ b/dali/devel-api/animation/animation-data.h @@ -2,7 +2,7 @@ #define __DALI_ANIMATION_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. @@ -37,7 +37,7 @@ namespace Dali * * This then allows the same description data to be used to repeatedly create an animation multiple times. */ -class DALI_IMPORT_API AnimationData +class DALI_CORE_API AnimationData { public: diff --git a/dali/devel-api/animation/animation-devel.h b/dali/devel-api/animation/animation-devel.h index b106f6f..f003075 100644 --- a/dali/devel-api/animation/animation-devel.h +++ b/dali/devel-api/animation/animation-devel.h @@ -2,7 +2,7 @@ #define DALI_ANIMATION_DEVEL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ namespace DevelAnimation * @param[in] animation the animation object to perform this operation on * @param[in] progress the progress percentage to trigger the signal at, e.g .3 for 30%. */ -DALI_IMPORT_API void SetProgressNotification( Animation animation, float progress ); +DALI_CORE_API void SetProgressNotification( Animation animation, float progress ); /** * @brief Get progress percentage marker that has been set to trigger ProgressHasBeenReachedSignal @@ -41,7 +41,7 @@ DALI_IMPORT_API void SetProgressNotification( Animation animation, float progres * @param[in] animation the animation object to perform this operation on * @return the percentage to trigger at eg 0.3 for 30% */ -DALI_IMPORT_API float GetProgressNotification( Animation animation ); +DALI_CORE_API float GetProgressNotification( Animation animation ); /** * @brief Connects to this signal to be notified when an Animation's animations have reached set progress. @@ -49,7 +49,7 @@ DALI_IMPORT_API float GetProgressNotification( Animation animation ); * @return A signal object to connect with * */ -DALI_IMPORT_API Animation::AnimationSignalType& ProgressReachedSignal( Animation animation ); +DALI_CORE_API Animation::AnimationSignalType& ProgressReachedSignal( Animation animation ); } // namespace DevelAnimation diff --git a/dali/devel-api/animation/path-constrainer.h b/dali/devel-api/animation/path-constrainer.h index c0a8517..cb6f73b 100644 --- a/dali/devel-api/animation/path-constrainer.h +++ b/dali/devel-api/animation/path-constrainer.h @@ -2,7 +2,7 @@ #define __DALI_PATH_CONSTRAINER_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 * the tangent of the path given a forward vector in object's local space. * */ -class DALI_IMPORT_API PathConstrainer : public Handle +class DALI_CORE_API PathConstrainer : public Handle { public: diff --git a/dali/devel-api/common/hash.h b/dali/devel-api/common/hash.h index 8a9a722..66b514d 100644 --- a/dali/devel-api/common/hash.h +++ b/dali/devel-api/common/hash.h @@ -2,7 +2,7 @@ #define __DALI_HASH__ /* - * 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. @@ -37,7 +37,7 @@ enum * @param toHash string to hash * @return hash code */ -DALI_IMPORT_API std::size_t CalculateHash( const std::string& toHash ); +DALI_CORE_API std::size_t CalculateHash( const std::string& toHash ); /** * @brief Create a hash code for 2 strings combined. @@ -46,7 +46,7 @@ DALI_IMPORT_API std::size_t CalculateHash( const std::string& toHash ); * @param string2 second string * @return hash code */ -DALI_IMPORT_API std::size_t CalculateHash( const std::string& string1, const std::string& string2 ); +DALI_CORE_API std::size_t CalculateHash( const std::string& string1, const std::string& string2 ); } // namespace Dali diff --git a/dali/devel-api/common/stage-devel.h b/dali/devel-api/common/stage-devel.h index f54e411..017797e 100644 --- a/dali/devel-api/common/stage-devel.h +++ b/dali/devel-api/common/stage-devel.h @@ -2,7 +2,7 @@ #define DALI_STAGE_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. @@ -35,7 +35,7 @@ typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType; ///< * @param[in] stage The stage to emit a signal * @return The return is true if KeyEvent is consumed, otherwise false. */ -DALI_IMPORT_API KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Stage stage ); +DALI_CORE_API KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Stage stage ); } // namespace DevelStage diff --git a/dali/devel-api/events/hit-test-algorithm.h b/dali/devel-api/events/hit-test-algorithm.h index 913a2af..20dfc22 100644 --- a/dali/devel-api/events/hit-test-algorithm.h +++ b/dali/devel-api/events/hit-test-algorithm.h @@ -2,7 +2,7 @@ #define __DALI_HIT_TEST_ALGORITHM_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. @@ -143,7 +143,7 @@ typedef bool (*HitTestFunction)(Actor actor, TraverseType type); * @param[in] func The function to use in the hit-test algorithm. * @return true if something was hit */ -DALI_IMPORT_API bool HitTest( Stage stage, const Vector2& screenCoordinates, Results& results, HitTestFunction func ); +DALI_CORE_API bool HitTest( Stage stage, const Vector2& screenCoordinates, Results& results, HitTestFunction func ); /** * @brief Hit test specific to a given RenderTask. @@ -154,7 +154,7 @@ DALI_IMPORT_API bool HitTest( Stage stage, const Vector2& screenCoordinates, Res * @param[in] func The function to use in the hit-test algorithm. * @return true if something was hit */ -DALI_IMPORT_API bool HitTest( RenderTask& renderTask, const Vector2& screenCoordinates, Results& results, HitTestFunction func ); +DALI_CORE_API bool HitTest( RenderTask& renderTask, const Vector2& screenCoordinates, Results& results, HitTestFunction func ); } // namespace HitTestAlgorithm diff --git a/dali/devel-api/images/distance-field.h b/dali/devel-api/images/distance-field.h index d0ebf2a..51ca056 100644 --- a/dali/devel-api/images/distance-field.h +++ b/dali/devel-api/images/distance-field.h @@ -2,7 +2,7 @@ #define __DALI_DISTANCE_FIELD_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 @@ struct Vector2; * @param[in] maxSize The image is scaled from this size to distanceMapSize * @param[in] highQuality Set true to generate high quality distance fields */ -DALI_IMPORT_API void GenerateDistanceFieldMap( const unsigned char* const imagePixels, const Vector2& imageSize, +DALI_CORE_API void GenerateDistanceFieldMap( const unsigned char* const imagePixels, const Vector2& imageSize, unsigned char* const distanceMap, const Vector2& distanceMapSize, const unsigned int fieldBorder, const Vector2& maxSize, diff --git a/dali/devel-api/images/nine-patch-image.h b/dali/devel-api/images/nine-patch-image.h index 904ec72..7c644e2 100644 --- a/dali/devel-api/images/nine-patch-image.h +++ b/dali/devel-api/images/nine-patch-image.h @@ -2,7 +2,7 @@ #define __DALI_NINE_PATCH_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. @@ -49,7 +49,7 @@ class NinePatchImage; * If you don't retain a handle to this object, it will be automatically destroyed. * @SINCE_1_0.0 */ -class DALI_IMPORT_API NinePatchImage : public ResourceImage +class DALI_CORE_API NinePatchImage : public ResourceImage { public: typedef Vector< Uint16Pair > StretchRanges; diff --git a/dali/devel-api/images/texture-set-image.h b/dali/devel-api/images/texture-set-image.h index 45f3efa..1e42e57 100644 --- a/dali/devel-api/images/texture-set-image.h +++ b/dali/devel-api/images/texture-set-image.h @@ -2,7 +2,7 @@ #define DALI_TEXTURE_SET_IMAGE_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. @@ -36,7 +36,7 @@ class TextureSet; * @param[in] index The position in the TextureSet that the image will be set * @param[in] image The image to set */ -DALI_IMPORT_API void TextureSetImage( TextureSet textureSet, size_t index, Image image ); +DALI_CORE_API void TextureSetImage( TextureSet textureSet, size_t index, Image image ); } //namespace Dali diff --git a/dali/devel-api/object/csharp-type-registry.h b/dali/devel-api/object/csharp-type-registry.h index c5e7810..7a6a360 100644 --- a/dali/devel-api/object/csharp-type-registry.h +++ b/dali/devel-api/object/csharp-type-registry.h @@ -2,7 +2,7 @@ #define __DALI_CSHARP_TYPE_REGISTRY_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. @@ -48,7 +48,7 @@ namespace CSharpTypeRegistry * @param [in] f registerType instance creation function * @return true if the name could be registered. */ - DALI_IMPORT_API bool RegisterType( const std::string& name, + DALI_CORE_API bool RegisterType( const std::string& name, const std::type_info& baseType, CSharpTypeInfo::CreateFunction f ); @@ -62,7 +62,7 @@ namespace CSharpTypeRegistry * @param [in] getFunc The function to get the value of a property. * @return true if the property could be registered. */ - DALI_IMPORT_API bool RegisterProperty( const std::string& objectName, + DALI_CORE_API bool RegisterProperty( const std::string& objectName, const std::string& name, Property::Index index, Property::Type type, diff --git a/dali/devel-api/object/handle-devel.h b/dali/devel-api/object/handle-devel.h index caae1b8..e8d3803 100644 --- a/dali/devel-api/object/handle-devel.h +++ b/dali/devel-api/object/handle-devel.h @@ -44,7 +44,7 @@ namespace DevelHandle * * @note The key is not the same as the returned index, though it has the same type. */ -DALI_IMPORT_API Property::Index GetPropertyIndex( const Handle& handle, Property::Index key ); +DALI_CORE_API Property::Index GetPropertyIndex( const Handle& handle, Property::Index key ); /** * @brief Query the index of a property using the given key from a Property::Map @@ -58,7 +58,7 @@ DALI_IMPORT_API Property::Index GetPropertyIndex( const Handle& handle, Property * * @note See also, GetPropertyIndex(Property::Index) and GetPropertyIndex(const std::string&) */ -DALI_IMPORT_API Property::Index GetPropertyIndex( const Handle& handle, Property::Key key ); +DALI_CORE_API Property::Index GetPropertyIndex( const Handle& handle, Property::Key key ); /** * @brief Register a new animatable property with an integer key. @@ -96,7 +96,7 @@ DALI_IMPORT_API Property::Index GetPropertyIndex( const Handle& handle, Property * - Property::ROTATION * @note If a property with the desired name already exists, then the value given is just set. */ -DALI_IMPORT_API Property::Index RegisterProperty( Handle handle, Property::Index key, const std::string& name, const Property::Value& propertyValue ); +DALI_CORE_API Property::Index RegisterProperty( Handle handle, Property::Index key, const std::string& name, const Property::Value& propertyValue ); /** * @brief Set the type-info that the object is created by. @@ -106,7 +106,7 @@ DALI_IMPORT_API Property::Index RegisterProperty( Handle handle, Property::Index * @param[in] handle The handle created by this TypeInfo. * @param[in] typeInfo The TypeInfo that creates the handle. */ -DALI_IMPORT_API void SetTypeInfo( Handle& handle, const TypeInfo& typeInfo ); +DALI_CORE_API void SetTypeInfo( Handle& handle, const TypeInfo& typeInfo ); /** @@ -116,7 +116,7 @@ DALI_IMPORT_API void SetTypeInfo( Handle& handle, const TypeInfo& typeInfo ); * @param[in] handle The handle to check * @param[in] index The index of the property to test for */ -DALI_IMPORT_API bool DoesCustomPropertyExist( Handle& handle, Property::Index index ); +DALI_CORE_API bool DoesCustomPropertyExist( Handle& handle, Property::Index index ); /** * @brief PropertySetSignal function prototype for signal handler. Called when a property is set on this object. @@ -129,7 +129,7 @@ using PropertySetSignalType = Signal< void( Handle& handle, Property::Index inde * @param[in] handle The handle of the object to listen to. * @return The signal to attach a connection to. */ -DALI_IMPORT_API PropertySetSignalType& PropertySetSignal( Handle handle ); +DALI_CORE_API PropertySetSignalType& PropertySetSignal( Handle handle ); } // namespace DevelHandle diff --git a/dali/devel-api/scripting/scripting.h b/dali/devel-api/scripting/scripting.h index 6149155..e7c51ba 100644 --- a/dali/devel-api/scripting/scripting.h +++ b/dali/devel-api/scripting/scripting.h @@ -2,7 +2,7 @@ #define DALI_SCRIPTING_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. @@ -55,7 +55,7 @@ struct StringEnum * @param[in] tableCount Number of items in the array. * @return The index of the enumeration. If enumeration is not found, logs an error and returns tableCount. */ -DALI_IMPORT_API unsigned int FindEnumIndex( const char* value, const StringEnum* table, unsigned int tableCount ); +DALI_CORE_API unsigned int FindEnumIndex( const char* value, const StringEnum* table, unsigned int tableCount ); /** * @brief Find the enum as an integer from the table @@ -68,7 +68,7 @@ DALI_IMPORT_API unsigned int FindEnumIndex( const char* value, const StringEnum* * @param[out] integerEnum The value of the enum. * @return true if one or more enums in value. */ -DALI_IMPORT_API bool EnumStringToInteger( const char* const value, const StringEnum* const table, unsigned int tableCount, int& integerEnum ); +DALI_CORE_API bool EnumStringToInteger( const char* const value, const StringEnum* const table, unsigned int tableCount, int& integerEnum ); /** * @brief Chooses the appropriate enumeration for the provided string from the given table. @@ -272,7 +272,7 @@ const char * GetLinearEnumerationName( T value, const StringEnum* table, unsigne * * @return A pointer to a newly created object. */ -DALI_IMPORT_API Image NewImage( const Property::Value& property ); +DALI_CORE_API Image NewImage( const Property::Value& property ); /** * @brief Creates an actor with the date from the property value map. @@ -295,7 +295,7 @@ DALI_IMPORT_API Image NewImage( const Property::Value& property ); * * @return A handle to the newly created actor. */ -DALI_IMPORT_API Actor NewActor( const Property::Map& map ); +DALI_CORE_API Actor NewActor( const Property::Map& map ); /** * @brief Creates a Property::Map from the actor provided. @@ -303,7 +303,7 @@ DALI_IMPORT_API Actor NewActor( const Property::Map& map ); * @param[in] actor The base-actor from which a Property::Map should be created * @param[out] map This map is cleared and a property map of actor and its children is filled in */ -DALI_IMPORT_API void CreatePropertyMap( Actor actor, Property::Map& map ); +DALI_CORE_API void CreatePropertyMap( Actor actor, Property::Map& map ); /** * @brief Creates a Property::Map from the image provided. @@ -311,7 +311,7 @@ DALI_IMPORT_API void CreatePropertyMap( Actor actor, Property::Map& map ); * @param[in] image The image from which a Property::Map should be created * @param[out] map This map is cleared and a property map of the image is filled in */ -DALI_IMPORT_API void CreatePropertyMap( Image image, Property::Map& map ); +DALI_CORE_API void CreatePropertyMap( Image image, Property::Map& map ); /** * @brief Creates description data required to create an Animation object from a property map. @@ -319,7 +319,7 @@ DALI_IMPORT_API void CreatePropertyMap( Image image, Property::Map& map ); * @param[in] map The property value map containing the animation description * @param[out] outputAnimationData Resultant data retrieved from the property map is written here */ -DALI_IMPORT_API void NewAnimation( const Property::Map& map, Dali::AnimationData& outputAnimationData ); +DALI_CORE_API void NewAnimation( const Property::Map& map, Dali::AnimationData& outputAnimationData ); } // namespace Scripting diff --git a/dali/devel-api/signals/signal-delegate.h b/dali/devel-api/signals/signal-delegate.h index 9e4ba64..f9941b8 100644 --- a/dali/devel-api/signals/signal-delegate.h +++ b/dali/devel-api/signals/signal-delegate.h @@ -2,7 +2,7 @@ #define __DALI_SIGNAL_DELEGATE_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. @@ -31,7 +31,7 @@ namespace Dali * EG: The SignalDelegate can be created internally and exposed to the application-developer. * They can then call the connect function to transparently bind to their callback. */ -class DALI_IMPORT_API SignalDelegate +class DALI_CORE_API SignalDelegate { public: diff --git a/dali/devel-api/threading/conditional-wait.h b/dali/devel-api/threading/conditional-wait.h index 81660cc..24a0874 100644 --- a/dali/devel-api/threading/conditional-wait.h +++ b/dali/devel-api/threading/conditional-wait.h @@ -2,7 +2,7 @@ #define __DALI_CONDITIONAL_WAIT_H__ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ namespace Dali /** * Helper class to allow conditional waiting and notifications between multiple threads. */ -class DALI_IMPORT_API ConditionalWait +class DALI_CORE_API ConditionalWait { public: diff --git a/dali/devel-api/threading/mutex.h b/dali/devel-api/threading/mutex.h index 9490212..26dfe11 100644 --- a/dali/devel-api/threading/mutex.h +++ b/dali/devel-api/threading/mutex.h @@ -2,7 +2,7 @@ #define __DALI_MUTEX_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 @@ namespace Dali /** * Class to synchronize access to critical resources from multiple threads */ -class DALI_IMPORT_API Mutex +class DALI_CORE_API Mutex { public: diff --git a/dali/devel-api/threading/thread.h b/dali/devel-api/threading/thread.h index 0e21639..176aa81 100644 --- a/dali/devel-api/threading/thread.h +++ b/dali/devel-api/threading/thread.h @@ -2,7 +2,7 @@ #define __DALI_THREAD_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 @@ namespace Dali /* * @brief Abstract class for thread functionality. Can be used for worker threads. */ -class DALI_IMPORT_API Thread +class DALI_CORE_API Thread { public: diff --git a/dali/integration-api/bitmap.h b/dali/integration-api/bitmap.h index 1e1b9bc..3c60065 100644 --- a/dali/integration-api/bitmap.h +++ b/dali/integration-api/bitmap.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_BITMAP_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. @@ -39,7 +39,7 @@ namespace Integration * @param[out] pixelDataType pixel data type (eg. GL_UNSIGNED_BYTE) * @param[out] internalFormat pixel internal format (eg. GL_RGBA) */ -DALI_IMPORT_API void ConvertToGlFormat(Pixel::Format pixelformat, unsigned& pixelDataType, unsigned& internalFormat); +DALI_CORE_API void ConvertToGlFormat(Pixel::Format pixelformat, unsigned& pixelDataType, unsigned& internalFormat); class Bitmap; typedef IntrusivePtr BitmapPtr; @@ -49,7 +49,7 @@ typedef unsigned char PixelBuffer; ///< Pixel data buffers are * Bitmap class. * An abstract container for image data. */ -class DALI_IMPORT_API Bitmap : public Dali::RefObject +class DALI_CORE_API Bitmap : public Dali::RefObject { protected: diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h index 5d05e85..3386247 100644 --- a/dali/integration-api/core.h +++ b/dali/integration-api/core.h @@ -171,7 +171,7 @@ private: * Interface to enable classes to be processed after the event loop. Classes are processed * in the order they are registered. */ -class DALI_IMPORT_API Processor +class DALI_CORE_API Processor { public: /** @@ -219,7 +219,7 @@ protected: * This is the recommended option, so that input processing will not affect the smoothness of animations. * Note that the rendering thread must be halted, before destroying the GL context. */ -class DALI_IMPORT_API Core +class DALI_CORE_API Core { public: diff --git a/dali/integration-api/debug.h b/dali/integration-api/debug.h index 8e59859..0bb89d1 100644 --- a/dali/integration-api/debug.h +++ b/dali/integration-api/debug.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_DEBUG_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. @@ -80,7 +80,7 @@ enum DebugPriority * @param level debug level * @param format string format */ -DALI_IMPORT_API void LogMessage(enum DebugPriority level,const char *format, ...); +DALI_CORE_API void LogMessage(enum DebugPriority level,const char *format, ...); /** * typedef for the logging function. @@ -94,13 +94,13 @@ typedef void (*LogFunction)(DebugPriority priority, std::string& message); * @param logFunction the log function to install * @param logOpts the log options to save in thread */ -DALI_IMPORT_API void InstallLogFunction(const LogFunction& logFunction); +DALI_CORE_API void InstallLogFunction(const LogFunction& logFunction); /** * A log function has to be uninstalled for every thread that wants to use logging. * The log function can be different for each thread. */ -DALI_IMPORT_API void UninstallLogFunction(); +DALI_CORE_API void UninstallLogFunction(); /******************************************************************************** * Error/Warning macros. * @@ -178,7 +178,7 @@ enum LogLevel * It provides the ability to turn tracing on or off. * */ -class DALI_IMPORT_API Filter +class DALI_CORE_API Filter { public: typedef std::list FilterList; @@ -330,7 +330,7 @@ public: #ifdef DEBUG_ENABLED -class DALI_IMPORT_API TraceObj +class DALI_CORE_API TraceObj { public: TraceObj(Filter* filter, const char* fmt, ...); @@ -434,7 +434,7 @@ public: \ * @param[in] color - the color to translate * @return string - the text representation of the color. */ -DALI_IMPORT_API std::string ColorToString(const Vector4& color); +DALI_CORE_API std::string ColorToString(const Vector4& color); /** * Helper method to translate a vector4 to a string. @@ -443,7 +443,7 @@ DALI_IMPORT_API std::string ColorToString(const Vector4& color); * @param[in] indent - the indent level to use. * @return string - the text representation of the vector. */ -DALI_IMPORT_API std::string Vector4ToString(const Vector4& v, size_t precision=3, size_t indent=0); +DALI_CORE_API std::string Vector4ToString(const Vector4& v, size_t precision=3, size_t indent=0); /** * Helper method to translate a vector4 to a string. @@ -452,7 +452,7 @@ DALI_IMPORT_API std::string Vector4ToString(const Vector4& v, size_t precision=3 * @param[in] indent - the indent level to use. * @return string - the text representation of the vector. */ -DALI_IMPORT_API std::string Vector3ToString(const Vector3& v, size_t precision=3, size_t indent=0); +DALI_CORE_API std::string Vector3ToString(const Vector3& v, size_t precision=3, size_t indent=0); /** * Helper method to translate a quaternion to a string. @@ -461,7 +461,7 @@ DALI_IMPORT_API std::string Vector3ToString(const Vector3& v, size_t precision=3 * @param[in] indent - the indent level to use. * @return string - the text representation of the quaternion. */ -DALI_IMPORT_API std::string QuaternionToString(const Quaternion& q, size_t precision=3, size_t indent=0); +DALI_CORE_API std::string QuaternionToString(const Quaternion& q, size_t precision=3, size_t indent=0); /** * Helper method to translate a 3x3 matrix to a string. @@ -470,7 +470,7 @@ DALI_IMPORT_API std::string QuaternionToString(const Quaternion& q, size_t preci * @param[in] indent - the indent level to use. * @return string - the text representation of the vector. */ -DALI_IMPORT_API std::string Matrix3ToString(const Matrix3& m, size_t precision=3, size_t indent=0); +DALI_CORE_API std::string Matrix3ToString(const Matrix3& m, size_t precision=3, size_t indent=0); /** * Helper method to translate a 4x4 matrix to a string. @@ -479,7 +479,7 @@ DALI_IMPORT_API std::string Matrix3ToString(const Matrix3& m, size_t precision=3 * @param[in] indent - the indent level to use. * @return string - the text representation of the vector. */ -DALI_IMPORT_API std::string MatrixToString(const Matrix& m, size_t precision=3, size_t indent=0); +DALI_CORE_API std::string MatrixToString(const Matrix& m, size_t precision=3, size_t indent=0); #ifdef DEBUG_ENABLED diff --git a/dali/integration-api/events/event.h b/dali/integration-api/events/event.h index 66bd92d..860011e 100644 --- a/dali/integration-api/events/event.h +++ b/dali/integration-api/events/event.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_EVENT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ // INTERNAL INCLUDES #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -31,7 +31,7 @@ namespace Integration * Base structure for events passed to Dali::Integration::Core::QueueEvent() * An instance of this class cannot be created. */ -struct Event +struct DALI_CORE_API Event { // Destruction diff --git a/dali/integration-api/events/gesture-event.h b/dali/integration-api/events/gesture-event.h index 8924474..c3b0f04 100644 --- a/dali/integration-api/events/gesture-event.h +++ b/dali/integration-api/events/gesture-event.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_GESTURE_EVENT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -32,7 +32,7 @@ namespace Integration * This is the abstract base structure for any gestures that the adaptor detects and wishes to send * to the Core. */ -struct GestureEvent : public Event +struct DALI_CORE_API GestureEvent : public Event { // Destruction diff --git a/dali/integration-api/events/gesture-requests.h b/dali/integration-api/events/gesture-requests.h index 21b4490..878aed1 100644 --- a/dali/integration-api/events/gesture-requests.h +++ b/dali/integration-api/events/gesture-requests.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_GESTURE_REQUESTS_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ // INTERNAL INCLUDES #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -30,7 +30,7 @@ namespace Integration /** * This structure specifies the gesture type required (or no longer required) by Core. */ -struct GestureRequest +struct DALI_CORE_API GestureRequest { // Creation & Destruction @@ -57,7 +57,7 @@ struct GestureRequest /** * This is used by Core when a pan gesture is required. */ -struct PanGestureRequest : public GestureRequest +struct DALI_CORE_API PanGestureRequest : public GestureRequest { // Creation & Destruction @@ -87,7 +87,7 @@ struct PanGestureRequest : public GestureRequest /** * This is used by Core when a pinch gesture is required. */ -struct PinchGestureRequest : public GestureRequest +struct DALI_CORE_API PinchGestureRequest : public GestureRequest { // Creation & Destruction @@ -110,7 +110,7 @@ struct PinchGestureRequest : public GestureRequest /** * This is used by Core when a tap gesture is required. */ -struct TapGestureRequest : public GestureRequest +struct DALI_CORE_API TapGestureRequest : public GestureRequest { // Creation & Destruction @@ -144,7 +144,7 @@ struct TapGestureRequest : public GestureRequest /** * This is used by Core when a long press gesture is required. */ -struct LongPressGestureRequest : public GestureRequest +struct DALI_CORE_API LongPressGestureRequest : public GestureRequest { // Creation & Destruction diff --git a/dali/integration-api/events/hover-event-integ.h b/dali/integration-api/events/hover-event-integ.h index 7d7bffd..0010b25 100644 --- a/dali/integration-api/events/hover-event-integ.h +++ b/dali/integration-api/events/hover-event-integ.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_HOVER_EVENT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -34,7 +34,7 @@ namespace Integration * This class can contain one or many touch points. It also contains the time at which the * event occurred. */ -struct HoverEvent : public MultiPointEvent +struct DALI_CORE_API HoverEvent : public MultiPointEvent { // Construction & Destruction diff --git a/dali/integration-api/events/key-event-integ.h b/dali/integration-api/events/key-event-integ.h index 07decbb..cf74794 100755 --- a/dali/integration-api/events/key-event-integ.h +++ b/dali/integration-api/events/key-event-integ.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_KEY_EVENT_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 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -36,7 +36,7 @@ namespace Integration * the Dali core. * */ -struct KeyEvent : public Event +struct DALI_CORE_API KeyEvent : public Event { // Enumerations // Specifies the state of the key event. diff --git a/dali/integration-api/events/long-press-gesture-event.h b/dali/integration-api/events/long-press-gesture-event.h index 828896f..e60e80c 100644 --- a/dali/integration-api/events/long-press-gesture-event.h +++ b/dali/integration-api/events/long-press-gesture-event.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_LONG_PRESS_GESTURE_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. @@ -22,7 +22,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -38,7 +38,7 @@ namespace Integration * - Finished: When the user finally lifts all touches. * - Cancelled: If, after a down event, no long press is detected, or a system interruption. */ -struct LongPressGestureEvent : public GestureEvent +struct DALI_CORE_API LongPressGestureEvent : public GestureEvent { // Construction & Destruction diff --git a/dali/integration-api/events/multi-point-event-integ.h b/dali/integration-api/events/multi-point-event-integ.h index 8fd7c2d..364c541 100644 --- a/dali/integration-api/events/multi-point-event-integ.h +++ b/dali/integration-api/events/multi-point-event-integ.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_MULTI_POINT_EVENT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -39,7 +39,7 @@ typedef PointContainer::const_iterator PointContainerConstIterator; ///< Const i * This class can contain one or multiple touch points. It also contains the time at which the * event occurred. */ -struct MultiPointEvent : public Event +struct DALI_CORE_API MultiPointEvent : public Event { // Construction & Destruction diff --git a/dali/integration-api/events/pan-gesture-event.h b/dali/integration-api/events/pan-gesture-event.h index 401cf43..9445694 100644 --- a/dali/integration-api/events/pan-gesture-event.h +++ b/dali/integration-api/events/pan-gesture-event.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_PAN_GESTURE_EVENT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -42,7 +42,7 @@ namespace Integration * A Started state will be ignored if a Possible state does not precede it. * Likewise, a Continuing or Finished state will be ignored if a Started state does not precede it. */ -struct PanGestureEvent: public GestureEvent +struct DALI_CORE_API PanGestureEvent: public GestureEvent { // Construction & Destruction diff --git a/dali/integration-api/events/pinch-gesture-event.h b/dali/integration-api/events/pinch-gesture-event.h index e05cd01..681c30f 100644 --- a/dali/integration-api/events/pinch-gesture-event.h +++ b/dali/integration-api/events/pinch-gesture-event.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_PINCH_GESTURE_EVENT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -38,7 +38,7 @@ namespace Integration * - Finished: If after a pinch, the user lifts their finger(s). * - Cancelled: If there is a system interruption. */ -struct PinchGestureEvent : public GestureEvent +struct DALI_CORE_API PinchGestureEvent : public GestureEvent { // Construction & Destruction diff --git a/dali/integration-api/events/point.h b/dali/integration-api/events/point.h index f55ea8e..d0c4f0f 100644 --- a/dali/integration-api/events/point.h +++ b/dali/integration-api/events/point.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_POINT_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 @@ namespace Integration /** * @brief A Point represents a point on the screen that is currently being touched or where touch has stopped. */ -struct DALI_IMPORT_API Point +struct DALI_CORE_API Point { /** * @brief Default Constructor diff --git a/dali/integration-api/events/tap-gesture-event.h b/dali/integration-api/events/tap-gesture-event.h index b70fc94..b3706e0 100644 --- a/dali/integration-api/events/tap-gesture-event.h +++ b/dali/integration-api/events/tap-gesture-event.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_TAP_GESTURE_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. @@ -22,7 +22,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -40,7 +40,7 @@ namespace Integration * * A Started state will be ignored if a Possible state does not precede it. */ -struct TapGestureEvent : public GestureEvent +struct DALI_CORE_API TapGestureEvent : public GestureEvent { // Construction & Destruction diff --git a/dali/integration-api/events/touch-event-combiner.h b/dali/integration-api/events/touch-event-combiner.h index fd2f25a..be6bf70 100644 --- a/dali/integration-api/events/touch-event-combiner.h +++ b/dali/integration-api/events/touch-event-combiner.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_TOUCH_EVENT_COMBINER_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. @@ -46,7 +46,7 @@ struct HoverEvent; * - Motion event throttling is carried out to satisfy the minimum distance and time delta required. * - If an interrupted event is received, then any stored Point history is cleared. */ -class DALI_IMPORT_API TouchEventCombiner +class DALI_CORE_API TouchEventCombiner { public: diff --git a/dali/integration-api/events/touch-event-integ.h b/dali/integration-api/events/touch-event-integ.h index 86752aa..c0982be 100644 --- a/dali/integration-api/events/touch-event-integ.h +++ b/dali/integration-api/events/touch-event-integ.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_TOUCH_EVENT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -34,7 +34,7 @@ namespace Integration * This class can contain one or many touch points. It also contains the time at which the * event occurred. */ -struct TouchEvent : public MultiPointEvent +struct DALI_CORE_API TouchEvent : public MultiPointEvent { // Construction & Destruction diff --git a/dali/integration-api/events/wheel-event-integ.h b/dali/integration-api/events/wheel-event-integ.h index 5b0e0b2..79b6fc0 100644 --- a/dali/integration-api/events/wheel-event-integ.h +++ b/dali/integration-api/events/wheel-event-integ.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_WHEEL_EVENT_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Integration @@ -36,7 +36,7 @@ namespace Integration * the Dali core. * */ -struct WheelEvent : public Event +struct DALI_CORE_API WheelEvent : public Event { // Enumerations diff --git a/dali/integration-api/gesture-manager.h b/dali/integration-api/gesture-manager.h index c86db4a..3cf597a 100644 --- a/dali/integration-api/gesture-manager.h +++ b/dali/integration-api/gesture-manager.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_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. @@ -33,7 +33,7 @@ namespace Integration * by the adaptor. A concrete implementation must be created for each adaptor, and provided when creating * the Dali::Integration::Core object. */ -class DALI_IMPORT_API GestureManager +class DALI_CORE_API GestureManager { public: diff --git a/dali/integration-api/input-options.h b/dali/integration-api/input-options.h index 1e58d18..6b8ce6b 100644 --- a/dali/integration-api/input-options.h +++ b/dali/integration-api/input-options.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_INPUT_OPTIONS_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. @@ -36,7 +36,7 @@ namespace Integration * @pre Should be called after Core creation. * @param mode The pan gesture prediction mode. */ -DALI_IMPORT_API void SetPanGesturePredictionMode( int mode ); +DALI_CORE_API void SetPanGesturePredictionMode( int mode ); /** * @brief Called by adaptor to set the prediction amount of the pan gesture @@ -44,7 +44,7 @@ DALI_IMPORT_API void SetPanGesturePredictionMode( int mode ); * * @param[in] amount The prediction amount in milliseconds */ -DALI_IMPORT_API void SetPanGesturePredictionAmount(unsigned int amount); +DALI_CORE_API void SetPanGesturePredictionAmount(unsigned int amount); /** * @brief Sets the upper bound of the prediction amount for clamping @@ -52,7 +52,7 @@ DALI_IMPORT_API void SetPanGesturePredictionAmount(unsigned int amount); * * @param[in] amount The prediction amount in milliseconds */ -DALI_IMPORT_API void SetPanGestureMaximumPredictionAmount( unsigned int amount ); +DALI_CORE_API void SetPanGestureMaximumPredictionAmount( unsigned int amount ); /** * @brief Sets the lower bound of the prediction amount for clamping @@ -60,7 +60,7 @@ DALI_IMPORT_API void SetPanGestureMaximumPredictionAmount( unsigned int amount ) * * @param[in] amount The prediction amount in milliseconds */ -DALI_IMPORT_API void SetPanGestureMinimumPredictionAmount( unsigned int amount ); +DALI_CORE_API void SetPanGestureMinimumPredictionAmount( unsigned int amount ); /** * @brief Sets the prediction amount to adjust when the pan velocity is changed @@ -71,77 +71,77 @@ DALI_IMPORT_API void SetPanGestureMinimumPredictionAmount( unsigned int amount ) * * @param[in] amount The prediction amount in milliseconds */ -DALI_IMPORT_API void SetPanGesturePredictionAmountAdjustment( unsigned int amount ); +DALI_CORE_API void SetPanGesturePredictionAmountAdjustment( unsigned int amount ); /** * @brief Called to set how pan gestures smooth input * * @param[in] mode The smoothing mode to use */ -DALI_IMPORT_API void SetPanGestureSmoothingMode( int mode ); +DALI_CORE_API void SetPanGestureSmoothingMode( int mode ); /** * @brief Sets the smoothing amount of the pan gesture * * @param[in] amount The smoothing amount [0.0f,1.0f] - 0.0f would be no smoothing, 1.0f maximum smoothing */ -DALI_IMPORT_API void SetPanGestureSmoothingAmount( float amount ); +DALI_CORE_API void SetPanGestureSmoothingAmount( float amount ); /** * @brief Sets whether to use actual times of the real gesture and frames or not. * * @param[in] value True = use actual times, False = use perfect values */ -DALI_IMPORT_API void SetPanGestureUseActualTimes( bool value ); +DALI_CORE_API void SetPanGestureUseActualTimes( bool value ); /** * @brief Sets the interpolation time range (ms) of past points to use (with weights) when interpolating. * * @param[in] value Time range in ms */ -DALI_IMPORT_API void SetPanGestureInterpolationTimeRange( int value ); +DALI_CORE_API void SetPanGestureInterpolationTimeRange( int value ); /** * @brief Sets whether to use scalar only prediction, which when enabled, ignores acceleration. * * @param[in] value True = use scalar prediction only */ -DALI_IMPORT_API void SetPanGestureScalarOnlyPredictionEnabled( bool value ); +DALI_CORE_API void SetPanGestureScalarOnlyPredictionEnabled( bool value ); /** * @brief Sets whether to use two point prediction. This combines two interpolated points to get more steady acceleration and velocity values. * * @param[in] value True = use two point prediction */ -DALI_IMPORT_API void SetPanGestureTwoPointPredictionEnabled( bool value ); +DALI_CORE_API void SetPanGestureTwoPointPredictionEnabled( bool value ); /** * @brief Sets the time in the past to interpolate the second point when using two point interpolation. * * @param[in] value Time in past in ms */ -DALI_IMPORT_API void SetPanGestureTwoPointInterpolatePastTime( int value ); +DALI_CORE_API void SetPanGestureTwoPointInterpolatePastTime( int value ); /** * @brief Sets the two point velocity bias. This is the ratio of first and second points to use for velocity. * * @param[in] value 0.0f = 100% first point. 1.0f = 100% of second point. */ -DALI_IMPORT_API void SetPanGestureTwoPointVelocityBias( float value ); +DALI_CORE_API void SetPanGestureTwoPointVelocityBias( float value ); /** * @brief Sets the two point acceleration bias. This is the ratio of first and second points to use for acceleration. * * @param[in] value 0.0f = 100% first point. 1.0f = 100% of second point. */ -DALI_IMPORT_API void SetPanGestureTwoPointAccelerationBias( float value ); +DALI_CORE_API void SetPanGestureTwoPointAccelerationBias( float value ); /** * @brief Sets the range of time (ms) of points in the history to perform multitap smoothing with (if enabled). * * @param[in] value Time in past in ms */ -DALI_IMPORT_API void SetPanGestureMultitapSmoothingRange( int value ); +DALI_CORE_API void SetPanGestureMultitapSmoothingRange( int value ); } // namespace Integration diff --git a/dali/integration-api/lockless-buffer.h b/dali/integration-api/lockless-buffer.h index dfb9a90..8c0530d 100644 --- a/dali/integration-api/lockless-buffer.h +++ b/dali/integration-api/lockless-buffer.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_LOCKLESS_BUFFER_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. @@ -44,7 +44,7 @@ namespace Integration * In case the other thread is writing at that moment, buffers are not swapped and previously available data is read. * Similarly if Write() is called before a Read() has finished the previous write buffer is overwritten. */ -class DALI_IMPORT_API LocklessBuffer +class DALI_CORE_API LocklessBuffer { public: diff --git a/dali/integration-api/profiling.h b/dali/integration-api/profiling.h index d828e78..21896fa 100644 --- a/dali/integration-api/profiling.h +++ b/dali/integration-api/profiling.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_PROFILING_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,26 +42,26 @@ enum ProfilingType * @pre Should be called after Core creation. * @param type The type of profiling information to output. */ -DALI_IMPORT_API void EnableProfiling( ProfilingType type ); +DALI_CORE_API void EnableProfiling( ProfilingType type ); namespace Profiling { -DALI_IMPORT_API extern const int ANIMATION_MEMORY_SIZE; ///< Total size of animation and associated internal objects -DALI_IMPORT_API extern const int CONSTRAINT_MEMORY_SIZE; ///< Total size of constraint and associated internal objects -DALI_IMPORT_API extern const int ACTOR_MEMORY_SIZE; ///< Total size of actor and associated internal objects -DALI_IMPORT_API extern const int CAMERA_ACTOR_MEMORY_SIZE; ///< Total size of camera actor and associated internal objects -DALI_IMPORT_API extern const int IMAGE_ACTOR_MEMORY_SIZE; ///< Total size of image actor and associated internal objects -DALI_IMPORT_API extern const int LAYER_MEMORY_SIZE; ///< Total size of layer and associated internal objects -DALI_IMPORT_API extern const int IMAGE_MEMORY_SIZE; ///< Total size of image and associated internal objects +DALI_CORE_API extern const int ANIMATION_MEMORY_SIZE; ///< Total size of animation and associated internal objects +DALI_CORE_API extern const int CONSTRAINT_MEMORY_SIZE; ///< Total size of constraint and associated internal objects +DALI_CORE_API extern const int ACTOR_MEMORY_SIZE; ///< Total size of actor and associated internal objects +DALI_CORE_API extern const int CAMERA_ACTOR_MEMORY_SIZE; ///< Total size of camera actor and associated internal objects +DALI_CORE_API extern const int IMAGE_ACTOR_MEMORY_SIZE; ///< Total size of image actor and associated internal objects +DALI_CORE_API extern const int LAYER_MEMORY_SIZE; ///< Total size of layer and associated internal objects +DALI_CORE_API extern const int IMAGE_MEMORY_SIZE; ///< Total size of image and associated internal objects -DALI_IMPORT_API extern const int RENDERER_MEMORY_SIZE; ///< Total size of renderer and associated internal objects -DALI_IMPORT_API extern const int GEOMETRY_MEMORY_SIZE; ///< Total size of geometry and associated internal objects -DALI_IMPORT_API extern const int PROPERTY_BUFFER_MEMORY_SIZE; ///< Total size of property-0buffer and associated internal objects -DALI_IMPORT_API extern const int TEXTURE_SET_MEMORY_SIZE; ///< Total size of TextureSet and associated internal objects -DALI_IMPORT_API extern const int SAMPLER_MEMORY_SIZE; ///< Total size of Sampler and associated internal objects -DALI_IMPORT_API extern const int SHADER_MEMORY_SIZE; ///< Total size of shader and associated internal objects +DALI_CORE_API extern const int RENDERER_MEMORY_SIZE; ///< Total size of renderer and associated internal objects +DALI_CORE_API extern const int GEOMETRY_MEMORY_SIZE; ///< Total size of geometry and associated internal objects +DALI_CORE_API extern const int PROPERTY_BUFFER_MEMORY_SIZE; ///< Total size of property-0buffer and associated internal objects +DALI_CORE_API extern const int TEXTURE_SET_MEMORY_SIZE; ///< Total size of TextureSet and associated internal objects +DALI_CORE_API extern const int SAMPLER_MEMORY_SIZE; ///< Total size of Sampler and associated internal objects +DALI_CORE_API extern const int SHADER_MEMORY_SIZE; ///< Total size of shader and associated internal objects } // namespace Profiling } // namespace Integration diff --git a/dali/integration-api/system-overlay.h b/dali/integration-api/system-overlay.h index 0d90702..12f432e 100644 --- a/dali/integration-api/system-overlay.h +++ b/dali/integration-api/system-overlay.h @@ -2,7 +2,7 @@ #define __DALI_INTEGRATION_SYSTEM_OVERLAY_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. @@ -39,7 +39,7 @@ namespace Integration * Use this interface to draw content for system-level indicators, dialogs etc. * The SystemOverlay is accessible using Dali::Integration::Core::GetSystemOverlay(). */ -class DALI_IMPORT_API SystemOverlay +class DALI_CORE_API SystemOverlay { public: diff --git a/dali/integration-api/trace.h b/dali/integration-api/trace.h index 804effb..c884a71 100644 --- a/dali/integration-api/trace.h +++ b/dali/integration-api/trace.h @@ -38,7 +38,7 @@ namespace Trace * @param start a bool to indicate start (true) or end (false) of the tracing / logging * @param tag a unique event tag name */ -DALI_IMPORT_API void LogContext( bool start, const char* tag ); +DALI_CORE_API void LogContext( bool start, const char* tag ); /** * typedef for the LogContextFunction function. @@ -51,7 +51,7 @@ typedef void ( *LogContextFunction )( bool start, const char* tag ); * The LogContextFunction function can be different for each thread. * @param LogContextFunction the Log Context function to install */ -DALI_IMPORT_API void InstallLogContextFunction( const LogContextFunction& logContextFunction ); +DALI_CORE_API void InstallLogContextFunction( const LogContextFunction& logContextFunction ); /******************************************************************************** * Filter * @@ -66,7 +66,7 @@ DALI_IMPORT_API void InstallLogContextFunction( const LogContextFunction& logCon * It provides the ability to turn tracing on or off. * */ -class DALI_IMPORT_API Filter +class DALI_CORE_API Filter { public: @@ -153,7 +153,7 @@ private: * and uses filter object which in tun routes the tracing via the platform abstraction's LogMessage. * */ -class DALI_IMPORT_API Tracer final +class DALI_CORE_API Tracer final { public: Tracer( Filter* filter, const char* tag ); diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index dbcf3c5..ebb7a19 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -2,7 +2,7 @@ #define DALI_ACTOR_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. @@ -238,7 +238,7 @@ typedef Rect Padding; ///< Padding definition @SINCE_1_0.0 * @SINCE_1_0.0 */ -class DALI_IMPORT_API Actor : public Handle +class DALI_CORE_API Actor : public Handle { public: diff --git a/dali/public-api/actors/camera-actor.h b/dali/public-api/actors/camera-actor.h index d02a835..401a0e1 100644 --- a/dali/public-api/actors/camera-actor.h +++ b/dali/public-api/actors/camera-actor.h @@ -2,7 +2,7 @@ #define __DALI_CAMERA_ACTOR_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. @@ -86,7 +86,7 @@ enum ProjectionMode * * @SINCE_1_0.0 */ -class DALI_IMPORT_API CameraActor : public Actor +class DALI_CORE_API CameraActor : public Actor { public: diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h index 331d5ae..d834606 100644 --- a/dali/public-api/actors/custom-actor-impl.h +++ b/dali/public-api/actors/custom-actor-impl.h @@ -2,7 +2,7 @@ #define __DALI_CUSTOM_ACTOR_IMPL_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. @@ -61,7 +61,7 @@ typedef IntrusivePtr CustomActorImplPtr; * And CustomActorImpl is typically owned by a single CustomActor instance; see also CustomActor::CustomActor( CustomActorImpl &implementation ). * @SINCE_1_0.0 */ -class DALI_IMPORT_API CustomActorImpl : public Dali::RefObject +class DALI_CORE_API CustomActorImpl : public Dali::RefObject { public: diff --git a/dali/public-api/actors/custom-actor.h b/dali/public-api/actors/custom-actor.h index e8b2876..ae31d67 100644 --- a/dali/public-api/actors/custom-actor.h +++ b/dali/public-api/actors/custom-actor.h @@ -2,7 +2,7 @@ #define __DALI_CUSTOM_ACTOR_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. @@ -40,7 +40,7 @@ class CustomActor; * The implementation of the control must be supplied; see CustomActorImpl for more details. * @SINCE_1_0.0 */ -class DALI_IMPORT_API CustomActor : public Actor +class DALI_CORE_API CustomActor : public Actor { public: diff --git a/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h index 3d1e002..c21e32f 100644 --- a/dali/public-api/actors/layer.h +++ b/dali/public-api/actors/layer.h @@ -2,7 +2,7 @@ #define DALI_LAYER_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. @@ -80,7 +80,7 @@ typedef Rect ClippingBox; * | lowerToBottom | @ref LowerToBottom() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API Layer : public Actor +class DALI_CORE_API Layer : public Actor { public: diff --git a/dali/public-api/animation/alpha-function.h b/dali/public-api/animation/alpha-function.h index b20eaa9..5f92d43 100644 --- a/dali/public-api/animation/alpha-function.h +++ b/dali/public-api/animation/alpha-function.h @@ -2,7 +2,7 @@ #define __DALI_ALPHA_FUNCTION_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 @@ typedef float (*AlphaFunctionPrototype)(float progress); ///< Prototype of an al * the animation before computing the final animation value. * @SINCE_1_0.0 */ -class DALI_IMPORT_API AlphaFunction +class DALI_CORE_API AlphaFunction { public: diff --git a/dali/public-api/animation/animation.h b/dali/public-api/animation/animation.h index 65abe6f..50fb999 100644 --- a/dali/public-api/animation/animation.h +++ b/dali/public-api/animation/animation.h @@ -2,7 +2,7 @@ #define DALI_ANIMATION_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. @@ -117,7 +117,7 @@ class Animation; * | pause | Pause() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API Animation : public BaseHandle +class DALI_CORE_API Animation : public BaseHandle { public: diff --git a/dali/public-api/animation/constraint-source.h b/dali/public-api/animation/constraint-source.h index c967eb0..bc20d06 100644 --- a/dali/public-api/animation/constraint-source.h +++ b/dali/public-api/animation/constraint-source.h @@ -2,7 +2,7 @@ #define __DALI_CONSTRAINT_SOURCE_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ enum SourceType * @brief Identifies a property from an object. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API LocalSource +struct DALI_CORE_API LocalSource { /** * @brief Creates a local constraint source. @@ -64,7 +64,7 @@ struct DALI_IMPORT_API LocalSource * @brief Identifies a property from the parent of an object. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API ParentSource +struct DALI_CORE_API ParentSource { /** * @brief Creates a parent constraint source. @@ -81,7 +81,7 @@ struct DALI_IMPORT_API ParentSource * @brief Identifies a property from any object. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API Source +struct DALI_CORE_API Source { /** * @brief Creates a constraint source. @@ -101,7 +101,7 @@ struct DALI_IMPORT_API Source * @brief The source of an input property for a constraint. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API ConstraintSource +struct DALI_CORE_API ConstraintSource { /** * @brief Creates a constraint source. diff --git a/dali/public-api/animation/constraint.h b/dali/public-api/animation/constraint.h index 0fc0627..eaf4509 100644 --- a/dali/public-api/animation/constraint.h +++ b/dali/public-api/animation/constraint.h @@ -2,7 +2,7 @@ #define __DALI_CONSTRAINT_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. @@ -65,7 +65,7 @@ typedef Vector< PropertyInput* > PropertyInputContainer; * @endcode * @SINCE_1_0.0 */ -class DALI_IMPORT_API Constraint : public BaseHandle +class DALI_CORE_API Constraint : public BaseHandle { public: diff --git a/dali/public-api/animation/key-frames.h b/dali/public-api/animation/key-frames.h index 219a05d..998def3 100644 --- a/dali/public-api/animation/key-frames.h +++ b/dali/public-api/animation/key-frames.h @@ -2,7 +2,7 @@ #define __DALI_KEY_FRAMES_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 KeyFrames; * different Property::Value type will result in a run time assert. * @SINCE_1_0.0 */ -class DALI_IMPORT_API KeyFrames : public BaseHandle +class DALI_CORE_API KeyFrames : public BaseHandle { public: /** diff --git a/dali/public-api/animation/linear-constrainer.h b/dali/public-api/animation/linear-constrainer.h index 6a29eec..4b08838 100644 --- a/dali/public-api/animation/linear-constrainer.h +++ b/dali/public-api/animation/linear-constrainer.h @@ -2,7 +2,7 @@ #define __DALI_LINEAR_CONSTRAINER_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. @@ -54,7 +54,7 @@ namespace Internal DALI_INTERNAL * target and the source as the actor's position. * @SINCE_1_0.0 */ -class DALI_IMPORT_API LinearConstrainer : public Handle +class DALI_CORE_API LinearConstrainer : public Handle { public: diff --git a/dali/public-api/animation/path.h b/dali/public-api/animation/path.h index 0a8dff0..5557639 100644 --- a/dali/public-api/animation/path.h +++ b/dali/public-api/animation/path.h @@ -2,7 +2,7 @@ #define __DALI_PATH_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 Path; * * @SINCE_1_0.0 */ -class DALI_IMPORT_API Path : public Handle +class DALI_CORE_API Path : public Handle { public: diff --git a/dali/public-api/animation/time-period.h b/dali/public-api/animation/time-period.h index 2932981..20b7785 100644 --- a/dali/public-api/animation/time-period.h +++ b/dali/public-api/animation/time-period.h @@ -2,7 +2,7 @@ #define __DALI_TIME_PERIOD_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. @@ -32,7 +32,7 @@ namespace Dali * @brief A value-type representing a period of time within an animation. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API TimePeriod +struct DALI_CORE_API TimePeriod { /** * @brief Creates a time period. diff --git a/dali/public-api/common/constants.h b/dali/public-api/common/constants.h index 14da714..8a2a94f 100644 --- a/dali/public-api/common/constants.h +++ b/dali/public-api/common/constants.h @@ -2,7 +2,7 @@ #define __DALI_CONSTANTS_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. @@ -47,15 +47,15 @@ static const float LEFT = 0.0f; static const float RIGHT = 1.0f; static const float MIDDLE = 0.5f; -DALI_IMPORT_API extern const Vector3 TOP_LEFT; ///< 0.0f, 0.0f, 0.5f -DALI_IMPORT_API extern const Vector3 TOP_CENTER; ///< 0.5f, 0.0f, 0.5f -DALI_IMPORT_API extern const Vector3 TOP_RIGHT; ///< 1.0f, 0.0f, 0.5f -DALI_IMPORT_API extern const Vector3 CENTER_LEFT; ///< 0.0f, 0.5f, 0.5f -DALI_IMPORT_API extern const Vector3 CENTER; ///< 0.5f, 0.5f, 0.5f -DALI_IMPORT_API extern const Vector3 CENTER_RIGHT; ///< 1.0f, 0.5f, 0.5f -DALI_IMPORT_API extern const Vector3 BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.5f -DALI_IMPORT_API extern const Vector3 BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.5f -DALI_IMPORT_API extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.5f +DALI_CORE_API extern const Vector3 TOP_LEFT; ///< 0.0f, 0.0f, 0.5f +DALI_CORE_API extern const Vector3 TOP_CENTER; ///< 0.5f, 0.0f, 0.5f +DALI_CORE_API extern const Vector3 TOP_RIGHT; ///< 1.0f, 0.0f, 0.5f +DALI_CORE_API extern const Vector3 CENTER_LEFT; ///< 0.0f, 0.5f, 0.5f +DALI_CORE_API extern const Vector3 CENTER; ///< 0.5f, 0.5f, 0.5f +DALI_CORE_API extern const Vector3 CENTER_RIGHT; ///< 1.0f, 0.5f, 0.5f +DALI_CORE_API extern const Vector3 BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.5f +DALI_CORE_API extern const Vector3 BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.5f +DALI_CORE_API extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.5f } @@ -74,15 +74,15 @@ static const float RIGHT = 1.0f; static const float MIDDLE = 0.5f; extern const Vector3 DEFAULT; ///< CENTER -DALI_IMPORT_API extern const Vector3 TOP_LEFT; ///< 0.0f, 0.0f, 0.5f -DALI_IMPORT_API extern const Vector3 TOP_CENTER; ///< 0.5f, 0.0f, 0.5f -DALI_IMPORT_API extern const Vector3 TOP_RIGHT; ///< 1.0f, 0.0f, 0.5f -DALI_IMPORT_API extern const Vector3 CENTER_LEFT; ///< 0.0f, 0.5f, 0.5f -DALI_IMPORT_API extern const Vector3 CENTER; ///< 0.5f, 0.5f, 0.5f -DALI_IMPORT_API extern const Vector3 CENTER_RIGHT; ///< 1.0f, 0.5f, 0.5f -DALI_IMPORT_API extern const Vector3 BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.5f -DALI_IMPORT_API extern const Vector3 BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.5f -DALI_IMPORT_API extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.5f +DALI_CORE_API extern const Vector3 TOP_LEFT; ///< 0.0f, 0.0f, 0.5f +DALI_CORE_API extern const Vector3 TOP_CENTER; ///< 0.5f, 0.0f, 0.5f +DALI_CORE_API extern const Vector3 TOP_RIGHT; ///< 1.0f, 0.0f, 0.5f +DALI_CORE_API extern const Vector3 CENTER_LEFT; ///< 0.0f, 0.5f, 0.5f +DALI_CORE_API extern const Vector3 CENTER; ///< 0.5f, 0.5f, 0.5f +DALI_CORE_API extern const Vector3 CENTER_RIGHT; ///< 1.0f, 0.5f, 0.5f +DALI_CORE_API extern const Vector3 BOTTOM_LEFT; ///< 0.0f, 1.0f, 0.5f +DALI_CORE_API extern const Vector3 BOTTOM_CENTER; ///< 0.5f, 1.0f, 0.5f +DALI_CORE_API extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.5f } @@ -95,18 +95,18 @@ DALI_IMPORT_API extern const Vector3 BOTTOM_RIGHT; ///< 1.0f, 1.0f, 0.5f */ namespace Color { -DALI_IMPORT_API extern const Vector4 BLACK; ///< Pure black (0.0f, 0.0f, 0.0f, 1.0f); -DALI_IMPORT_API extern const Vector4 WHITE; ///< Pure white (1.0f, 1.0f, 1.0f, 1.0f); +DALI_CORE_API extern const Vector4 BLACK; ///< Pure black (0.0f, 0.0f, 0.0f, 1.0f); +DALI_CORE_API extern const Vector4 WHITE; ///< Pure white (1.0f, 1.0f, 1.0f, 1.0f); -DALI_IMPORT_API extern const Vector4 RED; ///< Pure red (1.0f, 0.0f, 0.0f, 1.0f); -DALI_IMPORT_API extern const Vector4 GREEN; ///< Pure green (0.0f, 1.0f, 0.0f, 1.0f); -DALI_IMPORT_API extern const Vector4 BLUE; ///< Pure blue (0.0f, 0.0f, 1.0f, 1.0f); +DALI_CORE_API extern const Vector4 RED; ///< Pure red (1.0f, 0.0f, 0.0f, 1.0f); +DALI_CORE_API extern const Vector4 GREEN; ///< Pure green (0.0f, 1.0f, 0.0f, 1.0f); +DALI_CORE_API extern const Vector4 BLUE; ///< Pure blue (0.0f, 0.0f, 1.0f, 1.0f); -DALI_IMPORT_API extern const Vector4 YELLOW; ///< Pure yellow (1.0f, 1.0f, 0.0f, 1.0f); -DALI_IMPORT_API extern const Vector4 MAGENTA; ///< Pure magenta (1.0f, 0.0f, 1.0f, 1.0f); -DALI_IMPORT_API extern const Vector4 CYAN; ///< Pure cyan (0.0f, 1.0f, 1.0f, 1.0f); +DALI_CORE_API extern const Vector4 YELLOW; ///< Pure yellow (1.0f, 1.0f, 0.0f, 1.0f); +DALI_CORE_API extern const Vector4 MAGENTA; ///< Pure magenta (1.0f, 0.0f, 1.0f, 1.0f); +DALI_CORE_API extern const Vector4 CYAN; ///< Pure cyan (0.0f, 1.0f, 1.0f, 1.0f); -DALI_IMPORT_API extern const Vector4 TRANSPARENT; ///< Black transparent (0.0f, 0.0f, 0.0f, 0.0f); +DALI_CORE_API extern const Vector4 TRANSPARENT; ///< Black transparent (0.0f, 0.0f, 0.0f, 0.0f); } // namespace Color @@ -116,12 +116,12 @@ DALI_IMPORT_API extern const Vector4 TRANSPARENT; ///< Black transparent (0.0f, */ namespace Math { -DALI_IMPORT_API extern const float MACHINE_EPSILON_0; ///< Epsilon for values near zero -DALI_IMPORT_API extern const float MACHINE_EPSILON_1; ///< Epsilon for values near 1 -DALI_IMPORT_API extern const float MACHINE_EPSILON_10; ///< Epsilon for values near 10 -DALI_IMPORT_API extern const float MACHINE_EPSILON_100; ///< Epsilon for values near 100 -DALI_IMPORT_API extern const float MACHINE_EPSILON_1000; ///< Epsilon for values near 1000 -DALI_IMPORT_API extern const float MACHINE_EPSILON_10000; ///< Epsilon for values near 10000 +DALI_CORE_API extern const float MACHINE_EPSILON_0; ///< Epsilon for values near zero +DALI_CORE_API extern const float MACHINE_EPSILON_1; ///< Epsilon for values near 1 +DALI_CORE_API extern const float MACHINE_EPSILON_10; ///< Epsilon for values near 10 +DALI_CORE_API extern const float MACHINE_EPSILON_100; ///< Epsilon for values near 100 +DALI_CORE_API extern const float MACHINE_EPSILON_1000; ///< Epsilon for values near 1000 +DALI_CORE_API extern const float MACHINE_EPSILON_10000; ///< Epsilon for values near 10000 // float is preferred to double for performance on ARM targets static const float PI = static_cast(M_PI); ///< Constant representing PI diff --git a/dali/public-api/common/dali-common.cpp b/dali/public-api/common/dali-common.cpp index 79c6e69..14e362b 100644 --- a/dali/public-api/common/dali-common.cpp +++ b/dali/public-api/common/dali-common.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. @@ -94,7 +94,7 @@ std::string Demangle(const char* symbol) return result; } -DALI_EXPORT_API DaliException::DaliException( const char* location, const char* condition ) +DALI_CORE_API DaliException::DaliException( const char* location, const char* condition ) : location( location ), condition( condition ) { // Note, if a memory error has occured, then the backtrace won't work - backtrace_symbols relies on @@ -124,7 +124,7 @@ DALI_EXPORT_API DaliException::DaliException( const char* location, const char* #else // BACKTRACE_ENABLED -DALI_EXPORT_API DaliException::DaliException( const char* location, const char* condition ) +DALI_CORE_API DaliException::DaliException( const char* location, const char* condition ) : location( location ), condition( condition ) { #if defined(DEBUG_ENABLED) @@ -137,7 +137,7 @@ DALI_EXPORT_API DaliException::DaliException( const char* location, const char* #endif // BACKTRACE_ENABLED -DALI_EXPORT_API void DaliAssertMessage( const char* location, const char* condition ) +DALI_CORE_API void DaliAssertMessage( const char* location, const char* condition ) { #if defined(DEBUG_ENABLED) DALI_LOG_ERROR_NOFN( "Assert (%s) failed in: %s\n", condition, location ); diff --git a/dali/public-api/common/dali-common.h b/dali/public-api/common/dali-common.h old mode 100644 new mode 100755 index a76ff30..4b7c4aa --- a/dali/public-api/common/dali-common.h +++ b/dali/public-api/common/dali-common.h @@ -2,7 +2,7 @@ #define __DALI_COMMON_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,10 +34,12 @@ # ifndef HIDE_DALI_INTERNALS # define DALI_EXPORT_API # define DALI_IMPORT_API +# define DALI_CORE_API # define DALI_INTERNAL # else # define DALI_EXPORT_API __attribute__ ((visibility ("default"))) # define DALI_IMPORT_API __attribute__ ((visibility ("default"))) +# define DALI_CORE_API __attribute__ ((visibility ("default"))) # define DALI_INTERNAL __attribute__ ((visibility ("hidden"))) # endif #else @@ -45,6 +47,8 @@ # define DALI_EXPORT_API /** Visibility attribute to show declarations */ # define DALI_IMPORT_API +/** Visibility attribute to show declarations */ +# define DALI_CORE_API /** Visibility attribute to hide declarations */ # define DALI_INTERNAL #endif @@ -90,13 +94,13 @@ namespace Dali * @param[in] location Where the assertion occurred * @param[in] condition The assertion condition */ -DALI_IMPORT_API void DaliAssertMessage( const char* location, const char* condition ); +DALI_CORE_API void DaliAssertMessage( const char* location, const char* condition ); /** * @brief Exception class for Dali Core library - Raised by assertions in codebase. * @SINCE_1_0.0 */ -class DALI_IMPORT_API DaliException +class DALI_CORE_API DaliException { public: /** diff --git a/dali/public-api/common/dali-vector.h b/dali/public-api/common/dali-vector.h index 8422677..4140049 100755 --- a/dali/public-api/common/dali-vector.h +++ b/dali/public-api/common/dali-vector.h @@ -2,7 +2,7 @@ #define __DALI_VECTOR_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. @@ -58,7 +58,7 @@ namespace Dali * beginning of the first real item so that iterating the items is quick. * @SINCE_1_0.0 */ -class DALI_IMPORT_API VectorBase +class DALI_CORE_API VectorBase { public: // Typedefs diff --git a/dali/public-api/common/extents.h b/dali/public-api/common/extents.h index da62978..95aad55 100644 --- a/dali/public-api/common/extents.h +++ b/dali/public-api/common/extents.h @@ -2,7 +2,7 @@ #define DALI_EXTENTS_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 * @brief Structure describing the a collection of uint16_t. * @SINCE_1_2.62 */ -struct DALI_EXPORT_API Extents +struct DALI_CORE_API Extents { /** * @brief Default constructor which provides an initialized Dali::Extents( 0u, 0u, 0u, 0u ). @@ -113,7 +113,7 @@ public: * @param[in] extents The Extents to output * @return The output stream operator */ -DALI_EXPORT_API std::ostream& operator<<( std::ostream& stream, const Extents& extents ); +DALI_CORE_API std::ostream& operator<<( std::ostream& stream, const Extents& extents ); /** * @} diff --git a/dali/public-api/common/stage.h b/dali/public-api/common/stage.h index 1c77fb5..9ca8a9b 100644 --- a/dali/public-api/common/stage.h +++ b/dali/public-api/common/stage.h @@ -2,7 +2,7 @@ #define __DALI_STAGE_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. @@ -81,7 +81,7 @@ struct WheelEvent; * | sceneCreated | @ref SceneCreatedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API Stage : public BaseHandle +class DALI_CORE_API Stage : public BaseHandle { public: diff --git a/dali/public-api/dali-core-version.h b/dali/public-api/dali-core-version.h index 48bf112..5872984 100644 --- a/dali/public-api/dali-core-version.h +++ b/dali/public-api/dali-core-version.h @@ -2,7 +2,7 @@ #define __DALI_CORE_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. @@ -23,10 +23,10 @@ namespace Dali { -DALI_IMPORT_API extern const unsigned int CORE_MAJOR_VERSION; ///< The major version number of the Core library. -DALI_IMPORT_API extern const unsigned int CORE_MINOR_VERSION; ///< The minor version number of the Core library. -DALI_IMPORT_API extern const unsigned int CORE_MICRO_VERSION; ///< The micro version number of the Core library. -DALI_IMPORT_API extern const char * const CORE_BUILD_DATE; ///< The date/time the Core library was built. +DALI_CORE_API extern const unsigned int CORE_MAJOR_VERSION; ///< The major version number of the Core library. +DALI_CORE_API extern const unsigned int CORE_MINOR_VERSION; ///< The minor version number of the Core library. +DALI_CORE_API extern const unsigned int CORE_MICRO_VERSION; ///< The micro version number of the Core library. +DALI_CORE_API extern const char * const CORE_BUILD_DATE; ///< The date/time the Core library was built. } // namespace Dali #endif // __DALI_CORE_VERSION_H__ diff --git a/dali/public-api/events/gesture-detector.h b/dali/public-api/events/gesture-detector.h index c9ca84f..08f1999 100644 --- a/dali/public-api/events/gesture-detector.h +++ b/dali/public-api/events/gesture-detector.h @@ -2,7 +2,7 @@ #define __DALI_GESTURE_DETECTOR_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ class Actor; * @SINCE_1_0.0 * @see Gesture */ -class DALI_IMPORT_API GestureDetector : public Handle +class DALI_CORE_API GestureDetector : public Handle { public: // Creation & Destruction diff --git a/dali/public-api/events/gesture.h b/dali/public-api/events/gesture.h index 48c9960..bf93789 100644 --- a/dali/public-api/events/gesture.h +++ b/dali/public-api/events/gesture.h @@ -2,7 +2,7 @@ #define __DALI_GESTURE_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 @@ namespace Dali * @see GestureDetector * */ -struct DALI_IMPORT_API Gesture +struct DALI_CORE_API Gesture { /** * @brief Copy constructor. diff --git a/dali/public-api/events/hover-event.h b/dali/public-api/events/hover-event.h index 3cde5c4..ff7d719 100644 --- a/dali/public-api/events/hover-event.h +++ b/dali/public-api/events/hover-event.h @@ -2,7 +2,7 @@ #define __DALI_HOVER_EVENT_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. @@ -36,7 +36,7 @@ namespace Dali * hovered or the points where a hover has stopped. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API HoverEvent +struct DALI_CORE_API HoverEvent { // Construction & Destruction diff --git a/dali/public-api/events/key-event.h b/dali/public-api/events/key-event.h index 272be05..8aaadad 100755 --- a/dali/public-api/events/key-event.h +++ b/dali/public-api/events/key-event.h @@ -2,7 +2,7 @@ #define __DALI_KEY_EVENT_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 @@ namespace Dali * module. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API KeyEvent +struct DALI_CORE_API KeyEvent { // Enumerations diff --git a/dali/public-api/events/long-press-gesture-detector.h b/dali/public-api/events/long-press-gesture-detector.h index 815a8d6..111bbf2 100644 --- a/dali/public-api/events/long-press-gesture-detector.h +++ b/dali/public-api/events/long-press-gesture-detector.h @@ -2,7 +2,7 @@ #define __DALI_LONG_PRESS_GESTURE_DETECTOR_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ struct LongPressGesture; * |-------------------|-----------------------| * | longPressDetected | @ref DetectedSignal() | */ -class DALI_IMPORT_API LongPressGestureDetector : public GestureDetector +class DALI_CORE_API LongPressGestureDetector : public GestureDetector { public: // Typedefs diff --git a/dali/public-api/events/long-press-gesture.h b/dali/public-api/events/long-press-gesture.h index 1f7c4ee..414cc06 100644 --- a/dali/public-api/events/long-press-gesture.h +++ b/dali/public-api/events/long-press-gesture.h @@ -2,7 +2,7 @@ #define __DALI_LONG_PRESS_GESTURE_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. @@ -40,7 +40,7 @@ namespace Dali * @SINCE_1_0.0 * @see LongPressGestureDetector */ -struct DALI_IMPORT_API LongPressGesture : public Gesture +struct DALI_CORE_API LongPressGesture : public Gesture { // Construction & Destruction diff --git a/dali/public-api/events/pan-gesture-detector.h b/dali/public-api/events/pan-gesture-detector.h index 151abd4..ec83a38 100644 --- a/dali/public-api/events/pan-gesture-detector.h +++ b/dali/public-api/events/pan-gesture-detector.h @@ -2,7 +2,7 @@ #define __DALI_PAN_GESTURE_DETECTOR_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ struct PanGesture; * |--------------|-----------------------| * | panDetected | @ref DetectedSignal() | */ -class DALI_IMPORT_API PanGestureDetector : public GestureDetector +class DALI_CORE_API PanGestureDetector : public GestureDetector { public: diff --git a/dali/public-api/events/pan-gesture.h b/dali/public-api/events/pan-gesture.h index ee52212..d2fcb35 100644 --- a/dali/public-api/events/pan-gesture.h +++ b/dali/public-api/events/pan-gesture.h @@ -2,7 +2,7 @@ #define __DALI_PAN_GESTURE_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 @@ namespace Dali * A pan gesture will continue to be sent to the actor under than initial pan until it ends. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API PanGesture: public Gesture +struct DALI_CORE_API PanGesture: public Gesture { // Construction & Destruction diff --git a/dali/public-api/events/pinch-gesture-detector.h b/dali/public-api/events/pinch-gesture-detector.h index 33b4e9f..0202d34 100644 --- a/dali/public-api/events/pinch-gesture-detector.h +++ b/dali/public-api/events/pinch-gesture-detector.h @@ -2,7 +2,7 @@ #define __DALI_PINCH_GESTURE_DETECTOR_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ struct PinchGesture; * |----------------|-----------------------| * | pinchDetected | @ref DetectedSignal() | */ -class DALI_IMPORT_API PinchGestureDetector : public GestureDetector +class DALI_CORE_API PinchGestureDetector : public GestureDetector { public: // Typedefs diff --git a/dali/public-api/events/pinch-gesture.h b/dali/public-api/events/pinch-gesture.h index 9b13be5..384269c 100644 --- a/dali/public-api/events/pinch-gesture.h +++ b/dali/public-api/events/pinch-gesture.h @@ -2,7 +2,7 @@ #define __DALI_PINCH_GESTURE_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 Dali * until the pinch ends. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API PinchGesture: public Gesture +struct DALI_CORE_API PinchGesture: public Gesture { // Construction & Destruction diff --git a/dali/public-api/events/tap-gesture-detector.h b/dali/public-api/events/tap-gesture-detector.h index 4fe0f80..f51ebb4 100644 --- a/dali/public-api/events/tap-gesture-detector.h +++ b/dali/public-api/events/tap-gesture-detector.h @@ -2,7 +2,7 @@ #define __DALI_TAP_GESTURE_DETECTOR_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,7 +64,7 @@ struct TapGesture; * @see TapGesture * */ -class DALI_IMPORT_API TapGestureDetector : public GestureDetector +class DALI_CORE_API TapGestureDetector : public GestureDetector { public: // Typedefs diff --git a/dali/public-api/events/tap-gesture.h b/dali/public-api/events/tap-gesture.h index 16982e2..e752400 100644 --- a/dali/public-api/events/tap-gesture.h +++ b/dali/public-api/events/tap-gesture.h @@ -2,7 +2,7 @@ #define __DALI_TAP_GESTURE_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. @@ -36,7 +36,7 @@ namespace Dali * @SINCE_1_0.0 * @see TapGestureDetector */ -struct DALI_IMPORT_API TapGesture : public Gesture +struct DALI_CORE_API TapGesture : public Gesture { // Construction & Destruction diff --git a/dali/public-api/events/touch-data.h b/dali/public-api/events/touch-data.h index 9b7961d..9a3dec5 100644 --- a/dali/public-api/events/touch-data.h +++ b/dali/public-api/events/touch-data.h @@ -2,7 +2,7 @@ #define __DALI_TOUCH_DATA_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. @@ -58,7 +58,7 @@ struct Vector2; * * Should not use this in a TouchData container as it is just a handle and the internal object can change. */ -class DALI_IMPORT_API TouchData : public BaseHandle +class DALI_CORE_API TouchData : public BaseHandle { public: diff --git a/dali/public-api/events/touch-event.h b/dali/public-api/events/touch-event.h index f24ceba..9ce558e 100644 --- a/dali/public-api/events/touch-event.h +++ b/dali/public-api/events/touch-event.h @@ -2,7 +2,7 @@ #define __DALI_TOUCH_EVENT_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. @@ -38,7 +38,7 @@ namespace Dali * touched or the points where a touch has stopped. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API TouchEvent +struct DALI_CORE_API TouchEvent { // Construction & Destruction diff --git a/dali/public-api/events/touch-point.h b/dali/public-api/events/touch-point.h index 3cd23f8..671ea4d 100644 --- a/dali/public-api/events/touch-point.h +++ b/dali/public-api/events/touch-point.h @@ -2,7 +2,7 @@ #define __DALI_TOUCH_POINT_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. @@ -35,7 +35,7 @@ namespace Dali * or where touch has stopped. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API TouchPoint +struct DALI_CORE_API TouchPoint { // Enumerations diff --git a/dali/public-api/events/wheel-event.h b/dali/public-api/events/wheel-event.h index fe53b91..a0edc8f 100644 --- a/dali/public-api/events/wheel-event.h +++ b/dali/public-api/events/wheel-event.h @@ -2,7 +2,7 @@ #define __DALI_WHEEL_EVENT_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 Dali * The mouse wheel event can be sent to the specific actor but the custom wheel event will be sent to the stage. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API WheelEvent +struct DALI_CORE_API WheelEvent { // Enumerations diff --git a/dali/public-api/images/buffer-image.h b/dali/public-api/images/buffer-image.h index cc0280a..1515f11 100644 --- a/dali/public-api/images/buffer-image.h +++ b/dali/public-api/images/buffer-image.h @@ -2,7 +2,7 @@ #define __DALI_BUFFER_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. @@ -52,7 +52,7 @@ typedef Rect RectArea; ///< rectangular area (x,y,w,h) @SIN * * @SINCE_1_0.0 */ -class DALI_IMPORT_API BufferImage : public Image +class DALI_CORE_API BufferImage : public Image { public: diff --git a/dali/public-api/images/encoded-buffer-image.h b/dali/public-api/images/encoded-buffer-image.h index 86489fe..d160582 100644 --- a/dali/public-api/images/encoded-buffer-image.h +++ b/dali/public-api/images/encoded-buffer-image.h @@ -2,7 +2,7 @@ #define __DALI_ENCODED_BUFFER_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. @@ -68,7 +68,7 @@ typedef Uint16Pair ImageDimensions; * uploaded to the OpenGL ES implementation. * @SINCE_1_0.0 */ -class DALI_IMPORT_API EncodedBufferImage : public Image +class DALI_CORE_API EncodedBufferImage : public Image { public: diff --git a/dali/public-api/images/frame-buffer-image.h b/dali/public-api/images/frame-buffer-image.h index 0249e8f..d7f4051 100644 --- a/dali/public-api/images/frame-buffer-image.h +++ b/dali/public-api/images/frame-buffer-image.h @@ -2,7 +2,7 @@ #define __DALI_FRAME_BUFFER_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. @@ -62,7 +62,7 @@ enum Format ///< Framebuffer format, default color depth is RGBA 32 bit with alp * The FrameBufferImage can then be used for rendering to the screen. * @SINCE_1_0.0 */ -class DALI_IMPORT_API FrameBufferImage : public Image +class DALI_CORE_API FrameBufferImage : public Image { public: diff --git a/dali/public-api/images/image.h b/dali/public-api/images/image.h index 608a5bb..66af4ff 100644 --- a/dali/public-api/images/image.h +++ b/dali/public-api/images/image.h @@ -2,7 +2,7 @@ #define __DALI_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. @@ -57,7 +57,7 @@ class Image; * | uploaded | @ref UploadedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API Image : public BaseHandle +class DALI_CORE_API Image : public BaseHandle { public: diff --git a/dali/public-api/images/native-image.h b/dali/public-api/images/native-image.h index 819cab0..47dc0b7 100644 --- a/dali/public-api/images/native-image.h +++ b/dali/public-api/images/native-image.h @@ -2,7 +2,7 @@ #define __DALI_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. @@ -42,7 +42,7 @@ class NativeImage; * Its data is provided by native resources, such as shared bitmap memory or pixmap. * @SINCE_1_0.0 */ -class DALI_IMPORT_API NativeImage : public Image +class DALI_CORE_API NativeImage : public Image { public: diff --git a/dali/public-api/images/pixel-data.h b/dali/public-api/images/pixel-data.h index f1f4921..2347433 100644 --- a/dali/public-api/images/pixel-data.h +++ b/dali/public-api/images/pixel-data.h @@ -2,7 +2,7 @@ #define DALI_PIXEL_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. @@ -36,7 +36,7 @@ class PixelData; * * @SINCE_1_1.43 */ -class DALI_IMPORT_API PixelData : public BaseHandle +class DALI_CORE_API PixelData : public BaseHandle { public: diff --git a/dali/public-api/images/pixel.h b/dali/public-api/images/pixel.h index 49abf46..bb80167 100644 --- a/dali/public-api/images/pixel.h +++ b/dali/public-api/images/pixel.h @@ -2,7 +2,7 @@ #define __DALI_PIXEL_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. @@ -135,7 +135,7 @@ const Format LAST_VALID_PIXEL_FORMAT = RGB32F; * @param[in] pixelformat Pixel format * @return @c true if format has alpha, @c false otherwise */ -DALI_IMPORT_API bool HasAlpha(Format pixelformat); +DALI_CORE_API bool HasAlpha(Format pixelformat); /** * @brief Returns The number of bytes per pixel for the specified pixel format. @@ -144,7 +144,7 @@ DALI_IMPORT_API bool HasAlpha(Format pixelformat); * @param[in] pixelFormat The pixel format * @return The number of bytes per pixel */ -DALI_IMPORT_API unsigned int GetBytesPerPixel(Format pixelFormat); +DALI_CORE_API unsigned int GetBytesPerPixel(Format pixelFormat); /** * @brief Returns the offset of the byte containing the alpha value from the start of the pixel data @@ -160,7 +160,7 @@ DALI_IMPORT_API unsigned int GetBytesPerPixel(Format pixelFormat); * @param[out] bitMask The bitmask of the byte to get the alpha value * */ -DALI_IMPORT_API void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, int& bitMask); +DALI_CORE_API void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, int& bitMask); } //namespace Pixel diff --git a/dali/public-api/images/resource-image.h b/dali/public-api/images/resource-image.h index dae5411..5dcdd98 100644 --- a/dali/public-api/images/resource-image.h +++ b/dali/public-api/images/resource-image.h @@ -2,7 +2,7 @@ #define __DALI_RESOURCE_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. @@ -60,7 +60,7 @@ class ResourceImage; * | imageLoadingFinished | @ref LoadingFinishedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API ResourceImage : public Image +class DALI_CORE_API ResourceImage : public Image { public: diff --git a/dali/public-api/math/degree.h b/dali/public-api/math/degree.h index 8e53fc5..a185159 100644 --- a/dali/public-api/math/degree.h +++ b/dali/public-api/math/degree.h @@ -2,7 +2,7 @@ #define __DALI_DEGREE_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. @@ -64,7 +64,7 @@ struct Degree * @SINCE_1_0.0 * @param[in] value The initial value in Radians */ - DALI_EXPORT_API Degree( Radian value ); + DALI_CORE_API Degree( Radian value ); public: @@ -76,18 +76,18 @@ public: // compiler generated destructor, copy constructor and assignment operators are ok as this class is POD // useful constant angles -DALI_EXPORT_API extern const Radian ANGLE_360; ///< 360 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_315; ///< 315 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_270; ///< 270 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_225; ///< 225 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_180; ///< 180 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_135; ///< 135 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_120; ///< 120 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_90; ///< 90 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_60; ///< 60 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_45; ///< 45 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_30; ///< 30 degree turn in radians -DALI_EXPORT_API extern const Radian ANGLE_0; ///< 0 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_360; ///< 360 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_315; ///< 315 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_270; ///< 270 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_225; ///< 225 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_180; ///< 180 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_135; ///< 135 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_120; ///< 120 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_90; ///< 90 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_60; ///< 60 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_45; ///< 45 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_30; ///< 30 degree turn in radians +DALI_CORE_API extern const Radian ANGLE_0; ///< 0 degree turn in radians /** * @brief Compares equality between two degrees. diff --git a/dali/public-api/math/matrix.h b/dali/public-api/math/matrix.h index 7c8a1d8..9391124 100644 --- a/dali/public-api/math/matrix.h +++ b/dali/public-api/math/matrix.h @@ -2,7 +2,7 @@ #define __DALI_MATRIX_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 Quaternion; * Each axis is contiguous in memory, so the x axis corresponds to elements 0, 1, 2 and 3, the y axis corresponds to elements 4, 5, 6, 7, etc. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Matrix +class DALI_CORE_API Matrix { public: @@ -414,7 +414,7 @@ private: * @param[in] matrix The matrix to print * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Matrix& matrix); +DALI_CORE_API std::ostream& operator<< (std::ostream& o, const Matrix& matrix); // Allow Matrix to be treated as a POD type template <> struct TypeTraits< Matrix > : public BasicTypes< Matrix > { enum { IS_TRIVIAL_TYPE = true }; }; diff --git a/dali/public-api/math/matrix3.h b/dali/public-api/math/matrix3.h index 5031ebc..16b52eb 100644 --- a/dali/public-api/math/matrix3.h +++ b/dali/public-api/math/matrix3.h @@ -2,7 +2,7 @@ #define __DALI_MATRIX3_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. @@ -38,7 +38,7 @@ struct Vector2; * * @SINCE_1_0.0 */ -class DALI_IMPORT_API Matrix3 +class DALI_CORE_API Matrix3 { public: @@ -244,7 +244,7 @@ private: * @param[in] matrix The matrix to print * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Matrix3& matrix); +DALI_CORE_API std::ostream& operator<< (std::ostream& o, const Matrix3& matrix); // Allow Matrix3 to be treated as a POD type template <> struct TypeTraits< Matrix3 > : public BasicTypes< Matrix3 > { enum { IS_TRIVIAL_TYPE = true }; }; diff --git a/dali/public-api/math/quaternion.h b/dali/public-api/math/quaternion.h index 4a4f063..a41f39f 100644 --- a/dali/public-api/math/quaternion.h +++ b/dali/public-api/math/quaternion.h @@ -2,7 +2,7 @@ #define __DALI_QUATERNION_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 Matrix; * @brief The Quaternion class encapsulates the mathematics of the quaternion. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Quaternion +class DALI_CORE_API Quaternion { public: @@ -480,7 +480,7 @@ public: * @param[in] quaternion The quaternion to print * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Quaternion& quaternion); +DALI_CORE_API std::ostream& operator<< (std::ostream& o, const Quaternion& quaternion); // Allow Quaternion to be treated as a POD type template <> struct TypeTraits< Quaternion > : public BasicTypes< Quaternion > { enum { IS_TRIVIAL_TYPE = true }; }; diff --git a/dali/public-api/math/vector2.h b/dali/public-api/math/vector2.h index b9f7ccb..1ecd8f3 100644 --- a/dali/public-api/math/vector2.h +++ b/dali/public-api/math/vector2.h @@ -2,7 +2,7 @@ #define __DALI_VECTOR_2_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 @@ struct Vector4; * @brief A two dimensional vector. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API Vector2 +struct DALI_CORE_API Vector2 { // (x width) and (y height) must be consecutive in memory. // No other data must be added before (x width) member. @@ -468,7 +468,7 @@ typedef Vector2 Size; * @param[in] vector The vector to print * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Vector2& vector); +DALI_CORE_API std::ostream& operator<< (std::ostream& o, const Vector2& vector); /** * @brief Returns a vector with components set to the minimum of the corresponding component in a and b. @@ -507,7 +507,7 @@ inline Vector2 Max( const Vector2& a, const Vector2& b ) * @param[in] max The maximum value * @return A vector containing the clamped components of v */ -DALI_IMPORT_API Vector2 Clamp( const Vector2& v, const float& min, const float& max ); +DALI_CORE_API Vector2 Clamp( const Vector2& v, const float& min, const float& max ); // Allow Vector2 to be treated as a POD type template <> struct TypeTraits< Vector2 > : public BasicTypes< Vector2 > { enum { IS_TRIVIAL_TYPE = true }; }; diff --git a/dali/public-api/math/vector3.h b/dali/public-api/math/vector3.h index b813336..213651c 100644 --- a/dali/public-api/math/vector3.h +++ b/dali/public-api/math/vector3.h @@ -2,7 +2,7 @@ #define __DALI_VECTOR_3_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. @@ -40,7 +40,7 @@ class Quaternion; * @brief A three dimensional vector. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API Vector3 +struct DALI_CORE_API Vector3 { // Construction @@ -558,7 +558,7 @@ struct DALI_IMPORT_API Vector3 * @param[in] vector The vector to print * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Vector3& vector); +DALI_CORE_API std::ostream& operator<< (std::ostream& o, const Vector3& vector); /** * @brief Returns a vector with components set to the minimum of the corresponding component in a and b. @@ -601,7 +601,7 @@ inline Vector3 Max( const Vector3& a, const Vector3& b ) * @param[in] max The maximum value * @return A vector containing the clamped components of v */ -DALI_IMPORT_API Vector3 Clamp( const Vector3& v, const float& min, const float& max ); +DALI_CORE_API Vector3 Clamp( const Vector3& v, const float& min, const float& max ); // Allow Vector3 to be treated as a POD type template <> struct TypeTraits< Vector3 > : public BasicTypes< Vector3 > { enum { IS_TRIVIAL_TYPE = true }; }; diff --git a/dali/public-api/math/vector4.h b/dali/public-api/math/vector4.h index 0fc8d85..7516001 100644 --- a/dali/public-api/math/vector4.h +++ b/dali/public-api/math/vector4.h @@ -2,7 +2,7 @@ #define __DALI_VECTOR_4_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 @@ struct Vector3; * Components can be used as position or offset (x,y,z,w); color (r,g,b,a) or texture coords(s,t,p,q). * @SINCE_1_0.0 */ -struct DALI_IMPORT_API Vector4 +struct DALI_CORE_API Vector4 { // NOTE // xrs, ygt, zbp and waq must be consecutive in memory. @@ -569,7 +569,7 @@ struct DALI_IMPORT_API Vector4 * @param[in] vector The vector to print * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<<(std::ostream& o, const Vector4& vector); +DALI_CORE_API std::ostream& operator<<(std::ostream& o, const Vector4& vector); /** * @brief Returns a vector with components set to the minimum of the corresponding component in a and b. @@ -614,7 +614,7 @@ inline Vector4 Max( const Vector4& a, const Vector4& b ) * @param[in] max The maximum value * @return A vector containing the clamped components of v */ -DALI_IMPORT_API Vector4 Clamp( const Vector4& v, const float& min, const float& max ); +DALI_CORE_API Vector4 Clamp( const Vector4& v, const float& min, const float& max ); // Allow Vector4 to be treated as a POD type template <> struct TypeTraits< Vector4 > : public BasicTypes< Vector4 > { enum { IS_TRIVIAL_TYPE = true }; }; diff --git a/dali/public-api/object/any.h b/dali/public-api/object/any.h index f28ed48..4752fc0 100644 --- a/dali/public-api/object/any.h +++ b/dali/public-api/object/any.h @@ -2,7 +2,7 @@ #define __DALI_ANY_TYPE_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. @@ -53,13 +53,13 @@ public: * @brief Default constructor. * @SINCE_1_0.0 */ - DALI_IMPORT_API Any(); + DALI_CORE_API Any(); /** * @brief Destructor. Free resources. * @SINCE_1_0.0 */ - DALI_IMPORT_API ~Any(); + DALI_CORE_API ~Any(); /** * @brief Passes Assert message. @@ -67,7 +67,7 @@ public: * @SINCE_1_0.0 * @param[in] assertMessage Assert message to report */ - DALI_IMPORT_API static void AssertAlways( const char* assertMessage ); + DALI_CORE_API static void AssertAlways( const char* assertMessage ); /** * @brief Constructs a Any type with the given value. @@ -144,7 +144,7 @@ public: * @exception DaliException If parameter any is of a different type. * */ - DALI_IMPORT_API Any& operator=( const Any& any ); + DALI_CORE_API Any& operator=( const Any& any ); /** * @brief Gets a value of type Type from container. @@ -165,7 +165,7 @@ public: * @return The std::type_info of the stored value or the type info of the void * type if there is no value stored */ - DALI_IMPORT_API const std::type_info& GetType() const; + DALI_CORE_API const std::type_info& GetType() const; /** * @brief Retrieves the stored value in the Any type. diff --git a/dali/public-api/object/base-handle.h b/dali/public-api/object/base-handle.h index d6d11e3..861e1e7 100644 --- a/dali/public-api/object/base-handle.h +++ b/dali/public-api/object/base-handle.h @@ -2,7 +2,7 @@ #define __DALI_BASE_HANDLE_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. @@ -56,7 +56,7 @@ class TypeInfo; * * @SINCE_1_0.0 */ -class DALI_IMPORT_API BaseHandle +class DALI_CORE_API BaseHandle { public: diff --git a/dali/public-api/object/base-object.h b/dali/public-api/object/base-object.h index 01e5a27..30e3503 100644 --- a/dali/public-api/object/base-object.h +++ b/dali/public-api/object/base-object.h @@ -2,7 +2,7 @@ #define __DALI_BASE_OBJECT_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. @@ -37,7 +37,7 @@ class BaseHandle; * @brief A base class for objects. * @SINCE_1_0.0 */ -class DALI_IMPORT_API BaseObject : public Dali::RefObject +class DALI_CORE_API BaseObject : public Dali::RefObject { public: diff --git a/dali/public-api/object/handle.h b/dali/public-api/object/handle.h index f139f97..a7fcb36 100644 --- a/dali/public-api/object/handle.h +++ b/dali/public-api/object/handle.h @@ -49,7 +49,7 @@ class Object; * @brief Dali::Handle is a handle to an internal property owning Dali object that can have constraints applied to it. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Handle : public BaseHandle +class DALI_CORE_API Handle : public BaseHandle { public: @@ -400,7 +400,7 @@ public: namespace WeightObject { -DALI_IMPORT_API extern const Property::Index WEIGHT; ///< name "weight", type FLOAT +DALI_CORE_API extern const Property::Index WEIGHT; ///< name "weight", type FLOAT /** * @brief Convenience function to create an object with a custom "weight" property. @@ -408,7 +408,7 @@ DALI_IMPORT_API extern const Property::Index WEIGHT; ///< name "weight", type FL * @SINCE_1_0.0 * @return A handle to a newly allocated object */ -DALI_IMPORT_API Handle New(); +DALI_CORE_API Handle New(); } // namespace WeightObject diff --git a/dali/public-api/object/object-registry.h b/dali/public-api/object/object-registry.h index 57a4a26..203d676 100644 --- a/dali/public-api/object/object-registry.h +++ b/dali/public-api/object/object-registry.h @@ -2,7 +2,7 @@ #define __DALI_OBJECT_REGISTRY_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. @@ -56,7 +56,7 @@ class ObjectRegistry; * | objectDestroyed | @ref ObjectDestroyedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API ObjectRegistry : public BaseHandle +class DALI_CORE_API ObjectRegistry : public BaseHandle { public: diff --git a/dali/public-api/object/property-array.h b/dali/public-api/object/property-array.h index 3fbff39..ef47612 100644 --- a/dali/public-api/object/property-array.h +++ b/dali/public-api/object/property-array.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_ARRAY_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. @@ -37,7 +37,7 @@ namespace Dali * @brief A Array of property values. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Property::Array +class DALI_CORE_API Property::Array { public: @@ -215,7 +215,7 @@ private: * @param[in] array The array to insert * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<<( std::ostream& stream, const Property::Array& array ); +DALI_CORE_API std::ostream& operator<<( std::ostream& stream, const Property::Array& array ); /** * @} diff --git a/dali/public-api/object/property-conditions.h b/dali/public-api/object/property-conditions.h index 6a4bf16..16dee73 100644 --- a/dali/public-api/object/property-conditions.h +++ b/dali/public-api/object/property-conditions.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_CONDITIONS_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 @@ class PropertyCondition; * @brief This represents a condition that can be evaluated on a Property::Value. * @SINCE_1_0.0 */ -class DALI_IMPORT_API PropertyCondition : public BaseHandle +class DALI_CORE_API PropertyCondition : public BaseHandle { public: @@ -107,7 +107,7 @@ public: * @param[in] arg The argument for the condition * @return A property condition function object */ -DALI_IMPORT_API PropertyCondition LessThanCondition( float arg ); +DALI_CORE_API PropertyCondition LessThanCondition( float arg ); /** * @brief GreaterThanCondition compares whether property is greater than arg. @@ -122,7 +122,7 @@ DALI_IMPORT_API PropertyCondition LessThanCondition( float arg ); * @param[in] arg The argument for the condition * @return A property condition function object */ -DALI_IMPORT_API PropertyCondition GreaterThanCondition( float arg ); +DALI_CORE_API PropertyCondition GreaterThanCondition( float arg ); /** * @brief InsideCondition compares whether property is greater than arg0 and less than arg1. @@ -138,7 +138,7 @@ DALI_IMPORT_API PropertyCondition GreaterThanCondition( float arg ); * @param[in] arg1 The second argument for the condition * @return A property condition function object */ -DALI_IMPORT_API PropertyCondition InsideCondition( float arg0, float arg1 ); +DALI_CORE_API PropertyCondition InsideCondition( float arg0, float arg1 ); /** * @brief OutsideCondition compares whether property is less than arg0 or greater than arg1. @@ -154,7 +154,7 @@ DALI_IMPORT_API PropertyCondition InsideCondition( float arg0, float arg1 ); * @param[in] arg1 The second argument for the condition * @return A property condition function object */ -DALI_IMPORT_API PropertyCondition OutsideCondition( float arg0, float arg1 ); +DALI_CORE_API PropertyCondition OutsideCondition( float arg0, float arg1 ); /** * @brief Detects when a property changes by stepAmount from initialValue, in both positive and negative directions. This will continue checking for multiples of stepAmount. @@ -169,7 +169,7 @@ DALI_IMPORT_API PropertyCondition OutsideCondition( float arg0, float arg1 ); * @param[in] initialValue The initial value to step from * @return A property condition function object */ -DALI_IMPORT_API PropertyCondition StepCondition( float stepAmount, float initialValue = 0.0f ); +DALI_CORE_API PropertyCondition StepCondition( float stepAmount, float initialValue = 0.0f ); /** * @brief Receives notifications as a property goes above/below the inputted values. Values must be ordered and can be either ascending or descending. @@ -183,7 +183,7 @@ DALI_IMPORT_API PropertyCondition StepCondition( float stepAmount, float initial * @param[in] steps List of values to receive notifications for as a property crosses them * @return A property condition function object */ -DALI_IMPORT_API PropertyCondition VariableStepCondition( const Dali::Vector& steps ); +DALI_CORE_API PropertyCondition VariableStepCondition( const Dali::Vector& steps ); /** * @} diff --git a/dali/public-api/object/property-input.h b/dali/public-api/object/property-input.h index 2d85d2d..d74532b 100644 --- a/dali/public-api/object/property-input.h +++ b/dali/public-api/object/property-input.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_INPUT_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 @@ class Quaternion; * @brief An abstract interface for receiving property values. * @SINCE_1_0.0 */ -class DALI_IMPORT_API PropertyInput +class DALI_CORE_API PropertyInput { public: diff --git a/dali/public-api/object/property-key.h b/dali/public-api/object/property-key.h index bd9a921..831a02c 100644 --- a/dali/public-api/object/property-key.h +++ b/dali/public-api/object/property-key.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_KEY_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 @@ namespace Dali * @brief A key type which can be either a std::string or a Property::Index * @SINCE_1_2.7 */ -struct DALI_IMPORT_API Property::Key +struct DALI_CORE_API Property::Key { /** * @brief The type of key @@ -131,7 +131,7 @@ struct DALI_IMPORT_API Property::Key * @param [in] key the key to convert * @return The output stream operator. */ -DALI_IMPORT_API std::ostream& operator<<( std::ostream& stream, const Property::Key& key ); +DALI_CORE_API std::ostream& operator<<( std::ostream& stream, const Property::Key& key ); /** diff --git a/dali/public-api/object/property-map.h b/dali/public-api/object/property-map.h index aa7498d..8f77396 100644 --- a/dali/public-api/object/property-map.h +++ b/dali/public-api/object/property-map.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_MAP_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 @@ typedef std::pair StringValuePair; * @brief A Map of property values, the key type could be String or Property::Index. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Property::Map +class DALI_CORE_API Property::Map { public: @@ -378,7 +378,7 @@ private: * @param[in] map The map to insert * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<<( std::ostream& stream, const Property::Map& map ); +DALI_CORE_API std::ostream& operator<<( std::ostream& stream, const Property::Map& map ); /** * @} diff --git a/dali/public-api/object/property-notification.h b/dali/public-api/object/property-notification.h index bf1a582..ba61d6c 100644 --- a/dali/public-api/object/property-notification.h +++ b/dali/public-api/object/property-notification.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_NOTIFICATION_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 PropertyNotification; * @SINCE_1_0.0 * @see Dali::PropertyCondition */ -class DALI_IMPORT_API PropertyNotification : public BaseHandle +class DALI_CORE_API PropertyNotification : public BaseHandle { public: /** diff --git a/dali/public-api/object/property-types.cpp b/dali/public-api/object/property-types.cpp index 7f6e398..67264ae 100644 --- a/dali/public-api/object/property-types.cpp +++ b/dali/public-api/object/property-types.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. @@ -47,7 +47,7 @@ const unsigned int PROPERTY_TYPE_NAMES_COUNT = sizeof( PROPERTY_TYPE_NAMES ) / s namespace PropertyTypes { -DALI_EXPORT_API const char* GetName(Property::Type type) +DALI_CORE_API const char* GetName(Property::Type type) { if (type < PROPERTY_TYPE_NAMES_COUNT ) { diff --git a/dali/public-api/object/property-types.h b/dali/public-api/object/property-types.h index fcbd608..29b52a0 100644 --- a/dali/public-api/object/property-types.h +++ b/dali/public-api/object/property-types.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_TYPES_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. @@ -53,7 +53,7 @@ namespace PropertyTypes * @param[in] type The property type * @return The name of this type */ -DALI_IMPORT_API const char* GetName(Property::Type type); +DALI_CORE_API const char* GetName(Property::Type type); /** * @brief Retrieves an enumerated property type. diff --git a/dali/public-api/object/property-value.h b/dali/public-api/object/property-value.h index 5f2fa8e..fa66e05 100644 --- a/dali/public-api/object/property-value.h +++ b/dali/public-api/object/property-value.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_VALUE_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. @@ -45,7 +45,7 @@ struct Extents; * @brief A value-type representing a property value. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Property::Value +class DALI_CORE_API Property::Value { public: @@ -429,7 +429,7 @@ private: * @param[in] value The value to insert * @return The output stream operator */ -DALI_IMPORT_API std::ostream& operator<<( std::ostream& ouputStream, const Property::Value& value ); +DALI_CORE_API std::ostream& operator<<( std::ostream& ouputStream, const Property::Value& value ); /** * @} diff --git a/dali/public-api/object/property.h b/dali/public-api/object/property.h index acb5355..54bf2ec 100644 --- a/dali/public-api/object/property.h +++ b/dali/public-api/object/property.h @@ -2,7 +2,7 @@ #define __DALI_PROPERTY_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. @@ -39,7 +39,7 @@ class Handle; * @brief An object + property pair. * @SINCE_1_0.0 */ -struct DALI_IMPORT_API Property +struct DALI_CORE_API Property { /** * @brief A valid property index is zero or greater. diff --git a/dali/public-api/object/ref-object.h b/dali/public-api/object/ref-object.h index 72b9638..3ead400 100644 --- a/dali/public-api/object/ref-object.h +++ b/dali/public-api/object/ref-object.h @@ -2,7 +2,7 @@ #define __DALI_REF_OBJECT_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. @@ -38,7 +38,7 @@ class Value; * instead of calling Reference() and Unreference() methods directly. * @SINCE_1_0.0 */ -class DALI_IMPORT_API RefObject +class DALI_CORE_API RefObject { public: diff --git a/dali/public-api/object/type-info.h b/dali/public-api/object/type-info.h index 290c2b9..1a8d702 100644 --- a/dali/public-api/object/type-info.h +++ b/dali/public-api/object/type-info.h @@ -45,7 +45,7 @@ namespace Internal DALI_INTERNAL * See TypeRegistry for methods of type registration and TypeInfo retrieval. * @SINCE_1_0.0 */ -class DALI_IMPORT_API TypeInfo : public BaseHandle +class DALI_CORE_API TypeInfo : public BaseHandle { public: typedef BaseHandle (*CreateFunction)(); ///< Function signature for creating an instance of the associated object type. @SINCE_1_0.0 diff --git a/dali/public-api/object/type-registry.h b/dali/public-api/object/type-registry.h index 3c7574b..89d28bd 100644 --- a/dali/public-api/object/type-registry.h +++ b/dali/public-api/object/type-registry.h @@ -93,7 +93,7 @@ class TypeRegistry; * * @SINCE_1_0.0 */ -class DALI_IMPORT_API TypeRegistry : public BaseHandle +class DALI_CORE_API TypeRegistry : public BaseHandle { public: /** @@ -185,7 +185,7 @@ public: // Not intended for application developers * @brief Registers a type from type info. * @SINCE_1_0.0 */ -class DALI_IMPORT_API TypeRegistration +class DALI_CORE_API TypeRegistration { public: /** @@ -241,7 +241,7 @@ private: * @brief Registers a signal connector function to a registered type. * @SINCE_1_0.0 */ -class DALI_IMPORT_API SignalConnectorType +class DALI_CORE_API SignalConnectorType { public: /** @@ -259,7 +259,7 @@ public: * @brief Registers an action function. * @SINCE_1_0.0 */ -class DALI_IMPORT_API TypeAction +class DALI_CORE_API TypeAction { public: /** @@ -277,7 +277,7 @@ public: * @brief Registers a property for the given type. * @SINCE_1_0.0 */ -class DALI_IMPORT_API PropertyRegistration +class DALI_CORE_API PropertyRegistration { public: @@ -316,7 +316,7 @@ public: * @brief Registers an animatable property for the given type. * @SINCE_1_0.0 */ -class DALI_IMPORT_API AnimatablePropertyRegistration +class DALI_CORE_API AnimatablePropertyRegistration { public: @@ -357,7 +357,7 @@ public: * @brief Registers a component of animatable property for the given component index. * @SINCE_1_0.0 */ -class DALI_IMPORT_API AnimatablePropertyComponentRegistration +class DALI_CORE_API AnimatablePropertyComponentRegistration { public: @@ -385,7 +385,7 @@ public: * @brief Registers a child property for the given type. * @SINCE_1_1.35 */ -class DALI_IMPORT_API ChildPropertyRegistration +class DALI_CORE_API ChildPropertyRegistration { public: diff --git a/dali/public-api/object/weak-handle.h b/dali/public-api/object/weak-handle.h index 47883a8..25c980a 100644 --- a/dali/public-api/object/weak-handle.h +++ b/dali/public-api/object/weak-handle.h @@ -2,7 +2,7 @@ #define DALI_WEAK_HANDLE_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. @@ -37,7 +37,7 @@ namespace Dali * deleted object will return an empty handle. * @SINCE_1_2.60 */ -class DALI_IMPORT_API WeakHandleBase +class DALI_CORE_API WeakHandleBase { public: diff --git a/dali/public-api/render-tasks/render-task-list.h b/dali/public-api/render-tasks/render-task-list.h index 8f2b567..7f4b557 100644 --- a/dali/public-api/render-tasks/render-task-list.h +++ b/dali/public-api/render-tasks/render-task-list.h @@ -2,7 +2,7 @@ #define __DALI_RENDER_TASK_LIST_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 RenderTaskList; * These tasks describe how the Dali scene should be rendered; @see Dali::RenderTask for more details. * @SINCE_1_0.0 */ -class DALI_IMPORT_API RenderTaskList : public BaseHandle +class DALI_CORE_API RenderTaskList : public BaseHandle { public: diff --git a/dali/public-api/render-tasks/render-task.h b/dali/public-api/render-tasks/render-task.h index 834d836..6ca2b06 100644 --- a/dali/public-api/render-tasks/render-task.h +++ b/dali/public-api/render-tasks/render-task.h @@ -2,7 +2,7 @@ #define __DALI_RENDER_TASK_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. @@ -81,7 +81,7 @@ class RenderTask; * | finished | @ref FinishedSignal() | * @SINCE_1_0.0 */ -class DALI_IMPORT_API RenderTask : public Handle +class DALI_CORE_API RenderTask : public Handle { public: diff --git a/dali/public-api/rendering/frame-buffer.h b/dali/public-api/rendering/frame-buffer.h index 73df151..9663d55 100644 --- a/dali/public-api/rendering/frame-buffer.h +++ b/dali/public-api/rendering/frame-buffer.h @@ -2,7 +2,7 @@ #define DALI_FRAMEBUFFER_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. @@ -34,7 +34,7 @@ class FrameBuffer; * @brief FrameBuffer is a collection of textures that can be used as the destination for rendering. * @SINCE_1_1.43 */ -class DALI_IMPORT_API FrameBuffer : public BaseHandle +class DALI_CORE_API FrameBuffer : public BaseHandle { public: diff --git a/dali/public-api/rendering/geometry.h b/dali/public-api/rendering/geometry.h index 5f266e0..1c1732e 100644 --- a/dali/public-api/rendering/geometry.h +++ b/dali/public-api/rendering/geometry.h @@ -2,7 +2,7 @@ #define DALI_GEOMETRY_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. @@ -39,7 +39,7 @@ class Geometry; * * @SINCE_1_1.43 */ -class DALI_IMPORT_API Geometry : public BaseHandle +class DALI_CORE_API Geometry : public BaseHandle { public: diff --git a/dali/public-api/rendering/property-buffer.h b/dali/public-api/rendering/property-buffer.h index c91f099..ca8b913 100644 --- a/dali/public-api/rendering/property-buffer.h +++ b/dali/public-api/rendering/property-buffer.h @@ -2,7 +2,7 @@ #define DALI_PROPERTY_BUFFER_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 PropertyBuffer; * * @SINCE_1_1.43 */ -class DALI_IMPORT_API PropertyBuffer : public BaseHandle +class DALI_CORE_API PropertyBuffer : public BaseHandle { public: diff --git a/dali/public-api/rendering/renderer.h b/dali/public-api/rendering/renderer.h index 931de51..7d7c155 100644 --- a/dali/public-api/rendering/renderer.h +++ b/dali/public-api/rendering/renderer.h @@ -2,7 +2,7 @@ #define DALI_RENDERER_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. @@ -228,7 +228,7 @@ enum Type * * @SINCE_1_1.43 */ -class DALI_IMPORT_API Renderer : public Handle +class DALI_CORE_API Renderer : public Handle { public: diff --git a/dali/public-api/rendering/sampler.h b/dali/public-api/rendering/sampler.h index e70c3c1..f37daaa 100644 --- a/dali/public-api/rendering/sampler.h +++ b/dali/public-api/rendering/sampler.h @@ -2,7 +2,7 @@ #define DALI_SAMPLER_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. @@ -35,7 +35,7 @@ class Sampler; * * @SINCE_1_1.43 */ -class DALI_IMPORT_API Sampler : public BaseHandle +class DALI_CORE_API Sampler : public BaseHandle { public: diff --git a/dali/public-api/rendering/shader.h b/dali/public-api/rendering/shader.h index b1fc7fd..6c57ab9 100644 --- a/dali/public-api/rendering/shader.h +++ b/dali/public-api/rendering/shader.h @@ -2,7 +2,7 @@ #define DALI_SHADER_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. @@ -68,7 +68,7 @@ class Shader; * * @SINCE_1_1.43 */ -class DALI_IMPORT_API Shader : public Handle +class DALI_CORE_API Shader : public Handle { public: diff --git a/dali/public-api/rendering/texture-set.h b/dali/public-api/rendering/texture-set.h index 93e808d..52e8e24 100644 --- a/dali/public-api/rendering/texture-set.h +++ b/dali/public-api/rendering/texture-set.h @@ -2,7 +2,7 @@ #define DALI_TEXTURE_SET_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. @@ -40,7 +40,7 @@ class TextureSet; * The images have to be ordered in the same order they are declared in the shader. * @SINCE_1_1.43 */ -class DALI_IMPORT_API TextureSet : public BaseHandle +class DALI_CORE_API TextureSet : public BaseHandle { public: diff --git a/dali/public-api/rendering/texture.h b/dali/public-api/rendering/texture.h index 90bcad5..bbf2e67 100644 --- a/dali/public-api/rendering/texture.h +++ b/dali/public-api/rendering/texture.h @@ -2,7 +2,7 @@ #define DALI_TEXTURE_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. @@ -69,7 +69,7 @@ namespace CubeMapLayer * @brief Texture represents a texture object used as input or output by shaders. * @SINCE_1_1.43 */ -class DALI_IMPORT_API Texture : public BaseHandle +class DALI_CORE_API Texture : public BaseHandle { public: diff --git a/dali/public-api/signals/base-signal.h b/dali/public-api/signals/base-signal.h index e9c35b0..2ea9770 100644 --- a/dali/public-api/signals/base-signal.h +++ b/dali/public-api/signals/base-signal.h @@ -2,7 +2,7 @@ #define __DALI_BASE_SIGNAL_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. @@ -75,7 +75,7 @@ namespace Dali * * @SINCE_1_0.0 */ -class DALI_IMPORT_API BaseSignal : public SlotObserver +class DALI_CORE_API BaseSignal : public SlotObserver { public: diff --git a/dali/public-api/signals/callback.h b/dali/public-api/signals/callback.h index 2f13fe4..5224ee8 100644 --- a/dali/public-api/signals/callback.h +++ b/dali/public-api/signals/callback.h @@ -2,7 +2,7 @@ #define __DALI_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. @@ -38,7 +38,7 @@ class CallbackBase; * @brief Callback base class to hold the data for callback function and member function calls. * @SINCE_1_0.0 */ -class DALI_IMPORT_API CallbackBase +class DALI_CORE_API CallbackBase { public: diff --git a/dali/public-api/signals/connection-tracker-interface.h b/dali/public-api/signals/connection-tracker-interface.h index faf2046..06afe92 100644 --- a/dali/public-api/signals/connection-tracker-interface.h +++ b/dali/public-api/signals/connection-tracker-interface.h @@ -2,7 +2,7 @@ #define __DALI_CONNECTION_TRACKER_INTERFACE_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. @@ -51,7 +51,7 @@ namespace Dali * e.g. if Button object is destroyed while it is still connected. * @SINCE_1_0.0 */ -class DALI_IMPORT_API ConnectionTrackerInterface : public SignalObserver +class DALI_CORE_API ConnectionTrackerInterface : public SignalObserver { public: diff --git a/dali/public-api/signals/connection-tracker.h b/dali/public-api/signals/connection-tracker.h index 3e5383b..0bb1e9d 100644 --- a/dali/public-api/signals/connection-tracker.h +++ b/dali/public-api/signals/connection-tracker.h @@ -2,7 +2,7 @@ #define __DALI_CONNECTION_TRACKER_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. @@ -38,7 +38,7 @@ class SlotConnection; * @brief Connection tracker concrete implementation. * @SINCE_1_0.0 */ -class DALI_IMPORT_API ConnectionTracker : public ConnectionTrackerInterface +class DALI_CORE_API ConnectionTracker : public ConnectionTrackerInterface { public: diff --git a/dali/public-api/signals/functor-delegate.h b/dali/public-api/signals/functor-delegate.h index 60c6795..858c1ce 100644 --- a/dali/public-api/signals/functor-delegate.h +++ b/dali/public-api/signals/functor-delegate.h @@ -2,7 +2,7 @@ #define __DALI_FUNCTOR_DELEGATE_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 @@ struct FunctorDestroyer * @brief Used to connect a void() functor to a signal via BaseObject::SignalConnect(). * @SINCE_1_0.0 */ -class DALI_IMPORT_API FunctorDelegate +class DALI_CORE_API FunctorDelegate { public: diff --git a/dali/public-api/signals/signal-slot-connections.h b/dali/public-api/signals/signal-slot-connections.h index c73fa79..30be4c3 100644 --- a/dali/public-api/signals/signal-slot-connections.h +++ b/dali/public-api/signals/signal-slot-connections.h @@ -2,7 +2,7 @@ #define __DALI_SIGNAL_SLOT_CONNECTIONS_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 CallbackBase; * It holds a pointer to the callback, but does not own it. * @SINCE_1_0.0 */ -class DALI_IMPORT_API SlotConnection +class DALI_CORE_API SlotConnection { public: @@ -103,7 +103,7 @@ private: * the connection is destroyed. * @SINCE_1_0.0 */ -class DALI_IMPORT_API SignalConnection +class DALI_CORE_API SignalConnection { public: diff --git a/dali/public-api/signals/signal-slot-observers.h b/dali/public-api/signals/signal-slot-observers.h index e40dfbd..6f7abf7 100644 --- a/dali/public-api/signals/signal-slot-observers.h +++ b/dali/public-api/signals/signal-slot-observers.h @@ -2,7 +2,7 @@ #define __DALI_SIGNAL_SLOT_OBSERVERS_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. @@ -37,7 +37,7 @@ class CallbackBase; * This will happen if the object owning the signal is destroyed. * @SINCE_1_0.0 */ -class DALI_IMPORT_API SignalObserver +class DALI_CORE_API SignalObserver { public: @@ -69,7 +69,7 @@ public: * This is used by the slot if wants to disconnect or is deleted. * @SINCE_1_0.0 */ -class DALI_IMPORT_API SlotObserver +class DALI_CORE_API SlotObserver { public: -- 2.7.4