CAPI removal 71/24771/3
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 21 Jul 2014 11:02:12 +0000 (12:02 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 21 Jul 2014 13:51:31 +0000 (14:51 +0100)
Change-Id: Ib30ced6c7f9b7aa55feb4d531bce7f626ec2f83e

116 files changed:
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali-internal/utc-Dali-Internal-Character.cpp [new file with mode: 0644]
automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h
automated-tests/src/dali/dali-test-suite-utils/test-gl-abstraction.h
automated-tests/src/dali/utc-Dali-Character.cpp
build/slp/Makefile.am
build/slp/configure.ac
build/slp/dali-core/Makefile.am
build/slp/dali-test-suite-utils.pc.in [deleted file]
capi/dali/public-api/dali-core-capi-internal.h [deleted file]
capi/dali/public-api/file.list [deleted file]
capi/dali_doc.h [deleted file]
dali/internal/event/events/event-processor.cpp
dali/public-api/actors/actor-enumerations.h [moved from capi/dali/public-api/actors/actor-enumerations.h with 97% similarity]
dali/public-api/actors/actor.h [moved from capi/dali/public-api/actors/actor.h with 99% similarity]
dali/public-api/actors/blending.h [moved from capi/dali/public-api/actors/blending.h with 97% similarity]
dali/public-api/actors/camera-actor.h [moved from capi/dali/public-api/actors/camera-actor.h with 99% similarity]
dali/public-api/actors/custom-actor-impl.h [moved from capi/dali/public-api/actors/custom-actor-impl.h with 99% similarity]
dali/public-api/actors/custom-actor.h [moved from capi/dali/public-api/actors/custom-actor.h with 97% similarity]
dali/public-api/actors/draw-mode.h [moved from capi/dali/public-api/actors/draw-mode.h with 94% similarity]
dali/public-api/actors/image-actor.h [moved from capi/dali/public-api/actors/image-actor.h with 99% similarity]
dali/public-api/actors/layer.h [moved from capi/dali/public-api/actors/layer.h with 99% similarity]
dali/public-api/actors/mesh-actor.h [moved from capi/dali/public-api/actors/mesh-actor.h with 98% similarity]
dali/public-api/actors/renderable-actor.h [moved from capi/dali/public-api/actors/renderable-actor.h with 99% similarity]
dali/public-api/actors/text-actor.h [moved from capi/dali/public-api/actors/text-actor.h with 99% similarity]
dali/public-api/animation/active-constraint-declarations.h [moved from capi/dali/public-api/animation/active-constraint-declarations.h with 94% similarity]
dali/public-api/animation/active-constraint.h [moved from capi/dali/public-api/animation/active-constraint.h with 98% similarity]
dali/public-api/animation/alpha-functions.h [moved from capi/dali/public-api/animation/alpha-functions.h with 97% similarity]
dali/public-api/animation/animation.h [moved from capi/dali/public-api/animation/animation.h with 99% similarity]
dali/public-api/animation/constraint-functions.h [moved from capi/dali/public-api/animation/constraint-functions.h with 99% similarity]
dali/public-api/animation/constraint-source.h [moved from capi/dali/public-api/animation/constraint-source.h with 97% similarity]
dali/public-api/animation/constraint.h [moved from capi/dali/public-api/animation/constraint.h with 99% similarity]
dali/public-api/animation/constraints.h [moved from capi/dali/public-api/animation/constraints.h with 99% similarity]
dali/public-api/animation/interpolator-functions.h [moved from capi/dali/public-api/animation/interpolator-functions.h with 98% similarity]
dali/public-api/animation/key-frames.h [moved from capi/dali/public-api/animation/key-frames.h with 98% similarity]
dali/public-api/animation/time-period.h [moved from capi/dali/public-api/animation/time-period.h with 95% similarity]
dali/public-api/common/constants.h [moved from capi/dali/public-api/common/constants.h with 99% similarity]
dali/public-api/common/dali-common.h [moved from capi/dali/public-api/common/dali-common.h with 98% similarity]
dali/public-api/common/intrusive-ptr.h [moved from capi/dali/public-api/common/intrusive-ptr.h with 99% similarity]
dali/public-api/common/loading-state.h [moved from capi/dali/public-api/common/loading-state.h with 94% similarity]
dali/public-api/common/stage.h [moved from capi/dali/public-api/common/stage.h with 99% similarity]
dali/public-api/common/vector-wrapper.h [moved from capi/dali/public-api/common/vector-wrapper.h with 95% similarity]
dali/public-api/common/view-mode.h [moved from capi/dali/public-api/common/view-mode.h with 100% similarity]
dali/public-api/dali-core.h
dali/public-api/events/gesture-detector.h [moved from capi/dali/public-api/events/gesture-detector.h with 98% similarity]
dali/public-api/events/gesture.h [moved from capi/dali/public-api/events/gesture.h with 97% similarity]
dali/public-api/events/key-event.h [moved from capi/dali/public-api/events/key-event.h with 98% similarity]
dali/public-api/events/long-press-gesture-detector.h [moved from capi/dali/public-api/events/long-press-gesture-detector.h with 98% similarity]
dali/public-api/events/long-press-gesture.h [moved from capi/dali/public-api/events/long-press-gesture.h with 97% similarity]
dali/public-api/events/pan-gesture-detector.h [moved from capi/dali/public-api/events/pan-gesture-detector.h with 99% similarity]
dali/public-api/events/pan-gesture.h [moved from capi/dali/public-api/events/pan-gesture.h with 98% similarity]
dali/public-api/events/pinch-gesture-detector.h [moved from capi/dali/public-api/events/pinch-gesture-detector.h with 98% similarity]
dali/public-api/events/pinch-gesture.h [moved from capi/dali/public-api/events/pinch-gesture.h with 97% similarity]
dali/public-api/events/tap-gesture-detector.h [moved from capi/dali/public-api/events/tap-gesture-detector.h with 98% similarity]
dali/public-api/events/tap-gesture.h [moved from capi/dali/public-api/events/tap-gesture.h with 97% similarity]
dali/public-api/events/touch-event.h [moved from capi/dali/public-api/events/touch-event.h with 97% similarity]
dali/public-api/events/touch-point.h [moved from capi/dali/public-api/events/touch-point.h with 98% similarity]
dali/public-api/file.list
dali/public-api/geometry/animatable-mesh.h [moved from capi/dali/public-api/geometry/animatable-mesh.h with 98% similarity]
dali/public-api/geometry/animatable-vertex.h [moved from capi/dali/public-api/geometry/animatable-vertex.h with 97% similarity]
dali/public-api/images/bitmap-image.h [moved from capi/dali/public-api/images/bitmap-image.h with 99% similarity]
dali/public-api/images/encoded-buffer-image.h [moved from capi/dali/public-api/images/encoded-buffer-image.h with 98% similarity]
dali/public-api/images/frame-buffer-image.h [moved from capi/dali/public-api/images/frame-buffer-image.h with 98% similarity]
dali/public-api/images/image-attributes.h [moved from capi/dali/public-api/images/image-attributes.h with 99% similarity]
dali/public-api/images/image.h [moved from capi/dali/public-api/images/image.h with 99% similarity]
dali/public-api/images/native-image.h [moved from capi/dali/public-api/images/native-image.h with 97% similarity]
dali/public-api/images/pixel.h [moved from capi/dali/public-api/images/pixel.h with 98% similarity]
dali/public-api/math/angle-axis.h [moved from capi/dali/public-api/math/angle-axis.h with 96% similarity]
dali/public-api/math/compile-time-assert.h [moved from capi/dali/public-api/math/compile-time-assert.h with 95% similarity]
dali/public-api/math/compile-time-math.h [moved from capi/dali/public-api/math/compile-time-math.h with 98% similarity]
dali/public-api/math/degree.h [moved from capi/dali/public-api/math/degree.h with 97% similarity]
dali/public-api/math/math-utils.h [moved from capi/dali/public-api/math/math-utils.h with 98% similarity]
dali/public-api/math/matrix.h [moved from capi/dali/public-api/math/matrix.h with 99% similarity]
dali/public-api/math/matrix3.h [moved from capi/dali/public-api/math/matrix3.h with 98% similarity]
dali/public-api/math/quaternion.h [moved from capi/dali/public-api/math/quaternion.h with 99% similarity]
dali/public-api/math/radian.h [moved from capi/dali/public-api/math/radian.h with 97% similarity]
dali/public-api/math/random.h [moved from capi/dali/public-api/math/random.h with 97% similarity]
dali/public-api/math/rect.h [moved from capi/dali/public-api/math/rect.h with 98% similarity]
dali/public-api/math/vector2.h [moved from capi/dali/public-api/math/vector2.h with 99% similarity]
dali/public-api/math/vector3.h [moved from capi/dali/public-api/math/vector3.h with 99% similarity]
dali/public-api/math/vector4.h [moved from capi/dali/public-api/math/vector4.h with 99% similarity]
dali/public-api/math/viewport.h [moved from capi/dali/public-api/math/viewport.h with 93% similarity]
dali/public-api/modeling/material.h [moved from capi/dali/public-api/modeling/material.h with 99% similarity]
dali/public-api/object/any.h [moved from capi/dali/public-api/object/any.h with 99% similarity]
dali/public-api/object/base-handle.h [moved from capi/dali/public-api/object/base-handle.h with 99% similarity]
dali/public-api/object/base-object.h [moved from capi/dali/public-api/object/base-object.h with 98% similarity]
dali/public-api/object/constrainable.h [moved from capi/dali/public-api/object/constrainable.h with 98% similarity]
dali/public-api/object/handle.h [moved from capi/dali/public-api/object/handle.h with 99% similarity]
dali/public-api/object/object-registry.h [moved from capi/dali/public-api/object/object-registry.h with 98% similarity]
dali/public-api/object/property-conditions.h [moved from capi/dali/public-api/object/property-conditions.h with 98% similarity]
dali/public-api/object/property-index.h [moved from capi/dali/public-api/object/property-index.h with 95% similarity]
dali/public-api/object/property-input.h [moved from capi/dali/public-api/object/property-input.h with 97% similarity]
dali/public-api/object/property-notification-declarations.h [moved from capi/dali/public-api/object/property-notification-declarations.h with 95% similarity]
dali/public-api/object/property-notification.h [moved from capi/dali/public-api/object/property-notification.h with 98% similarity]
dali/public-api/object/property-types.h [moved from capi/dali/public-api/object/property-types.h with 97% similarity]
dali/public-api/object/property-value.h [moved from capi/dali/public-api/object/property-value.h with 98% similarity]
dali/public-api/object/property.h [moved from capi/dali/public-api/object/property.h with 98% similarity]
dali/public-api/object/ref-object.h [moved from capi/dali/public-api/object/ref-object.h with 96% similarity]
dali/public-api/render-tasks/render-task-list.h [moved from capi/dali/public-api/render-tasks/render-task-list.h with 97% similarity]
dali/public-api/render-tasks/render-task.h [moved from capi/dali/public-api/render-tasks/render-task.h with 99% similarity]
dali/public-api/shader-effects/shader-effect.h [moved from capi/dali/public-api/shader-effects/shader-effect.h with 99% similarity]
dali/public-api/signals/base-signal.h [moved from capi/dali/public-api/signals/base-signal.h with 99% similarity]
dali/public-api/signals/callback.h [moved from capi/dali/public-api/signals/callback.h with 99% similarity]
dali/public-api/signals/connection-tracker-interface.h [moved from capi/dali/public-api/signals/connection-tracker-interface.h with 97% similarity]
dali/public-api/signals/connection-tracker.h [moved from capi/dali/public-api/signals/connection-tracker.h with 96% similarity]
dali/public-api/signals/dali-signal-v2.h [moved from capi/dali/public-api/signals/dali-signal-v2.h with 99% similarity]
dali/public-api/signals/functor-delegate.h [moved from capi/dali/public-api/signals/functor-delegate.h with 98% similarity]
dali/public-api/signals/signal-slot-connections.h [moved from capi/dali/public-api/signals/signal-slot-connections.h with 98% similarity]
dali/public-api/signals/signal-slot-observers.h [moved from capi/dali/public-api/signals/signal-slot-observers.h with 96% similarity]
dali/public-api/signals/slot-delegate.h [moved from capi/dali/public-api/signals/slot-delegate.h with 97% similarity]
dali/public-api/text/character.h [moved from capi/dali/public-api/text/character.h with 98% similarity]
dali/public-api/text/font-parameters.h [moved from capi/dali/public-api/text/font-parameters.h with 98% similarity]
dali/public-api/text/font.h [moved from capi/dali/public-api/text/font.h with 99% similarity]
dali/public-api/text/text-style.h [moved from capi/dali/public-api/text/text-style.h with 99% similarity]
dali/public-api/text/text.h [moved from capi/dali/public-api/text/text.h with 99% similarity]
packaging/dali.spec

index 9082ae4..9728100 100644 (file)
@@ -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 (file)
index 0000000..e884843
--- /dev/null
@@ -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 <iostream>
+
+#include <stdlib.h>
+#include <dali/public-api/dali-core.h>
+#include <dali-test-suite-utils.h>
+
+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;
+}
index 70ca7e2..de77903 100644 (file)
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
-#include <dali/public-api/dali-core-capi-internal.h>
 #include <stdarg.h>
 
 void tet_infoline(const char*str);
index 710b1b8..7d203c1 100644 (file)
@@ -24,7 +24,6 @@
 #include <map>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/dali-core-capi-internal.h>
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/gl-abstraction.h>
index fb99922..9f0a47c 100644 (file)
@@ -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;
-}
index a8e70e3..543abca 100644 (file)
 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 \
index 0810352..eb544e0 100644 (file)
@@ -110,7 +110,6 @@ AC_CONFIG_FILES([
  Makefile
  dali-core/Makefile
  dali-core.pc
- dali-test-suite-utils.pc
 ])
 
 AC_OUTPUT
index 68a897a..bb7bc39 100644 (file)
@@ -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 (file)
index cf315e8..0000000
+++ /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 (file)
index c9edb4a..0000000
+++ /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 <dali/public-api/actors/actor.h>
-#include <dali/public-api/actors/actor-enumerations.h>
-#include <dali/public-api/actors/blending.h>
-#include <dali/public-api/actors/camera-actor.h>
-#include <dali/public-api/actors/custom-actor-impl.h>
-#include <dali/public-api/actors/custom-actor.h>
-#include <dali/public-api/actors/draw-mode.h>
-#include <dali/public-api/actors/image-actor.h>
-#include <dali/public-api/actors/layer.h>
-#include <dali/public-api/actors/mesh-actor.h>
-#include <dali/public-api/actors/renderable-actor.h>
-#include <dali/public-api/actors/text-actor.h>
-
-#include <dali/public-api/animation/active-constraint-declarations.h>
-#include <dali/public-api/animation/active-constraint.h>
-#include <dali/public-api/animation/alpha-functions.h>
-#include <dali/public-api/animation/animation.h>
-#include <dali/public-api/animation/constraint-functions.h>
-#include <dali/public-api/animation/constraint-source.h>
-#include <dali/public-api/animation/constraint.h>
-#include <dali/public-api/animation/constraints.h>
-#include <dali/public-api/animation/interpolator-functions.h>
-#include <dali/public-api/animation/key-frames.h>
-#include <dali/public-api/animation/time-period.h>
-
-#include <dali/public-api/common/constants.h>
-#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/common/loading-state.h>
-#include <dali/public-api/common/intrusive-ptr.h>
-#include <dali/public-api/common/stage.h>
-#include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/common/view-mode.h>
-
-#include <dali/public-api/events/gesture-detector.h>
-#include <dali/public-api/events/gesture.h>
-#include <dali/public-api/events/key-event.h>
-#include <dali/public-api/events/long-press-gesture-detector.h>
-#include <dali/public-api/events/long-press-gesture.h>
-#include <dali/public-api/events/pan-gesture-detector.h>
-#include <dali/public-api/events/pan-gesture.h>
-#include <dali/public-api/events/pinch-gesture-detector.h>
-#include <dali/public-api/events/pinch-gesture.h>
-#include <dali/public-api/events/tap-gesture-detector.h>
-#include <dali/public-api/events/tap-gesture.h>
-#include <dali/public-api/events/touch-event.h>
-#include <dali/public-api/events/touch-point.h>
-
-#include <dali/public-api/geometry/animatable-mesh.h>
-#include <dali/public-api/geometry/animatable-vertex.h>
-
-#include <dali/public-api/images/bitmap-image.h>
-#include <dali/public-api/images/encoded-buffer-image.h>
-#include <dali/public-api/images/frame-buffer-image.h>
-#include <dali/public-api/images/image-attributes.h>
-#include <dali/public-api/images/image.h>
-#include <dali/public-api/images/native-image.h>
-#include <dali/public-api/images/pixel.h>
-#include <dali/public-api/images/glyph-image.h>
-
-#include <dali/public-api/math/angle-axis.h>
-#include <dali/public-api/math/compile-time-assert.h>
-#include <dali/public-api/math/compile-time-math.h>
-#include <dali/public-api/math/degree.h>
-#include <dali/public-api/math/math-utils.h>
-#include <dali/public-api/math/quaternion.h>
-#include <dali/public-api/math/radian.h>
-#include <dali/public-api/math/random.h>
-#include <dali/public-api/math/rect.h>
-#include <dali/public-api/math/vector2.h>
-#include <dali/public-api/math/vector3.h>
-#include <dali/public-api/math/vector4.h>
-
-#include <dali/public-api/modeling/material.h>
-
-#include <dali/public-api/object/any.h>
-#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/object/constrainable.h>
-#include <dali/public-api/object/handle.h>
-#include <dali/public-api/object/object-registry.h>
-#include <dali/public-api/object/property-conditions.h>
-#include <dali/public-api/object/property-index.h>
-#include <dali/public-api/object/property-input.h>
-#include <dali/public-api/object/property-notification-declarations.h>
-#include <dali/public-api/object/property-notification.h>
-#include <dali/public-api/object/property-types.h>
-#include <dali/public-api/object/property-value.h>
-#include <dali/public-api/object/property.h>
-#include <dali/public-api/object/ref-object.h>
-
-#include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/public-api/render-tasks/render-task.h>
-
-#include <dali/public-api/shader-effects/shader-effect.h>
-
-#include <dali/public-api/signals/base-signal.h>
-#include <dali/public-api/signals/callback.h>
-#include <dali/public-api/signals/connection-tracker-interface.h>
-#include <dali/public-api/signals/connection-tracker.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
-#include <dali/public-api/signals/functor-delegate.h>
-#include <dali/public-api/signals/signal-slot-connections.h>
-#include <dali/public-api/signals/signal-slot-observers.h>
-#include <dali/public-api/signals/slot-delegate.h>
-
-#include <dali/public-api/text/font-parameters.h>
-#include <dali/public-api/text/font.h>
-#include <dali/public-api/text/text-style.h>
-#include <dali/public-api/text/text.h>
-
-
-#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 (file)
index 5942449..0000000
+++ /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 (file)
index 0812cfb..0000000
+++ /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.
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref CAPI_DALI_MODULE</td><td>A library to provide a C++ scene graph based on OpenGL ES 2.0.</td></tr>
- * <tr><td>@ref CAPI_DALI_TOOLKIT_MODULE</td><td>A library to provide a user interface toolkit on top of Dali.</td></tr>
- * </table>
- */
-
-/**
- * @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 <dali/dali.h>
- * @section CAPI_DALI_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref CAPI_DALI_ACTORS_MODULE</td><td>The set of interactive objects that can be placed on the Dali::Stage.</td></tr>
- * <tr><td>@ref CAPI_DALI_ADAPTOR_MODULE</td><td>Interface to the platform.</td></tr>
- * <tr><td>@ref CAPI_DALI_ANIMATION_MODULE</td><td>The property animation and constraints system.</td></tr>
- * <tr><td>@ref CAPI_DALI_COMMON_MODULE</td><td>General classes.</td></tr>
- * <tr><td>@ref CAPI_DALI_EVENTS_MODULE</td><td>Events, gestures and gesture detectors.</td></tr>
- * <tr><td>@ref CAPI_DALI_GEOMETRY_MODULE</td><td></td>Meshes.</tr>
- * <tr><td>@ref CAPI_DALI_IMAGES_MODULE</td><td></td>Image resource types.</tr>
- * <tr><td>@ref CAPI_DALI_MATH_MODULE</td><td></td>Math classes and utilities.</tr>
- * <tr><td>@ref CAPI_DALI_MODELING_MODULE</td><td>Ancilliary classes for meshes and 3D models </td></tr>
- * <tr><td>@ref CAPI_DALI_OBJECT_MODULE</td><td></td>Registered Object and property system.</tr>
- * <tr><td>@ref CAPI_DALI_RENDER_TASKS_MODULE</td><td>Classes to describe how the scene is rendered. </td></tr>
- * <tr><td>@ref CAPI_DALI_SHADER_EFFECTS_MODULE</td><td>Classes to change how actors are visualised.</td></tr>
- * <tr><td>@ref CAPI_DALI_SIGNALS_MODULE</td><td>Signals and Slots - a type-safe, loosely-coupled callback system.</td></tr>
- * <tr><td>@ref CAPI_DALI_TEXT_MODULE</td><td></td>Classes for manipulating text.</tr>
- * </table>
- */
-
-
-/**
- * @ingroup CAPI_DALI_MODULE
- *
- * @defgroup CAPI_DALI_ACTORS_MODULE Actors
- *
- * @section CAPI_DALI_ACTORS_MODULE_HEADER RequiredHeader
- * \#include <dali/dali.h>
- *
- * @section CAPI_DALI_ACTORS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Actor </td><td>Primary class for application interaction.</td></tr>
- * <tr><td>@ref Dali::CameraActor </td><td>An actor which controls a camera.</td></tr>
- * <tr><td>@ref Dali::CustomActor </td><td>CustomActor is a base class for custom UI controls.</td></tr>
- * <tr><td>@ref Dali::CustomActorImpl </td><td>CustomActorImpl is an abstract base class for custom control implementations.</td></tr>
- * <tr><td>@ref Dali::RenderableActor </td><td>A base class for renderable actors.</td></tr>
- * <tr><td>@ref Dali::ImageActor </td><td>An actor for displaying images.</td></tr>
- * <tr><td>@ref Dali::MeshActor </td><td>An actor for displaying mesh geometries.</td></tr>
- * <tr><td>@ref Dali::TextActor </td><td>An actor for display simple text.</td></tr>
- * <tr><td>@ref Dali::Layer </td><td></td>An actor for grouping and sorting other actors.</tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_ANIMATION_MODULE Animation
- * @section  CAPI_DALI_ANIMATION_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section  CAPI_DALI_ANIMATION_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::ActiveConstraint </td><td>A constraint which is being applied to an object.</td></tr>
- * <tr><td> Dali::AlphaFunctions </td><td>Various functions that control progress of an animation.</td></tr>
- * <tr><td>@ref Dali::Animation </td><td>Dali::Animation can be used to animate the properties of any number of objects, typically Dali::Actor%s.</td></tr>
- * <tr><td>@ref Dali::Constraint </td><td>An abstract base class for Constraints.</td></tr>
- * <tr><td>Constraints</td><td>Various 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 </td></tr>
- * <tr><td>Interpolator Functions </td><td>Dali::LerpBoolean(), Dali::LerpFloat(), Dali::LerpVector2(), Dali::LerpVector3(), Dali::LerpVector4(), Dali::SlerpQuaternion() </td></tr>
- * <tr><td>@ref Dali::KeyFrames </td><td>A set of key frames for a property that can be animated using @ref Dali::Animation::AnimateBetween()</td></tr>
- * <tr><td>Constraint Sources</td><td>Specifies 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</td></tr>
- * <tr><td>@ref Dali::TimePeriod </td><td>A value-type representing a period of time within an animation.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_COMMON_MODULE Common
- * @section CAPI_DALI_COMMON_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_COMMON_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::ParentOrigin </td><td>Constants to specify the origin of an actor within it's parent volume, used by Dali::Actor::SetParentOrigin()</td></tr>
- * <tr><td>@ref Dali::AnchorPoint </td><td>Constants to specify the anchor point of an actor, used by Dali::Actor::SetAnchorPoint() </td></tr>
- * <tr><td>@ref Dali::Color </td><td>Constants to specify primary colors</td></tr>
- * <tr><td>@ref Dali::Math </td><td>Epsilon and Pi constants</td></tr>
- * <tr><td>@ref Dali::String </td><td>String constants</td></tr>
- * <tr><td>@ref Dali::LoadingState </td><td>The status during resource loading operations.</td></tr>
- * <tr><td>@ref Dali::Stage </td><td>The Stage is a top-level object used for displaying a tree of Actors.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_EVENTS_MODULE Events
- * @section CAPI_DALI_EVENTS_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_EVENTS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::GestureDetector </td><td>GestureDetectors analyse a stream of touch events and attempt to determine the intention of the user.</td></tr>
- * <tr><td>@ref Dali::Gesture </td><td>Base structure for different gestures that an application can receive.</td></tr>
- * <tr><td>@ref Dali::KeyEvent </td><td>The key event structure is used to store a key press.</td></tr>
- * <tr><td>@ref Dali::LongPressGestureDetector</td><td>This emits a signal when a long press gesture occurs.</td></tr>
- * <tr><td>@ref Dali::LongPressGesture </td><td>A LongPressGesture is emitted when the user touches and holds the screen with the stated number of fingers.</td></tr>
- * <tr><td>@ref Dali::PanGestureDetector </td><td>This class looks for panning (or dragging) gestures.</td></tr>
- * <tr><td>@ref Dali::PanGesture </td><td>A PanGesture is emitted when the user moves one or more fingers in a particular direction.</td></tr>
- * <tr><td>@ref Dali::PinchGestureDetector </td><td>This class looks for pinching gestures involving two touches.</td></tr>
- * <tr><td>@ref Dali::PinchGesture </td><td>A PinchGesture is emitted when the user moves two fingers towards or away from each other.</td></tr>
- * <tr><td>@ref Dali::TapGestureDetector </td><td>This class emits a signal when a tap gesture occurs</td></tr>
- * <tr><td>@ref Dali::TapGesture </td><td>A TapGesture is emitted when the user taps the screen</td></tr>
- * <tr><td>@ref Dali::TouchEvent </td><td>Touch events are a collection of touch points at a specific moment in time.</td></tr>
- * <tr><td>@ref Dali::TouchPoint </td><td>A TouchPoint represents a point on the screen that is currently being touched or where touch
- * has stopped.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_GEOMETRY_MODULE Geometry
- * @section CAPI_DALI_GEOMETRY_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_GEOMETRY_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::AnimatableMesh </td><td>A mesh geometry that can be animated using the Dali property animation system.</td></tr>
- * <tr><td>@ref Dali::AnimatableVertex </td><td>Represents a vertex in a Dali::AnimatableMesh.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_IMAGES_MODULE Images
- * @section CAPI_DALI_IMAGES_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_IMAGES_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::BitmapImage </td><td>This represents an image resource supplied by Application writer that can be added to Dali::ImageActor.</td></tr>
- * <tr><td>@ref Dali::EncodedBufferImage </td><td>This represents an encoded image supplied by Application writer that can be added to Dali::ImageActor.</td></tr>
- * <tr><td>@ref Dali::FrameBufferImage </td><td>This represents a GLES frame buffer object and contains the result of an 'off-screen' render pass of a Dali::RenderTask</td></tr>
- * <tr><td>@ref Dali::ImageAttributes </td><td>Describes Image properties like width or pixel format.</td></tr>
- * <tr><td>@ref Dali::Image </td><td>An Image object represents an image resource that can be added to ImageActors.</td></tr>
- * <tr><td>@ref Dali::NativeImage </td><td>Abstract interface to provide platform-specific support for handling image data.</td></tr>
- * <tr><td>@ref Dali::Pixel </td><td>Pixel format types and their properties.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_MATH_MODULE Math
- * @section CAPI_DALI_MATH_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_MATH_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::AngleAxis </td><td>An angle & axis pair.</td></tr>
- * <tr><td>@ref Dali::Degree </td><td>An angle in degrees.</td></tr>
- * <tr><td>@ref Dali::Radian </td><td>An angle in radians.</td></tr>
- * <tr><td>@ref Dali::Matrix </td><td>The Matrix class represents transformations and projections.</td></tr>
- * <tr><td>@ref Dali::Matrix3 </td><td>A 3x3 matrix.</td></tr>
- * <tr><td>@ref Dali::Quaternion </td><td>The Quaternion class encapsulates the mathematics of the quaternion.</td></tr>
- * <tr><td>@ref Dali::Rect </td><td>Template class to create and operate on rectangles.</td></tr>
- * <tr><td>@ref Dali::Vector2 </td><td>A two-dimensional vector.</td></tr>
- * <tr><td>@ref Dali::Vector3 </td><td>A three-dimensional vector.</td></tr>
- * <tr><td>@ref Dali::Vector4 </td><td>A four-dimensional vector.</td></tr>
- * <tr><td>@ref Dali::Random </td><td>Provides methods to generate and use random values.</td></tr>
- * <tr><td>@ref Dali::Viewport </td><td>Screen area in pixels</td></tr>
- * <tr><td> Math Utilities </td><td>
-Dali::NextPowerOfTwo()
-Dali::IsPowerOfTwo()
-Dali::Clamp()
-Dali::ClampInPlace()
-Dali::Lerp()
-Dali::GetRangedEpsilon()
-Dali::EqualsZero()
-Dali::Equals()
-Dali::Round()
-Dali::WrapInDomain()
-Dali::ShortestDistanceInDomain()
- * </td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_MODELING_MODULE Modeling
- * @section CAPI_DALI_MODELING_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_MODELING_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Material </td><td>Encapsulates the data describing a material.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_OBJECT_MODULE Object
- * @section CAPI_DALI_OBJECT_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_OBJECT_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::BaseHandle </td><td>Dali::BaseHandle is a handle to an internal Dali resource.</td></tr>
- * <tr><td>@ref Dali::BaseObject </td><td>A base class for objects.</td></tr>
- * <tr><td>@ref Dali::Constrainable </td><td>A handle to an internal property owning Dali object that
- * can have constraints applied to it.</td></tr>
- * <tr><td>@ref Dali::Handle </td><td>A handle to an internal property owning Dali object.</td></tr>
- * <tr><td>@ref Dali::ObjectRegistry </td><td>The ObjectRegistry notifies it's observers when an object is created.</td></tr>
- * <tr><td>@ref Dali::PropertyCondition </td><td>This represents a condition that can be evaluated on a Property::Value. Factory methods include Dali::LessThanCondition(), Dali::GreaterThanCondition(), Dali::InsideCondition() and Dali::OutsideCondition()</td></tr>
- * <tr><td>@ref Dali::PropertyInput </td><td>An abstract interface for receiving property values.</td></tr>
- * <tr><td>@ref Dali::PropertyNotification </td><td>This is used to issue a notification upon a condition of the property being met.</td></tr>
- * <tr><td>@ref Dali::PropertyTypes </td><td>Template function instances for property getters.</td></tr>
- * <tr><td>@ref Dali::Property </td><td>An object + property pair.</td></tr>
- * <tr><td>@ref Dali::Property::Value </td><td>A value-type representing a property value.</td></tr>a
- * <tr><td>@ref Dali::RefObject </td><td>Base class for reference counted objects.</td></tr>
- * <tr><td>@ref Dali::IntrusivePtr </td><td>Template class used to point at Dali::RefObjects</td></tr>
- * <tr><td>@ref Dali::Any </td><td>Class for objects that contain values of different types</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_RENDER_TASKS_MODULE Render Tasks
- * @section CAPI_DALI_RENDER_TASKS_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_RENDER_TASKS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::RenderTask </td><td>A RenderTask describes how all or part of the Dali scene should be rendered.</td></tr>
- * <tr><td>@ref Dali::RenderTaskList </td><td>An ordered list of Dali::RenderTask%s.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_SHADER_EFFECTS_MODULE Shader effects
- * @section CAPI_DALI_SHADER_EFFECTS_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_SHADER_EFFECTS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::ShaderEffect </td><td>Shader effects provide a visual effect for actors.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_SIGNALS_MODULE Signals
- * @section CAPI_DALI_SIGNALS_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_SIGNALS_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::BaseSignal </td><td>Implementation class for Dali::SignalV2%s.</td></tr>
- * <tr><td>@ref Dali::Callback </td><td>Templates to provide type safety for member function callbacks.</td></tr>
- * <tr><td>@ref Dali::ConnectionTracker </td><td>Connection tracker concrete implementation</td></tr>
- * <tr><td>@ref Dali::ConnectionTrackerInterface </td><td>Interface used to track connections between signals and slots.</td></tr>
- * <tr><td>@ref Dali::SignalV2 </td><td>Template classes that provide signals</td></tr>
- * <tr><td>@ref Dali::FunctorDelegate </td><td>Used to connect a void() functor to a signal via Dali::BaseObject::SignalConnect()</td></tr>
- * <tr><td>@ref Dali::SlotConnection </td><td>SlotConnection is the connection information held by a connection tracker.</td></tr>
- * <tr><td>@ref Dali::SignalConnection </td><td>SignalConnection is the connection information held by the signal.</td></tr>
- * <tr><td>@ref Dali::SignalObserver </td><td>Abstract interface used by a signal to inform a slot it is disconnecting.</td></tr>
- * <tr><td>@ref Dali::SlotObserver </td><td>Abstract Interface used by a slot to inform a signal it is disconnecting.</td></tr>
- * <tr><td>@ref Dali::SlotDelegate </td><td>SlotDelegates can be used to connect member functions to signals, without inheriting from SlotDelegateInterface.</td></tr>
- * </table>
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_TEXT_MODULE Text
- * @section CAPI_DALI_TEXT_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_TEXT_MODULE_OVERVIEW Overview
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::Character </td><td>Character class encapsulates a character implementation to support multiple languages.</td></tr>
- * <tr><td>@ref Dali::PointSize </td><td>Font size in points.</td></tr>
- * <tr><td>@ref Dali::PixelSize </td><td>Font size in pixels.</td></tr>
- * <tr><td>@ref Dali::CapsHeight </td><td>Font size in caps height.</td></tr>
- * <tr><td>@ref Dali::FontParameters </td><td>Encapsulates all font parameters.</td></tr>
- * <tr><td>@ref Dali::Font </td><td>Encapsulates a font resource</td></tr>
- * <tr><td>@ref Dali::TextStyle </td><td>Encapsulates style properties for text, such as weight, italics, underline, shadow, etc.</td></tr>
- * <tr><td>@ref Dali::Text </td><td>Encapsulates a string of characters implementation to support multiple languages.</td></tr>
- * </table>
- */
-
-
-
-#endif //__DALI_DOC_H__
index f6c9725..3f62462 100644 (file)
@@ -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
 
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 #include <dali/public-api/common/dali-common.h>
 
 namespace Dali DALI_IMPORT_API
@@ -54,7 +49,4 @@ enum PositionInheritanceMode
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_ACTOR_ENUMERATIONS_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 #include <string>
@@ -1328,9 +1323,4 @@ void UnparentAndReset( Actor& actor );
 
 } // namespace Dali
 
-
-/**
- * @}
- */
-
 #endif // __DALI_ACTOR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -98,7 +93,4 @@ extern const BlendingEquation::Type DEFAULT_BLENDING_EQUATION_ALPHA;   ///< Blen
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_BLENDING_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 #include <dali/public-api/actors/actor.h>
 
 namespace Dali DALI_IMPORT_API
@@ -315,8 +310,4 @@ public: // Not intended for use by Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
-
 #endif // __DALI_CAMERA_ACTOR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/property.h>
@@ -248,8 +243,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
-
 #endif // __DALI_CUSTOM_ACTOR_IMPL_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/custom-actor-impl.h>
@@ -109,7 +104,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CUSTOM_ACTOR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 #include <dali/public-api/common/dali-common.h>
 
 namespace Dali DALI_IMPORT_API
@@ -47,7 +42,4 @@ enum Type
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_DRAW_MODE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -358,7 +353,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_IMAGE_ACTOR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/actors/actor.h>
@@ -331,7 +326,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif //__DALI_LAYER_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 (file)
  */
 
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/renderable-actor.h>
 
@@ -170,7 +165,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif /* _MESH_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 (file)
  */
 
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/blending.h>
@@ -240,7 +235,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_RENDERABLE_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 (file)
  */
 
 
-/**
- * @addtogroup CAPI_DALI_ACTORS_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -495,7 +490,4 @@ public: // Not intended for use by Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TEXT_ACTOR_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 
@@ -41,7 +36,4 @@ typedef boost::function<void (ActiveConstraint& constraint)> ActiveConstraintCal
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_ACTIVE_CONSTRAINT_DECLARATIONS_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/animation/active-constraint-declarations.h>
 #include <dali/public-api/object/any.h>
@@ -123,7 +118,4 @@ public: // Not intended for use by Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_ACTIVE_CONSTRAINT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -77,7 +72,4 @@ float Sin2x(float progress);      ///< Two revolutions
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_ALPHA_FUNCTIONS_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 
@@ -1150,7 +1145,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_ANIMATION_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 
@@ -196,7 +191,4 @@ typedef boost::function<bool (const bool&       current,
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CONSTRAINT_FUNCTIONS_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/handle.h>
 #include <dali/public-api/object/property.h>
@@ -126,7 +121,4 @@ struct DALI_IMPORT_API ConstraintSource
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CONSTRAINT_SOURCE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 
@@ -760,7 +755,4 @@ private: // Not intended for use by Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CONSTRAINT_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/quaternion.h>
@@ -428,7 +423,4 @@ struct DALI_IMPORT_API OrientedLookAt
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CONSTRAINTS_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/any.h>
 #include <dali/public-api/math/vector2.h>
@@ -193,7 +188,4 @@ AnyInterpolator GetDefaultInterpolator(Property::Type type);
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_INTERPOLATOR_FUNCTIONS_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/object/base-handle.h>
@@ -124,7 +119,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_KEY_FRAMES_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_ANIMATION_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -60,7 +55,4 @@ struct DALI_IMPORT_API TimePeriod
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TIME_PERIOD_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_COMMON_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <math.h> // M_PI
 
@@ -180,7 +175,4 @@ extern const std::string EMPTY; ///< The empty string
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CONSTANTS_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_COMMON_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 #include <cstdio>
@@ -154,7 +149,4 @@ public:
 #define DALI_ASSERT_DEBUG(cond)
 #endif
 
-/**
- * @}
- */
 #endif // __DALI_COMMON_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -305,7 +300,4 @@ template<typename T>inline T* get_pointer(IntrusivePtr<T> const& rhs)
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif /* __DALI_INTRUSIVE_PTR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_COMMON_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -41,7 +36,4 @@ enum LoadingState
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_LOADING_STATE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_COMMON_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
@@ -286,7 +281,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_STAGE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_COMMON_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <cstddef>
 
@@ -49,7 +44,4 @@
 
 #endif //ifndef HIDE_DALI_INTERNALS
 
-/**
- * @}
- */
 #endif /* __VECTOR_WRAPPER__H__ */
index 21b55d8..019c70e 100644 (file)
  *
  */
 
-#include <dali/public-api/dali-core-capi-internal.h>
-
-// NON-CAPI PUBLIC INCLUDES
+#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/actors/actor-enumerations.h>
+#include <dali/public-api/actors/blending.h>
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/actors/custom-actor-impl.h>
+#include <dali/public-api/actors/custom-actor.h>
+#include <dali/public-api/actors/draw-mode.h>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/layer.h>
 #include <dali/public-api/actors/light-actor.h>
+#include <dali/public-api/actors/mesh-actor.h>
 #include <dali/public-api/actors/model-actor-factory.h>
+#include <dali/public-api/actors/renderable-actor.h>
+#include <dali/public-api/actors/text-actor.h>
 
+#include <dali/public-api/animation/active-constraint-declarations.h>
+#include <dali/public-api/animation/active-constraint.h>
+#include <dali/public-api/animation/alpha-functions.h>
+#include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/animator-functions.h>
+#include <dali/public-api/animation/constraint-functions.h>
+#include <dali/public-api/animation/constraint-source.h>
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/animation/interpolator-functions.h>
+#include <dali/public-api/animation/key-frames.h>
+#include <dali/public-api/animation/time-period.h>
 
+#include <dali/public-api/common/constants.h>
+#include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/common/light.h>
+#include <dali/public-api/common/loading-state.h>
 #include <dali/public-api/common/map-wrapper.h>
 #include <dali/public-api/common/set-wrapper.h>
-#include <dali/public-api/common/light.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/common/view-mode.h>
 
 #include <dali/public-api/dynamics/dynamics-body.h>
 #include <dali/public-api/dynamics/dynamics-body-config.h>
 #include <dali/public-api/dynamics/dynamics-world-config.h>
 #include <dali/public-api/dynamics/dynamics-world.h>
 
+#include <dali/public-api/events/gesture-detector.h>
+#include <dali/public-api/events/gesture.h>
 #include <dali/public-api/events/hit-test-algorithm.h>
+#include <dali/public-api/events/key-event.h>
+#include <dali/public-api/events/long-press-gesture-detector.h>
+#include <dali/public-api/events/long-press-gesture.h>
 #include <dali/public-api/events/mouse-wheel-event.h>
+#include <dali/public-api/events/pan-gesture-detector.h>
+#include <dali/public-api/events/pan-gesture.h>
+#include <dali/public-api/events/pinch-gesture-detector.h>
+#include <dali/public-api/events/pinch-gesture.h>
+#include <dali/public-api/events/tap-gesture-detector.h>
+#include <dali/public-api/events/tap-gesture.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/events/touch-point.h>
 
+#include <dali/public-api/geometry/animatable-mesh.h>
+#include <dali/public-api/geometry/animatable-vertex.h>
 #include <dali/public-api/geometry/cloth.h>
 #include <dali/public-api/geometry/mesh.h>
 #include <dali/public-api/geometry/mesh-factory.h>
 #include <dali/public-api/geometry/spline.h>
 
+#include <dali/public-api/images/bitmap-image.h>
 #include <dali/public-api/images/distance-field.h>
+#include <dali/public-api/images/encoded-buffer-image.h>
+#include <dali/public-api/images/frame-buffer-image.h>
+#include <dali/public-api/images/glyph-image.h>
+#include <dali/public-api/images/image-attributes.h>
+#include <dali/public-api/images/image.h>
+#include <dali/public-api/images/native-image.h>
 #include <dali/public-api/images/nine-patch-image.h>
+#include <dali/public-api/images/pixel.h>
+
+#include <dali/public-api/math/angle-axis.h>
+#include <dali/public-api/math/compile-time-assert.h>
+#include <dali/public-api/math/compile-time-math.h>
+#include <dali/public-api/math/degree.h>
+#include <dali/public-api/math/math-utils.h>
+#include <dali/public-api/math/quaternion.h>
+#include <dali/public-api/math/radian.h>
+#include <dali/public-api/math/random.h>
+#include <dali/public-api/math/rect.h>
+#include <dali/public-api/math/vector2.h>
+#include <dali/public-api/math/vector3.h>
+#include <dali/public-api/math/vector4.h>
 
 #include <dali/public-api/modeling/bone.h>
 #include <dali/public-api/modeling/entity-animator-map.h>
 #include <dali/public-api/modeling/entity.h>
+#include <dali/public-api/modeling/material.h>
 #include <dali/public-api/modeling/model-animation-map.h>
 #include <dali/public-api/modeling/model-data.h>
 #include <dali/public-api/modeling/model.h>
 
+#include <dali/public-api/object/any.h>
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/object/base-object.h>
+#include <dali/public-api/object/constrainable.h>
+#include <dali/public-api/object/handle.h>
+#include <dali/public-api/object/object-registry.h>
+#include <dali/public-api/object/property-conditions.h>
+#include <dali/public-api/object/property-index.h>
+#include <dali/public-api/object/property-input.h>
+#include <dali/public-api/object/property-notification-declarations.h>
+#include <dali/public-api/object/property-notification.h>
+#include <dali/public-api/object/property-types.h>
+#include <dali/public-api/object/property-value.h>
+#include <dali/public-api/object/property.h>
+#include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/type-info.h>
 #include <dali/public-api/object/type-registry.h>
 
-#include <dali/public-api/text/utf8.h>
+#include <dali/public-api/render-tasks/render-task-list.h>
+#include <dali/public-api/render-tasks/render-task.h>
 
 #include <dali/public-api/scripting/scripting.h>
 
+#include <dali/public-api/signals/base-signal.h>
+#include <dali/public-api/signals/callback.h>
+#include <dali/public-api/signals/connection-tracker-interface.h>
+#include <dali/public-api/signals/connection-tracker.h>
+#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/functor-delegate.h>
+#include <dali/public-api/signals/signal-slot-connections.h>
+#include <dali/public-api/signals/signal-slot-observers.h>
+#include <dali/public-api/signals/slot-delegate.h>
+
+#include <dali/public-api/shader-effects/shader-effect.h>
+
+#include <dali/public-api/text/font-parameters.h>
+#include <dali/public-api/text/font.h>
+#include <dali/public-api/text/text-style.h>
+#include <dali/public-api/text/text.h>
+#include <dali/public-api/text/utf8.h>
+
 #endif // __DALI_CORE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/handle.h>
@@ -131,7 +126,4 @@ protected:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_GESTURE_DETECTOR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -120,7 +115,4 @@ protected: // Creation
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_GESTURE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -141,7 +136,4 @@ struct KeyEvent
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_KEY_EVENT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
@@ -196,7 +191,4 @@ public: // Not intended for Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_LONG_PRESS_GESTURE_DETECTOR_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
@@ -92,7 +87,4 @@ struct LongPressGesture : public Gesture
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_LONG_PRESS_GESTURE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
@@ -300,7 +295,4 @@ public: // Not intended for Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PAN_GESTURE_DETECTOR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
@@ -169,7 +164,4 @@ struct PanGesture: public Gesture
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PAN_GESTURE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
@@ -130,7 +125,4 @@ public: // Not intended for Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PINCH_GESTURE_DETECTOR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
@@ -98,7 +93,4 @@ struct PinchGesture: public Gesture
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PINCH_GESTURE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
@@ -181,7 +176,4 @@ public: // Not intended for Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TAP_GESTURE_DETECTOR_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/math/vector2.h>
@@ -91,7 +86,4 @@ struct TapGesture : public Gesture
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TAP_GESTURE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/common/dali-common.h>
@@ -99,7 +94,4 @@ struct DALI_IMPORT_API TouchEvent
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOUCH_EVENT_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_EVENTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/math/vector2.h>
@@ -119,7 +114,4 @@ struct TouchPoint
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOUCH_POINT_H__
index 66a3569..378721a 100644 (file)
@@ -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
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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_GEOMETRY_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/constrainable.h>
@@ -165,7 +160,4 @@ public: // Not for use by application developer
 
 }// Dali
 
-/**
- * @}
- */
 #endif
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_GEOMETRY_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/object/property.h>
@@ -134,7 +129,4 @@ private:
 
 }//Dali
 
-/**
- * @}
- */
 #endif
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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_IMAGES_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/images/image.h>
@@ -280,7 +275,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_BITMAP_IMAGE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_IMAGES_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <stdint.h>
 
@@ -141,7 +136,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_ENCODED_BUFFER_IMAGE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_IMAGES_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/math/rect.h>
@@ -139,7 +134,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_FRAME_BUFFER_IMAGE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_IMAGES_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/images/pixel.h>
 #include <dali/public-api/math/rect.h>
@@ -330,7 +325,4 @@ bool operator!=(const ImageAttributes& a, const ImageAttributes& b);
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_IMAGE_ATTRIBUTES_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_IMAGES_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -375,7 +370,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_IMAGES_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/images/pixel.h>
 #include <dali/public-api/object/ref-object.h>
@@ -112,7 +107,4 @@ typedef IntrusivePtr<NativeImage>  NativeImagePtr;
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_INTEGRATION_NATIVE_IMAGE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_IMAGES_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -118,7 +113,4 @@ void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, int& bitMask);
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PIXEL_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/math/degree.h>
 #include <dali/public-api/math/vector3.h>
@@ -68,7 +63,4 @@ struct DALI_IMPORT_API AngleAxis
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_ANGLE_AXIS_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -46,7 +41,4 @@ template<int x> struct CompileTimeAssertInt {};    ///< Template to wrap conditi
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_COMPILE_TIME_ASSERT_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <stdlib.h>
 
@@ -161,7 +156,4 @@ struct Epsilon< 0 >
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_COMPILE_TIME_MATH_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -114,7 +109,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_DEGREE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <algorithm> // 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__
similarity index 99%
rename from capi/dali/public-api/math/matrix.h
rename to dali/public-api/math/matrix.h
index bf7f912..2a3a4cf 100644 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <iostream>
 
@@ -365,7 +360,4 @@ DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Matrix& matrix)
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_MATRIX_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/math/matrix.h>
@@ -217,7 +212,4 @@ DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Matrix3& matrix
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif //__DALI_MATRIX3_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <iostream>
 #include <math.h>
@@ -459,7 +454,4 @@ DALI_IMPORT_API std::ostream& operator<< (std::ostream& o, const Quaternion& qua
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_QUATERNION_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -112,7 +107,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_RADIAN_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/math/vector4.h>
 
@@ -86,7 +81,4 @@ inline bool Chance(float chance = 0.5f)
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_RANDOM_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <math.h>
 
@@ -271,7 +266,4 @@ inline bool Rect<float>::IsEmpty() const
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_RECT_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <algorithm>
 #include <iostream>
@@ -513,7 +508,4 @@ DALI_IMPORT_API Size ShrinkInside( const Size& target, const Size& source );
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_VECTOR_2_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <algorithm>
 #include <iostream>
@@ -608,7 +603,4 @@ Vector3 ShrinkInsideKeepAspectRatio( const Vector3& target, const Vector3& sourc
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_VECTOR_3_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <algorithm>
 #include <iostream>
@@ -564,7 +559,4 @@ DALI_IMPORT_API Vector4 Clamp( const Vector4& v, const float& min, const float&
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_VECTOR_4_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MATH_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/math/rect.h>
 
@@ -36,7 +31,4 @@ typedef Rect<int> Viewport;
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_VIEWPORT_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_MODELING_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/common/constants.h>
@@ -388,7 +383,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_MATERIAL_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <typeinfo>   // operator typeid
 
@@ -455,7 +450,4 @@ template<typename Type>inline const Type& AnyCastReference( const Any& any )
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_ANY_TYPE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -291,7 +286,4 @@ bool operator<(const BaseHandle& lhs, const BaseHandle& rhs);
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_BASE_HANDLE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-handle.h>
@@ -134,7 +129,4 @@ inline const BaseObject& GetImplementation(const Dali::BaseHandle& handle)
 
 } // namespace Dali
 
-/**
- * @}
- */
 # endif // __DALI_BASE_OBJECT_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/handle.h>
 #include <dali/public-api/animation/active-constraint.h>
@@ -167,7 +162,4 @@ Constrainable New();
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CONSTRAINABLE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -297,7 +292,4 @@ public:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_HANDLE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 
@@ -143,7 +138,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_OBJECT_REGISTRY_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-handle.h>
@@ -173,7 +168,4 @@ PropertyCondition VariableStepCondition(const std::vector<float>& steps);
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PROPERTY_CONDITIONS_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -44,7 +39,4 @@ enum
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PROPERTY_INDEX_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/property.h>
 
@@ -122,7 +117,4 @@ public:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PROPERTY_INPUT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <boost/function.hpp>
 
@@ -47,7 +42,4 @@ typedef boost::function<void (PropertyNotification& source)> PropertyNotifyCallb
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PROPERTY_NOTIFICATION_DECLARATIONS_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/object/property-notification-declarations.h>
@@ -159,7 +154,4 @@ public: // Not intended for use by Application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PROPERTY_NOTIFICATION_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/constants.h>
 #include <dali/public-api/math/angle-axis.h>
@@ -80,7 +75,4 @@ template <>           Property::Type Get<Property::Array >();
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PROPERTY_TYPES_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/property.h>
 #include <dali/public-api/math/rect.h>
@@ -39,7 +34,7 @@ class Matrix3;
 class Matrix;
 
 /**
- * @brief Container of Dali::Property::Value%s.
+ * @brief Container of Dali::Property::Value.
  */
 typedef std::vector<Property::Value> PropertyValueContainer;
 typedef PropertyValueContainer::iterator PropertyValueIter; ///< Iterator for Dali::PropertyValueContainer
@@ -421,7 +416,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PROPERTY_VALUE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 #include <utility>
@@ -160,7 +155,4 @@ struct Property
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_PROPERTY_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_OBJECT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/intrusive-ptr.h>
@@ -99,8 +94,4 @@ private:
 
 } // namespace Dali
 
-
-/**
- * @}
- */
 #endif // __DALI_REF_OBJECT_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_RENDER_TASKS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-handle.h>
@@ -118,7 +113,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif //__DALI_RENDER_TASK_LIST_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_RENDER_TASKS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/math/viewport.h>
 #include <dali/public-api/object/constrainable.h>
@@ -389,7 +384,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif //__DALI_RENDER_TASK_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SHADER_EFFECTS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/animation/active-constraint-declarations.h>
 #include <dali/public-api/object/constrainable.h>
@@ -463,7 +458,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_SHADER_EFFECT_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SIGNALS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/vector-wrapper.h>
@@ -499,7 +494,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_BASE_SIGNAL_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SIGNALS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/signals/functor-delegate.h>
@@ -1637,7 +1632,4 @@ inline CallbackBase* MakeCallback( T& object, void(Base::*function)(void) )
 
 } // namespace DALI
 
-/**
- * @}
- */
 #endif // __DALI_CALLBACK_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SIGNALS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/signals/signal-slot-observers.h>
@@ -88,7 +83,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CONNECTION_TRACKER_INTERFACE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SIGNALS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/vector-wrapper.h>
@@ -84,7 +79,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CONNECTION_TRACKER_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 (file)
  */
 
 /**
- * @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__
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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SIGNALS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -136,7 +131,4 @@ public: // Data for deriving classes & Dispatchers
 
 } // namespace DALI
 
-/**
- * @}
- */
 #endif // __DALI_FUNCTOR_DELEGATE_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SIGNALS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/signals/signal-slot-observers.h>
 
@@ -150,7 +145,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_SIGNAL_SLOT_CONNECTIONS_H__
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SIGNALS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -89,7 +84,4 @@ public:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_SIGNAL_SLOT_OBSERVERS_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_SIGNALS_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/signals/connection-tracker.h>
@@ -147,7 +142,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_SLOT_DELEGATE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TEXT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
@@ -144,7 +139,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_CHARACTER_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TEXT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/text/text.h>
@@ -205,7 +200,4 @@ extern FontParameters DEFAULT_FONT_PARAMETERS; ///< Used to choose the platform'
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_FONT_PARAMETERS_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TEXT_MODULE
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/text/font-parameters.h>
@@ -433,7 +428,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_FONT_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TEXT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -572,7 +567,4 @@ private:
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TEXT_STYLE_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 (file)
  *
  */
 
-/**
- * @addtogroup CAPI_DALI_TEXT_MODULE
- * @{
- */
-
 // EXTERNAL INCLUDES
 #include <string>
 
@@ -258,7 +253,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TEXT_H__
index 123e147..9909957 100644 (file)
@@ -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