Remove a few unnecessary exports

Change-Id: I81b56ba3008d5099e383294c7718c0536252c1b8

diff --git a/dali/integration-api/profiling.h b/dali/integration-api/profiling.h
index 464da30..037e29b 100644 (file)
--- a/dali/integration-api/profiling.h
+++ b/dali/integration-api/profiling.h
@@ -2,7 +2,7 @@
 #define __DALI_INTEGRATION_PROFILING_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,6 @@ DALI_IMPORT_API extern const int ANIMATION_MEMORY_SIZE;    ///< Total size of an
 DALI_IMPORT_API extern const int CONSTRAINT_MEMORY_SIZE;   ///< Total size of constraint and associated internal objects
 DALI_IMPORT_API extern const int ACTOR_MEMORY_SIZE;        ///< Total size of actor and associated internal objects
 DALI_IMPORT_API extern const int CAMERA_ACTOR_MEMORY_SIZE; ///< Total size of camera actor and associated internal objects
-DALI_IMPORT_API extern const int TEXT_ACTOR_MEMORY_SIZE;   ///< Total size of text actor and associated internal objects
 DALI_IMPORT_API extern const int MESH_ACTOR_MEMORY_SIZE;   ///< Total size of mesh actor and associated internal objects
 DALI_IMPORT_API extern const int IMAGE_ACTOR_MEMORY_SIZE;  ///< Total size of image actor and associated internal objects
 DALI_IMPORT_API extern const int LAYER_MEMORY_SIZE;        ///< Total size of layer and associated internal objects

diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp
index 38d0e75..1f413fb 100644 (file)
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -568,13 +568,4 @@ Actor::Actor(Internal::Actor* internal)
 {
 }
 
-void UnparentAndReset( Actor& actor )
-{
-  if( actor )
-  {
-    actor.Unparent();
-    actor.Reset();
-  }
-}
-
 } // namespace Dali

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index 1d6035b..bbc06d7 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -1369,7 +1369,16 @@ public: // Not intended for application developers
  * actor.Unparent() will be called, followed by actor.Reset().
  * @param[in,out] actor A handle to an actor, or an empty handle.
  */
- DALI_IMPORT_API void UnparentAndReset( Actor& actor );
+inline void UnparentAndReset( Actor& actor )
+{
+  if( actor )
+  {
+    actor.Unparent();
+    actor.Reset();
+  }
+}
+
+
 
 } // namespace Dali
 

diff --git a/dali/public-api/animation/constraint.h b/dali/public-api/animation/constraint.h
index 6d047f4..6f51a68 100644 (file)
--- a/dali/public-api/animation/constraint.h
+++ b/dali/public-api/animation/constraint.h
@@ -86,7 +86,7 @@ public:
    * @tparam  P  The property type to constrain.
    */
   template< typename P >
-  class Function : public CallbackBase
+  class DALI_INTERNAL Function : public CallbackBase
   {
   public: