From 7bedd5c934115c17ad6178ac8f984ba5db1ac775 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Mon, 21 Jul 2014 12:02:12 +0100 Subject: [PATCH] CAPI removal Change-Id: Ib30ced6c7f9b7aa55feb4d531bce7f626ec2f83e --- automated-tests/src/dali-internal/CMakeLists.txt | 1 + .../dali-internal/utc-Dali-Internal-Character.cpp | 52 ++++ .../dali-test-suite-utils/dali-test-suite-utils.h | 1 - .../dali-test-suite-utils/test-gl-abstraction.h | 1 - automated-tests/src/dali/utc-Dali-Character.cpp | 18 -- build/slp/Makefile.am | 5 +- build/slp/configure.ac | 1 - build/slp/dali-core/Makefile.am | 55 +--- build/slp/dali-test-suite-utils.pc.in | 12 - capi/dali/public-api/dali-core-capi-internal.h | 132 --------- capi/dali/public-api/file.list | 127 -------- capi/dali_doc.h | 325 --------------------- dali/internal/event/events/event-processor.cpp | 4 +- .../public-api/actors/actor-enumerations.h | 8 - {capi/dali => dali}/public-api/actors/actor.h | 10 - {capi/dali => dali}/public-api/actors/blending.h | 8 - .../dali => dali}/public-api/actors/camera-actor.h | 9 - .../public-api/actors/custom-actor-impl.h | 9 - .../dali => dali}/public-api/actors/custom-actor.h | 8 - {capi/dali => dali}/public-api/actors/draw-mode.h | 8 - .../dali => dali}/public-api/actors/image-actor.h | 8 - {capi/dali => dali}/public-api/actors/layer.h | 8 - {capi/dali => dali}/public-api/actors/mesh-actor.h | 8 - .../public-api/actors/renderable-actor.h | 8 - {capi/dali => dali}/public-api/actors/text-actor.h | 8 - .../animation/active-constraint-declarations.h | 8 - .../public-api/animation/active-constraint.h | 8 - .../public-api/animation/alpha-functions.h | 8 - .../dali => dali}/public-api/animation/animation.h | 8 - .../public-api/animation/constraint-functions.h | 8 - .../public-api/animation/constraint-source.h | 8 - .../public-api/animation/constraint.h | 8 - .../public-api/animation/constraints.h | 8 - .../public-api/animation/interpolator-functions.h | 8 - .../public-api/animation/key-frames.h | 8 - .../public-api/animation/time-period.h | 8 - {capi/dali => dali}/public-api/common/constants.h | 8 - .../dali => dali}/public-api/common/dali-common.h | 8 - .../public-api/common/intrusive-ptr.h | 8 - .../public-api/common/loading-state.h | 8 - {capi/dali => dali}/public-api/common/stage.h | 8 - .../public-api/common/vector-wrapper.h | 8 - {capi/dali => dali}/public-api/common/view-mode.h | 0 dali/public-api/dali-core.h | 108 ++++++- .../public-api/events/gesture-detector.h | 8 - {capi/dali => dali}/public-api/events/gesture.h | 8 - {capi/dali => dali}/public-api/events/key-event.h | 8 - .../events/long-press-gesture-detector.h | 8 - .../public-api/events/long-press-gesture.h | 8 - .../public-api/events/pan-gesture-detector.h | 8 - .../dali => dali}/public-api/events/pan-gesture.h | 8 - .../public-api/events/pinch-gesture-detector.h | 8 - .../public-api/events/pinch-gesture.h | 8 - .../public-api/events/tap-gesture-detector.h | 8 - .../dali => dali}/public-api/events/tap-gesture.h | 8 - .../dali => dali}/public-api/events/touch-event.h | 8 - .../dali => dali}/public-api/events/touch-point.h | 8 - dali/public-api/file.list | 120 +++++++- .../public-api/geometry/animatable-mesh.h | 8 - .../public-api/geometry/animatable-vertex.h | 8 - .../dali => dali}/public-api/images/bitmap-image.h | 8 - .../public-api/images/encoded-buffer-image.h | 8 - .../public-api/images/frame-buffer-image.h | 8 - .../public-api/images/image-attributes.h | 8 - {capi/dali => dali}/public-api/images/image.h | 8 - .../dali => dali}/public-api/images/native-image.h | 8 - {capi/dali => dali}/public-api/images/pixel.h | 8 - {capi/dali => dali}/public-api/math/angle-axis.h | 8 - .../public-api/math/compile-time-assert.h | 8 - .../public-api/math/compile-time-math.h | 8 - {capi/dali => dali}/public-api/math/degree.h | 8 - {capi/dali => dali}/public-api/math/math-utils.h | 8 - {capi/dali => dali}/public-api/math/matrix.h | 8 - {capi/dali => dali}/public-api/math/matrix3.h | 8 - {capi/dali => dali}/public-api/math/quaternion.h | 8 - {capi/dali => dali}/public-api/math/radian.h | 8 - {capi/dali => dali}/public-api/math/random.h | 8 - {capi/dali => dali}/public-api/math/rect.h | 8 - {capi/dali => dali}/public-api/math/vector2.h | 8 - {capi/dali => dali}/public-api/math/vector3.h | 8 - {capi/dali => dali}/public-api/math/vector4.h | 8 - {capi/dali => dali}/public-api/math/viewport.h | 8 - {capi/dali => dali}/public-api/modeling/material.h | 8 - {capi/dali => dali}/public-api/object/any.h | 8 - .../dali => dali}/public-api/object/base-handle.h | 8 - .../dali => dali}/public-api/object/base-object.h | 8 - .../public-api/object/constrainable.h | 8 - {capi/dali => dali}/public-api/object/handle.h | 8 - .../public-api/object/object-registry.h | 8 - .../public-api/object/property-conditions.h | 8 - .../public-api/object/property-index.h | 8 - .../public-api/object/property-input.h | 8 - .../object/property-notification-declarations.h | 8 - .../public-api/object/property-notification.h | 8 - .../public-api/object/property-types.h | 8 - .../public-api/object/property-value.h | 10 +- {capi/dali => dali}/public-api/object/property.h | 8 - {capi/dali => dali}/public-api/object/ref-object.h | 9 - .../public-api/render-tasks/render-task-list.h | 8 - .../public-api/render-tasks/render-task.h | 8 - .../public-api/shader-effects/shader-effect.h | 8 - .../dali => dali}/public-api/signals/base-signal.h | 8 - {capi/dali => dali}/public-api/signals/callback.h | 8 - .../signals/connection-tracker-interface.h | 8 - .../public-api/signals/connection-tracker.h | 8 - .../public-api/signals/dali-signal-v2.h | 7 - .../public-api/signals/functor-delegate.h | 8 - .../public-api/signals/signal-slot-connections.h | 8 - .../public-api/signals/signal-slot-observers.h | 8 - .../public-api/signals/slot-delegate.h | 8 - {capi/dali => dali}/public-api/text/character.h | 8 - .../public-api/text/font-parameters.h | 8 - {capi/dali => dali}/public-api/text/font.h | 8 - {capi/dali => dali}/public-api/text/text-style.h | 8 - {capi/dali => dali}/public-api/text/text.h | 8 - packaging/dali.spec | 2 - 116 files changed, 271 insertions(+), 1491 deletions(-) create mode 100644 automated-tests/src/dali-internal/utc-Dali-Internal-Character.cpp delete mode 100644 build/slp/dali-test-suite-utils.pc.in delete mode 100644 capi/dali/public-api/dali-core-capi-internal.h delete mode 100644 capi/dali/public-api/file.list delete mode 100644 capi/dali_doc.h rename {capi/dali => dali}/public-api/actors/actor-enumerations.h (97%) rename {capi/dali => dali}/public-api/actors/actor.h (99%) rename {capi/dali => dali}/public-api/actors/blending.h (97%) rename {capi/dali => dali}/public-api/actors/camera-actor.h (99%) rename {capi/dali => dali}/public-api/actors/custom-actor-impl.h (99%) rename {capi/dali => dali}/public-api/actors/custom-actor.h (97%) rename {capi/dali => dali}/public-api/actors/draw-mode.h (94%) rename {capi/dali => dali}/public-api/actors/image-actor.h (99%) rename {capi/dali => dali}/public-api/actors/layer.h (99%) rename {capi/dali => dali}/public-api/actors/mesh-actor.h (98%) rename {capi/dali => dali}/public-api/actors/renderable-actor.h (99%) rename {capi/dali => dali}/public-api/actors/text-actor.h (99%) rename {capi/dali => dali}/public-api/animation/active-constraint-declarations.h (94%) rename {capi/dali => dali}/public-api/animation/active-constraint.h (98%) rename {capi/dali => dali}/public-api/animation/alpha-functions.h (97%) rename {capi/dali => dali}/public-api/animation/animation.h (99%) rename {capi/dali => dali}/public-api/animation/constraint-functions.h (99%) rename {capi/dali => dali}/public-api/animation/constraint-source.h (97%) rename {capi/dali => dali}/public-api/animation/constraint.h (99%) rename {capi/dali => dali}/public-api/animation/constraints.h (99%) rename {capi/dali => dali}/public-api/animation/interpolator-functions.h (98%) rename {capi/dali => dali}/public-api/animation/key-frames.h (98%) rename {capi/dali => dali}/public-api/animation/time-period.h (95%) rename {capi/dali => dali}/public-api/common/constants.h (99%) rename {capi/dali => dali}/public-api/common/dali-common.h (98%) rename {capi/dali => dali}/public-api/common/intrusive-ptr.h (99%) rename {capi/dali => dali}/public-api/common/loading-state.h (94%) rename {capi/dali => dali}/public-api/common/stage.h (99%) rename {capi/dali => dali}/public-api/common/vector-wrapper.h (95%) rename {capi/dali => dali}/public-api/common/view-mode.h (100%) rename {capi/dali => dali}/public-api/events/gesture-detector.h (98%) rename {capi/dali => dali}/public-api/events/gesture.h (97%) rename {capi/dali => dali}/public-api/events/key-event.h (98%) rename {capi/dali => dali}/public-api/events/long-press-gesture-detector.h (98%) rename {capi/dali => dali}/public-api/events/long-press-gesture.h (97%) rename {capi/dali => dali}/public-api/events/pan-gesture-detector.h (99%) rename {capi/dali => dali}/public-api/events/pan-gesture.h (98%) rename {capi/dali => dali}/public-api/events/pinch-gesture-detector.h (98%) rename {capi/dali => dali}/public-api/events/pinch-gesture.h (97%) rename {capi/dali => dali}/public-api/events/tap-gesture-detector.h (98%) rename {capi/dali => dali}/public-api/events/tap-gesture.h (97%) rename {capi/dali => dali}/public-api/events/touch-event.h (97%) rename {capi/dali => dali}/public-api/events/touch-point.h (98%) rename {capi/dali => dali}/public-api/geometry/animatable-mesh.h (98%) rename {capi/dali => dali}/public-api/geometry/animatable-vertex.h (97%) rename {capi/dali => dali}/public-api/images/bitmap-image.h (99%) rename {capi/dali => dali}/public-api/images/encoded-buffer-image.h (98%) rename {capi/dali => dali}/public-api/images/frame-buffer-image.h (98%) rename {capi/dali => dali}/public-api/images/image-attributes.h (99%) rename {capi/dali => dali}/public-api/images/image.h (99%) rename {capi/dali => dali}/public-api/images/native-image.h (97%) rename {capi/dali => dali}/public-api/images/pixel.h (98%) rename {capi/dali => dali}/public-api/math/angle-axis.h (96%) rename {capi/dali => dali}/public-api/math/compile-time-assert.h (95%) rename {capi/dali => dali}/public-api/math/compile-time-math.h (98%) rename {capi/dali => dali}/public-api/math/degree.h (97%) rename {capi/dali => dali}/public-api/math/math-utils.h (98%) rename {capi/dali => dali}/public-api/math/matrix.h (99%) rename {capi/dali => dali}/public-api/math/matrix3.h (98%) rename {capi/dali => dali}/public-api/math/quaternion.h (99%) rename {capi/dali => dali}/public-api/math/radian.h (97%) rename {capi/dali => dali}/public-api/math/random.h (97%) rename {capi/dali => dali}/public-api/math/rect.h (98%) rename {capi/dali => dali}/public-api/math/vector2.h (99%) rename {capi/dali => dali}/public-api/math/vector3.h (99%) rename {capi/dali => dali}/public-api/math/vector4.h (99%) rename {capi/dali => dali}/public-api/math/viewport.h (93%) rename {capi/dali => dali}/public-api/modeling/material.h (99%) rename {capi/dali => dali}/public-api/object/any.h (99%) rename {capi/dali => dali}/public-api/object/base-handle.h (99%) rename {capi/dali => dali}/public-api/object/base-object.h (98%) rename {capi/dali => dali}/public-api/object/constrainable.h (98%) rename {capi/dali => dali}/public-api/object/handle.h (99%) rename {capi/dali => dali}/public-api/object/object-registry.h (98%) rename {capi/dali => dali}/public-api/object/property-conditions.h (98%) rename {capi/dali => dali}/public-api/object/property-index.h (95%) rename {capi/dali => dali}/public-api/object/property-input.h (97%) rename {capi/dali => dali}/public-api/object/property-notification-declarations.h (95%) rename {capi/dali => dali}/public-api/object/property-notification.h (98%) rename {capi/dali => dali}/public-api/object/property-types.h (97%) rename {capi/dali => dali}/public-api/object/property-value.h (98%) rename {capi/dali => dali}/public-api/object/property.h (98%) rename {capi/dali => dali}/public-api/object/ref-object.h (96%) rename {capi/dali => dali}/public-api/render-tasks/render-task-list.h (97%) rename {capi/dali => dali}/public-api/render-tasks/render-task.h (99%) rename {capi/dali => dali}/public-api/shader-effects/shader-effect.h (99%) rename {capi/dali => dali}/public-api/signals/base-signal.h (99%) rename {capi/dali => dali}/public-api/signals/callback.h (99%) rename {capi/dali => dali}/public-api/signals/connection-tracker-interface.h (97%) rename {capi/dali => dali}/public-api/signals/connection-tracker.h (96%) rename {capi/dali => dali}/public-api/signals/dali-signal-v2.h (99%) rename {capi/dali => dali}/public-api/signals/functor-delegate.h (98%) rename {capi/dali => dali}/public-api/signals/signal-slot-connections.h (98%) rename {capi/dali => dali}/public-api/signals/signal-slot-observers.h (96%) rename {capi/dali => dali}/public-api/signals/slot-delegate.h (97%) rename {capi/dali => dali}/public-api/text/character.h (98%) rename {capi/dali => dali}/public-api/text/font-parameters.h (98%) rename {capi/dali => dali}/public-api/text/font.h (99%) rename {capi/dali => dali}/public-api/text/text-style.h (99%) rename {capi/dali => dali}/public-api/text/text.h (99%) diff --git a/automated-tests/src/dali-internal/CMakeLists.txt b/automated-tests/src/dali-internal/CMakeLists.txt index 9082ae4..9728100 100644 --- a/automated-tests/src/dali-internal/CMakeLists.txt +++ b/automated-tests/src/dali-internal/CMakeLists.txt @@ -6,6 +6,7 @@ SET(RPM_NAME "core-${PKG_NAME}-tests") SET(CAPI_LIB "dali-internal") SET(TC_SOURCES + utc-Dali-Internal-Character.cpp utc-Dali-Internal-Font.cpp utc-Dali-Internal-Handles.cpp utc-Dali-Internal-ImageFactory.cpp diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Character.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Character.cpp new file mode 100644 index 0000000..e884843 --- /dev/null +++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Character.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include + +#include +#include +#include + +using namespace Dali; + +void utc_dali_character_startup(void) +{ + test_return_value = TET_UNDEF; +} + +void utc_dali_character_cleanup(void) +{ + test_return_value = TET_PASS; +} + +int UtcDaliCharacterGetImplementation(void) +{ + TestApplication application; + + Text text( std::string( "Hello world" ) ); + Character c = text[0]; + + const Internal::Character& characterImpl1 = c.GetImplementation(); + + DALI_TEST_CHECK( NULL != &characterImpl1 ); + + Internal::Character& characterImpl2 = c.GetImplementation(); + + DALI_TEST_CHECK( NULL != &characterImpl2 ); + + END_TEST; +} diff --git a/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h b/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h index 70ca7e2..de77903 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h +++ b/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h @@ -20,7 +20,6 @@ // INTERNAL INCLUDES #include -#include #include void tet_infoline(const char*str); 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 710b1b8..7d203c1 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 @@ -24,7 +24,6 @@ #include // INTERNAL INCLUDES -#include #include #include #include diff --git a/automated-tests/src/dali/utc-Dali-Character.cpp b/automated-tests/src/dali/utc-Dali-Character.cpp index fb99922..9f0a47c 100644 --- a/automated-tests/src/dali/utc-Dali-Character.cpp +++ b/automated-tests/src/dali/utc-Dali-Character.cpp @@ -160,21 +160,3 @@ int UtcDaliCharacterIsNewLine(void) DALI_TEST_CHECK(!text[8].IsNewLine()); // 'f' END_TEST; } - -int UtcDaliCharacterGetImplementation(void) -{ - TestApplication application; - - Text text( std::string( "Hello world" ) ); - Character c = text[0]; - - const Internal::Character& characterImpl1 = c.GetImplementation(); - - DALI_TEST_CHECK( NULL != &characterImpl1 ); - - Internal::Character& characterImpl2 = c.GetImplementation(); - - DALI_TEST_CHECK( NULL != &characterImpl2 ); - - END_TEST; -} diff --git a/build/slp/Makefile.am b/build/slp/Makefile.am index a8e70e3..543abca 100644 --- a/build/slp/Makefile.am +++ b/build/slp/Makefile.am @@ -16,10 +16,7 @@ SUBDIRS = dali-core pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dali-core.pc dali-test-suite-utils.pc - -dalitestsuitedir = $(includedir)/dali/test-suite-utils -dalitestsuite_HEADERS = $(test_suite_utils_header_files) +pkgconfig_DATA = dali-core.pc MAINTAINERCLEANFILES = \ aclocal.m4 \ diff --git a/build/slp/configure.ac b/build/slp/configure.ac index 0810352..eb544e0 100644 --- a/build/slp/configure.ac +++ b/build/slp/configure.ac @@ -110,7 +110,6 @@ AC_CONFIG_FILES([ Makefile dali-core/Makefile dali-core.pc - dali-test-suite-utils.pc ]) AC_OUTPUT diff --git a/build/slp/dali-core/Makefile.am b/build/slp/dali-core/Makefile.am index 68a897a..bb7bc39 100644 --- a/build/slp/dali-core/Makefile.am +++ b/build/slp/dali-core/Makefile.am @@ -28,9 +28,6 @@ include ../../../dali/public-api/file.list platform_abstraction_src_dir = ../../../dali/integration-api include ../../../dali/integration-api/file.list -capi_devel_src_dir = ../../../capi/dali/public-api -include ${capi_devel_src_dir}/file.list - # Build the Dali libtool library src_files = $(internal_src_files) \ @@ -58,11 +55,8 @@ dali_shaders_src_file = dali-shaders.cpp dali-shaders.cpp: $(dali_shaders_script) $(dali_shaders_dir)/*.txt $< --shader-dir=$(dali_shaders_dir) --file-prefix=dali-shaders -# Building dali doesn't rely on installed capi headers -# It will instead use headers from this repo in place dali_core_includes = \ - -I../../.. \ - -I../../../capi + -I../../.. daliShaderbinDir = ${dataReadWriteDir}/core/shaderbin/ daliGlyphCacheDir = ${dataReadWriteDir}/glyphcache/ @@ -93,15 +87,11 @@ platformabstraction_HEADERS = $(platform_abstraction_header_files) platformabstractionevents_HEADERS = $(platform_abstraction_events_header_files) platformabstractiondynamics_HEADERS = $(platform_abstraction_dynamics_header_files) -# Should match same subdirectory list as CAPI DEVEL HEADERS below publicapidir = $(devincludepath)/dali/public-api -publicapiactionsdir = $(publicapidir)/actions publicapiactorsdir = $(publicapidir)/actors -publicapiactorattachmentsdir = $(publicapidir)/actor-attachments publicapianimationdir = $(publicapidir)/animation publicapicommondir = $(publicapidir)/common publicapidynamicsdir = $(publicapidir)/dynamics -publicapieffectsdir = $(publicapidir)/effects publicapieventsdir = $(publicapidir)/events publicapigeometrydir = $(publicapidir)/geometry publicapiimagesdir = $(publicapidir)/images @@ -115,13 +105,10 @@ publicapitextdir = $(publicapidir)/text publicapiscriptingdir = $(publicapidir)/scripting publicapi_HEADERS = $(public_api_header_files) -publicapiactorattachments_HEADERS = $(public_api_core_actor_attachments_header_files) -publicapiactions_HEADERS = $(public_api_core_actions_header_files) publicapiactors_HEADERS = $(public_api_core_actors_header_files) publicapianimation_HEADERS = $(public_api_core_animation_header_files) publicapicommon_HEADERS = $(public_api_core_common_header_files) publicapidynamics_HEADERS = $(public_api_core_dynamics_header_files) -publicapieffects_HEADERS = $(public_api_core_effects_header_files) publicapievents_HEADERS = $(public_api_core_events_header_files) publicapigeometry_HEADERS = $(public_api_core_geometry_header_files) publicapiimages_HEADERS = $(public_api_core_images_header_files) @@ -134,46 +121,6 @@ publicapishadereffects_HEADERS = $(public_api_core_shader_effects_header_files) publicapisignals_HEADERS = $(public_api_core_signals_header_files) publicapitext_HEADERS = $(public_api_core_text_header_files) -capideveldir = $(devincludepath)/dali/public-api -capidevelactionsdir = $(capideveldir)/actions -capidevelactorsdir = $(capideveldir)/actors -capidevelactorattachmentsdir = $(capideveldir)/actor-attachments -capidevelanimationdir = $(capideveldir)/animation -capidevelcommondir = $(capideveldir)/common -capideveldynamicsdir = $(capideveldir)/dynamics -capideveleffectsdir = $(capideveldir)/effects -capideveleventsdir = $(capideveldir)/events -capidevelgeometrydir = $(capideveldir)/geometry -capidevelimagesdir = $(capideveldir)/images -capidevelmathdir = $(capideveldir)/math -capidevelmodelingdir = $(capideveldir)/modeling -capidevelobjectdir = $(capideveldir)/object -capidevelrendertasksdir = $(capideveldir)/render-tasks -capidevelshadereffectsdir = $(capideveldir)/shader-effects -capidevelsignalsdir = $(capideveldir)/signals -capideveltextdir = $(capideveldir)/text -capidevelscriptingdir = $(capideveldir)/scripting - -capidevel_HEADERS = $(capi_devel_header_files) -capidevelactorattachments_HEADERS = $(capi_devel_actor_attachments_header_files) -capidevelactions_HEADERS = $(capi_devel_actions_header_files) -capidevelactors_HEADERS = $(capi_devel_actors_header_files) -capidevelanimation_HEADERS = $(capi_devel_animation_header_files) -capidevelcommon_HEADERS = $(capi_devel_common_header_files) -capideveldynamics_HEADERS = $(capi_devel_dynamics_header_files) -capideveleffects_HEADERS = $(capi_devel_effects_header_files) -capidevelevents_HEADERS = $(capi_devel_events_header_files) -capidevelgeometry_HEADERS = $(capi_devel_geometry_header_files) -capidevelimages_HEADERS = $(capi_devel_images_header_files) -capidevelmath_HEADERS = $(capi_devel_math_header_files) -capidevelmodeling_HEADERS = $(capi_devel_modeling_header_files) -capidevelrendertasks_HEADERS = $(capi_devel_render_tasks_header_files) -capidevelobject_HEADERS = $(capi_devel_object_header_files) -capidevelscripting_HEADERS = $(capi_devel_scripting_header_files) -capidevelshadereffects_HEADERS = $(capi_devel_shader_effects_header_files) -capidevelsignals_HEADERS = $(capi_devel_signals_header_files) -capideveltext_HEADERS = $(capi_devel_text_header_files) - CLEANFILES = dali-shaders.cpp \ dali-shaders.h diff --git a/build/slp/dali-test-suite-utils.pc.in b/build/slp/dali-test-suite-utils.pc.in deleted file mode 100644 index cf315e8..0000000 --- a/build/slp/dali-test-suite-utils.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -apiversion=0.1.1 -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Samsung OpenGLES Library Test Suite Framework -Description: Automated Test Suite Framework for Samsung OpenGLES Canvas Library -Version: ${apiversion} -Requires: dali-core -Libs: -Cflags: -I${includedir} -I${includedir}/dali/test-suite-utils diff --git a/capi/dali/public-api/dali-core-capi-internal.h b/capi/dali/public-api/dali-core-capi-internal.h deleted file mode 100644 index c9edb4a..0000000 --- a/capi/dali/public-api/dali-core-capi-internal.h +++ /dev/null @@ -1,132 +0,0 @@ -#ifndef __DALI_CORE_CAPI_INTERNAL_H__ -#define __DALI_CORE_CAPI_INTERNAL_H__ - -/* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - - -#endif //__DALI_CORE_CAPI_INTERNAL_H__ diff --git a/capi/dali/public-api/file.list b/capi/dali/public-api/file.list deleted file mode 100644 index 5942449..0000000 --- a/capi/dali/public-api/file.list +++ /dev/null @@ -1,127 +0,0 @@ -capi_devel_header_files = $(capi_devel_src_dir)/dali-core-capi-internal.h - -capi_devel_actors_header_files = \ - $(capi_devel_src_dir)/actors/actor.h \ - $(capi_devel_src_dir)/actors/actor-enumerations.h \ - $(capi_devel_src_dir)/actors/blending.h \ - $(capi_devel_src_dir)/actors/camera-actor.h \ - $(capi_devel_src_dir)/actors/custom-actor.h \ - $(capi_devel_src_dir)/actors/custom-actor-impl.h \ - $(capi_devel_src_dir)/actors/draw-mode.h \ - $(capi_devel_src_dir)/actors/image-actor.h \ - $(capi_devel_src_dir)/actors/layer.h \ - $(capi_devel_src_dir)/actors/mesh-actor.h \ - $(capi_devel_src_dir)/actors/text-actor.h \ - $(capi_devel_src_dir)/actors/renderable-actor.h - -capi_devel_animation_header_files = \ - $(capi_devel_src_dir)/animation/active-constraint.h \ - $(capi_devel_src_dir)/animation/active-constraint-declarations.h \ - $(capi_devel_src_dir)/animation/alpha-functions.h \ - $(capi_devel_src_dir)/animation/animation.h \ - $(capi_devel_src_dir)/animation/constraint.h \ - $(capi_devel_src_dir)/animation/constraints.h \ - $(capi_devel_src_dir)/animation/constraint-functions.h \ - $(capi_devel_src_dir)/animation/constraint-source.h \ - $(capi_devel_src_dir)/animation/interpolator-functions.h \ - $(capi_devel_src_dir)/animation/key-frames.h \ - $(capi_devel_src_dir)/animation/time-period.h - -capi_devel_common_header_files = \ - $(capi_devel_src_dir)/common/constants.h \ - $(capi_devel_src_dir)/common/dali-common.h \ - $(capi_devel_src_dir)/common/loading-state.h \ - $(capi_devel_src_dir)/common/intrusive-ptr.h \ - $(capi_devel_src_dir)/common/stage.h \ - $(capi_devel_src_dir)/common/vector-wrapper.h \ - $(capi_devel_src_dir)/common/view-mode.h - -capi_devel_events_header_files = \ - $(capi_devel_src_dir)/events/gesture.h \ - $(capi_devel_src_dir)/events/gesture-detector.h \ - $(capi_devel_src_dir)/events/key-event.h \ - $(capi_devel_src_dir)/events/long-press-gesture.h \ - $(capi_devel_src_dir)/events/long-press-gesture-detector.h \ - $(capi_devel_src_dir)/events/pan-gesture.h \ - $(capi_devel_src_dir)/events/pan-gesture-detector.h \ - $(capi_devel_src_dir)/events/pinch-gesture.h \ - $(capi_devel_src_dir)/events/pinch-gesture-detector.h \ - $(capi_devel_src_dir)/events/tap-gesture.h \ - $(capi_devel_src_dir)/events/tap-gesture-detector.h \ - $(capi_devel_src_dir)/events/touch-point.h \ - $(capi_devel_src_dir)/events/touch-event.h - -capi_devel_geometry_header_files = \ - $(capi_devel_src_dir)/geometry/animatable-mesh.h \ - $(capi_devel_src_dir)/geometry/animatable-vertex.h - -capi_devel_images_header_files = \ - $(capi_devel_src_dir)/images/bitmap-image.h \ - $(capi_devel_src_dir)/images/encoded-buffer-image.h \ - $(capi_devel_src_dir)/images/frame-buffer-image.h \ - $(capi_devel_src_dir)/images/image.h \ - $(capi_devel_src_dir)/images/image-attributes.h \ - $(capi_devel_src_dir)/images/native-image.h \ - $(capi_devel_src_dir)/images/pixel.h - -capi_devel_math_header_files = \ - $(capi_devel_src_dir)/math/angle-axis.h \ - $(capi_devel_src_dir)/math/compile-time-assert.h \ - $(capi_devel_src_dir)/math/compile-time-math.h \ - $(capi_devel_src_dir)/math/degree.h \ - $(capi_devel_src_dir)/math/math-utils.h \ - $(capi_devel_src_dir)/math/matrix.h \ - $(capi_devel_src_dir)/math/matrix3.h \ - $(capi_devel_src_dir)/math/quaternion.h \ - $(capi_devel_src_dir)/math/radian.h \ - $(capi_devel_src_dir)/math/random.h \ - $(capi_devel_src_dir)/math/rect.h \ - $(capi_devel_src_dir)/math/vector2.h \ - $(capi_devel_src_dir)/math/vector3.h \ - $(capi_devel_src_dir)/math/vector4.h \ - $(capi_devel_src_dir)/math/viewport.h - -capi_devel_modeling_header_files = \ - $(capi_devel_src_dir)/modeling/material.h - -capi_devel_object_header_files = \ - $(capi_devel_src_dir)/object/any.h \ - $(capi_devel_src_dir)/object/base-handle.h \ - $(capi_devel_src_dir)/object/base-object.h \ - $(capi_devel_src_dir)/object/constrainable.h \ - $(capi_devel_src_dir)/object/handle.h \ - $(capi_devel_src_dir)/object/object-registry.h \ - $(capi_devel_src_dir)/object/property-conditions.h \ - $(capi_devel_src_dir)/object/property-index.h \ - $(capi_devel_src_dir)/object/property-input.h \ - $(capi_devel_src_dir)/object/property-notification-declarations.h \ - $(capi_devel_src_dir)/object/property-notification.h \ - $(capi_devel_src_dir)/object/property-types.h \ - $(capi_devel_src_dir)/object/property-value.h \ - $(capi_devel_src_dir)/object/property.h \ - $(capi_devel_src_dir)/object/ref-object.h - -capi_devel_render_tasks_header_files = \ - $(capi_devel_src_dir)/render-tasks/render-task.h \ - $(capi_devel_src_dir)/render-tasks/render-task-list.h - -capi_devel_shader_effects_header_files = \ - $(capi_devel_src_dir)/shader-effects/shader-effect.h - -capi_devel_signals_header_files = \ - $(capi_devel_src_dir)/signals/base-signal.h \ - $(capi_devel_src_dir)/signals/callback.h \ - $(capi_devel_src_dir)/signals/connection-tracker-interface.h \ - $(capi_devel_src_dir)/signals/connection-tracker.h \ - $(capi_devel_src_dir)/signals/dali-signal-v2.h \ - $(capi_devel_src_dir)/signals/functor-delegate.h \ - $(capi_devel_src_dir)/signals/signal-slot-connections.h \ - $(capi_devel_src_dir)/signals/signal-slot-observers.h \ - $(capi_devel_src_dir)/signals/slot-delegate.h - -capi_devel_text_header_files = \ - $(capi_devel_src_dir)/text/character.h \ - $(capi_devel_src_dir)/text/font.h \ - $(capi_devel_src_dir)/text/font-parameters.h \ - $(capi_devel_src_dir)/text/text.h \ - $(capi_devel_src_dir)/text/text-style.h diff --git a/capi/dali_doc.h b/capi/dali_doc.h deleted file mode 100644 index 0812cfb..0000000 --- a/capi/dali_doc.h +++ /dev/null @@ -1,325 +0,0 @@ -#ifndef __DALI_DOC_H__ -#define __DALI_DOC_H__ - -/* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -/** - * @ingroup CAPI_UI_FRAMEWORK - * @defgroup CAPI_DALI_FRAMEWORK Dali - * @brief The Dali provides a cross-platform C++ 3D UI toolkit based on - * OpenGL ES 2.0. - * - * - * - *
APIDescription
@ref CAPI_DALI_MODULEA library to provide a C++ scene graph based on OpenGL ES 2.0.
@ref CAPI_DALI_TOOLKIT_MODULEA library to provide a user interface toolkit on top of Dali.
- */ - -/** - * @ingroup CAPI_DALI_FRAMEWORK - * @defgroup CAPI_DALI_MODULE Dali Core - * @brief The Dali library provides a C++ scene graph based on OpenGL ES 2.0. - * - * @section CAPI_DALI_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * Meshes. - * Image resource types. - * Math classes and utilities. - * - * Registered Object and property system. - * - * - * - * Classes for manipulating text. - *
APIDescription
@ref CAPI_DALI_ACTORS_MODULEThe set of interactive objects that can be placed on the Dali::Stage.
@ref CAPI_DALI_ADAPTOR_MODULEInterface to the platform.
@ref CAPI_DALI_ANIMATION_MODULEThe property animation and constraints system.
@ref CAPI_DALI_COMMON_MODULEGeneral classes.
@ref CAPI_DALI_EVENTS_MODULEEvents, gestures and gesture detectors.
@ref CAPI_DALI_GEOMETRY_MODULE
@ref CAPI_DALI_IMAGES_MODULE
@ref CAPI_DALI_MATH_MODULE
@ref CAPI_DALI_MODELING_MODULEAncilliary classes for meshes and 3D models
@ref CAPI_DALI_OBJECT_MODULE
@ref CAPI_DALI_RENDER_TASKS_MODULEClasses to describe how the scene is rendered.
@ref CAPI_DALI_SHADER_EFFECTS_MODULEClasses to change how actors are visualised.
@ref CAPI_DALI_SIGNALS_MODULESignals and Slots - a type-safe, loosely-coupled callback system.
@ref CAPI_DALI_TEXT_MODULE
- */ - - -/** - * @ingroup CAPI_DALI_MODULE - * - * @defgroup CAPI_DALI_ACTORS_MODULE Actors - * - * @section CAPI_DALI_ACTORS_MODULE_HEADER RequiredHeader - * \#include - * - * @section CAPI_DALI_ACTORS_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - * - * An actor for grouping and sorting other actors. - *
APIDescription
@ref Dali::Actor Primary class for application interaction.
@ref Dali::CameraActor An actor which controls a camera.
@ref Dali::CustomActor CustomActor is a base class for custom UI controls.
@ref Dali::CustomActorImpl CustomActorImpl is an abstract base class for custom control implementations.
@ref Dali::RenderableActor A base class for renderable actors.
@ref Dali::ImageActor An actor for displaying images.
@ref Dali::MeshActor An actor for displaying mesh geometries.
@ref Dali::TextActor An actor for display simple text.
@ref Dali::Layer
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_ANIMATION_MODULE Animation - * @section CAPI_DALI_ANIMATION_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_ANIMATION_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - * - * - *
APIDescription
@ref Dali::ActiveConstraint A constraint which is being applied to an object.
Dali::AlphaFunctions Various functions that control progress of an animation.
@ref Dali::Animation Dali::Animation can be used to animate the properties of any number of objects, typically Dali::Actor%s.
@ref Dali::Constraint An abstract base class for Constraints.
ConstraintsVarious constraints for properties: -@ref Dali::ScaleToFitConstraint -@ref Dali::ScaleToFitKeepAspectRatioConstraint -@ref Dali::ScaleToFillKeepAspectRatioConstraint -@ref Dali::ScaleToFillXYKeepAspectRatioConstraint -@ref Dali::ShrinkInsideKeepAspectRatioConstraint -@ref Dali::MultiplyConstraint -@ref Dali::DivideConstraint -@ref Dali::EqualToConstraint -@ref Dali::RelativeToConstraint -@ref Dali::RelativeToConstraintFloat -@ref Dali::InverseOfConstraint -@ref Dali::SourceWidthFixedHeight -@ref Dali::SourceHeightFixedWidth -Dali::LookAt() -@ref Dali::OrientedLookAt
Interpolator Functions Dali::LerpBoolean(), Dali::LerpFloat(), Dali::LerpVector2(), Dali::LerpVector3(), Dali::LerpVector4(), Dali::SlerpQuaternion()
@ref Dali::KeyFrames A set of key frames for a property that can be animated using @ref Dali::Animation::AnimateBetween()
Constraint SourcesSpecifies the location of a property for use in a constraint: - * @ref Dali::SourceType -@ref Dali::LocalSource -@ref Dali::ParentSource -@ref Dali::Source -@ref Dali::ConstraintSource
@ref Dali::TimePeriod A value-type representing a period of time within an animation.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_COMMON_MODULE Common - * @section CAPI_DALI_COMMON_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_COMMON_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - *
APIDescription
@ref Dali::ParentOrigin Constants to specify the origin of an actor within it's parent volume, used by Dali::Actor::SetParentOrigin()
@ref Dali::AnchorPoint Constants to specify the anchor point of an actor, used by Dali::Actor::SetAnchorPoint()
@ref Dali::Color Constants to specify primary colors
@ref Dali::Math Epsilon and Pi constants
@ref Dali::String String constants
@ref Dali::LoadingState The status during resource loading operations.
@ref Dali::Stage The Stage is a top-level object used for displaying a tree of Actors.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_EVENTS_MODULE Events - * @section CAPI_DALI_EVENTS_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_EVENTS_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
APIDescription
@ref Dali::GestureDetector GestureDetectors analyse a stream of touch events and attempt to determine the intention of the user.
@ref Dali::Gesture Base structure for different gestures that an application can receive.
@ref Dali::KeyEvent The key event structure is used to store a key press.
@ref Dali::LongPressGestureDetectorThis emits a signal when a long press gesture occurs.
@ref Dali::LongPressGesture A LongPressGesture is emitted when the user touches and holds the screen with the stated number of fingers.
@ref Dali::PanGestureDetector This class looks for panning (or dragging) gestures.
@ref Dali::PanGesture A PanGesture is emitted when the user moves one or more fingers in a particular direction.
@ref Dali::PinchGestureDetector This class looks for pinching gestures involving two touches.
@ref Dali::PinchGesture A PinchGesture is emitted when the user moves two fingers towards or away from each other.
@ref Dali::TapGestureDetector This class emits a signal when a tap gesture occurs
@ref Dali::TapGesture A TapGesture is emitted when the user taps the screen
@ref Dali::TouchEvent Touch events are a collection of touch points at a specific moment in time.
@ref Dali::TouchPoint A TouchPoint represents a point on the screen that is currently being touched or where touch - * has stopped.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_GEOMETRY_MODULE Geometry - * @section CAPI_DALI_GEOMETRY_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_GEOMETRY_MODULE_OVERVIEW Overview - * - * - * - *
APIDescription
@ref Dali::AnimatableMesh A mesh geometry that can be animated using the Dali property animation system.
@ref Dali::AnimatableVertex Represents a vertex in a Dali::AnimatableMesh.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_IMAGES_MODULE Images - * @section CAPI_DALI_IMAGES_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_IMAGES_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - *
APIDescription
@ref Dali::BitmapImage This represents an image resource supplied by Application writer that can be added to Dali::ImageActor.
@ref Dali::EncodedBufferImage This represents an encoded image supplied by Application writer that can be added to Dali::ImageActor.
@ref Dali::FrameBufferImage This represents a GLES frame buffer object and contains the result of an 'off-screen' render pass of a Dali::RenderTask
@ref Dali::ImageAttributes Describes Image properties like width or pixel format.
@ref Dali::Image An Image object represents an image resource that can be added to ImageActors.
@ref Dali::NativeImage Abstract interface to provide platform-specific support for handling image data.
@ref Dali::Pixel Pixel format types and their properties.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_MATH_MODULE Math - * @section CAPI_DALI_MATH_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_MATH_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
APIDescription
@ref Dali::AngleAxis An angle & axis pair.
@ref Dali::Degree An angle in degrees.
@ref Dali::Radian An angle in radians.
@ref Dali::Matrix The Matrix class represents transformations and projections.
@ref Dali::Matrix3 A 3x3 matrix.
@ref Dali::Quaternion The Quaternion class encapsulates the mathematics of the quaternion.
@ref Dali::Rect Template class to create and operate on rectangles.
@ref Dali::Vector2 A two-dimensional vector.
@ref Dali::Vector3 A three-dimensional vector.
@ref Dali::Vector4 A four-dimensional vector.
@ref Dali::Random Provides methods to generate and use random values.
@ref Dali::Viewport Screen area in pixels
Math Utilities -Dali::NextPowerOfTwo() -Dali::IsPowerOfTwo() -Dali::Clamp() -Dali::ClampInPlace() -Dali::Lerp() -Dali::GetRangedEpsilon() -Dali::EqualsZero() -Dali::Equals() -Dali::Round() -Dali::WrapInDomain() -Dali::ShortestDistanceInDomain() - *
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_MODELING_MODULE Modeling - * @section CAPI_DALI_MODELING_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_MODELING_MODULE_OVERVIEW Overview - * - * - *
APIDescription
@ref Dali::Material Encapsulates the data describing a material.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_OBJECT_MODULE Object - * @section CAPI_DALI_OBJECT_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_OBJECT_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - * - * - * - * a - * - * - * - *
APIDescription
@ref Dali::BaseHandle Dali::BaseHandle is a handle to an internal Dali resource.
@ref Dali::BaseObject A base class for objects.
@ref Dali::Constrainable A handle to an internal property owning Dali object that - * can have constraints applied to it.
@ref Dali::Handle A handle to an internal property owning Dali object.
@ref Dali::ObjectRegistry The ObjectRegistry notifies it's observers when an object is created.
@ref Dali::PropertyCondition This represents a condition that can be evaluated on a Property::Value. Factory methods include Dali::LessThanCondition(), Dali::GreaterThanCondition(), Dali::InsideCondition() and Dali::OutsideCondition()
@ref Dali::PropertyInput An abstract interface for receiving property values.
@ref Dali::PropertyNotification This is used to issue a notification upon a condition of the property being met.
@ref Dali::PropertyTypes Template function instances for property getters.
@ref Dali::Property An object + property pair.
@ref Dali::Property::Value A value-type representing a property value.
@ref Dali::RefObject Base class for reference counted objects.
@ref Dali::IntrusivePtr Template class used to point at Dali::RefObjects
@ref Dali::Any Class for objects that contain values of different types
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_RENDER_TASKS_MODULE Render Tasks - * @section CAPI_DALI_RENDER_TASKS_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_RENDER_TASKS_MODULE_OVERVIEW Overview - * - * - * - *
APIDescription
@ref Dali::RenderTask A RenderTask describes how all or part of the Dali scene should be rendered.
@ref Dali::RenderTaskList An ordered list of Dali::RenderTask%s.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_SHADER_EFFECTS_MODULE Shader effects - * @section CAPI_DALI_SHADER_EFFECTS_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_SHADER_EFFECTS_MODULE_OVERVIEW Overview - * - * - *
APIDescription
@ref Dali::ShaderEffect Shader effects provide a visual effect for actors.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_SIGNALS_MODULE Signals - * @section CAPI_DALI_SIGNALS_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_SIGNALS_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - * - * - * - * - *
APIDescription
@ref Dali::BaseSignal Implementation class for Dali::SignalV2%s.
@ref Dali::Callback Templates to provide type safety for member function callbacks.
@ref Dali::ConnectionTracker Connection tracker concrete implementation
@ref Dali::ConnectionTrackerInterface Interface used to track connections between signals and slots.
@ref Dali::SignalV2 Template classes that provide signals
@ref Dali::FunctorDelegate Used to connect a void() functor to a signal via Dali::BaseObject::SignalConnect()
@ref Dali::SlotConnection SlotConnection is the connection information held by a connection tracker.
@ref Dali::SignalConnection SignalConnection is the connection information held by the signal.
@ref Dali::SignalObserver Abstract interface used by a signal to inform a slot it is disconnecting.
@ref Dali::SlotObserver Abstract Interface used by a slot to inform a signal it is disconnecting.
@ref Dali::SlotDelegate SlotDelegates can be used to connect member functions to signals, without inheriting from SlotDelegateInterface.
- */ - -/** - * @ingroup CAPI_DALI_MODULE - * @defgroup CAPI_DALI_TEXT_MODULE Text - * @section CAPI_DALI_TEXT_MODULE_HEADER Required Header - * \#include - * @section CAPI_DALI_TEXT_MODULE_OVERVIEW Overview - * - * - * - * - * - * - * - * - * - *
APIDescription
@ref Dali::Character Character class encapsulates a character implementation to support multiple languages.
@ref Dali::PointSize Font size in points.
@ref Dali::PixelSize Font size in pixels.
@ref Dali::CapsHeight Font size in caps height.
@ref Dali::FontParameters Encapsulates all font parameters.
@ref Dali::Font Encapsulates a font resource
@ref Dali::TextStyle Encapsulates style properties for text, such as weight, italics, underline, shadow, etc.
@ref Dali::Text Encapsulates a string of characters implementation to support multiple languages.
- */ - - - -#endif //__DALI_DOC_H__ diff --git a/dali/internal/event/events/event-processor.cpp b/dali/internal/event/events/event-processor.cpp index f6c9725..3f62462 100644 --- a/dali/internal/event/events/event-processor.cpp +++ b/dali/internal/event/events/event-processor.cpp @@ -48,9 +48,9 @@ static const std::size_t MAX_MESSAGE_SIZE = std::max( sizeof(Integration::TouchE std::max( sizeof(Integration::KeyEvent), std::max( sizeof(Integration::MouseWheelEvent), sizeof(Integration::GestureEvent) ) ) ); -static const std::size_t INITIAL_MIN_CAPICITY = 4; +static const std::size_t INITIAL_MIN_CAPACITY = 4; -static const std::size_t INITIAL_BUFFER_SIZE = MAX_MESSAGE_SIZE * INITIAL_MIN_CAPICITY; +static const std::size_t INITIAL_BUFFER_SIZE = MAX_MESSAGE_SIZE * INITIAL_MIN_CAPACITY; } // unnamed namespace diff --git a/capi/dali/public-api/actors/actor-enumerations.h b/dali/public-api/actors/actor-enumerations.h similarity index 97% rename from capi/dali/public-api/actors/actor-enumerations.h rename to dali/public-api/actors/actor-enumerations.h index e077a90..484d7f1 100644 --- a/capi/dali/public-api/actors/actor-enumerations.h +++ b/dali/public-api/actors/actor-enumerations.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - #include namespace Dali DALI_IMPORT_API @@ -54,7 +49,4 @@ enum PositionInheritanceMode } // namespace Dali -/** - * @} - */ #endif // __DALI_ACTOR_ENUMERATIONS_H__ diff --git a/capi/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h similarity index 99% rename from capi/dali/public-api/actors/actor.h rename to dali/public-api/actors/actor.h index a03259e..05d72ad 100644 --- a/capi/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include #include @@ -1328,9 +1323,4 @@ void UnparentAndReset( Actor& actor ); } // namespace Dali - -/** - * @} - */ - #endif // __DALI_ACTOR_H__ diff --git a/capi/dali/public-api/actors/blending.h b/dali/public-api/actors/blending.h similarity index 97% rename from capi/dali/public-api/actors/blending.h rename to dali/public-api/actors/blending.h index 69b9ee8..c3c7628 100644 --- a/capi/dali/public-api/actors/blending.h +++ b/dali/public-api/actors/blending.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -98,7 +93,4 @@ extern const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_ALPHA; ///< Blen } // namespace Dali -/** - * @} - */ #endif // __DALI_BLENDING_H__ diff --git a/capi/dali/public-api/actors/camera-actor.h b/dali/public-api/actors/camera-actor.h similarity index 99% rename from capi/dali/public-api/actors/camera-actor.h rename to dali/public-api/actors/camera-actor.h index 20a560e..875cb66 100644 --- a/capi/dali/public-api/actors/camera-actor.h +++ b/dali/public-api/actors/camera-actor.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - #include namespace Dali DALI_IMPORT_API @@ -315,8 +310,4 @@ public: // Not intended for use by Application developers } // namespace Dali -/** - * @} - */ - #endif // __DALI_CAMERA_ACTOR_H__ diff --git a/capi/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h similarity index 99% rename from capi/dali/public-api/actors/custom-actor-impl.h rename to dali/public-api/actors/custom-actor-impl.h index 8f053b2..df7ad32 100644 --- a/capi/dali/public-api/actors/custom-actor-impl.h +++ b/dali/public-api/actors/custom-actor-impl.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -248,8 +243,4 @@ private: } // namespace Dali -/** - * @} - */ - #endif // __DALI_CUSTOM_ACTOR_IMPL_H__ diff --git a/capi/dali/public-api/actors/custom-actor.h b/dali/public-api/actors/custom-actor.h similarity index 97% rename from capi/dali/public-api/actors/custom-actor.h rename to dali/public-api/actors/custom-actor.h index cd62f49..192ab51 100644 --- a/capi/dali/public-api/actors/custom-actor.h +++ b/dali/public-api/actors/custom-actor.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -109,7 +104,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_CUSTOM_ACTOR_H__ diff --git a/capi/dali/public-api/actors/draw-mode.h b/dali/public-api/actors/draw-mode.h similarity index 94% rename from capi/dali/public-api/actors/draw-mode.h rename to dali/public-api/actors/draw-mode.h index ad55f9d..9872e04 100644 --- a/capi/dali/public-api/actors/draw-mode.h +++ b/dali/public-api/actors/draw-mode.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - #include namespace Dali DALI_IMPORT_API @@ -47,7 +42,4 @@ enum Type } // namespace Dali -/** - * @} - */ #endif // __DALI_DRAW_MODE_H__ diff --git a/capi/dali/public-api/actors/image-actor.h b/dali/public-api/actors/image-actor.h similarity index 99% rename from capi/dali/public-api/actors/image-actor.h rename to dali/public-api/actors/image-actor.h index d612f53..0507b7b 100644 --- a/capi/dali/public-api/actors/image-actor.h +++ b/dali/public-api/actors/image-actor.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -358,7 +353,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_IMAGE_ACTOR_H__ diff --git a/capi/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h similarity index 99% rename from capi/dali/public-api/actors/layer.h rename to dali/public-api/actors/layer.h index 153e10b..d1d3c85 100644 --- a/capi/dali/public-api/actors/layer.h +++ b/dali/public-api/actors/layer.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -331,7 +326,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif //__DALI_LAYER_H__ diff --git a/capi/dali/public-api/actors/mesh-actor.h b/dali/public-api/actors/mesh-actor.h similarity index 98% rename from capi/dali/public-api/actors/mesh-actor.h rename to dali/public-api/actors/mesh-actor.h index c36d8ca..a4764b9 100644 --- a/capi/dali/public-api/actors/mesh-actor.h +++ b/dali/public-api/actors/mesh-actor.h @@ -19,11 +19,6 @@ */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -170,7 +165,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif /* _MESH_ACTOR_H_ */ diff --git a/capi/dali/public-api/actors/renderable-actor.h b/dali/public-api/actors/renderable-actor.h similarity index 99% rename from capi/dali/public-api/actors/renderable-actor.h rename to dali/public-api/actors/renderable-actor.h index 69ea621..5a25a16 100644 --- a/capi/dali/public-api/actors/renderable-actor.h +++ b/dali/public-api/actors/renderable-actor.h @@ -19,11 +19,6 @@ */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -240,7 +235,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_RENDERABLE_ACTOR_H__ diff --git a/capi/dali/public-api/actors/text-actor.h b/dali/public-api/actors/text-actor.h similarity index 99% rename from capi/dali/public-api/actors/text-actor.h rename to dali/public-api/actors/text-actor.h index 82566e5..e69dc81 100644 --- a/capi/dali/public-api/actors/text-actor.h +++ b/dali/public-api/actors/text-actor.h @@ -19,11 +19,6 @@ */ -/** - * @addtogroup CAPI_DALI_ACTORS_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -495,7 +490,4 @@ public: // Not intended for use by Application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_TEXT_ACTOR_H__ diff --git a/capi/dali/public-api/animation/active-constraint-declarations.h b/dali/public-api/animation/active-constraint-declarations.h similarity index 94% rename from capi/dali/public-api/animation/active-constraint-declarations.h rename to dali/public-api/animation/active-constraint-declarations.h index e53180c..96c9994 100644 --- a/capi/dali/public-api/animation/active-constraint-declarations.h +++ b/dali/public-api/animation/active-constraint-declarations.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -41,7 +36,4 @@ typedef boost::function ActiveConstraintCal } // namespace Dali -/** - * @} - */ #endif // __DALI_ACTIVE_CONSTRAINT_DECLARATIONS_H__ diff --git a/capi/dali/public-api/animation/active-constraint.h b/dali/public-api/animation/active-constraint.h similarity index 98% rename from capi/dali/public-api/animation/active-constraint.h rename to dali/public-api/animation/active-constraint.h index 187b777..bac9c2f 100644 --- a/capi/dali/public-api/animation/active-constraint.h +++ b/dali/public-api/animation/active-constraint.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -123,7 +118,4 @@ public: // Not intended for use by Application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_ACTIVE_CONSTRAINT_H__ diff --git a/capi/dali/public-api/animation/alpha-functions.h b/dali/public-api/animation/alpha-functions.h similarity index 97% rename from capi/dali/public-api/animation/alpha-functions.h rename to dali/public-api/animation/alpha-functions.h index 6c1535d..553b0bf 100644 --- a/capi/dali/public-api/animation/alpha-functions.h +++ b/dali/public-api/animation/alpha-functions.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -77,7 +72,4 @@ float Sin2x(float progress); ///< Two revolutions } // namespace Dali -/** - * @} - */ #endif // __DALI_ALPHA_FUNCTIONS_H__ diff --git a/capi/dali/public-api/animation/animation.h b/dali/public-api/animation/animation.h similarity index 99% rename from capi/dali/public-api/animation/animation.h rename to dali/public-api/animation/animation.h index 9843cd0..7ed8c61 100644 --- a/capi/dali/public-api/animation/animation.h +++ b/dali/public-api/animation/animation.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -1150,7 +1145,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_ANIMATION_H__ diff --git a/capi/dali/public-api/animation/constraint-functions.h b/dali/public-api/animation/constraint-functions.h similarity index 99% rename from capi/dali/public-api/animation/constraint-functions.h rename to dali/public-api/animation/constraint-functions.h index ed7cd1f..8179e11 100644 --- a/capi/dali/public-api/animation/constraint-functions.h +++ b/dali/public-api/animation/constraint-functions.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -196,7 +191,4 @@ typedef boost::function #include @@ -126,7 +121,4 @@ struct DALI_IMPORT_API ConstraintSource } // namespace Dali -/** - * @} - */ #endif // __DALI_CONSTRAINT_SOURCE_H__ diff --git a/capi/dali/public-api/animation/constraint.h b/dali/public-api/animation/constraint.h similarity index 99% rename from capi/dali/public-api/animation/constraint.h rename to dali/public-api/animation/constraint.h index 1ffa952..57447cf 100644 --- a/capi/dali/public-api/animation/constraint.h +++ b/dali/public-api/animation/constraint.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -760,7 +755,4 @@ private: // Not intended for use by Application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_CONSTRAINT_H__ diff --git a/capi/dali/public-api/animation/constraints.h b/dali/public-api/animation/constraints.h similarity index 99% rename from capi/dali/public-api/animation/constraints.h rename to dali/public-api/animation/constraints.h index f0addfc..7cf4faa 100644 --- a/capi/dali/public-api/animation/constraints.h +++ b/dali/public-api/animation/constraints.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -428,7 +423,4 @@ struct DALI_IMPORT_API OrientedLookAt } // namespace Dali -/** - * @} - */ #endif // __DALI_CONSTRAINTS_H__ diff --git a/capi/dali/public-api/animation/interpolator-functions.h b/dali/public-api/animation/interpolator-functions.h similarity index 98% rename from capi/dali/public-api/animation/interpolator-functions.h rename to dali/public-api/animation/interpolator-functions.h index c5161e5..ce3ae83 100644 --- a/capi/dali/public-api/animation/interpolator-functions.h +++ b/dali/public-api/animation/interpolator-functions.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -193,7 +188,4 @@ AnyInterpolator GetDefaultInterpolator(Property::Type type); } // namespace Dali -/** - * @} - */ #endif // __DALI_INTERPOLATOR_FUNCTIONS_H__ diff --git a/capi/dali/public-api/animation/key-frames.h b/dali/public-api/animation/key-frames.h similarity index 98% rename from capi/dali/public-api/animation/key-frames.h rename to dali/public-api/animation/key-frames.h index 452165b..3e7a6c3 100644 --- a/capi/dali/public-api/animation/key-frames.h +++ b/dali/public-api/animation/key-frames.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -124,7 +119,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_KEY_FRAMES_H__ diff --git a/capi/dali/public-api/animation/time-period.h b/dali/public-api/animation/time-period.h similarity index 95% rename from capi/dali/public-api/animation/time-period.h rename to dali/public-api/animation/time-period.h index 422dd9a..6cecc4f 100644 --- a/capi/dali/public-api/animation/time-period.h +++ b/dali/public-api/animation/time-period.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_ANIMATION_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -60,7 +55,4 @@ struct DALI_IMPORT_API TimePeriod } // namespace Dali -/** - * @} - */ #endif // __DALI_TIME_PERIOD_H__ diff --git a/capi/dali/public-api/common/constants.h b/dali/public-api/common/constants.h similarity index 99% rename from capi/dali/public-api/common/constants.h rename to dali/public-api/common/constants.h index 46ccac0..053642a 100644 --- a/capi/dali/public-api/common/constants.h +++ b/dali/public-api/common/constants.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_COMMON_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include // M_PI @@ -180,7 +175,4 @@ extern const std::string EMPTY; ///< The empty string } // namespace Dali -/** - * @} - */ #endif // __DALI_CONSTANTS_H__ diff --git a/capi/dali/public-api/common/dali-common.h b/dali/public-api/common/dali-common.h similarity index 98% rename from capi/dali/public-api/common/dali-common.h rename to dali/public-api/common/dali-common.h index 383626e..e866ef2 100644 --- a/capi/dali/public-api/common/dali-common.h +++ b/dali/public-api/common/dali-common.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_COMMON_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include #include @@ -154,7 +149,4 @@ public: #define DALI_ASSERT_DEBUG(cond) #endif -/** - * @} - */ #endif // __DALI_COMMON_H__ diff --git a/capi/dali/public-api/common/intrusive-ptr.h b/dali/public-api/common/intrusive-ptr.h similarity index 99% rename from capi/dali/public-api/common/intrusive-ptr.h rename to dali/public-api/common/intrusive-ptr.h index a7c0501..654c125 100644 --- a/capi/dali/public-api/common/intrusive-ptr.h +++ b/dali/public-api/common/intrusive-ptr.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -305,7 +300,4 @@ templateinline T* get_pointer(IntrusivePtr const& rhs) } // namespace Dali -/** - * @} - */ #endif /* __DALI_INTRUSIVE_PTR_H__ */ diff --git a/capi/dali/public-api/common/loading-state.h b/dali/public-api/common/loading-state.h similarity index 94% rename from capi/dali/public-api/common/loading-state.h rename to dali/public-api/common/loading-state.h index a5fcdd9..fe859af 100644 --- a/capi/dali/public-api/common/loading-state.h +++ b/dali/public-api/common/loading-state.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_COMMON_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -41,7 +36,4 @@ enum LoadingState } // namespace Dali -/** - * @} - */ #endif // __DALI_LOADING_STATE_H__ diff --git a/capi/dali/public-api/common/stage.h b/dali/public-api/common/stage.h similarity index 99% rename from capi/dali/public-api/common/stage.h rename to dali/public-api/common/stage.h index d8df880..94ac6c5 100644 --- a/capi/dali/public-api/common/stage.h +++ b/dali/public-api/common/stage.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_COMMON_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -286,7 +281,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_STAGE_H__ diff --git a/capi/dali/public-api/common/vector-wrapper.h b/dali/public-api/common/vector-wrapper.h similarity index 95% rename from capi/dali/public-api/common/vector-wrapper.h rename to dali/public-api/common/vector-wrapper.h index 00f572a..c0a2727 100644 --- a/capi/dali/public-api/common/vector-wrapper.h +++ b/dali/public-api/common/vector-wrapper.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_COMMON_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -49,7 +44,4 @@ #endif //ifndef HIDE_DALI_INTERNALS -/** - * @} - */ #endif /* __VECTOR_WRAPPER__H__ */ diff --git a/capi/dali/public-api/common/view-mode.h b/dali/public-api/common/view-mode.h similarity index 100% rename from capi/dali/public-api/common/view-mode.h rename to dali/public-api/common/view-mode.h diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h index 21b55d8..019c70e 100644 --- a/dali/public-api/dali-core.h +++ b/dali/public-api/dali-core.h @@ -18,18 +18,45 @@ * */ -#include - -// NON-CAPI PUBLIC INCLUDES +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include #include -#include +#include +#include +#include #include #include @@ -39,29 +66,100 @@ #include #include +#include +#include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include #include +#include +#include +#include +#include +#include +#include #include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + #endif // __DALI_CORE_H__ diff --git a/capi/dali/public-api/events/gesture-detector.h b/dali/public-api/events/gesture-detector.h similarity index 98% rename from capi/dali/public-api/events/gesture-detector.h rename to dali/public-api/events/gesture-detector.h index 719da30..fa321d0 100644 --- a/capi/dali/public-api/events/gesture-detector.h +++ b/dali/public-api/events/gesture-detector.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -131,7 +126,4 @@ protected: } // namespace Dali -/** - * @} - */ #endif // __DALI_GESTURE_DETECTOR_H__ diff --git a/capi/dali/public-api/events/gesture.h b/dali/public-api/events/gesture.h similarity index 97% rename from capi/dali/public-api/events/gesture.h rename to dali/public-api/events/gesture.h index 870ee3c..9fb1681 100644 --- a/capi/dali/public-api/events/gesture.h +++ b/dali/public-api/events/gesture.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -120,7 +115,4 @@ protected: // Creation } // namespace Dali -/** - * @} - */ #endif // __DALI_GESTURE_H__ diff --git a/capi/dali/public-api/events/key-event.h b/dali/public-api/events/key-event.h similarity index 98% rename from capi/dali/public-api/events/key-event.h rename to dali/public-api/events/key-event.h index 0fda706..942f944 100644 --- a/capi/dali/public-api/events/key-event.h +++ b/dali/public-api/events/key-event.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -141,7 +136,4 @@ struct KeyEvent } // namespace Dali -/** - * @} - */ #endif // __DALI_KEY_EVENT_H__ diff --git a/capi/dali/public-api/events/long-press-gesture-detector.h b/dali/public-api/events/long-press-gesture-detector.h similarity index 98% rename from capi/dali/public-api/events/long-press-gesture-detector.h rename to dali/public-api/events/long-press-gesture-detector.h index e7cdfab..0014c6b 100644 --- a/capi/dali/public-api/events/long-press-gesture-detector.h +++ b/dali/public-api/events/long-press-gesture-detector.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -196,7 +191,4 @@ public: // Not intended for Application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_LONG_PRESS_GESTURE_DETECTOR_H__ diff --git a/capi/dali/public-api/events/long-press-gesture.h b/dali/public-api/events/long-press-gesture.h similarity index 97% rename from capi/dali/public-api/events/long-press-gesture.h rename to dali/public-api/events/long-press-gesture.h index f08b446..7258f0a 100644 --- a/capi/dali/public-api/events/long-press-gesture.h +++ b/dali/public-api/events/long-press-gesture.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -92,7 +87,4 @@ struct LongPressGesture : public Gesture } // namespace Dali -/** - * @} - */ #endif // __DALI_LONG_PRESS_GESTURE_H__ diff --git a/capi/dali/public-api/events/pan-gesture-detector.h b/dali/public-api/events/pan-gesture-detector.h similarity index 99% rename from capi/dali/public-api/events/pan-gesture-detector.h rename to dali/public-api/events/pan-gesture-detector.h index f9786f8..aa06f44 100644 --- a/capi/dali/public-api/events/pan-gesture-detector.h +++ b/dali/public-api/events/pan-gesture-detector.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -300,7 +295,4 @@ public: // Not intended for Application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_PAN_GESTURE_DETECTOR_H__ diff --git a/capi/dali/public-api/events/pan-gesture.h b/dali/public-api/events/pan-gesture.h similarity index 98% rename from capi/dali/public-api/events/pan-gesture.h rename to dali/public-api/events/pan-gesture.h index b797630..436a0f7 100644 --- a/capi/dali/public-api/events/pan-gesture.h +++ b/dali/public-api/events/pan-gesture.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -169,7 +164,4 @@ struct PanGesture: public Gesture } // namespace Dali -/** - * @} - */ #endif // __DALI_PAN_GESTURE_H__ diff --git a/capi/dali/public-api/events/pinch-gesture-detector.h b/dali/public-api/events/pinch-gesture-detector.h similarity index 98% rename from capi/dali/public-api/events/pinch-gesture-detector.h rename to dali/public-api/events/pinch-gesture-detector.h index fa49fa7..dcc5374 100644 --- a/capi/dali/public-api/events/pinch-gesture-detector.h +++ b/dali/public-api/events/pinch-gesture-detector.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -130,7 +125,4 @@ public: // Not intended for Application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_PINCH_GESTURE_DETECTOR_H__ diff --git a/capi/dali/public-api/events/pinch-gesture.h b/dali/public-api/events/pinch-gesture.h similarity index 97% rename from capi/dali/public-api/events/pinch-gesture.h rename to dali/public-api/events/pinch-gesture.h index 4eb6009..0953fe8 100644 --- a/capi/dali/public-api/events/pinch-gesture.h +++ b/dali/public-api/events/pinch-gesture.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -98,7 +93,4 @@ struct PinchGesture: public Gesture } // namespace Dali -/** - * @} - */ #endif // __DALI_PINCH_GESTURE_H__ diff --git a/capi/dali/public-api/events/tap-gesture-detector.h b/dali/public-api/events/tap-gesture-detector.h similarity index 98% rename from capi/dali/public-api/events/tap-gesture-detector.h rename to dali/public-api/events/tap-gesture-detector.h index cb0c5db..4dc11f42 100644 --- a/capi/dali/public-api/events/tap-gesture-detector.h +++ b/dali/public-api/events/tap-gesture-detector.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -181,7 +176,4 @@ public: // Not intended for Application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_TAP_GESTURE_DETECTOR_H__ diff --git a/capi/dali/public-api/events/tap-gesture.h b/dali/public-api/events/tap-gesture.h similarity index 97% rename from capi/dali/public-api/events/tap-gesture.h rename to dali/public-api/events/tap-gesture.h index 80eff0d..e8c89c8 100644 --- a/capi/dali/public-api/events/tap-gesture.h +++ b/dali/public-api/events/tap-gesture.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -91,7 +86,4 @@ struct TapGesture : public Gesture } // namespace Dali -/** - * @} - */ #endif // __DALI_TAP_GESTURE_H__ diff --git a/capi/dali/public-api/events/touch-event.h b/dali/public-api/events/touch-event.h similarity index 97% rename from capi/dali/public-api/events/touch-event.h rename to dali/public-api/events/touch-event.h index 6dc2ae9..e068726 100644 --- a/capi/dali/public-api/events/touch-event.h +++ b/dali/public-api/events/touch-event.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -99,7 +94,4 @@ struct DALI_IMPORT_API TouchEvent } // namespace Dali -/** - * @} - */ #endif // __DALI_TOUCH_EVENT_H__ diff --git a/capi/dali/public-api/events/touch-point.h b/dali/public-api/events/touch-point.h similarity index 98% rename from capi/dali/public-api/events/touch-point.h rename to dali/public-api/events/touch-point.h index 28592c6..d5038ef 100644 --- a/capi/dali/public-api/events/touch-point.h +++ b/dali/public-api/events/touch-point.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_EVENTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -119,7 +114,4 @@ struct TouchPoint } // namespace Dali -/** - * @} - */ #endif // __DALI_TOUCH_POINT_H__ diff --git a/dali/public-api/file.list b/dali/public-api/file.list index 66a3569..378721a 100644 --- a/dali/public-api/file.list +++ b/dali/public-api/file.list @@ -122,18 +122,48 @@ public_api_header_files = \ $(public_api_src_dir)/dali-core.h public_api_core_actors_header_files = \ + $(public_api_src_dir)/actors/actor.h \ + $(public_api_src_dir)/actors/actor-enumerations.h \ + $(public_api_src_dir)/actors/blending.h \ + $(public_api_src_dir)/actors/camera-actor.h \ + $(public_api_src_dir)/actors/custom-actor.h \ + $(public_api_src_dir)/actors/custom-actor-impl.h \ + $(public_api_src_dir)/actors/draw-mode.h \ + $(public_api_src_dir)/actors/image-actor.h \ + $(public_api_src_dir)/actors/layer.h \ $(public_api_src_dir)/actors/light-actor.h \ - $(public_api_src_dir)/actors/model-actor-factory.h + $(public_api_src_dir)/actors/mesh-actor.h \ + $(public_api_src_dir)/actors/model-actor-factory.h \ + $(public_api_src_dir)/actors/text-actor.h \ + $(public_api_src_dir)/actors/renderable-actor.h public_api_core_animation_header_files = \ - $(public_api_src_dir)/animation/animator-functions.h + $(public_api_src_dir)/animation/active-constraint.h \ + $(public_api_src_dir)/animation/active-constraint-declarations.h \ + $(public_api_src_dir)/animation/alpha-functions.h \ + $(public_api_src_dir)/animation/animation.h \ + $(public_api_src_dir)/animation/animator-functions.h \ + $(public_api_src_dir)/animation/constraint.h \ + $(public_api_src_dir)/animation/constraints.h \ + $(public_api_src_dir)/animation/constraint-functions.h \ + $(public_api_src_dir)/animation/constraint-source.h \ + $(public_api_src_dir)/animation/interpolator-functions.h \ + $(public_api_src_dir)/animation/key-frames.h \ + $(public_api_src_dir)/animation/time-period.h public_api_core_common_header_files = \ + $(public_api_src_dir)/common/constants.h \ + $(public_api_src_dir)/common/dali-common.h \ $(public_api_src_dir)/common/dali-vector.h \ + $(public_api_src_dir)/common/intrusive-ptr.h \ + $(public_api_src_dir)/common/light.h \ + $(public_api_src_dir)/common/loading-state.h \ $(public_api_src_dir)/common/map-wrapper.h \ - $(public_api_src_dir)/common/set-wrapper.h \ $(public_api_src_dir)/common/ref-counted-dali-vector.h \ - $(public_api_src_dir)/common/light.h + $(public_api_src_dir)/common/set-wrapper.h \ + $(public_api_src_dir)/common/stage.h \ + $(public_api_src_dir)/common/vector-wrapper.h \ + $(public_api_src_dir)/common/view-mode.h public_api_core_dynamics_header_files = \ $(public_api_src_dir)/dynamics/dynamics-body.h \ @@ -145,10 +175,25 @@ public_api_core_dynamics_header_files = \ $(public_api_src_dir)/dynamics/dynamics-world-config.h public_api_core_events_header_files = \ + $(public_api_src_dir)/events/gesture.h \ + $(public_api_src_dir)/events/gesture-detector.h \ $(public_api_src_dir)/events/hit-test-algorithm.h \ - $(public_api_src_dir)/events/mouse-wheel-event.h + $(public_api_src_dir)/events/key-event.h \ + $(public_api_src_dir)/events/long-press-gesture.h \ + $(public_api_src_dir)/events/long-press-gesture-detector.h \ + $(public_api_src_dir)/events/mouse-wheel-event.h \ + $(public_api_src_dir)/events/pan-gesture.h \ + $(public_api_src_dir)/events/pan-gesture-detector.h \ + $(public_api_src_dir)/events/pinch-gesture.h \ + $(public_api_src_dir)/events/pinch-gesture-detector.h \ + $(public_api_src_dir)/events/tap-gesture.h \ + $(public_api_src_dir)/events/tap-gesture-detector.h \ + $(public_api_src_dir)/events/touch-point.h \ + $(public_api_src_dir)/events/touch-event.h public_api_core_geometry_header_files = \ + $(public_api_src_dir)/geometry/animatable-mesh.h \ + $(public_api_src_dir)/geometry/animatable-vertex.h \ $(public_api_src_dir)/geometry/cloth.h \ $(public_api_src_dir)/geometry/mesh.h \ $(public_api_src_dir)/geometry/mesh-data.h \ @@ -156,32 +201,87 @@ public_api_core_geometry_header_files = \ $(public_api_src_dir)/geometry/spline.h public_api_core_images_header_files = \ + $(public_api_src_dir)/images/bitmap-image.h \ $(public_api_src_dir)/images/distance-field.h \ + $(public_api_src_dir)/images/encoded-buffer-image.h \ + $(public_api_src_dir)/images/frame-buffer-image.h \ + $(public_api_src_dir)/images/glyph-image.h \ + $(public_api_src_dir)/images/image.h \ + $(public_api_src_dir)/images/image-attributes.h \ + $(public_api_src_dir)/images/native-image.h \ $(public_api_src_dir)/images/nine-patch-image.h \ - $(public_api_src_dir)/images/glyph-image.h + $(public_api_src_dir)/images/pixel.h -public_api_core_math_header_files = +public_api_core_math_header_files = \ + $(public_api_src_dir)/math/angle-axis.h \ + $(public_api_src_dir)/math/compile-time-assert.h \ + $(public_api_src_dir)/math/compile-time-math.h \ + $(public_api_src_dir)/math/degree.h \ + $(public_api_src_dir)/math/math-utils.h \ + $(public_api_src_dir)/math/matrix.h \ + $(public_api_src_dir)/math/matrix3.h \ + $(public_api_src_dir)/math/quaternion.h \ + $(public_api_src_dir)/math/radian.h \ + $(public_api_src_dir)/math/random.h \ + $(public_api_src_dir)/math/rect.h \ + $(public_api_src_dir)/math/vector2.h \ + $(public_api_src_dir)/math/vector3.h \ + $(public_api_src_dir)/math/vector4.h \ + $(public_api_src_dir)/math/viewport.h public_api_core_modeling_header_files = \ $(public_api_src_dir)/modeling/bone.h \ $(public_api_src_dir)/modeling/entity-animator-map.h \ $(public_api_src_dir)/modeling/entity.h \ + $(public_api_src_dir)/modeling/material.h \ $(public_api_src_dir)/modeling/model-animation-map.h \ $(public_api_src_dir)/modeling/model-data.h \ $(public_api_src_dir)/modeling/model.h public_api_core_object_header_files = \ + $(public_api_src_dir)/object/any.h \ + $(public_api_src_dir)/object/base-handle.h \ + $(public_api_src_dir)/object/base-object.h \ + $(public_api_src_dir)/object/constrainable.h \ + $(public_api_src_dir)/object/handle.h \ + $(public_api_src_dir)/object/object-registry.h \ + $(public_api_src_dir)/object/property-conditions.h \ + $(public_api_src_dir)/object/property-index.h \ + $(public_api_src_dir)/object/property-input.h \ + $(public_api_src_dir)/object/property-notification-declarations.h \ + $(public_api_src_dir)/object/property-notification.h \ + $(public_api_src_dir)/object/property-types.h \ + $(public_api_src_dir)/object/property-value.h \ + $(public_api_src_dir)/object/property.h \ + $(public_api_src_dir)/object/ref-object.h \ $(public_api_src_dir)/object/type-info.h \ $(public_api_src_dir)/object/type-registry.h -public_api_core_render_tasks_header_files = +public_api_core_render_tasks_header_files = \ + $(public_api_src_dir)/render-tasks/render-task.h \ + $(public_api_src_dir)/render-tasks/render-task-list.h -public_api_core_shader_effects_header_files = +public_api_core_shader_effects_header_files = \ + $(public_api_src_dir)/shader-effects/shader-effect.h public_api_core_scripting_header_files = \ $(public_api_src_dir)/scripting/scripting.h -public_api_core_signals_header_files = +public_api_core_signals_header_files = \ + $(public_api_src_dir)/signals/base-signal.h \ + $(public_api_src_dir)/signals/callback.h \ + $(public_api_src_dir)/signals/connection-tracker-interface.h \ + $(public_api_src_dir)/signals/connection-tracker.h \ + $(public_api_src_dir)/signals/dali-signal-v2.h \ + $(public_api_src_dir)/signals/functor-delegate.h \ + $(public_api_src_dir)/signals/signal-slot-connections.h \ + $(public_api_src_dir)/signals/signal-slot-observers.h \ + $(public_api_src_dir)/signals/slot-delegate.h public_api_core_text_header_files = \ + $(public_api_src_dir)/text/character.h \ + $(public_api_src_dir)/text/font.h \ + $(public_api_src_dir)/text/font-parameters.h \ + $(public_api_src_dir)/text/text.h \ + $(public_api_src_dir)/text/text-style.h \ $(public_api_src_dir)/text/utf8.h diff --git a/capi/dali/public-api/geometry/animatable-mesh.h b/dali/public-api/geometry/animatable-mesh.h similarity index 98% rename from capi/dali/public-api/geometry/animatable-mesh.h rename to dali/public-api/geometry/animatable-mesh.h index 88a41eb..86ed1c3 100644 --- a/capi/dali/public-api/geometry/animatable-mesh.h +++ b/dali/public-api/geometry/animatable-mesh.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_GEOMETRY_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -165,7 +160,4 @@ public: // Not for use by application developer }// Dali -/** - * @} - */ #endif diff --git a/capi/dali/public-api/geometry/animatable-vertex.h b/dali/public-api/geometry/animatable-vertex.h similarity index 97% rename from capi/dali/public-api/geometry/animatable-vertex.h rename to dali/public-api/geometry/animatable-vertex.h index 3c0fb62..21ba4cd 100644 --- a/capi/dali/public-api/geometry/animatable-vertex.h +++ b/dali/public-api/geometry/animatable-vertex.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_GEOMETRY_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -134,7 +129,4 @@ private: }//Dali -/** - * @} - */ #endif diff --git a/capi/dali/public-api/images/bitmap-image.h b/dali/public-api/images/bitmap-image.h similarity index 99% rename from capi/dali/public-api/images/bitmap-image.h rename to dali/public-api/images/bitmap-image.h index 5020362..42388d7 100644 --- a/capi/dali/public-api/images/bitmap-image.h +++ b/dali/public-api/images/bitmap-image.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_IMAGES_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -280,7 +275,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_BITMAP_IMAGE_H__ diff --git a/capi/dali/public-api/images/encoded-buffer-image.h b/dali/public-api/images/encoded-buffer-image.h similarity index 98% rename from capi/dali/public-api/images/encoded-buffer-image.h rename to dali/public-api/images/encoded-buffer-image.h index 6c03275..c5f44c1 100644 --- a/capi/dali/public-api/images/encoded-buffer-image.h +++ b/dali/public-api/images/encoded-buffer-image.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_IMAGES_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -141,7 +136,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_ENCODED_BUFFER_IMAGE_H__ diff --git a/capi/dali/public-api/images/frame-buffer-image.h b/dali/public-api/images/frame-buffer-image.h similarity index 98% rename from capi/dali/public-api/images/frame-buffer-image.h rename to dali/public-api/images/frame-buffer-image.h index 5f48065..41b5c53 100644 --- a/capi/dali/public-api/images/frame-buffer-image.h +++ b/dali/public-api/images/frame-buffer-image.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_IMAGES_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -139,7 +134,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_FRAME_BUFFER_IMAGE_H__ diff --git a/capi/dali/public-api/images/image-attributes.h b/dali/public-api/images/image-attributes.h similarity index 99% rename from capi/dali/public-api/images/image-attributes.h rename to dali/public-api/images/image-attributes.h index c2fc7c9..3714d8f 100644 --- a/capi/dali/public-api/images/image-attributes.h +++ b/dali/public-api/images/image-attributes.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_IMAGES_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -330,7 +325,4 @@ bool operator!=(const ImageAttributes& a, const ImageAttributes& b); } // namespace Dali -/** - * @} - */ #endif // __DALI_IMAGE_ATTRIBUTES_H__ diff --git a/capi/dali/public-api/images/image.h b/dali/public-api/images/image.h similarity index 99% rename from capi/dali/public-api/images/image.h rename to dali/public-api/images/image.h index bca77ff..de5dfe1 100644 --- a/capi/dali/public-api/images/image.h +++ b/dali/public-api/images/image.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_IMAGES_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -375,7 +370,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_IMAGE_H__ diff --git a/capi/dali/public-api/images/native-image.h b/dali/public-api/images/native-image.h similarity index 97% rename from capi/dali/public-api/images/native-image.h rename to dali/public-api/images/native-image.h index fc09848..9723201 100644 --- a/capi/dali/public-api/images/native-image.h +++ b/dali/public-api/images/native-image.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_IMAGES_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -112,7 +107,4 @@ typedef IntrusivePtr NativeImagePtr; } // namespace Dali -/** - * @} - */ #endif // __DALI_INTEGRATION_NATIVE_IMAGE_H__ diff --git a/capi/dali/public-api/images/pixel.h b/dali/public-api/images/pixel.h similarity index 98% rename from capi/dali/public-api/images/pixel.h rename to dali/public-api/images/pixel.h index 91e40c0..46320b5 100644 --- a/capi/dali/public-api/images/pixel.h +++ b/dali/public-api/images/pixel.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_IMAGES_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -118,7 +113,4 @@ void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, int& bitMask); } // namespace Dali -/** - * @} - */ #endif // __DALI_PIXEL_H__ diff --git a/capi/dali/public-api/math/angle-axis.h b/dali/public-api/math/angle-axis.h similarity index 96% rename from capi/dali/public-api/math/angle-axis.h rename to dali/public-api/math/angle-axis.h index d817128..488f917 100644 --- a/capi/dali/public-api/math/angle-axis.h +++ b/dali/public-api/math/angle-axis.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -68,7 +63,4 @@ struct DALI_IMPORT_API AngleAxis } // namespace Dali -/** - * @} - */ #endif // __DALI_ANGLE_AXIS_H__ diff --git a/capi/dali/public-api/math/compile-time-assert.h b/dali/public-api/math/compile-time-assert.h similarity index 95% rename from capi/dali/public-api/math/compile-time-assert.h rename to dali/public-api/math/compile-time-assert.h index a2e08d4..d022ab6 100644 --- a/capi/dali/public-api/math/compile-time-assert.h +++ b/dali/public-api/math/compile-time-assert.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -46,7 +41,4 @@ template struct CompileTimeAssertInt {}; ///< Template to wrap conditi } // namespace Dali -/** - * @} - */ #endif // __DALI_COMPILE_TIME_ASSERT_H__ diff --git a/capi/dali/public-api/math/compile-time-math.h b/dali/public-api/math/compile-time-math.h similarity index 98% rename from capi/dali/public-api/math/compile-time-math.h rename to dali/public-api/math/compile-time-math.h index 37c5dc0..9d90040 100644 --- a/capi/dali/public-api/math/compile-time-math.h +++ b/dali/public-api/math/compile-time-math.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -161,7 +156,4 @@ struct Epsilon< 0 > } // namespace Dali -/** - * @} - */ #endif // __DALI_COMPILE_TIME_MATH_H__ diff --git a/capi/dali/public-api/math/degree.h b/dali/public-api/math/degree.h similarity index 97% rename from capi/dali/public-api/math/degree.h rename to dali/public-api/math/degree.h index fd78b29..a973050 100644 --- a/capi/dali/public-api/math/degree.h +++ b/dali/public-api/math/degree.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -114,7 +109,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_DEGREE_H__ diff --git a/capi/dali/public-api/math/math-utils.h b/dali/public-api/math/math-utils.h similarity index 98% rename from capi/dali/public-api/math/math-utils.h rename to dali/public-api/math/math-utils.h index 3700629..22336a3 100644 --- a/capi/dali/public-api/math/math-utils.h +++ b/dali/public-api/math/math-utils.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include // std::min & max @@ -204,7 +199,4 @@ DALI_IMPORT_API float ShortestDistanceInDomain(float a, float b, float start, fl } // namespace Dali -/** - * @} - */ #endif // __DALI_MATH_UTILS_H__ diff --git a/capi/dali/public-api/math/matrix.h b/dali/public-api/math/matrix.h similarity index 99% rename from capi/dali/public-api/math/matrix.h rename to dali/public-api/math/matrix.h index bf7f912..2a3a4cf 100644 --- a/capi/dali/public-api/math/matrix.h +++ b/dali/public-api/math/matrix.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -365,7 +360,4 @@ DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Matrix& matrix) } // namespace Dali -/** - * @} - */ #endif // __DALI_MATRIX_H__ diff --git a/capi/dali/public-api/math/matrix3.h b/dali/public-api/math/matrix3.h similarity index 98% rename from capi/dali/public-api/math/matrix3.h rename to dali/public-api/math/matrix3.h index f15571a..2c8a3bb 100644 --- a/capi/dali/public-api/math/matrix3.h +++ b/dali/public-api/math/matrix3.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -217,7 +212,4 @@ DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Matrix3& matrix } // namespace Dali -/** - * @} - */ #endif //__DALI_MATRIX3_H__ diff --git a/capi/dali/public-api/math/quaternion.h b/dali/public-api/math/quaternion.h similarity index 99% rename from capi/dali/public-api/math/quaternion.h rename to dali/public-api/math/quaternion.h index 410e092..e298c85 100644 --- a/capi/dali/public-api/math/quaternion.h +++ b/dali/public-api/math/quaternion.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include #include @@ -459,7 +454,4 @@ DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Quaternion& qua } // namespace Dali -/** - * @} - */ #endif // __DALI_QUATERNION_H__ diff --git a/capi/dali/public-api/math/radian.h b/dali/public-api/math/radian.h similarity index 97% rename from capi/dali/public-api/math/radian.h rename to dali/public-api/math/radian.h index 6820c12..0d3bc2d 100644 --- a/capi/dali/public-api/math/radian.h +++ b/dali/public-api/math/radian.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -112,7 +107,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_RADIAN_H__ diff --git a/capi/dali/public-api/math/random.h b/dali/public-api/math/random.h similarity index 97% rename from capi/dali/public-api/math/random.h rename to dali/public-api/math/random.h index 053161b..b0eb321 100644 --- a/capi/dali/public-api/math/random.h +++ b/dali/public-api/math/random.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -86,7 +81,4 @@ inline bool Chance(float chance = 0.5f) } // namespace Dali -/** - * @} - */ #endif // __DALI_RANDOM_H__ diff --git a/capi/dali/public-api/math/rect.h b/dali/public-api/math/rect.h similarity index 98% rename from capi/dali/public-api/math/rect.h rename to dali/public-api/math/rect.h index b4ca768..3c33d77 100644 --- a/capi/dali/public-api/math/rect.h +++ b/dali/public-api/math/rect.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -271,7 +266,4 @@ inline bool Rect::IsEmpty() const } // namespace Dali -/** - * @} - */ #endif // __DALI_RECT_H__ diff --git a/capi/dali/public-api/math/vector2.h b/dali/public-api/math/vector2.h similarity index 99% rename from capi/dali/public-api/math/vector2.h rename to dali/public-api/math/vector2.h index 714874f..a5a8071 100644 --- a/capi/dali/public-api/math/vector2.h +++ b/dali/public-api/math/vector2.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include #include @@ -513,7 +508,4 @@ DALI_IMPORT_API Size ShrinkInside( const Size& target, const Size& source ); } // namespace Dali -/** - * @} - */ #endif // __DALI_VECTOR_2_H__ diff --git a/capi/dali/public-api/math/vector3.h b/dali/public-api/math/vector3.h similarity index 99% rename from capi/dali/public-api/math/vector3.h rename to dali/public-api/math/vector3.h index 23e0031..079d25a 100644 --- a/capi/dali/public-api/math/vector3.h +++ b/dali/public-api/math/vector3.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include #include @@ -608,7 +603,4 @@ Vector3 ShrinkInsideKeepAspectRatio( const Vector3& target, const Vector3& sourc } // namespace Dali -/** - * @} - */ #endif // __DALI_VECTOR_3_H__ diff --git a/capi/dali/public-api/math/vector4.h b/dali/public-api/math/vector4.h similarity index 99% rename from capi/dali/public-api/math/vector4.h rename to dali/public-api/math/vector4.h index 76358bf..8461d9b 100644 --- a/capi/dali/public-api/math/vector4.h +++ b/dali/public-api/math/vector4.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include #include @@ -564,7 +559,4 @@ DALI_IMPORT_API Vector4 Clamp( const Vector4& v, const float& min, const float& } // namespace Dali -/** - * @} - */ #endif // __DALI_VECTOR_4_H__ diff --git a/capi/dali/public-api/math/viewport.h b/dali/public-api/math/viewport.h similarity index 93% rename from capi/dali/public-api/math/viewport.h rename to dali/public-api/math/viewport.h index 4f7042f..7b8bb4e 100644 --- a/capi/dali/public-api/math/viewport.h +++ b/dali/public-api/math/viewport.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MATH_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -36,7 +31,4 @@ typedef Rect Viewport; } // namespace Dali -/** - * @} - */ #endif // __DALI_VIEWPORT_H__ diff --git a/capi/dali/public-api/modeling/material.h b/dali/public-api/modeling/material.h similarity index 99% rename from capi/dali/public-api/modeling/material.h rename to dali/public-api/modeling/material.h index c3850fd..e5a1c0a 100644 --- a/capi/dali/public-api/modeling/material.h +++ b/dali/public-api/modeling/material.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_MODELING_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -388,7 +383,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_MATERIAL_H__ diff --git a/capi/dali/public-api/object/any.h b/dali/public-api/object/any.h similarity index 99% rename from capi/dali/public-api/object/any.h rename to dali/public-api/object/any.h index 8542d0f..2d01667 100644 --- a/capi/dali/public-api/object/any.h +++ b/dali/public-api/object/any.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include // operator typeid @@ -455,7 +450,4 @@ templateinline const Type& AnyCastReference( const Any& any ) } // namespace Dali -/** - * @} - */ #endif // __DALI_ANY_TYPE_H__ diff --git a/capi/dali/public-api/object/base-handle.h b/dali/public-api/object/base-handle.h similarity index 99% rename from capi/dali/public-api/object/base-handle.h rename to dali/public-api/object/base-handle.h index 51344c4..cdf7b42 100644 --- a/capi/dali/public-api/object/base-handle.h +++ b/dali/public-api/object/base-handle.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -291,7 +286,4 @@ bool operator<(const BaseHandle& lhs, const BaseHandle& rhs); } // namespace Dali -/** - * @} - */ #endif // __DALI_BASE_HANDLE_H__ diff --git a/capi/dali/public-api/object/base-object.h b/dali/public-api/object/base-object.h similarity index 98% rename from capi/dali/public-api/object/base-object.h rename to dali/public-api/object/base-object.h index 84e6798..c6081a0 100644 --- a/capi/dali/public-api/object/base-object.h +++ b/dali/public-api/object/base-object.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -134,7 +129,4 @@ inline const BaseObject& GetImplementation(const Dali::BaseHandle& handle) } // namespace Dali -/** - * @} - */ # endif // __DALI_BASE_OBJECT_H__ diff --git a/capi/dali/public-api/object/constrainable.h b/dali/public-api/object/constrainable.h similarity index 98% rename from capi/dali/public-api/object/constrainable.h rename to dali/public-api/object/constrainable.h index 73b917a..de697f8 100644 --- a/capi/dali/public-api/object/constrainable.h +++ b/dali/public-api/object/constrainable.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -167,7 +162,4 @@ Constrainable New(); } // namespace Dali -/** - * @} - */ #endif // __DALI_CONSTRAINABLE_H__ diff --git a/capi/dali/public-api/object/handle.h b/dali/public-api/object/handle.h similarity index 99% rename from capi/dali/public-api/object/handle.h rename to dali/public-api/object/handle.h index a4cd607..7a3a3bf 100644 --- a/capi/dali/public-api/object/handle.h +++ b/dali/public-api/object/handle.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -297,7 +292,4 @@ public: } // namespace Dali -/** - * @} - */ #endif // __DALI_HANDLE_H__ diff --git a/capi/dali/public-api/object/object-registry.h b/dali/public-api/object/object-registry.h similarity index 98% rename from capi/dali/public-api/object/object-registry.h rename to dali/public-api/object/object-registry.h index f4a0e7e..537d9c9 100644 --- a/capi/dali/public-api/object/object-registry.h +++ b/dali/public-api/object/object-registry.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -143,7 +138,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_OBJECT_REGISTRY_H__ diff --git a/capi/dali/public-api/object/property-conditions.h b/dali/public-api/object/property-conditions.h similarity index 98% rename from capi/dali/public-api/object/property-conditions.h rename to dali/public-api/object/property-conditions.h index e73fa5c..d8b4449 100644 --- a/capi/dali/public-api/object/property-conditions.h +++ b/dali/public-api/object/property-conditions.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -173,7 +168,4 @@ PropertyCondition VariableStepCondition(const std::vector& steps); } // namespace Dali -/** - * @} - */ #endif // __DALI_PROPERTY_CONDITIONS_H__ diff --git a/capi/dali/public-api/object/property-index.h b/dali/public-api/object/property-index.h similarity index 95% rename from capi/dali/public-api/object/property-index.h rename to dali/public-api/object/property-index.h index 82fcd88..8a68340 100644 --- a/capi/dali/public-api/object/property-index.h +++ b/dali/public-api/object/property-index.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -44,7 +39,4 @@ enum } // namespace Dali -/** - * @} - */ #endif // __DALI_PROPERTY_INDEX_H__ diff --git a/capi/dali/public-api/object/property-input.h b/dali/public-api/object/property-input.h similarity index 97% rename from capi/dali/public-api/object/property-input.h rename to dali/public-api/object/property-input.h index c10cbef..0fbeacc 100644 --- a/capi/dali/public-api/object/property-input.h +++ b/dali/public-api/object/property-input.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -122,7 +117,4 @@ public: } // namespace Dali -/** - * @} - */ #endif // __DALI_PROPERTY_INPUT_H__ diff --git a/capi/dali/public-api/object/property-notification-declarations.h b/dali/public-api/object/property-notification-declarations.h similarity index 95% rename from capi/dali/public-api/object/property-notification-declarations.h rename to dali/public-api/object/property-notification-declarations.h index 8cd499e..6cfa758 100644 --- a/capi/dali/public-api/object/property-notification-declarations.h +++ b/dali/public-api/object/property-notification-declarations.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -47,7 +42,4 @@ typedef boost::function PropertyNotifyCallb } // namespace Dali -/** - * @} - */ #endif // __DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H__ diff --git a/capi/dali/public-api/object/property-notification.h b/dali/public-api/object/property-notification.h similarity index 98% rename from capi/dali/public-api/object/property-notification.h rename to dali/public-api/object/property-notification.h index 4b74624..3ca1479 100644 --- a/capi/dali/public-api/object/property-notification.h +++ b/dali/public-api/object/property-notification.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -159,7 +154,4 @@ public: // Not intended for use by Application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_PROPERTY_NOTIFICATION_H__ diff --git a/capi/dali/public-api/object/property-types.h b/dali/public-api/object/property-types.h similarity index 97% rename from capi/dali/public-api/object/property-types.h rename to dali/public-api/object/property-types.h index 4d27ced..a38076a 100644 --- a/capi/dali/public-api/object/property-types.h +++ b/dali/public-api/object/property-types.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -80,7 +75,4 @@ template <> Property::Type Get(); } // namespace Dali -/** - * @} - */ #endif // __DALI_PROPERTY_TYPES_H__ diff --git a/capi/dali/public-api/object/property-value.h b/dali/public-api/object/property-value.h similarity index 98% rename from capi/dali/public-api/object/property-value.h rename to dali/public-api/object/property-value.h index b2b9526..57efa22 100644 --- a/capi/dali/public-api/object/property-value.h +++ b/dali/public-api/object/property-value.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -39,7 +34,7 @@ class Matrix3; class Matrix; /** - * @brief Container of Dali::Property::Value%s. + * @brief Container of Dali::Property::Value. */ typedef std::vector PropertyValueContainer; typedef PropertyValueContainer::iterator PropertyValueIter; ///< Iterator for Dali::PropertyValueContainer @@ -421,7 +416,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_PROPERTY_VALUE_H__ diff --git a/capi/dali/public-api/object/property.h b/dali/public-api/object/property.h similarity index 98% rename from capi/dali/public-api/object/property.h rename to dali/public-api/object/property.h index c9dcb16..7480409 100644 --- a/capi/dali/public-api/object/property.h +++ b/dali/public-api/object/property.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include #include @@ -160,7 +155,4 @@ struct Property } // namespace Dali -/** - * @} - */ #endif // __DALI_PROPERTY_H__ diff --git a/capi/dali/public-api/object/ref-object.h b/dali/public-api/object/ref-object.h similarity index 96% rename from capi/dali/public-api/object/ref-object.h rename to dali/public-api/object/ref-object.h index 883f6f8..66dc65d 100644 --- a/capi/dali/public-api/object/ref-object.h +++ b/dali/public-api/object/ref-object.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_OBJECT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include #include @@ -99,8 +94,4 @@ private: } // namespace Dali - -/** - * @} - */ #endif // __DALI_REF_OBJECT_H__ diff --git a/capi/dali/public-api/render-tasks/render-task-list.h b/dali/public-api/render-tasks/render-task-list.h similarity index 97% rename from capi/dali/public-api/render-tasks/render-task-list.h rename to dali/public-api/render-tasks/render-task-list.h index 1ff2d10..bb02117 100644 --- a/capi/dali/public-api/render-tasks/render-task-list.h +++ b/dali/public-api/render-tasks/render-task-list.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_RENDER_TASKS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -118,7 +113,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif //__DALI_RENDER_TASK_LIST_H__ diff --git a/capi/dali/public-api/render-tasks/render-task.h b/dali/public-api/render-tasks/render-task.h similarity index 99% rename from capi/dali/public-api/render-tasks/render-task.h rename to dali/public-api/render-tasks/render-task.h index aef6daa..939f148 100644 --- a/capi/dali/public-api/render-tasks/render-task.h +++ b/dali/public-api/render-tasks/render-task.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_RENDER_TASKS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -389,7 +384,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif //__DALI_RENDER_TASK_H__ diff --git a/capi/dali/public-api/shader-effects/shader-effect.h b/dali/public-api/shader-effects/shader-effect.h similarity index 99% rename from capi/dali/public-api/shader-effects/shader-effect.h rename to dali/public-api/shader-effects/shader-effect.h index 0625ff0..0f83f5a 100644 --- a/capi/dali/public-api/shader-effects/shader-effect.h +++ b/dali/public-api/shader-effects/shader-effect.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SHADER_EFFECTS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -463,7 +458,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_SHADER_EFFECT_H__ diff --git a/capi/dali/public-api/signals/base-signal.h b/dali/public-api/signals/base-signal.h similarity index 99% rename from capi/dali/public-api/signals/base-signal.h rename to dali/public-api/signals/base-signal.h index 33128c8..e1facb2 100644 --- a/capi/dali/public-api/signals/base-signal.h +++ b/dali/public-api/signals/base-signal.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -499,7 +494,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_BASE_SIGNAL_H__ diff --git a/capi/dali/public-api/signals/callback.h b/dali/public-api/signals/callback.h similarity index 99% rename from capi/dali/public-api/signals/callback.h rename to dali/public-api/signals/callback.h index 4cbf52b..47b7f5d 100644 --- a/capi/dali/public-api/signals/callback.h +++ b/dali/public-api/signals/callback.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -1637,7 +1632,4 @@ inline CallbackBase* MakeCallback( T& object, void(Base::*function)(void) ) } // namespace DALI -/** - * @} - */ #endif // __DALI_CALLBACK_H__ diff --git a/capi/dali/public-api/signals/connection-tracker-interface.h b/dali/public-api/signals/connection-tracker-interface.h similarity index 97% rename from capi/dali/public-api/signals/connection-tracker-interface.h rename to dali/public-api/signals/connection-tracker-interface.h index 48122d7..5ec50d2 100644 --- a/capi/dali/public-api/signals/connection-tracker-interface.h +++ b/dali/public-api/signals/connection-tracker-interface.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -88,7 +83,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_CONNECTION_TRACKER_INTERFACE_H__ diff --git a/capi/dali/public-api/signals/connection-tracker.h b/dali/public-api/signals/connection-tracker.h similarity index 96% rename from capi/dali/public-api/signals/connection-tracker.h rename to dali/public-api/signals/connection-tracker.h index 41fff4e..d1efcbf 100644 --- a/capi/dali/public-api/signals/connection-tracker.h +++ b/dali/public-api/signals/connection-tracker.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -84,7 +79,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_CONNECTION_TRACKER_H__ diff --git a/capi/dali/public-api/signals/dali-signal-v2.h b/dali/public-api/signals/dali-signal-v2.h similarity index 99% rename from capi/dali/public-api/signals/dali-signal-v2.h rename to dali/public-api/signals/dali-signal-v2.h index 78a9df0..1049611 100644 --- a/capi/dali/public-api/signals/dali-signal-v2.h +++ b/dali/public-api/signals/dali-signal-v2.h @@ -19,10 +19,6 @@ */ /** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - * - * @section CAPI_DALI_SIGNALS_MODULE_CONNECTION Connecting signals to C++ member functions * The class should implement Dali::ConnectionTrackerInterface, or inherit from Dali::ConnectionTracker. * This enforces automatic disconnection when an object is destroyed, so you don't have * to manually disconnect from signals. @@ -1309,7 +1305,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_SIGNAL_V2_H__ diff --git a/capi/dali/public-api/signals/functor-delegate.h b/dali/public-api/signals/functor-delegate.h similarity index 98% rename from capi/dali/public-api/signals/functor-delegate.h rename to dali/public-api/signals/functor-delegate.h index 61b2865..5b3891b 100644 --- a/capi/dali/public-api/signals/functor-delegate.h +++ b/dali/public-api/signals/functor-delegate.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -136,7 +131,4 @@ public: // Data for deriving classes & Dispatchers } // namespace DALI -/** - * @} - */ #endif // __DALI_FUNCTOR_DELEGATE_H__ diff --git a/capi/dali/public-api/signals/signal-slot-connections.h b/dali/public-api/signals/signal-slot-connections.h similarity index 98% rename from capi/dali/public-api/signals/signal-slot-connections.h rename to dali/public-api/signals/signal-slot-connections.h index 19d0c13..f81f584 100644 --- a/capi/dali/public-api/signals/signal-slot-connections.h +++ b/dali/public-api/signals/signal-slot-connections.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -150,7 +145,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_SIGNAL_SLOT_CONNECTIONS_H__ diff --git a/capi/dali/public-api/signals/signal-slot-observers.h b/dali/public-api/signals/signal-slot-observers.h similarity index 96% rename from capi/dali/public-api/signals/signal-slot-observers.h rename to dali/public-api/signals/signal-slot-observers.h index 64af3a2..89b7bc0 100644 --- a/capi/dali/public-api/signals/signal-slot-observers.h +++ b/dali/public-api/signals/signal-slot-observers.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -89,7 +84,4 @@ public: } // namespace Dali -/** - * @} - */ #endif // __DALI_SIGNAL_SLOT_OBSERVERS_H__ diff --git a/capi/dali/public-api/signals/slot-delegate.h b/dali/public-api/signals/slot-delegate.h similarity index 97% rename from capi/dali/public-api/signals/slot-delegate.h rename to dali/public-api/signals/slot-delegate.h index ae51134..64529b0 100644 --- a/capi/dali/public-api/signals/slot-delegate.h +++ b/dali/public-api/signals/slot-delegate.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_SIGNALS_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -147,7 +142,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_SLOT_DELEGATE_H__ diff --git a/capi/dali/public-api/text/character.h b/dali/public-api/text/character.h similarity index 98% rename from capi/dali/public-api/text/character.h rename to dali/public-api/text/character.h index 778d26a..1128d61 100644 --- a/capi/dali/public-api/text/character.h +++ b/dali/public-api/text/character.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_TEXT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include @@ -144,7 +139,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_CHARACTER_H__ diff --git a/capi/dali/public-api/text/font-parameters.h b/dali/public-api/text/font-parameters.h similarity index 98% rename from capi/dali/public-api/text/font-parameters.h rename to dali/public-api/text/font-parameters.h index ccc86e1..968d741 100644 --- a/capi/dali/public-api/text/font-parameters.h +++ b/dali/public-api/text/font-parameters.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_TEXT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -205,7 +200,4 @@ extern FontParameters DEFAULT_FONT_PARAMETERS; ///< Used to choose the platform' } // namespace Dali -/** - * @} - */ #endif // __DALI_FONT_PARAMETERS_H__ diff --git a/capi/dali/public-api/text/font.h b/dali/public-api/text/font.h similarity index 99% rename from capi/dali/public-api/text/font.h rename to dali/public-api/text/font.h index b553910..661198c 100644 --- a/capi/dali/public-api/text/font.h +++ b/dali/public-api/text/font.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_TEXT_MODULE - * @{ - */ - // INTERNAL INCLUDES #include #include @@ -433,7 +428,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_FONT_H__ diff --git a/capi/dali/public-api/text/text-style.h b/dali/public-api/text/text-style.h similarity index 99% rename from capi/dali/public-api/text/text-style.h rename to dali/public-api/text/text-style.h index fd68c00..e404a4f 100644 --- a/capi/dali/public-api/text/text-style.h +++ b/dali/public-api/text/text-style.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_TEXT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -572,7 +567,4 @@ private: } // namespace Dali -/** - * @} - */ #endif // __DALI_TEXT_STYLE_H__ diff --git a/capi/dali/public-api/text/text.h b/dali/public-api/text/text.h similarity index 99% rename from capi/dali/public-api/text/text.h rename to dali/public-api/text/text.h index 851823b..05eac4c 100644 --- a/capi/dali/public-api/text/text.h +++ b/dali/public-api/text/text.h @@ -18,11 +18,6 @@ * */ -/** - * @addtogroup CAPI_DALI_TEXT_MODULE - * @{ - */ - // EXTERNAL INCLUDES #include @@ -258,7 +253,4 @@ public: // Not intended for application developers } // namespace Dali -/** - * @} - */ #endif // __DALI_TEXT_H__ diff --git a/packaging/dali.spec b/packaging/dali.spec index 123e147..9909957 100644 --- a/packaging/dali.spec +++ b/packaging/dali.spec @@ -21,8 +21,6 @@ The OpenGLES Canvas Core Library provides a 3D scene graph ############################## # devel ############################## -# This should be used only for building dali-adaptor and dali-toolkit independently of -# dali-capi - i.e. to break cyclic dependencies. %package devel Summary: Development components for the OpenGLES Canvas Core Library Group: Development/Building -- 2.7.4