Stop exporting Internal symbols

Change-Id: I3b089e077523beac0020e3f96a3e66175e440cdc

diff --git a/base/dali-toolkit/internal/builder/json-parser-impl.h b/base/dali-toolkit/internal/builder/json-parser-impl.h
index 1b3adcf..987799e 100644 (file)
--- a/base/dali-toolkit/internal/builder/json-parser-impl.h
+++ b/base/dali-toolkit/internal/builder/json-parser-impl.h
@@ -29,13 +29,13 @@
 
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
 
 
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 {
 
 namespace Toolkit
 {
 

-namespace Internal DALI_INTERNAL
+namespace Internal

 {
 
 /*
 {
 
 /*

diff --git a/base/dali-toolkit/internal/builder/json-parser-state.h b/base/dali-toolkit/internal/builder/json-parser-state.h
index 6a563bc..44b911e 100644 (file)
--- a/base/dali-toolkit/internal/builder/json-parser-state.h
+++ b/base/dali-toolkit/internal/builder/json-parser-state.h
@@ -24,13 +24,13 @@
 
 #include <dali-toolkit/internal/builder/tree-node-manipulator.h>
 
 
 #include <dali-toolkit/internal/builder/tree-node-manipulator.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 {
 
 namespace Toolkit
 {
 

-namespace Internal DALI_INTERNAL
+namespace Internal

 {
 
 /*
 {
 
 /*

diff --git a/base/dali-toolkit/internal/builder/tree-node-manipulator.h b/base/dali-toolkit/internal/builder/tree-node-manipulator.h
index 3f91bcd..c21f4e1 100644 (file)
--- a/base/dali-toolkit/internal/builder/tree-node-manipulator.h
+++ b/base/dali-toolkit/internal/builder/tree-node-manipulator.h
@@ -27,13 +27,13 @@
 #include <dali/public-api/common/dali-common.h>
 #include <dali-toolkit/public-api/builder/tree-node.h>
 
 #include <dali/public-api/common/dali-common.h>
 #include <dali-toolkit/public-api/builder/tree-node.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 {
 
 namespace Toolkit
 {
 

-namespace Internal DALI_INTERNAL
+namespace Internal

 {
 typedef std::vector<char> VectorChar;
 typedef VectorChar::iterator VectorCharIter;
 {
 typedef std::vector<char> VectorChar;
 typedef VectorChar::iterator VectorCharIter;

diff --git a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
index f1e84af..25169ec 100755 (executable)
--- a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
+++ b/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
@@ -22,7 +22,7 @@
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 
 // Forward declarations
 
 
 // Forward declarations
 

-namespace Internal DALI_INTERNAL
+namespace Internal

 {
 // Forward declarations
 
 {
 // Forward declarations
 

diff --git a/base/dali-toolkit/public-api/builder/builder.h b/base/dali-toolkit/public-api/builder/builder.h
index 3819238..65ece45 100644 (file)
--- a/base/dali-toolkit/public-api/builder/builder.h
+++ b/base/dali-toolkit/public-api/builder/builder.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 #include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -117,7 +117,7 @@ class Builder;
  *
  */
 
  *
  */
 

-class Builder : public BaseHandle
+class DALI_IMPORT_API Builder : public BaseHandle

  {
  public:
    /**
  {
  public:
    /**


@@ -412,7 +412,7 @@ class Builder : public BaseHandle
   Signal& QuitSignal();
 
 private:
   Signal& QuitSignal();
 
 private:

-  Builder(Internal::Builder *impl);
+  explicit DALI_INTERNAL Builder(Internal::Builder *impl);

 
 }; // class Builder
 
 
 }; // class Builder
 

diff --git a/base/dali-toolkit/public-api/builder/json-parser.h b/base/dali-toolkit/public-api/builder/json-parser.h
index 5ea57e2..7f47be3 100644 (file)
--- a/base/dali-toolkit/public-api/builder/json-parser.h
+++ b/base/dali-toolkit/public-api/builder/json-parser.h
@@ -27,7 +27,7 @@
 #include <dali-toolkit/public-api/builder/tree-node.h>
 #include <dali/public-api/object/base-handle.h>
 
 #include <dali-toolkit/public-api/builder/tree-node.h>
 #include <dali/public-api/object/base-handle.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -41,7 +41,7 @@ class JsonParser;
 /*
  * Parses JSON
  */
 /*
  * Parses JSON
  */

-class JsonParser : public BaseHandle
+class DALI_IMPORT_API JsonParser : public BaseHandle

 {
 public:
 
 {
 public:
 

diff --git a/base/dali-toolkit/public-api/builder/tree-node.h b/base/dali-toolkit/public-api/builder/tree-node.h
index d912e30..210cb77 100644 (file)
--- a/base/dali-toolkit/public-api/builder/tree-node.h
+++ b/base/dali-toolkit/public-api/builder/tree-node.h
@@ -25,7 +25,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -44,7 +44,7 @@ class TreeNodeManipulator;
  * TreeNode does not own its string data which is held by a container eg JsonParser
  * Modification operations should be done through a container.
  */
  * TreeNode does not own its string data which is held by a container eg JsonParser
  * Modification operations should be done through a container.
  */

-class TreeNode
+class DALI_IMPORT_API TreeNode

 {
 public:
   /*
 {
 public:
   /*


@@ -208,11 +208,11 @@ private:
   /*
    * Constructor
    */
   /*
    * Constructor
    */

-  TreeNode();
+  DALI_INTERNAL TreeNode();

 
   // non copyable or assignable
 
   // non copyable or assignable

-  TreeNode(TreeNode &);
-  TreeNode& operator=(const TreeNode&);
+  DALI_INTERNAL TreeNode(TreeNode &);
+  DALI_INTERNAL TreeNode& operator=(const TreeNode&);

 
   const char* mName;                   ///< The nodes name (if any)
 
 
   const char* mName;                   ///< The nodes name (if any)
 

diff --git a/base/dali-toolkit/public-api/controls/alignment/alignment.h b/base/dali-toolkit/public-api/controls/alignment/alignment.h
index d91db90..80e3cea 100644 (file)
--- a/base/dali-toolkit/public-api/controls/alignment/alignment.h
+++ b/base/dali-toolkit/public-api/controls/alignment/alignment.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -41,7 +41,7 @@ class Alignment;
  * All actors added to an alignment are going to be set with the same anchor point and parent origin. And, if the scaling property is set to a value
  * different than ScaleNone, constraints as well.
  */
  * All actors added to an alignment are going to be set with the same anchor point and parent origin. And, if the scaling property is set to a value
  * different than ScaleNone, constraints as well.
  */

-class Alignment : public Control
+class DALI_IMPORT_API Alignment : public Control

 {
 public:
   /**
 {
 public:
   /**


@@ -217,14 +217,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  Alignment( Internal::Alignment& implementation );
+  DALI_INTERNAL Alignment( Internal::Alignment& implementation );

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  Alignment( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Alignment( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/buttons/button.h b/base/dali-toolkit/public-api/controls/buttons/button.h
index 980ddbd..eb62d05 100644 (file)
--- a/base/dali-toolkit/public-api/controls/buttons/button.h
+++ b/base/dali-toolkit/public-api/controls/buttons/button.h
@@ -21,14 +21,9 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 {
 

-namespace Internal DALI_INTERNAL
-{
-class CustomActor;
-}
-

 namespace Toolkit
 {
 
 namespace Toolkit
 {
 


@@ -47,7 +42,7 @@ class Button;
  *
  * When the \e dimmed property is set to \e true, no signal is emitted.
  */
  *
  * When the \e dimmed property is set to \e true, no signal is emitted.
  */

-class Button : public Control
+class DALI_IMPORT_API Button : public Control

 {
 public:
 
 {
 public:
 


@@ -153,14 +148,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  Button( Internal::Button& implementation );
+  DALI_INTERNAL Button( Internal::Button& implementation );

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  Button( Dali::Internal::CustomActor* internal );
+  DALI_INTERNAL Button( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/buttons/check-box-button.h b/base/dali-toolkit/public-api/controls/buttons/check-box-button.h
index de65310..7d68fee 100644 (file)
--- a/base/dali-toolkit/public-api/controls/buttons/check-box-button.h
+++ b/base/dali-toolkit/public-api/controls/buttons/check-box-button.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -50,7 +50,7 @@ class CheckBoxButton;
  * CheckBoxButton doesn't have a text. However, a Dali::Toolkit::TableView with a Dali::TextActor or a Dali::Toolkit::TextView
  * and a CheckBoxButton could be used instead.
  */
  * CheckBoxButton doesn't have a text. However, a Dali::Toolkit::TableView with a Dali::TextActor or a Dali::Toolkit::TextView
  * and a CheckBoxButton could be used instead.
  */

-class CheckBoxButton : public Button
+class DALI_IMPORT_API CheckBoxButton : public Button

 {
 public:
   //Action Names
 {
 public:
   //Action Names


@@ -192,13 +192,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  CheckBoxButton( Internal::CheckBoxButton& implementation );
+  DALI_INTERNAL CheckBoxButton( Internal::CheckBoxButton& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  CheckBoxButton( Dali::Internal::CustomActor* internal );
+  DALI_INTERNAL CheckBoxButton( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/buttons/push-button.h b/base/dali-toolkit/public-api/controls/buttons/push-button.h
index 658dbae..7db2644 100644 (file)
--- a/base/dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/base/dali-toolkit/public-api/controls/buttons/push-button.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include "button.h"
 
 // INTERNAL INCLUDES
 #include "button.h"
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -75,7 +75,7 @@ class PushButton;
  *
  * Is not mandatory set all images. A button could be defined only by setting its \e background image or by setting its \e background and \e pressed images.
  */
  *
  * Is not mandatory set all images. A button could be defined only by setting its \e background image or by setting its \e background and \e pressed images.
  */

-class PushButton : public Button
+class DALI_IMPORT_API PushButton : public Button

 {
 public:
 
 {
 public:
 


@@ -355,14 +355,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  PushButton( Internal::PushButton& implementation );
+  DALI_INTERNAL PushButton( Internal::PushButton& implementation );

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  PushButton( Dali::Internal::CustomActor* internal );
+  DALI_INTERNAL PushButton( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/buttons/radio-button.h b/base/dali-toolkit/public-api/controls/buttons/radio-button.h
index 23c370b..d972ecd 100644 (file)
--- a/base/dali-toolkit/public-api/controls/buttons/radio-button.h
+++ b/base/dali-toolkit/public-api/controls/buttons/radio-button.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include "button.h"
 
 // INTERNAL INCLUDES
 #include "button.h"
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -53,7 +53,7 @@ class RadioButton;
  *
  * A Button::ClickedSignal() is emitted when the RadioButton change its state to \e active or \e inactive.
  */
  *
  * A Button::ClickedSignal() is emitted when the RadioButton change its state to \e active or \e inactive.
  */

-class RadioButton: public Button
+class DALI_IMPORT_API RadioButton: public Button

 {
  public:
 
 {
  public:
 


@@ -169,14 +169,14 @@ class RadioButton: public Button
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  RadioButton(Internal::RadioButton& implementation);
+  DALI_INTERNAL RadioButton(Internal::RadioButton& implementation);

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  RadioButton(Dali::Internal::CustomActor* internal);
+  DALI_INTERNAL RadioButton(Dali::Internal::CustomActor* internal);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/control-impl.h b/base/dali-toolkit/public-api/controls/control-impl.h
index f1dfcbe..f79bb8b 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.h
+++ b/base/dali-toolkit/public-api/controls/control-impl.h
@@ -30,7 +30,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -550,7 +550,7 @@ private:
    * @param[in] styleManager The StyleManager Object
    * @param[in] change  Information denoting what has changed.
    */
    * @param[in] styleManager The StyleManager Object
    * @param[in] change  Information denoting what has changed.
    */

-  void DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change );
+  DALI_INTERNAL void DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change );

 
 protected: // Construction
 
 
 protected: // Construction
 


@@ -708,7 +708,7 @@ private: // Used by the RelayoutController
    * @param[in,out]  container  The container that holds actors that are fed back into the
    *                            RelayoutController algorithm.
    */
    * @param[in,out]  container  The container that holds actors that are fed back into the
    *                            RelayoutController algorithm.
    */

-  void NegotiateSize( Vector2 size, ActorSizeContainer& container );
+  DALI_INTERNAL void NegotiateSize( Vector2 size, ActorSizeContainer& container );

 
 private:
 
 
 private:
 


@@ -721,7 +721,7 @@ private:
    * @param[in,out]  container  The control should add actors to this container that it is not able
    *                            to allocate a size for.
    */
    * @param[in,out]  container  The control should add actors to this container that it is not able
    *                            to allocate a size for.
    */

-  void Relayout( Vector2 size, ActorSizeContainer& container );
+  DALI_INTERNAL void Relayout( Vector2 size, ActorSizeContainer& container );

 
   /**
    * @brief Used by the KeyInputFocusManager to emit key event signals.
 
   /**
    * @brief Used by the KeyInputFocusManager to emit key event signals.


@@ -729,13 +729,13 @@ private:
    * @param[in] event The key event.
    * @return True if the event was consumed.
    */
    * @param[in] event The key event.
    * @return True if the event was consumed.
    */

-  bool EmitKeyEventSignal(const KeyEvent& event);
+  DALI_INTERNAL bool EmitKeyEventSignal(const KeyEvent& event);

 
 private:
 
   // Undefined
 
 private:
 
   // Undefined

-  Control(const Control&);
-  Control& operator=(const Control&);
+  DALI_INTERNAL Control(const Control&);
+  DALI_INTERNAL Control& operator=(const Control&);

 
   class Impl;
   Impl* mImpl;
 
   class Impl;
   Impl* mImpl;

diff --git a/base/dali-toolkit/public-api/controls/control.h b/base/dali-toolkit/public-api/controls/control.h
index f41cb00..1500115 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control.h
+++ b/base/dali-toolkit/public-api/controls/control.h
@@ -28,7 +28,7 @@
 #include <dali/public-api/events/tap-gesture-detector.h>
 #include <dali/public-api/images/image.h>
 
 #include <dali/public-api/events/tap-gesture-detector.h>
 #include <dali/public-api/images/image.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -47,7 +47,7 @@ class Control;
  * The implementation of the control must be supplied; see Internal::Control for more details.
  * @see Internal::Control
  */
  * The implementation of the control must be supplied; see Internal::Control for more details.
  * @see Internal::Control
  */

-class Control : public CustomActor
+class DALI_IMPORT_API Control : public CustomActor

 {
 public:
 
 {
 public:
 


@@ -380,7 +380,7 @@ public:
    */
   KeyEventSignalV2& KeyEventSignal();
 
    */
   KeyEventSignalV2& KeyEventSignal();
 

-public: // Not intended for application developers
+public: // Intended for control developers (used implicitly)

 
   /**
    * @brief Create an initialised Control.
 
   /**
    * @brief Create an initialised Control.


@@ -410,7 +410,7 @@ public: // Templates for Deriving Classes
    * @see DownCast(BaseHandle)
    */
   template<typename T, typename I>
    * @see DownCast(BaseHandle)
    */
   template<typename T, typename I>

-  static T DownCast( BaseHandle handle )
+  DALI_INTERNAL static T DownCast( BaseHandle handle )

   {
     T result;
 
   {
     T result;
 


@@ -438,7 +438,7 @@ public: // Templates for Deriving Classes
    * @param[in]  internal  Pointer to the Internal::CustomActor
    */
   template<typename I>
    * @param[in]  internal  Pointer to the Internal::CustomActor
    */
   template<typename I>

-  void VerifyCustomActorPointer(Dali::Internal::CustomActor* internal)
+  DALI_INTERNAL void VerifyCustomActorPointer(Dali::Internal::CustomActor* internal)

   {
     // Can have a NULL pointer so we only need to check if the internal implementation is our class
     // when there is a value.
   {
     // Can have a NULL pointer so we only need to check if the internal implementation is our class
     // when there is a value.

diff --git a/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h b/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h
index d197131..6a95311 100644 (file)
--- a/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h
+++ b/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -38,7 +38,7 @@ namespace Toolkit
  * @param[in] dimmedBackgroundImagePath Image path to be shown as button dimmed background.
  * @param[in] dimmedCheckedImagePath Image path to be shown as dimmed checked button.
  */
  * @param[in] dimmedBackgroundImagePath Image path to be shown as button dimmed background.
  * @param[in] dimmedCheckedImagePath Image path to be shown as dimmed checked button.
  */

-CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath, const std::string& dimmedBackgroundImagePath, const std::string& dimmedCheckedImagePath );
+DALI_IMPORT_API CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath, const std::string& dimmedBackgroundImagePath, const std::string& dimmedCheckedImagePath );

 
 /**
  * Creates a check box button with the given images.
 
 /**
  * Creates a check box button with the given images.


@@ -51,7 +51,7 @@ CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, con
  * @param[in] dimmedBackgroundImageActor Image to be shown as button dimmed background.
  * @param[in] dimmedCheckedImagActor Image to be shown as dimmed checked button.
  */
  * @param[in] dimmedBackgroundImageActor Image to be shown as button dimmed background.
  * @param[in] dimmedCheckedImagActor Image to be shown as dimmed checked button.
  */

-CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor, Actor dimmedBackgroundImageActor, Actor dimmedCheckedImagActor );
+DALI_IMPORT_API CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor, Actor dimmedBackgroundImageActor, Actor dimmedCheckedImagActor );

 
 /**
  * Creates a check box button with the given background and checked images.
 
 /**
  * Creates a check box button with the given background and checked images.


@@ -61,7 +61,7 @@ CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedIm
  * @param[in] backgroundImagePath  Image path to be shown as button background.
  * @param[in] checkedImagePath  Image path to be shown as checked button.
  */
  * @param[in] backgroundImagePath  Image path to be shown as button background.
  * @param[in] checkedImagePath  Image path to be shown as checked button.
  */

-CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath );
+DALI_IMPORT_API CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, const std::string& checkedImagePath );

 
 /**
  * Creates a check box button with the given background and checked images.
 
 /**
  * Creates a check box button with the given background and checked images.


@@ -71,7 +71,8 @@ CheckBoxButton CreateCheckBoxButton( const std::string& backgroundImagePath, con
  * @param[in] backgroundImageActor  Image to be shown as button background.
  * @param[in] checkedImageActor  Image to be shown as checked button.
  */
  * @param[in] backgroundImageActor  Image to be shown as button background.
  * @param[in] checkedImageActor  Image to be shown as checked button.
  */

-CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor );
+DALI_IMPORT_API CheckBoxButton CreateCheckBoxButton( Actor backgroundImageActor, Actor checkedImageActor );
+

 } // namespace Toolkit
 
 } // namespace Dali
 } // namespace Toolkit
 
 } // namespace Dali

diff --git a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h b/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h
index 6677430..0463d08 100644 (file)
--- a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h
+++ b/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -40,7 +40,7 @@ namespace Toolkit
  * @param[in] dimmedBackgroundImagePath  Image path to be shown as button background when the button is dimmed.
  * @return A handle to the new push button
  */
  * @param[in] dimmedBackgroundImagePath  Image path to be shown as button background when the button is dimmed.
  * @return A handle to the new push button
  */

-PushButton CreatePushButton( const std::string& releasedImagePath, const std::string& pressedImagePath, const std::string& backgroundImagePath,
+DALI_IMPORT_API PushButton CreatePushButton( const std::string& releasedImagePath, const std::string& pressedImagePath, const std::string& backgroundImagePath,

                              const std::string& dimmedReleasedImagePath, const std::string& dimmedBackgroundImagePath );
 
 /**
                              const std::string& dimmedReleasedImagePath, const std::string& dimmedBackgroundImagePath );
 
 /**


@@ -57,7 +57,7 @@ PushButton CreatePushButton( const std::string& releasedImagePath, const std::st
  * @param[in] dimmedBackgroundImageActor  Image to be shown as button background when the button is dimmed.
  * @return A handle to the new pushbutton
  */
  * @param[in] dimmedBackgroundImageActor  Image to be shown as button background when the button is dimmed.
  * @return A handle to the new pushbutton
  */

-PushButton CreatePushButton( Actor releasedImageActor, Actor pressedImageActor, Actor backgroundImageActor,
+DALI_IMPORT_API PushButton CreatePushButton( Actor releasedImageActor, Actor pressedImageActor, Actor backgroundImageActor,

                              Actor dimmedReleasedImageActor, Actor dimmedBackgroundImageActor );
 
 /**
                              Actor dimmedReleasedImageActor, Actor dimmedBackgroundImageActor );
 
 /**


@@ -69,7 +69,7 @@ PushButton CreatePushButton( Actor releasedImageActor, Actor pressedImageActor,
  * @param[in] backgroundImagePath  Image path to be shown as button background.
  * @return a handle to the new push button
  */
  * @param[in] backgroundImagePath  Image path to be shown as button background.
  * @return a handle to the new push button
  */

-PushButton CreatePushButton( const std::string& backgroundImagePath );
+DALI_IMPORT_API PushButton CreatePushButton( const std::string& backgroundImagePath );

 
 /**
  * @brief Creates a push button with the given background image.
 
 /**
  * @brief Creates a push button with the given background image.


@@ -80,7 +80,7 @@ PushButton CreatePushButton( const std::string& backgroundImagePath );
  * @param[in] backgroundImageActor  Image to be shown as button background.
  * @return a handle to the new push button
  */
  * @param[in] backgroundImageActor  Image to be shown as button background.
  * @return a handle to the new push button
  */

-PushButton CreatePushButton( Actor backgroundImageActor );
+DALI_IMPORT_API PushButton CreatePushButton( Actor backgroundImageActor );

 
 } // namespace Toolkit
 
 
 } // namespace Toolkit
 

diff --git a/base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h b/base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h
index 7ef0c7e..8e307ce 100644 (file)
--- a/base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h
+++ b/base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/math/vector4.h>
 #include <dali/public-api/actors/image-actor.h>
 
 #include <dali/public-api/math/vector4.h>
 #include <dali/public-api/actors/image-actor.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -39,8 +39,7 @@ namespace Toolkit
  * @param[in] borderSize The size for the ImageActor's border. By default, the value is set to 1 pixel. It supports under 10 pixel for clear result of gl blend
  * @return a handle to the new ImageActor
  */
  * @param[in] borderSize The size for the ImageActor's border. By default, the value is set to 1 pixel. It supports under 10 pixel for clear result of gl blend
  * @return a handle to the new ImageActor
  */

-ImageActor CreateSolidColorActor( const Vector4& color, bool border = false, const Vector4& borderColor = Color::WHITE, const unsigned int borderSize = 1 );
-
+DALI_IMPORT_API ImageActor CreateSolidColorActor( const Vector4& color, bool border = false, const Vector4& borderColor = Color::WHITE, const unsigned int borderSize = 1 );

 
 } // namespace Toolkit
 
 
 } // namespace Toolkit
 

diff --git a/base/dali-toolkit/public-api/controls/popup/popup.h b/base/dali-toolkit/public-api/controls/popup/popup.h
index 4806137..5bfaac9 100644 (file)
--- a/base/dali-toolkit/public-api/controls/popup/popup.h
+++ b/base/dali-toolkit/public-api/controls/popup/popup.h
@@ -22,7 +22,7 @@
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -63,7 +63,7 @@ class Button;
  * A popup can use various custom transition effects, e.g.
  * Alpha fade, Scaling transition, position/rotation, shader effects.
  */
  * A popup can use various custom transition effects, e.g.
  * Alpha fade, Scaling transition, position/rotation, shader effects.
  */

-class Popup : public Control
+class DALI_IMPORT_API Popup : public Control

 {
 
 public:
 {
 
 public:


@@ -257,14 +257,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  Popup(Internal::Popup& implementation);
+  DALI_INTERNAL Popup(Internal::Popup& implementation);

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  Popup( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Popup( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
index a4b387d..73c2b8a 100755 (executable)
--- a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
+++ b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -44,7 +44,7 @@ class ScrollBar;
  * ScrollBar is a UI component that can be added to the scrollable controls
  * indicating the current scroll position of the scrollable content.
  */
  * ScrollBar is a UI component that can be added to the scrollable controls
  * indicating the current scroll position of the scrollable content.
  */

-class ScrollBar : public ScrollComponent
+class DALI_IMPORT_API ScrollBar : public ScrollComponent

 {
 public:
 
 {
 public:
 


@@ -232,13 +232,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  ScrollBar( Internal::ScrollBar& implementation );
+  DALI_INTERNAL ScrollBar( Internal::ScrollBar& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  ScrollBar( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ScrollBar( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h
index f4e6eb5..a7ca49b 100755 (executable)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/album-layout.h
@@ -31,7 +31,7 @@ Note:This layout is customized for music player application, so there are some l
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -44,7 +44,7 @@ typedef IntrusivePtr<AlbumLayout> AlbumLayoutPtr;
 /**
  * An ItemView layout which arranges items in a album.
  */
 /**
  * An ItemView layout which arranges items in a album.
  */

-class AlbumLayout : public ItemLayout
+class DALI_IMPORT_API AlbumLayout : public ItemLayout

 {
 public:
 
 {
 public:
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h
index aea3964..c4e3683 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h
@@ -22,7 +22,7 @@
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -35,7 +35,7 @@ typedef IntrusivePtr<DepthLayout> DepthLayoutPtr;
 /**
  * This layout arranges items in a grid, which scrolls along the Z-Axis.
  */
 /**
  * This layout arranges items in a grid, which scrolls along the Z-Axis.
  */

-class DepthLayout : public ItemLayout
+class DALI_IMPORT_API DepthLayout : public ItemLayout

 {
 public:
 
 {
 public:
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h
index 3914433..8824ffe 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h
@@ -22,7 +22,7 @@
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -35,7 +35,7 @@ typedef IntrusivePtr<GridLayout> GridLayoutPtr; ///< Pointer to a Dali::Toolkit:
 /**
  * @brief An ItemView layout which arranges items in a grid.
  */
 /**
  * @brief An ItemView layout which arranges items in a grid.
  */

-class GridLayout : public ItemLayout
+class DALI_IMPORT_API GridLayout : public ItemLayout

 {
 public:
 
 {
 public:
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
index e11ef16..a8bdb3c 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -38,7 +38,7 @@ public:
   /**
    * @brief Virtual destructor.
    */
   /**
    * @brief Virtual destructor.
    */

-  virtual ~ItemFactory() = 0;
+  DALI_EXPORT_API virtual ~ItemFactory() = 0;

 
   /**
    * @brief Query the number of items available from the factory.
 
   /**
    * @brief Query the number of items available from the factory.

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
index 9d4775c..fdea8ec 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
@@ -25,7 +25,7 @@
 #include <dali-toolkit/public-api/enums.h>
 #include <dali-toolkit/public-api/controls/control.h>
 
 #include <dali-toolkit/public-api/enums.h>
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -146,21 +146,21 @@ public:
   /**
    * @brief Virtual destructor.
    */
   /**
    * @brief Virtual destructor.
    */

-  virtual ~ItemLayout();
+  DALI_IMPORT_API virtual ~ItemLayout();

 
   /**
    * @brief Set the orientation of the layout.
    *
    * @param[in] orientation The orientation of the layout.
    */
 
   /**
    * @brief Set the orientation of the layout.
    *
    * @param[in] orientation The orientation of the layout.
    */

-  void SetOrientation(ControlOrientation::Type orientation);
+  DALI_IMPORT_API void SetOrientation(ControlOrientation::Type orientation);

 
   /**
    * @brief Query the orientation of the layout.
    *
    * @return the orientation of the layout.
    */
 
   /**
    * @brief Query the orientation of the layout.
    *
    * @return the orientation of the layout.
    */

-  ControlOrientation::Type GetOrientation() const;
+  DALI_IMPORT_API ControlOrientation::Type GetOrientation() const;

 
   /**
    * @brief Query the minimum valid layout position; this is a negative value.
 
   /**
    * @brief Query the minimum valid layout position; this is a negative value.


@@ -216,7 +216,7 @@ public:
    * @param[in] layoutSize the current size of the item view instance
    * @return The layout position
    */
    * @param[in] layoutSize the current size of the item view instance
    * @return The layout position
    */

-  virtual float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize);
+  DALI_IMPORT_API virtual float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize);

 
   /**
    * @brief Query the number of items that should be reserved, for scrolling purposes.
 
   /**
    * @brief Query the number of items that should be reserved, for scrolling purposes.


@@ -323,7 +323,7 @@ public:
    *
    * @param[out] scrollHint Vector2 describing how x and y scroll values should be used for x-axis scrolling
    */
    *
    * @param[out] scrollHint Vector2 describing how x and y scroll values should be used for x-axis scrolling
    */

-  virtual void GetXAxisScrollHint(Vector2& scrollHint) const;
+  DALI_IMPORT_API virtual void GetXAxisScrollHint(Vector2& scrollHint) const;

 
   /**
    * @brief Tells scroll components how to interpolate our logical scroll position as a screen x/y direction.
 
   /**
    * @brief Tells scroll components how to interpolate our logical scroll position as a screen x/y direction.


@@ -339,7 +339,7 @@ public:
    *
    * @param[out] scrollHint Vector2 describing how x and y scroll values should be used for y-axis scrolling
    */
    *
    * @param[out] scrollHint Vector2 describing how x and y scroll values should be used for y-axis scrolling
    */

-  virtual void GetYAxisScrollHint(Vector2& scrollHint) const;
+  DALI_IMPORT_API virtual void GetYAxisScrollHint(Vector2& scrollHint) const;

 
   /**
    * @brief Query the scroll speed factor of the layout while dragging.
 
   /**
    * @brief Query the scroll speed factor of the layout while dragging.


@@ -382,7 +382,7 @@ public:
    * @param[in] loopEnabled Whether the KeyboardFocusManager is set to wrap around between first and last item
    * @return The next item ID.
    */
    * @param[in] loopEnabled Whether the KeyboardFocusManager is set to wrap around between first and last item
    * @return The next item ID.
    */

-  virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+  DALI_IMPORT_API virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);

 
   /**
    * @brief Query the flick speed factor of the layout while swipping.
 
   /**
    * @brief Query the flick speed factor of the layout while swipping.


@@ -396,7 +396,7 @@ public:
    *
    * @return The scroll speed factor of the layout.
    */
    *
    * @return The scroll speed factor of the layout.
    */

-  virtual float GetFlickSpeedFactor() const;
+  DALI_IMPORT_API virtual float GetFlickSpeedFactor() const;

 
   /*
    * @brief Applies constraints defined by the layout to an actor.
 
   /*
    * @brief Applies constraints defined by the layout to an actor.


@@ -407,7 +407,7 @@ public:
    * @param[in] scrollPositionObject The object which provides the layout position property.
    * @param[in] itemViewActor The item view instance which requests the application of constraints.
    */
    * @param[in] scrollPositionObject The object which provides the layout position property.
    * @param[in] itemViewActor The item view instance which requests the application of constraints.
    */

-  virtual void ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Constrainable scrollPositionObject, const Actor& itemViewActor );
+  DALI_IMPORT_API virtual void ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Constrainable scrollPositionObject, const Actor& itemViewActor );

 
   /**
    * @brief Gets the position of a given item
 
   /**
    * @brief Gets the position of a given item


@@ -417,28 +417,28 @@ public:
    * @param[in] layoutSize the current size of the item view instance
    * @return The item position (x,y,z)
    */
    * @param[in] layoutSize the current size of the item view instance
    * @return The item position (x,y,z)
    */

-  virtual Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const;
+  DALI_IMPORT_API virtual Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const;

 
   /**
    * @brief Set the alpha function used when applying constraints
    *
    * @param[in] func The alpha function to use.
    */
 
   /**
    * @brief Set the alpha function used when applying constraints
    *
    * @param[in] func The alpha function to use.
    */

-  void SetAlphaFunction(AlphaFunction func);
+  DALI_IMPORT_API void SetAlphaFunction(AlphaFunction func);

 
   /**
    * @brief Retrieve the alpha function used when applying constraints
    *
    * @return The alpha function.
    */
 
   /**
    * @brief Retrieve the alpha function used when applying constraints
    *
    * @return The alpha function.
    */

-  AlphaFunction GetAlphaFunction() const;
+  DALI_IMPORT_API AlphaFunction GetAlphaFunction() const;

 
 protected:
 
   /**
    * @brief Create a new ItemLayout; Only derived versions are instantiatable.
    */
 
 protected:
 
   /**
    * @brief Create a new ItemLayout; Only derived versions are instantiatable.
    */

-  ItemLayout();
+  DALI_IMPORT_API ItemLayout();

 
 protected:
 
 
 protected:
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h
index e4ae17a..be7e56c 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/common/vector-wrapper.h>
 
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/common/vector-wrapper.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
index 5bc5c7e..1dd4fe3 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
@@ -24,7 +24,7 @@
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -48,7 +48,7 @@ typedef IntrusivePtr<ItemLayout> ItemLayoutPtr;
  * Multiple ItemLayouts may be provided, to determine the logical position of each item a layout.
  * Actors are provided from an external ItemFactory, to display the currently visible items.
  */
  * Multiple ItemLayouts may be provided, to determine the logical position of each item a layout.
  * Actors are provided from an external ItemFactory, to display the currently visible items.
  */

-class ItemView : public Scrollable
+class DALI_IMPORT_API ItemView : public Scrollable

 {
 public:
 
 {
 public:
 


@@ -407,14 +407,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  ItemView(Internal::ItemView& implementation);
+  DALI_INTERNAL ItemView(Internal::ItemView& implementation);

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  ItemView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ItemView( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
index d94c802..eb49a07 100755 (executable)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 namespace Toolkit
 {
 {
 namespace Toolkit
 {


@@ -32,7 +32,7 @@ typedef IntrusivePtr<NavigationLayout> NavigationLayoutPtr;
 /**
  * An ItemView layout which arranges items in navigation mode.
  */
 /**
  * An ItemView layout which arranges items in navigation mode.
  */

-class NavigationLayout: public ItemLayout
+class DALI_IMPORT_API NavigationLayout: public ItemLayout

 {
 public:
 
 {
 public:
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h
index e54a651..bbaea00 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h
@@ -22,7 +22,7 @@
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -35,7 +35,7 @@ typedef IntrusivePtr<RollLayout> RollLayoutPtr;
 /**
  * An ItemView layout which arranges items in a roll.
  */
 /**
  * An ItemView layout which arranges items in a roll.
  */

-class RollLayout : public ItemLayout
+class DALI_IMPORT_API RollLayout : public ItemLayout

 {
 public:
 
 {
 public:
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h
index 883410b..7b608c9 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h
@@ -22,7 +22,7 @@
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -35,7 +35,7 @@ typedef IntrusivePtr<SpiralLayout> SpiralLayoutPtr;
 /**
  * An ItemView layout which arranges items in a spiral.
  */
 /**
  * An ItemView layout which arranges items in a spiral.
  */

-class SpiralLayout : public ItemLayout
+class DALI_IMPORT_API SpiralLayout : public ItemLayout

 {
 public:
 
 {
 public:
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
index 65e503a..c5f0bb8 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
@@ -38,7 +38,7 @@ typedef IntrusivePtr<ScrollComponentImpl> ScrollComponentPtr;
  * Base class for scroll component implementations.
  * Scroll-components such as scroll bars, indicators etc. are connected to scrollable containers via ScrollConnector.
  */
  * Base class for scroll component implementations.
  * Scroll-components such as scroll bars, indicators etc. are connected to scrollable containers via ScrollConnector.
  */

-class ScrollComponentImpl : public Internal::Control
+class DALI_IMPORT_API ScrollComponentImpl : public Internal::Control

 {
 public:
 
 {
 public:
 


@@ -83,10 +83,10 @@ protected:
 private:
 
   // Undefined
 private:
 
   // Undefined

-  ScrollComponentImpl(const ScrollComponentImpl&);
+  DALI_INTERNAL ScrollComponentImpl(const ScrollComponentImpl&);

 
   // Undefined
 
   // Undefined

-  ScrollComponentImpl& operator=(const ScrollComponentImpl& rhs);
+  DALI_INTERNAL ScrollComponentImpl& operator=(const ScrollComponentImpl& rhs);

 
 protected:
 
 
 protected:
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h
index db5fb61..cbfdf5b 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -34,7 +34,7 @@ class ScrollConnector;
  * Base class for scroll component handles.
  * Scroll-components such as scroll bars, indicators etc. are connected to scrollable containers via ScrollConnector.
  */
  * Base class for scroll component handles.
  * Scroll-components such as scroll bars, indicators etc. are connected to scrollable containers via ScrollConnector.
  */

-class ScrollComponent : public Control
+class DALI_IMPORT_API ScrollComponent : public Control

 {
 
 public:
 {
 
 public:


@@ -89,13 +89,13 @@ public: // Not intended for application developers
    * Creates a handle using the implementation.
    * @param[in]  implementation The Control implementation.
    */
    * Creates a handle using the implementation.
    * @param[in]  implementation The Control implementation.
    */

-  ScrollComponent( ScrollComponentImpl& implementation );
+  DALI_INTERNAL ScrollComponent( ScrollComponentImpl& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  ScrollComponent( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ScrollComponent( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
index 7806e43..c9f4955 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/constrainable.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/constrainable.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -51,7 +51,7 @@ class ScrollConnector;
  * -1 to 1, where -1 shows an attempt the scroll beyond the minimum limit, and 1 shows an attempt the scroll beyond the maximum limit.
  * Zero indicates normal scrolling i.e. when overshoot indicators should be hidden.
  */
  * -1 to 1, where -1 shows an attempt the scroll beyond the minimum limit, and 1 shows an attempt the scroll beyond the maximum limit.
  * Zero indicates normal scrolling i.e. when overshoot indicators should be hidden.
  */

-class ScrollConnector : public BaseHandle
+class DALI_IMPORT_API ScrollConnector : public BaseHandle

 {
 public:
 
 {
 public:
 


@@ -166,7 +166,7 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in] impl The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in] impl The Control implementation.
    */

-  ScrollConnector( Internal::ScrollConnector* impl );
+  explicit DALI_INTERNAL ScrollConnector( Internal::ScrollConnector* impl );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h
index 2f321bb..868ebca 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -61,7 +61,7 @@ class ScrollViewCarouselEffect;
  * Notes:
  * * Assumes Actor's AnchorPoint = AnchorPoint::CENTER
  */
  * Notes:
  * * Assumes Actor's AnchorPoint = AnchorPoint::CENTER
  */

-class ScrollViewCarouselEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewCarouselEffect : public ScrollViewEffect

 {
 
 public:
 {
 
 public:


@@ -104,7 +104,7 @@ protected:
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewCarouselEffect(Internal::ScrollViewCarouselEffect *impl);
+  explicit DALI_INTERNAL ScrollViewCarouselEffect(Internal::ScrollViewCarouselEffect *impl);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
index 1d891e9..9faba35 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
@@ -22,7 +22,7 @@
 
 // INTERNAL INCLUDES
 
 
 // INTERNAL INCLUDES
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 struct Vector2;
 {
 
 struct Vector2;


@@ -44,21 +44,21 @@ namespace Toolkit
  *
  * Moves an Actor in accordance to scroll position.
  */
  *
  * Moves an Actor in accordance to scroll position.
  */

-Vector3 MoveActorConstraint(const Vector3&    current,
-                            const PropertyInput& scrollPositionProperty);
+DALI_IMPORT_API Vector3 MoveActorConstraint(const Vector3&    current,
+                                           const PropertyInput& scrollPositionProperty);

 
 /**
  * Wrap Actor constraint.
  *
  * Wraps an Actors position in accordance to min/max bounds of domain.
  */
 
 /**
  * Wrap Actor constraint.
  *
  * Wraps an Actors position in accordance to min/max bounds of domain.
  */

-Vector3 WrapActorConstraint(const Vector3&    current,
-                            const PropertyInput& actorScaleProperty,
-                            const PropertyInput& actorAnchorPointProperty,
-                            const PropertyInput& actorSizeProperty,
-                            const PropertyInput& scrollPositionMin,
-                            const PropertyInput& scrollPositionMax,
-                            const PropertyInput& scrollWrap);
+DALI_IMPORT_API Vector3 WrapActorConstraint(const Vector3&    current,
+                                            const PropertyInput& actorScaleProperty,
+                                            const PropertyInput& actorAnchorPointProperty,
+                                            const PropertyInput& actorSizeProperty,
+                                            const PropertyInput& scrollPositionMin,
+                                            const PropertyInput& scrollPositionMax,
+                                            const PropertyInput& scrollWrap);

 
 } // namespace Toolkit
 
 
 } // namespace Toolkit
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h
index d1f3bae..3546a28 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -57,7 +57,7 @@ class ScrollViewCubeEffect;
  * Automatic operation:
  * not implemented.
  */
  * Automatic operation:
  * not implemented.
  */

-class ScrollViewCubeEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewCubeEffect : public ScrollViewEffect

 {
 
 public:
 {
 
 public:


@@ -128,7 +128,7 @@ protected:
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewCubeEffect(Internal::ScrollViewCubeEffect *impl);
+  explicit DALI_INTERNAL ScrollViewCubeEffect(Internal::ScrollViewCubeEffect *impl);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h
index c1d6cd2..c77fe24 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-custom-effect.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -56,7 +56,7 @@ class ScrollViewCustomEffect;
  * Automatic operation:
  * not implemented.
  */
  * Automatic operation:
  * not implemented.
  */

-class ScrollViewCustomEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewCustomEffect : public ScrollViewEffect

 {
 public:
   /**
 {
 public:
   /**


@@ -464,7 +464,7 @@ protected:
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewCustomEffect( Internal::ScrollViewCustomEffect *impl );
+  explicit DALI_INTERNAL ScrollViewCustomEffect( Internal::ScrollViewCustomEffect *impl );

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h
index 30ca7dc..1c8a605 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -60,7 +60,7 @@ class ScrollViewDepthEffect;
  * Automatic operation:
  * not implemented.
  */
  * Automatic operation:
  * not implemented.
  */

-class ScrollViewDepthEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewDepthEffect : public ScrollViewEffect

 {
 
 public:
 {
 
 public:


@@ -109,7 +109,7 @@ protected:
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewDepthEffect(Internal::ScrollViewDepthEffect *impl);
+  explicit DALI_INTERNAL ScrollViewDepthEffect(Internal::ScrollViewDepthEffect *impl);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
index 27aed5a..40ca06e 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-handle.h>
 
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-handle.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 struct Vector2;
 {
 
 struct Vector2;


@@ -55,7 +55,7 @@ typedef ScrollViewEffectContainer::const_iterator ScrollViewEffectConstIter; ///
  * constraints that are applied to ShaderEffects or Actors using these
  * properties as inputs.
  */
  * constraints that are applied to ShaderEffects or Actors using these
  * properties as inputs.
  */

-class ScrollViewEffect : public Dali::BaseHandle
+class DALI_IMPORT_API ScrollViewEffect : public Dali::BaseHandle

 {
 
 public:
 {
 
 public:


@@ -74,7 +74,7 @@ public: // Not intended for application developers
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewEffect(Internal::ScrollViewEffect *impl);
+  explicit DALI_INTERNAL ScrollViewEffect(Internal::ScrollViewEffect *impl);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h
index a15282e..60a936a 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -54,7 +54,7 @@ class ScrollViewPageCarouselEffect;
  * Automatic operation:
  * not implemented.
  */
  * Automatic operation:
  * not implemented.
  */

-class ScrollViewPageCarouselEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewPageCarouselEffect : public ScrollViewEffect

 {
 
 public:
 {
 
 public:


@@ -93,7 +93,7 @@ protected:
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewPageCarouselEffect( Internal::ScrollViewPageCarouselEffect *impl );
+  explicit DALI_INTERNAL ScrollViewPageCarouselEffect( Internal::ScrollViewPageCarouselEffect *impl );

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h
index 46b51d8..ffafbd5 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -54,7 +54,7 @@ class ScrollViewPageCubeEffect;
  * Automatic operation:
  * not implemented.
  */
  * Automatic operation:
  * not implemented.
  */

-class ScrollViewPageCubeEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewPageCubeEffect : public ScrollViewEffect

 {
 
 public:
 {
 
 public:


@@ -93,7 +93,7 @@ protected:
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewPageCubeEffect( Internal::ScrollViewPageCubeEffect *impl );
+  explicit DALI_INTERNAL ScrollViewPageCubeEffect( Internal::ScrollViewPageCubeEffect *impl );

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h
index 7e725bb..11c48cc 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -53,7 +53,7 @@ class ScrollViewPageSpiralEffect;
  * Automatic operation:
  * not implemented.
  */
  * Automatic operation:
  * not implemented.
  */

-class ScrollViewPageSpiralEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewPageSpiralEffect : public ScrollViewEffect

 {
 
 public:
 {
 
 public:


@@ -100,7 +100,7 @@ protected:
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewPageSpiralEffect( Internal::ScrollViewPageSpiralEffect *impl );
+  explicit DALI_INTERNAL ScrollViewPageSpiralEffect( Internal::ScrollViewPageSpiralEffect *impl );

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h
index f629ec8..f58559c 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h
@@ -23,7 +23,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -41,7 +41,7 @@ class ScrollViewSlideEffect;
 /**
  * @brief ScrollView effect that uses slides for transitioning pages.
  */
 /**
  * @brief ScrollView effect that uses slides for transitioning pages.
  */

-class ScrollViewSlideEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewSlideEffect : public ScrollViewEffect

 {
 public:
   static const std::string EFFECT_TIME;        ///< Effect time property name
 {
 public:
   static const std::string EFFECT_TIME;        ///< Effect time property name


@@ -152,7 +152,7 @@ protected:
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewSlideEffect(Internal::ScrollViewSlideEffect *impl);
+  explicit DALI_INTERNAL ScrollViewSlideEffect(Internal::ScrollViewSlideEffect *impl);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h
index f6b175a..d07839d 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-twist-effect.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -42,7 +42,7 @@ class ScrollViewTwistEffect;
 /**
  * @brief ScrollView effect that twists pages onto screen when transitioning.
  */
 /**
  * @brief ScrollView effect that twists pages onto screen when transitioning.
  */

-class ScrollViewTwistEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewTwistEffect : public ScrollViewEffect

 {
 
 public:
 {
 
 public:


@@ -172,7 +172,7 @@ protected:
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewTwistEffect(Internal::ScrollViewTwistEffect *impl);
+  explicit DALI_INTERNAL ScrollViewTwistEffect(Internal::ScrollViewTwistEffect *impl);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
index ca3eac5..c5558e8 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -40,7 +40,7 @@ class ScrollViewWobbleEffect;
  * Using this effect, a %wobble% property is produced which swings
  * towards the origin in accordance to how the user pans the ScrollView.
  */
  * Using this effect, a %wobble% property is produced which swings
  * towards the origin in accordance to how the user pans the ScrollView.
  */

-class ScrollViewWobbleEffect : public ScrollViewEffect
+class DALI_IMPORT_API ScrollViewWobbleEffect : public ScrollViewEffect

 {
 public:
 
 {
 public:
 


@@ -67,7 +67,7 @@ protected:
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  ScrollViewWobbleEffect(Internal::ScrollViewWobbleEffect *impl);
+  explicit DALI_INTERNAL ScrollViewWobbleEffect(Internal::ScrollViewWobbleEffect *impl);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
index 5c04e61..6c8d935 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -54,7 +54,7 @@ enum DirectionBias
 /**
  * @brief Used for specifying minimum/maximum extents of a ruler.
  */
 /**
  * @brief Used for specifying minimum/maximum extents of a ruler.
  */

-class RulerDomain
+class DALI_IMPORT_API RulerDomain

 {
 public:
 
 {
 public:
 


@@ -115,7 +115,7 @@ public:
  * It can specify whether they are traversable, where their snap
  * points are and their domain.
  */
  * It can specify whether they are traversable, where their snap
  * points are and their domain.
  */

-class Ruler : public RefObject
+class DALI_IMPORT_API Ruler : public RefObject

 {
 public:
   /// @brief The type of the ruler
 {
 public:
   /// @brief The type of the ruler


@@ -304,7 +304,7 @@ typedef IntrusivePtr<Ruler> RulerPtr; ///< Pointer to Dali::Toolkit::Ruler objec
 /**
  * @brief Concrete implementation of Ruler that has no snapping and has one single page.
  */
 /**
  * @brief Concrete implementation of Ruler that has no snapping and has one single page.
  */

-class DefaultRuler : public Ruler
+class DALI_IMPORT_API DefaultRuler : public Ruler

 {
 public:
   /**
 {
 public:
   /**


@@ -336,7 +336,7 @@ public:
 /**
  * @brief Concrete implementation of Ruler that has fixed snapping.
  */
 /**
  * @brief Concrete implementation of Ruler that has fixed snapping.
  */

-class FixedRuler : public Ruler
+class DALI_IMPORT_API FixedRuler : public Ruler

 {
 public:
   /**
 {
 public:
   /**


@@ -377,7 +377,7 @@ class ScrollView;
  * @brief ScrollView contains actors that can be scrolled manually (via touch)
  * or automatically.
  */
  * @brief ScrollView contains actors that can be scrolled manually (via touch)
  * or automatically.
  */

-class ScrollView : public Scrollable
+class DALI_IMPORT_API ScrollView : public Scrollable

 {
 public:
   /// Page effect types
 {
 public:
   /// Page effect types


@@ -1119,14 +1119,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  ScrollView(Internal::ScrollView& implementation);
+  DALI_INTERNAL ScrollView(Internal::ScrollView& implementation);

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  ScrollView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ScrollView( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scrollable.h b/base/dali-toolkit/public-api/controls/scrollable/scrollable.h
index e1ce852..7c0af4e 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/scrollable.h
+++ b/base/dali-toolkit/public-api/controls/scrollable/scrollable.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -67,7 +67,7 @@ struct ClampState3
  *
  * Scrollables such as ScrollView and ItemView can be derived from this class.
  */
  *
  * Scrollables such as ScrollView and ItemView can be derived from this class.
  */

-class Scrollable : public Control
+class DALI_IMPORT_API Scrollable : public Control

 {
 public:
 
 {
 public:
 


@@ -226,14 +226,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  Scrollable(Internal::Scrollable& implementation);
+  DALI_INTERNAL Scrollable(Internal::Scrollable& implementation);

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  Scrollable( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Scrollable( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/table-view/table-view.h b/base/dali-toolkit/public-api/controls/table-view/table-view.h
index b5cad9f..1b4a332 100644 (file)
--- a/base/dali-toolkit/public-api/controls/table-view/table-view.h
+++ b/base/dali-toolkit/public-api/controls/table-view/table-view.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -41,7 +41,7 @@ class TableView;
  * z position and depth are left intact so that 3D model actors can also be laid out
  * in a grid without loosing their depth scaling.
  */
  * z position and depth are left intact so that 3D model actors can also be laid out
  * in a grid without loosing their depth scaling.
  */

-class TableView : public Control
+class DALI_IMPORT_API TableView : public Control

 {
 public:
 
 {
 public:
 


@@ -361,13 +361,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  TableView(Internal::TableView& implementation);
+  DALI_INTERNAL TableView(Internal::TableView& implementation);

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  TableView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL TableView( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/text-input/text-input.h b/base/dali-toolkit/public-api/controls/text-input/text-input.h
index 76b7af7..836a1b3 100644 (file)
--- a/base/dali-toolkit/public-api/controls/text-input/text-input.h
+++ b/base/dali-toolkit/public-api/controls/text-input/text-input.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -37,7 +37,7 @@ class TextInput;
  * Characters can be removed from the end of the string until it is empty. A maximum length of displayed string
  * can be set.
  */
  * Characters can be removed from the end of the string until it is empty. A maximum length of displayed string
  * can be set.
  */

-class TextInput : public Control
+class DALI_IMPORT_API TextInput : public Control

 {
 
 public:
 {
 
 public:


@@ -633,14 +633,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  TextInput(Internal::TextInput& implementation);
+  DALI_INTERNAL TextInput(Internal::TextInput& implementation);

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  TextInput(Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL TextInput(Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/controls/text-view/text-view.h b/base/dali-toolkit/public-api/controls/text-view/text-view.h
index d478b3b..5529aa4 100644 (file)
--- a/base/dali-toolkit/public-api/controls/text-view/text-view.h
+++ b/base/dali-toolkit/public-api/controls/text-view/text-view.h
@@ -25,7 +25,7 @@
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/markup-processor/markup-processor.h>
 
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/markup-processor/markup-processor.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -43,7 +43,7 @@ class TextView;
  *
  * See the \link text-view Text View \endlink page of the Programming Guide for more details and examples.
  */
  *
  * See the \link text-view Text View \endlink page of the Programming Guide for more details and examples.
  */

-class TextView : public Control
+class DALI_IMPORT_API TextView : public Control

 {
 public:
 
 {
 public:
 


@@ -637,7 +637,7 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  TextView( Internal::TextView& implementation );
+  DALI_INTERNAL TextView( Internal::TextView& implementation );

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.


@@ -645,7 +645,7 @@ public: // Not intended for application developers
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  TextView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL TextView( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/enums.h b/base/dali-toolkit/public-api/enums.h
index a62dbf9..e1e34ec 100644 (file)
--- a/base/dali-toolkit/public-api/enums.h
+++ b/base/dali-toolkit/public-api/enums.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 /**
 {
 
 /**


@@ -55,7 +55,7 @@ enum Type
  * @param[in] orientation The orientation.
  * @return True if the orientation is vertical.
  */
  * @param[in] orientation The orientation.
  * @return True if the orientation is vertical.
  */

-bool IsVertical(ControlOrientation::Type orientation);
+DALI_IMPORT_API bool IsVertical(ControlOrientation::Type orientation);

 
 /**
  * @brief Query whether an orientation is horizontal.
 
 /**
  * @brief Query whether an orientation is horizontal.


@@ -63,7 +63,7 @@ bool IsVertical(ControlOrientation::Type orientation);
  * @param[in] orientation The orientation.
  * @return True if the orientation is horizontal.
  */
  * @param[in] orientation The orientation.
  * @return True if the orientation is horizontal.
  */

-bool IsHorizontal(ControlOrientation::Type orientation);
+DALI_IMPORT_API bool IsHorizontal(ControlOrientation::Type orientation);

 
 } // namespace Toolkit
 
 
 } // namespace Toolkit
 

diff --git a/base/dali-toolkit/public-api/focus-manager/focus-manager.h b/base/dali-toolkit/public-api/focus-manager/focus-manager.h
index b8ca24a..ed96b6c 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/focus-manager.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/image-actor.h>
 
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/image-actor.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -45,7 +45,7 @@ class FocusManager;
  * focused actor and emits a signal when the focus is changed.
  */
 
  * focused actor and emits a signal when the focus is changed.
  */
 

-class FocusManager : public BaseHandle
+class DALI_IMPORT_API FocusManager : public BaseHandle

 {
 public:
   // Signal Names
 {
 public:
   // Signal Names


@@ -403,7 +403,7 @@ public:
 
 private:
 
 
 private:
 

-  FocusManager(Internal::FocusManager *impl);
+  explicit DALI_INTERNAL FocusManager(Internal::FocusManager *impl);

 
 }; // class FocusManager
 
 
 }; // class FocusManager
 

diff --git a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
index 01a4862..cce6c58 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -41,7 +41,7 @@ class KeyboardFocusManager;
  * highlight for the focused actor and emits a signal when the focus
  * is changed.
  */
  * highlight for the focused actor and emits a signal when the focus
  * is changed.
  */

-class KeyboardFocusManager : public BaseHandle
+class DALI_IMPORT_API KeyboardFocusManager : public BaseHandle

 {
 public:
   //Signal Names
 {
 public:
   //Signal Names

diff --git a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
index 7d829a4..d481771 100644 (file)
--- a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
+++ b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -40,11 +40,10 @@ class KeyInputFocusManager;
  * the next control in the stack. If none of the controls in the stack consume the key event then
  * UnhandledKeyEventSignal() is emitted.
  */
  * the next control in the stack. If none of the controls in the stack consume the key event then
  * UnhandledKeyEventSignal() is emitted.
  */

-
- class KeyInputFocusManager : public BaseHandle
- {
- public:
-  //Signal Names
+class DALI_IMPORT_API KeyInputFocusManager : public BaseHandle
+{
+public:
+  // Signal Names

   static const char* const SIGNAL_KEY_INPUT_FOCUS_CHANGED;
   static const char* const SIGNAL_UNHANDLED_KEY_EVENT;
 
   static const char* const SIGNAL_KEY_INPUT_FOCUS_CHANGED;
   static const char* const SIGNAL_UNHANDLED_KEY_EVENT;
 


@@ -54,7 +53,7 @@ class KeyInputFocusManager;
   // Unhandled Key Event
   typedef SignalV2< void (const KeyEvent&) > UnhandledKeyEventSignalV2;
 
   // Unhandled Key Event
   typedef SignalV2< void (const KeyEvent&) > UnhandledKeyEventSignalV2;
 

- public:
+public:

 
   /**
    * Create a KeyInputFocusManager handle; this can be initialised with KeyInputFocusManager::Get()
 
   /**
    * Create a KeyInputFocusManager handle; this can be initialised with KeyInputFocusManager::Get()


@@ -108,7 +107,7 @@ class KeyInputFocusManager;
    */
   bool IsKeyboardListener(Control control);
 
    */
   bool IsKeyboardListener(Control control);
 

- public: // Signals
+public: // Signals

 
   /**
    * This signal is emitted when the key input focus control changes.
 
   /**
    * This signal is emitted when the key input focus control changes.


@@ -134,7 +133,7 @@ class KeyInputFocusManager;
 
 private:
 
 
 private:
 

-  KeyInputFocusManager(Internal::KeyInputFocusManager *impl);
+  explicit DALI_INTERNAL KeyInputFocusManager(Internal::KeyInputFocusManager *impl);

 
 }; // class KeyInputFocusManager
 
 
 }; // class KeyInputFocusManager
 

diff --git a/base/dali-toolkit/public-api/markup-processor/markup-processor.h b/base/dali-toolkit/public-api/markup-processor/markup-processor.h
index 5400599..0a10996 100644 (file)
--- a/base/dali-toolkit/public-api/markup-processor/markup-processor.h
+++ b/base/dali-toolkit/public-api/markup-processor/markup-processor.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/text/text.h>
 #include <dali/public-api/text/text-style.h>
 
 #include <dali/public-api/text/text.h>
 #include <dali/public-api/text/text-style.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -90,7 +90,7 @@ typedef std::vector<StyledText> StyledTextArray;
  * @param [out] styledTextArray A text array split in characters, each one with its style.
  * @param [in] scanForMarkup If true will check to see string contains markup, else assume not
  */
  * @param [out] styledTextArray A text array split in characters, each one with its style.
  * @param [in] scanForMarkup If true will check to see string contains markup, else assume not
  */

-void GetStyledTextArray( const std::string& markupString, StyledTextArray& styledTextArray, bool scanForMarkup );
+DALI_IMPORT_API void GetStyledTextArray( const std::string& markupString, StyledTextArray& styledTextArray, bool scanForMarkup );

 
 /**
  * @brief Creates a plain string from a text array (thus stripping the style meta).
 
 /**
  * @brief Creates a plain string from a text array (thus stripping the style meta).


@@ -98,7 +98,7 @@ void GetStyledTextArray( const std::string& markupString, StyledTextArray& style
  * @param [in] styledTextArray A text array split in characters, each one with its style.
  * @param [out] plainString A string without style.
  */
  * @param [in] styledTextArray A text array split in characters, each one with its style.
  * @param [out] plainString A string without style.
  */

-void GetPlainString( const StyledTextArray& styledTextArray, std::string& plainString );
+DALI_IMPORT_API void GetPlainString( const StyledTextArray& styledTextArray, std::string& plainString );

 
 /**
  * @brief Creates a markup string from a text array with its style.
 
 /**
  * @brief Creates a markup string from a text array with its style.


@@ -106,7 +106,7 @@ void GetPlainString( const StyledTextArray& styledTextArray, std::string& plainS
  * @param [in] styledTextArray A text array split in characters, each one with its style.
  * @param [out] markupString A string with style.
  */
  * @param [in] styledTextArray A text array split in characters, each one with its style.
  * @param [out] markupString A string with style.
  */

-void GetMarkupString( const StyledTextArray& styledTextArray, std::string& markupString );
+DALI_IMPORT_API void GetMarkupString( const StyledTextArray& styledTextArray, std::string& markupString );

 
 /**
  * @brief Sets a text style to the given text.
 
 /**
  * @brief Sets a text style to the given text.


@@ -116,7 +116,7 @@ void GetMarkupString( const StyledTextArray& styledTextArray, std::string& marku
  * @param[in] style The given style
  * @param[in] mask The bit mask.
  */
  * @param[in] style The given style
  * @param[in] mask The bit mask.
  */

-void SetTextStyle( StyledTextArray& styledTextArray, const TextStyle& style, TextStyle::Mask mask = TextStyle::ALL );
+DALI_IMPORT_API void SetTextStyle( StyledTextArray& styledTextArray, const TextStyle& style, TextStyle::Mask mask = TextStyle::ALL );

 
 /**
  * @brief Sets a text style to the given text.
 
 /**
  * @brief Sets a text style to the given text.


@@ -128,7 +128,7 @@ void SetTextStyle( StyledTextArray& styledTextArray, const TextStyle& style, Tex
  * @param[in] style The given style.
  * @param[in] mask The bit mask.
  */
  * @param[in] style The given style.
  * @param[in] mask The bit mask.
  */

-void SetTextStyle( const Text& text, StyledTextArray& styledTextArray, const TextStyle& style, TextStyle::Mask mask = TextStyle::ALL );
+DALI_IMPORT_API void SetTextStyle( const Text& text, StyledTextArray& styledTextArray, const TextStyle& style, TextStyle::Mask mask = TextStyle::ALL );

 
 /**
  * @brief Sets a text style to a range of characters of the given text.
 
 /**
  * @brief Sets a text style to a range of characters of the given text.


@@ -141,7 +141,7 @@ void SetTextStyle( const Text& text, StyledTextArray& styledTextArray, const Tex
  * @param[in] end The last character of the range.
  * @note It will assert if begin or end are out of range, or if begin > end.
  */
  * @param[in] end The last character of the range.
  * @note It will assert if begin or end are out of range, or if begin > end.
  */

-void SetTextStyleToRange( StyledTextArray& styledTextArray, const TextStyle& style, TextStyle::Mask mask, std::size_t begin, std::size_t end );
+DALI_IMPORT_API void SetTextStyleToRange( StyledTextArray& styledTextArray, const TextStyle& style, TextStyle::Mask mask, std::size_t begin, std::size_t end );

 
 } // namespace MarkupProcessor
 
 
 } // namespace MarkupProcessor
 

diff --git a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h b/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
index cd95ef3..f4dac3e 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -46,7 +46,7 @@ namespace Toolkit
  *                        1.f, AlphaFunctions::Bounce );
  *   animation.Play();
  */
  *                        1.f, AlphaFunctions::Bounce );
  *   animation.Play();
  */

-class BouncingEffect : public ShaderEffect
+class DALI_IMPORT_API BouncingEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -88,7 +88,7 @@ public:
 
 
 private: // Not intended for application developers
 
 
 private: // Not intended for application developers

-  BouncingEffect( ShaderEffect handle );
+  DALI_INTERNAL BouncingEffect( ShaderEffect handle );

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h b/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h
index c308660..481735d 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * @brief DissolveEffect is a custom shader effect to achieve Dissolve effects in Image actors.
  */
 /**
  * @brief DissolveEffect is a custom shader effect to achieve Dissolve effects in Image actors.
  */

-class DissolveEffect : public ShaderEffect
+class DALI_IMPORT_API DissolveEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -84,7 +84,7 @@ public:
   const std::string& GetDistortionPropertyName() const;
 
 private: // Not intended for application developers
   const std::string& GetDistortionPropertyName() const;
 
 private: // Not intended for application developers

-  DissolveEffect(ShaderEffect handle);
+  DALI_INTERNAL DissolveEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/shader-effects/image-region-effect.h b/base/dali-toolkit/public-api/shader-effects/image-region-effect.h
index fe85474..7a3b372 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/image-region-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/image-region-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * @brief ImageRegionEffect is a custom shader effect to show only a region of an Image actor.
  */
 /**
  * @brief ImageRegionEffect is a custom shader effect to show only a region of an Image actor.
  */

-class ImageRegionEffect : public ShaderEffect
+class DALI_IMPORT_API ImageRegionEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -87,7 +87,7 @@ public:
   const std::string& GetBottomRightPropertyName() const;
 
 private: // Not intended for application developers
   const std::string& GetBottomRightPropertyName() const;
 
 private: // Not intended for application developers

-  ImageRegionEffect(ShaderEffect handle);
+  DALI_INTERNAL ImageRegionEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/shader-effects/iris-effect.h b/base/dali-toolkit/public-api/shader-effects/iris-effect.h
index 8550e30..4d1cdaf 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/iris-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/iris-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * @brief IrisEffect is a custom shader effect to achieve iris effects in Image actors
  */
 /**
  * @brief IrisEffect is a custom shader effect to achieve iris effects in Image actors
  */

-class IrisEffect : public ShaderEffect
+class DALI_IMPORT_API IrisEffect : public ShaderEffect

 {
 
 public:
 {
 
 public:


@@ -110,7 +110,7 @@ public:
 
 
 private: // Not intended for application developers
 
 
 private: // Not intended for application developers

-  IrisEffect(ShaderEffect handle);
+  DALI_INTERNAL IrisEffect(ShaderEffect handle);

 };
 
 }
 };
 
 }

diff --git a/base/dali-toolkit/public-api/shader-effects/mask-effect.h b/base/dali-toolkit/public-api/shader-effects/mask-effect.h
index c020428..c9f1881 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/mask-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/mask-effect.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit

diff --git a/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h b/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h
index 7199e04..e61401f 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/image-actor.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/image-actor.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -52,7 +52,7 @@ namespace NinePatchMaskEffect
  * @param [in] actor The actor which needs the effect. To remove the effect call actor.RemoveShaderEffect().
  * @param [in] maskImage The path to a file containing the mask. The center pixels of the mask will be stretched.
  */
  * @param [in] actor The actor which needs the effect. To remove the effect call actor.RemoveShaderEffect().
  * @param [in] maskImage The path to a file containing the mask. The center pixels of the mask will be stretched.
  */

-void Apply( ImageActor actor, const std::string& maskImage );
+DALI_IMPORT_API void Apply( ImageActor actor, const std::string& maskImage );

 
 /**
  * @brief Apply the mask effect to an ImageActor.
 
 /**
  * @brief Apply the mask effect to an ImageActor.


@@ -62,7 +62,7 @@ void Apply( ImageActor actor, const std::string& maskImage );
  * @param [in] maskImage The path to a file containing the mask.
  * @param [in] maskBorder Specifies the part of the mask image that will be stretched (left, top, right, bottom).
  */
  * @param [in] maskImage The path to a file containing the mask.
  * @param [in] maskBorder Specifies the part of the mask image that will be stretched (left, top, right, bottom).
  */

-void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder );
+DALI_IMPORT_API void Apply( ImageActor actor, const std::string& maskImage, const Vector4& maskBorder );

 
 } // namespace NinePatchMaskEffect
 
 
 } // namespace NinePatchMaskEffect
 

diff --git a/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h b/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
index 7e23a26..98f0ebe 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -35,7 +35,7 @@ namespace Toolkit
  * display the pages visually consistent with its turning state,
  * please set the uniforms with the same values as the PageTurnEffect.
  **/
  * display the pages visually consistent with its turning state,
  * please set the uniforms with the same values as the PageTurnEffect.
  **/

-class PageTurnBookSpineEffect : public ShaderEffect
+class DALI_IMPORT_API PageTurnBookSpineEffect : public ShaderEffect

 {
 public:
   /**
 {
 public:
   /**


@@ -93,7 +93,7 @@ public:
 
 
 private:// Helper for New()
 
 
 private:// Helper for New()

-  PageTurnBookSpineEffect( ShaderEffect handle );
+  DALI_INTERNAL PageTurnBookSpineEffect( ShaderEffect handle );

 
 }; // End of PageTurnBookSpineEffect class
 
 
 }; // End of PageTurnBookSpineEffect class
 

diff --git a/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h b/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h
index 6b3f3f1..f48070f 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -68,7 +68,7 @@ class PageTurnEffect;
  * animation[mAnimationIndex].Play(); \n
  */
 
  * animation[mAnimationIndex].Play(); \n
  */
 

-class PageTurnEffect : public ShaderEffect
+class DALI_IMPORT_API PageTurnEffect : public ShaderEffect

 {
 public:
   /**
 {
 public:
   /**


@@ -162,7 +162,7 @@ public:
 
 public: // Not intended for application developers
 
 
 public: // Not intended for application developers
 

-  PageTurnEffect( ShaderEffect handle, Internal::PageTurnEffect* shaderExtension );
+  DALI_INTERNAL PageTurnEffect( ShaderEffect handle, Internal::PageTurnEffect* shaderExtension );

 
 };  //end of PageTurnEffect class
 
 
 };  //end of PageTurnEffect class
 

diff --git a/base/dali-toolkit/public-api/shader-effects/ripple-effect.h b/base/dali-toolkit/public-api/shader-effects/ripple-effect.h
index 279f55e..5a4a0e4 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/ripple-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/ripple-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * @brief RippleEffect is a custom shader effect to achieve ripple effects on Image actors.
  */
 /**
  * @brief RippleEffect is a custom shader effect to achieve ripple effects on Image actors.
  */

-class RippleEffect : public ShaderEffect
+class DALI_IMPORT_API RippleEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -100,7 +100,7 @@ public:
   const std::string& GetTimePropertyName() const;
 
 private:
   const std::string& GetTimePropertyName() const;
 
 private:

-  RippleEffect(ShaderEffect handle);
+  DALI_INTERNAL RippleEffect(ShaderEffect handle);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h b/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
index e02327e..76d1d07 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * @brief Ripple2DEffect is a custom shader effect to achieve 2d ripple effects on Image actors.
  */
 /**
  * @brief Ripple2DEffect is a custom shader effect to achieve 2d ripple effects on Image actors.
  */

-class Ripple2DEffect : public ShaderEffect
+class DALI_IMPORT_API Ripple2DEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -85,7 +85,7 @@ public:
   const std::string& GetTimePropertyName() const;
 
 private:
   const std::string& GetTimePropertyName() const;
 
 private:

-  Ripple2DEffect(ShaderEffect handle);
+  DALI_INTERNAL Ripple2DEffect(ShaderEffect handle);

 
 };
 
 
 };
 

diff --git a/base/dali-toolkit/public-api/shader-effects/swirl-effect.h b/base/dali-toolkit/public-api/shader-effects/swirl-effect.h
index 8c71e80..b052476 100644 (file)
--- a/base/dali-toolkit/public-api/shader-effects/swirl-effect.h
+++ b/base/dali-toolkit/public-api/shader-effects/swirl-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * @brief SwirlEffect is a custom shader effect to achieve swirl effects in Image actors.
  */
 /**
  * @brief SwirlEffect is a custom shader effect to achieve swirl effects in Image actors.
  */

-class SwirlEffect : public ShaderEffect
+class DALI_IMPORT_API SwirlEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -99,7 +99,7 @@ public:
   const std::string& GetRadiusPropertyName() const;
 
 private: // Not intended for application developers
   const std::string& GetRadiusPropertyName() const;
 
 private: // Not intended for application developers

-  SwirlEffect(ShaderEffect handle);
+  DALI_INTERNAL SwirlEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/base/dali-toolkit/public-api/styling/style-manager.h b/base/dali-toolkit/public-api/styling/style-manager.h
index 1ec2ea2..8f44266 100644 (file)
--- a/base/dali-toolkit/public-api/styling/style-manager.h
+++ b/base/dali-toolkit/public-api/styling/style-manager.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -59,7 +59,7 @@ class StyleManager;
  * Internal::Control can be configured to register for the signals that are required from StyleManager,
  * such as theme change.
  */
  * Internal::Control can be configured to register for the signals that are required from StyleManager,
  * such as theme change.
  */

-class StyleManager : public BaseHandle
+class DALI_IMPORT_API StyleManager : public BaseHandle

 {
 public:
 
 {
 public:
 

diff --git a/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h b/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
index 7edfc14..b36d416 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
+++ b/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h
@@ -22,7 +22,7 @@
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -88,7 +88,7 @@ class BloomView;
  *  Stage::GetCurrent().Remove(bloomView);\n
  *  bloomView.Deactivate();\n
  */
  *  Stage::GetCurrent().Remove(bloomView);\n
  *  bloomView.Deactivate();\n
  */

-class BloomView : public Control
+class DALI_IMPORT_API BloomView : public Control

 {
 public:
 
 {
 public:
 


@@ -237,15 +237,13 @@ public:
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */

-  BloomView( Internal::BloomView& implementation );
+  DALI_INTERNAL BloomView( Internal::BloomView& implementation );

 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  BloomView( Dali::Internal::CustomActor* internal );
-
-private:
+  explicit DALI_INTERNAL BloomView( Dali::Internal::CustomActor* internal );

 
 };
 
 
 };
 

diff --git a/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h b/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h
index f44aa56..5648280 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h
+++ b/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -40,7 +40,7 @@ namespace Internal DALI_INTERNAL
  *
  * This is done by applying BubbleEffect to multiple specifically created meshActors.
  */
  *
  * This is done by applying BubbleEffect to multiple specifically created meshActors.
  */

-class BubbleEmitter : public Control
+class DALI_IMPORT_API BubbleEmitter : public Control

 {
 public:
 
 {
 public:
 


@@ -184,7 +184,7 @@ public: // Not intended for developer use
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  DALI_INTERNAL BubbleEmitter(Dali::Internal::CustomActor* internal);
+  explicit DALI_INTERNAL BubbleEmitter(Dali::Internal::CustomActor* internal);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h b/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h
index e5924d0..7596b66 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h
+++ b/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h
@@ -28,7 +28,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/enums.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/enums.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 class Actor;
 {
 
 class Actor;


@@ -49,7 +49,7 @@ typedef IntrusivePtr<ClusterStyle> ClusterStylePtr; ///< Pointer to a Dali::Tool
 /**
  * @brief A ClusterStyle describes the constraints which are imposed on the child actors in the cluster.
  */
 /**
  * @brief A ClusterStyle describes the constraints which are imposed on the child actors in the cluster.
  */

-class ClusterStyle : public Dali::BaseHandle
+class DALI_IMPORT_API ClusterStyle : public Dali::BaseHandle

 {
 public:
 
 {
 public:
 


@@ -115,13 +115,13 @@ public: // Not intended for application developers
    *
    * @param [in] internal A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] internal A pointer to a newly allocated Dali resource
    */

-  ClusterStyle(Internal::ClusterStyle* internal);
+  explicit DALI_INTERNAL ClusterStyle(Internal::ClusterStyle* internal);

 };
 
 /**
  * @brief A ClusterStyle describes the constraints, which are imposed on the child actors in the cluster.
  */
 };
 
 /**
  * @brief A ClusterStyle describes the constraints, which are imposed on the child actors in the cluster.
  */

-class ClusterStyleStandard : public ClusterStyle
+class DALI_IMPORT_API ClusterStyleStandard : public ClusterStyle

 {
 public:
 
 {
 public:
 


@@ -151,13 +151,13 @@ public: // Not intended for application developers
    *
    * @param [in] internal A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] internal A pointer to a newly allocated Dali resource
    */

-  ClusterStyleStandard(Internal::ClusterStyle* internal);
+  explicit DALI_INTERNAL ClusterStyleStandard(Internal::ClusterStyle* internal);

 };
 
 /**
  * @brief A ClusterStyle describes the constraints, which are imposed on the child actors in the cluster.
  */
 };
 
 /**
  * @brief A ClusterStyle describes the constraints, which are imposed on the child actors in the cluster.
  */

-class ClusterStyleRandom : public ClusterStyle
+class DALI_IMPORT_API ClusterStyleRandom : public ClusterStyle

 {
 public:
 
 {
 public:
 


@@ -173,7 +173,7 @@ public: // Not intended for application developers
    *
    * @param [in] internal A pointer to a newly allocated Dali resource
    */
    *
    * @param [in] internal A pointer to a newly allocated Dali resource
    */

-  ClusterStyleRandom(Internal::ClusterStyle* internal);
+  explicit DALI_INTERNAL ClusterStyleRandom(Internal::ClusterStyle* internal);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/cluster/cluster.h b/optional/dali-toolkit/public-api/controls/cluster/cluster.h
index 8ab3ddb..6e7033c 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/cluster/cluster.h
+++ b/optional/dali-toolkit/public-api/controls/cluster/cluster.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -37,7 +37,7 @@ class ClusterStyle;
 /**
  * Cluster is a container of grouped actors positioned in different cluster styles.
  */
 /**
  * Cluster is a container of grouped actors positioned in different cluster styles.
  */

-class Cluster : public Control
+class DALI_IMPORT_API Cluster : public Control

 {
 public:
 
 {
 public:
 


@@ -242,13 +242,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  Cluster( Internal::Cluster& implementation );
+  DALI_INTERNAL Cluster( Internal::Cluster& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  Cluster( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Cluster( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h b/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
index 6dd7048..1fd4854 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
+++ b/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -67,7 +67,7 @@ class EffectsView;
  * // start effect processing
  * effectsView.Enable();
  */
  * // start effect processing
  * effectsView.Enable();
  */

-class EffectsView : public Control
+class DALI_IMPORT_API EffectsView : public Control

 {
 public:
 
 {
 public:
 


@@ -213,13 +213,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  EffectsView( Internal::EffectsView& implementation );
+  DALI_INTERNAL EffectsView( Internal::EffectsView& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  EffectsView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL EffectsView( Dali::Internal::CustomActor* internal );

 
 }; // class EffectsView
 
 
 }; // class EffectsView
 

diff --git a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
index 66e4ef7..2d2848f 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
+++ b/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
@@ -29,7 +29,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -96,7 +96,7 @@ class BloomView;
  *  Stage::GetCurrent().Remove(gaussianBlurView);\n
  *  gaussianBlurView.Deactivate();\n
  */
  *  Stage::GetCurrent().Remove(gaussianBlurView);\n
  *  gaussianBlurView.Deactivate();\n
  */

-class GaussianBlurView : public Control
+class DALI_IMPORT_API GaussianBlurView : public Control

 {
 public:
   /**
 {
 public:
   /**


@@ -266,15 +266,13 @@ public:
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */

-  GaussianBlurView( Internal::GaussianBlurView& implementation );
+  DALI_INTERNAL GaussianBlurView( Internal::GaussianBlurView& implementation );

 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  GaussianBlurView( Dali::Internal::CustomActor* internal );
-
-private:
+  DALI_INTERNAL GaussianBlurView( Dali::Internal::CustomActor* internal );

 
 };
 
 
 };
 

diff --git a/optional/dali-toolkit/public-api/controls/image-view/image-view.h b/optional/dali-toolkit/public-api/controls/image-view/image-view.h
index 0d48baa..b790c3e 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/optional/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -57,7 +57,7 @@ class Button;
  * based on the distance imageView is from mCamera an appropriate, different
  * image will be loaded and dispayed.
  */
  * based on the distance imageView is from mCamera an appropriate, different
  * image will be loaded and dispayed.
  */

-class ImageView : public Control
+class DALI_IMPORT_API ImageView : public Control

 {
 public:
 
 {
 public:
 


@@ -185,13 +185,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  ImageView(Internal::ImageView& implementation);
+  DALI_INTERNAL ImageView(Internal::ImageView& implementation);

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  ImageView(Dali::Internal::CustomActor* internal);
+  explicit DALI_INTERNAL ImageView(Dali::Internal::CustomActor* internal);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h
index bd5447f..9c15f43 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h
+++ b/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -50,7 +50,7 @@ class MaskedImageView;
  * avoided by calling Pause() e.g. when the source & mask positions are not being modified. The Resume() method can then be called
  * to continue the masking operation when required.
  */
  * avoided by calling Pause() e.g. when the source & mask positions are not being modified. The Resume() method can then be called
  * to continue the masking operation when required.
  */

-class MaskedImageView : public Control
+class DALI_IMPORT_API MaskedImageView : public Control

 {
 public:
 
 {
 public:
 


@@ -284,14 +284,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
    *
    * @param[in]  implementation  The Control implementation.
    */

-  MaskedImageView(Internal::MaskedImageView& implementation);
+  DALI_INTERNAL MaskedImageView(Internal::MaskedImageView& implementation);

 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  MaskedImageView(Dali::Internal::CustomActor* internal);
+  explicit DALI_INTERNAL MaskedImageView(Dali::Internal::CustomActor* internal);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
index 0f62504..4538f81 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
+++ b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h
@@ -23,7 +23,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -41,7 +41,7 @@ class Magnifier;
  * to the stage as a separate overlay. In addition to the contents, an optional frame
  * is displayed around the magnified contents.
  */
  * to the stage as a separate overlay. In addition to the contents, an optional frame
  * is displayed around the magnified contents.
  */

-class Magnifier : public Control
+class DALI_IMPORT_API Magnifier : public Control

 {
 public:
 
 {
 public:
 


@@ -143,7 +143,7 @@ public: // Not intended for application developers
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  DALI_INTERNAL Magnifier(Dali::Internal::CustomActor* internal);
+  explicit DALI_INTERNAL Magnifier(Dali::Internal::CustomActor* internal);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h
index c35b57e..9df024c 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h
+++ b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h
@@ -18,7 +18,7 @@
  *
  */
 
  *
  */
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
index be49931..5b3fa6d 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
+++ b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
@@ -23,7 +23,7 @@
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h>
 
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -75,7 +75,7 @@ class NavigationControl;
  *                 +----------------------------------------+
  */
 
  *                 +----------------------------------------+
  */
 

-class NavigationControl : public Control
+class DALI_IMPORT_API NavigationControl : public Control

 {
 
 public:
 {
 
 public:


@@ -229,13 +229,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  NavigationControl( Internal::NavigationControl& implementation );
+  DALI_INTERNAL NavigationControl( Internal::NavigationControl& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  NavigationControl( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL NavigationControl( Dali::Internal::CustomActor* internal );

 
 }; // class NavigationControl
 
 
 }; // class NavigationControl
 

diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/page.h b/optional/dali-toolkit/public-api/controls/navigation-frame/page.h
index 1032a2e..02b71bc 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/navigation-frame/page.h
+++ b/optional/dali-toolkit/public-api/controls/navigation-frame/page.h
@@ -26,7 +26,7 @@
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>
 
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -43,7 +43,7 @@ class Page;
  * It serves as the root of a navigation view.
  * It also carries the title/subtitle/buttons/icons information which would be shown on the navigation bars when the item is on the top of the stack.
  */
  * It serves as the root of a navigation view.
  * It also carries the title/subtitle/buttons/icons information which would be shown on the navigation bars when the item is on the top of the stack.
  */

-class Page : public Control
+class DALI_IMPORT_API Page : public Control

 {
 
 public:
 {
 
 public:


@@ -197,13 +197,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in] impl The Page implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in] impl The Page implementation.
    */

-  Page(Internal::Page& impl);
+  DALI_INTERNAL Page(Internal::Page& impl);

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  Page( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Page( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
index 6b86f92..2a4edf9 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
+++ b/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -31,7 +31,7 @@ namespace Toolkit
  * PageFactory is an abstract interface for providing image actors to PageTurnView
  * Each image actor is identified by a unique ID, and has a linear order from 0 to GetNumberOfPages()-1
  */
  * PageFactory is an abstract interface for providing image actors to PageTurnView
  * Each image actor is identified by a unique ID, and has a linear order from 0 to GetNumberOfPages()-1
  */

-class PageFactory
+class DALI_IMPORT_API PageFactory

 {
 public:
   // Property Names
 {
 public:
   // Property Names

diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
index 00f99d9..0c4d0b0 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
+++ b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
@@ -21,7 +21,7 @@
 //INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 
 //INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -36,7 +36,7 @@ class PageTurnLandscapeView;
 /**
  * PageTurnLandscapeView provides a page turn view in landscape mode
  */
 /**
  * PageTurnLandscapeView provides a page turn view in landscape mode
  */

-class PageTurnLandscapeView : public PageTurnView
+class DALI_IMPORT_API PageTurnLandscapeView : public PageTurnView

 {
 public:
   /**
 {
 public:
   /**


@@ -84,15 +84,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  PageTurnLandscapeView( Internal::PageTurnLandscapeView& implementation );
+  DALI_INTERNAL PageTurnLandscapeView( Internal::PageTurnLandscapeView& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  PageTurnLandscapeView( Dali::Internal::CustomActor* internal );
-
-
+  explicit DALI_INTERNAL PageTurnLandscapeView( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
index 1af8bf5..7df18f0 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
+++ b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
@@ -21,7 +21,7 @@
 //INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 
 //INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -36,7 +36,7 @@ class PageTurnPortraitView;
 /**
  * PageTurnLandscapeView provides a page turn view in portrait mode
  */
 /**
  * PageTurnLandscapeView provides a page turn view in portrait mode
  */

-class PageTurnPortraitView : public PageTurnView
+class DALI_IMPORT_API PageTurnPortraitView : public PageTurnView

 {
 public:
   /**
 {
 public:
   /**


@@ -84,13 +84,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  PageTurnPortraitView( Internal::PageTurnPortraitView& implementation );
+  DALI_INTERNAL PageTurnPortraitView( Internal::PageTurnPortraitView& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  PageTurnPortraitView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL PageTurnPortraitView( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
index b91aeec..0e320cd 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
+++ b/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -52,7 +52,7 @@ class PageTurnView;
  * Pan with no animation will occur when the user touches the page in an area that does not start the
  * page turning.
  */
  * Pan with no animation will occur when the user touches the page in an area that does not start the
  * page turning.
  */

-class PageTurnView : public Control
+class DALI_IMPORT_API PageTurnView : public Control

 {
 public:
 
 {
 public:
 


@@ -208,7 +208,7 @@ public: // Not intended for application developers
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  DALI_INTERNAL PageTurnView(Dali::Internal::CustomActor* internal);
+  explicit DALI_INTERNAL PageTurnView(Dali::Internal::CustomActor* internal);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
index 882f764..b751427 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
+++ b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -36,7 +36,7 @@ class RotatingSelector;
  * RotatingSelector is a simple control to switch between two states (selected/unselected). A signal is emitted when the selector switches between
  * the two states. The control has two faces one behind the other, The control is rotated while switching between the two states
  */
  * RotatingSelector is a simple control to switch between two states (selected/unselected). A signal is emitted when the selector switches between
  * the two states. The control has two faces one behind the other, The control is rotated while switching between the two states
  */

-class RotatingSelector : public Control
+class DALI_IMPORT_API RotatingSelector : public Control

 {
 public:
   //Signal Names
 {
 public:
   //Signal Names


@@ -145,13 +145,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  RotatingSelector( Internal::RotatingSelector& implementation );
+  DALI_INTERNAL RotatingSelector( Internal::RotatingSelector& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  RotatingSelector( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL RotatingSelector( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h b/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
index 4a2cb76..1c15ff4 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
+++ b/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -102,7 +102,7 @@ class ShadowView;
  *  shadowView.Deactivate();
  *  @endcode
  */
  *  shadowView.Deactivate();
  *  @endcode
  */

-class ShadowView : public Control
+class DALI_IMPORT_API ShadowView : public Control

 {
 public:
 
 {
 public:
 


@@ -246,13 +246,13 @@ public:
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */

-  ShadowView( Internal::ShadowView& implementation );
+  DALI_INTERNAL ShadowView( Internal::ShadowView& implementation );

 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  ShadowView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ShadowView( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/slider/slider.h b/optional/dali-toolkit/public-api/controls/slider/slider.h
index 4f111dc..4a82afa 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/slider/slider.h
+++ b/optional/dali-toolkit/public-api/controls/slider/slider.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -33,9 +33,9 @@ class Slider;
 }
 
 /**
 }
 
 /**

- * Slider is a control to enable sliding an indicator between two values
+ * @brief Slider is a control to enable sliding an indicator between two values

  */
  */

-class Slider : public Control
+class DALI_IMPORT_API Slider : public Control

 {
 public:
 
 {
 public:
 


@@ -139,13 +139,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  Slider(Internal::Slider& implementation);
+  DALI_INTERNAL Slider(Internal::Slider& implementation);

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  Slider( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Slider( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h b/optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h
index 457b2f2..f327cab 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h
+++ b/optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h
@@ -23,7 +23,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -52,7 +52,7 @@ class SuperBlurView;
  *  blurAnimation.AnimateTo( Property( blurView, blurView.GetBlurStrengthPropertyIndex() ), ... );\n
  *  blurAnimation.Play();\n
  */
  *  blurAnimation.AnimateTo( Property( blurView, blurView.GetBlurStrengthPropertyIndex() ), ... );\n
  *  blurAnimation.Play();\n
  */

-class SuperBlurView : public Control
+class DALI_IMPORT_API SuperBlurView : public Control

 {
 public:
 
 {
 public:
 


@@ -171,8 +171,7 @@ public: // Not intended for application developers
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  DALI_INTERNAL SuperBlurView(Dali::Internal::CustomActor* internal);
-
+  explicit DALI_INTERNAL SuperBlurView(Dali::Internal::CustomActor* internal);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
index e31b315..1bbb0d1 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
+++ b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -43,7 +43,7 @@ class ToolBar;
  * is not forbidden, it adds controls on the left group with a size of 10% of the total tool bar size.
  * Dali::Actor::Remove() method does nothing.
  */
  * is not forbidden, it adds controls on the left group with a size of 10% of the total tool bar size.
  * Dali::Actor::Remove() method does nothing.
  */

-class ToolBar : public Control
+class DALI_IMPORT_API ToolBar : public Control

 {
 public:
   static const Toolkit::Alignment::Padding DEFAULT_PADDING; ///< Default padding space between controls. By default all values are set to 0.
 {
 public:
   static const Toolkit::Alignment::Padding DEFAULT_PADDING; ///< Default padding space between controls. By default all values are set to 0.


@@ -117,13 +117,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  ToolBar( Internal::ToolBar& implementation );
+  DALI_INTERNAL ToolBar( Internal::ToolBar& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  ToolBar( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ToolBar( Dali::Internal::CustomActor* internal );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/controls/view/view.h b/optional/dali-toolkit/public-api/controls/view/view.h
index e86cf8b..a0a29b0 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/view/view.h
+++ b/optional/dali-toolkit/public-api/controls/view/view.h
@@ -25,7 +25,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -73,7 +73,7 @@ class View;
  * view.AddContentLayer( contentLayer );
  * \endcode
  */
  * view.AddContentLayer( contentLayer );
  * \endcode
  */

-class View : public Control
+class DALI_IMPORT_API View : public Control

 {
 public:
   //Signal Names
 {
 public:
   //Signal Names


@@ -200,16 +200,15 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */

-  View( Internal::View& implementation );
+  DALI_INTERNAL View( Internal::View& implementation );

 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */

-  View( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL View( Dali::Internal::CustomActor* internal );

 };
 
 };
 

-

 } // namespace Toolkit
 
 } // namespace Dali
 } // namespace Toolkit
 
 } // namespace Dali

diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.h b/optional/dali-toolkit/public-api/dali-toolkit-version.h
index e2813bf..8c5bf2a 100644 (file)
--- a/optional/dali-toolkit/public-api/dali-toolkit-version.h
+++ b/optional/dali-toolkit/public-api/dali-toolkit-version.h
@@ -18,14 +18,17 @@
  *
  */
 
  *
  */
 

+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+

 namespace Dali
 {
 namespace Toolkit
 {
 namespace Dali
 {
 namespace Toolkit
 {

-extern const unsigned int TOOLKIT_MAJOR_VERSION; ///< The major version number of the Toolkit.
-extern const unsigned int TOOLKIT_MINOR_VERSION; ///< The minor version number of the Toolkit.
-extern const unsigned int TOOLKIT_MICRO_VERSION; ///< The micro version number of the Toolkit.
-extern const char * const TOOLKIT_BUILD_DATE;    ///< The date/time the Toolkit library was built.
+DALI_IMPORT_API extern const unsigned int TOOLKIT_MAJOR_VERSION; ///< The major version number of the Toolkit.
+DALI_IMPORT_API extern const unsigned int TOOLKIT_MINOR_VERSION; ///< The minor version number of the Toolkit.
+DALI_IMPORT_API extern const unsigned int TOOLKIT_MICRO_VERSION; ///< The micro version number of the Toolkit.
+DALI_IMPORT_API extern const char * const TOOLKIT_BUILD_DATE;    ///< The date/time the Toolkit library was built.

 } // namespace Toolkit
 } // namespace Dali
 
 } // namespace Toolkit
 } // namespace Dali
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h b/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
index 8d4ff5f..656fa40 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h b/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
index d097f52..8ce19a0 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * BendyEffect is a custom shader effect to achieve bendy effects in Image actors
  */
 /**
  * BendyEffect is a custom shader effect to achieve bendy effects in Image actors
  */

-class BendyEffect : public ShaderEffect
+class DALI_IMPORT_API BendyEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -93,7 +93,7 @@ public:
 
 
 private: // Not intended for application developers
 
 
 private: // Not intended for application developers

-  BendyEffect(ShaderEffect handle);
+  DALI_INTERNAL BendyEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
index 79c5d8d..ede89ca 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/blind-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * BlindEffect is a custom shader effect to achieve blind effects in Image actors
  */
 /**
  * BlindEffect is a custom shader effect to achieve blind effects in Image actors
  */

-class BlindEffect : public ShaderEffect
+class DALI_IMPORT_API BlindEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -68,7 +68,7 @@ public:
   const std::string& GetStepPropertyName() const;
 
 private: // Not intended for application developers
   const std::string& GetStepPropertyName() const;
 
 private: // Not intended for application developers

-  BlindEffect(ShaderEffect handle);
+  DALI_INTERNAL BlindEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
index 3f39c90..0e2f359 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -31,7 +31,7 @@ namespace Toolkit
  * BubbleEffect is a custom shader to achieve similar effect of particle system by applying on a specially created MeshActor
  * Each bubble is rendered on a patch with two triangles; and each mesh can contain multiple such patches.
  */
  * BubbleEffect is a custom shader to achieve similar effect of particle system by applying on a specially created MeshActor
  * Each bubble is rendered on a patch with two triangles; and each mesh can contain multiple such patches.
  */

-class BubbleEffect : public ShaderEffect
+class DALI_IMPORT_API BubbleEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -128,7 +128,7 @@ public:
 
 private:// Not intended for application developers
 
 
 private:// Not intended for application developers
 

-  BubbleEffect( ShaderEffect handle );
+  DALI_INTERNAL BubbleEffect( ShaderEffect handle );

 
 private:
 
 
 private:
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
index 94fc5da..74a9c9c 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
+++ b/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 #include <dali/public-api/math/vector3.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -31,7 +31,7 @@ namespace Toolkit
 /**
  * ColorAdjuster is a custom shader effect to adjust the image color in HSV space.
  */
 /**
  * ColorAdjuster is a custom shader effect to adjust the image color in HSV space.
  */

-class ColorAdjuster : public ShaderEffect
+class DALI_IMPORT_API ColorAdjuster : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -62,8 +62,7 @@ public:
 
 private: // Not intended for application developers
 
 
 private: // Not intended for application developers
 

-ColorAdjuster( ShaderEffect handle );
-
+  DALI_INTERNAL ColorAdjuster( ShaderEffect handle );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
index 8362574..777b303 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -40,7 +40,7 @@ namespace Toolkit
  * Finally, the carousel's center position can be specified as a Screen coordinate (top-left being
  * the origin).
  */
  * Finally, the carousel's center position can be specified as a Screen coordinate (top-left being
  * the origin).
  */

-class CarouselEffect : public ShaderEffect
+class DALI_IMPORT_API CarouselEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -111,7 +111,7 @@ public:
 
 
 private: // Not intended for application developers
 
 
 private: // Not intended for application developers

-  CarouselEffect(ShaderEffect handle);
+  DALI_INTERNAL CarouselEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
index 695a076..d285a32 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -70,7 +70,7 @@ namespace Toolkit
  * animation.Play();\n
  *
  */
  * animation.Play();\n
  *
  */

-class DisplacementEffect : public ShaderEffect
+class DALI_IMPORT_API DisplacementEffect : public ShaderEffect

 {
 
 public:
 {
 
 public:


@@ -213,7 +213,7 @@ public:
 
 private:
   // Not intended for application developers
 
 private:
   // Not intended for application developers

-  DisplacementEffect(ShaderEffect handle);
+  DALI_INTERNAL DisplacementEffect(ShaderEffect handle);

 };
 
 }
 };
 
 }

diff --git a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
index 86035a0..9dbbfbf 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * DissolveLocalEffect is a custom shader effect to achieve Dissolve effects in multiple small areas of Image actors
  */
 /**
  * DissolveLocalEffect is a custom shader effect to achieve Dissolve effects in multiple small areas of Image actors
  */

-class DissolveLocalEffect : public ShaderEffect
+class DALI_IMPORT_API DissolveLocalEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -117,7 +117,7 @@ public:
 
 private: // Not intended for application developers
 
 
 private: // Not intended for application developers
 

-  DissolveLocalEffect( ShaderEffect handle );
+  DALI_INTERNAL DissolveLocalEffect( ShaderEffect handle );

 
 private:
 
 
 private:
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h b/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
index 28f966c..9adf92b 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * DistanceFieldEffect is a custom shader effect to achieve distance field on Image actors
  */
 /**
  * DistanceFieldEffect is a custom shader effect to achieve distance field on Image actors
  */

-class DistanceFieldEffect : public ShaderEffect
+class DALI_IMPORT_API DistanceFieldEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -188,7 +188,7 @@ public:
   const std::string& GetGlowBoundaryPropertyName() const;
 
 private:
   const std::string& GetGlowBoundaryPropertyName() const;
 
 private:

-  DistanceFieldEffect(ShaderEffect handle);
+  DALI_INTERNAL DistanceFieldEffect(ShaderEffect handle);

 
 };
 
 
 };
 

diff --git a/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h b/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
index 101cc70..574c906 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * MirrorEffect is a custom shader effect to achieve square effects in Image actors
  */
 /**
  * MirrorEffect is a custom shader effect to achieve square effects in Image actors
  */

-class MirrorEffect : public ShaderEffect
+class DALI_IMPORT_API MirrorEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -80,7 +80,7 @@ public:
   const std::string& GetAlphaPropertyName() const;
 
 private: // Not intended for application developers
   const std::string& GetAlphaPropertyName() const;
 
 private: // Not intended for application developers

-  MirrorEffect(ShaderEffect handle);
+  DALI_INTERNAL MirrorEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
index 5206540..1cd0880 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/actors/renderable-actor.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 #include <dali/public-api/actors/renderable-actor.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -44,7 +44,7 @@ namespace Toolkit
  * Actor.SetShaderEffect( MotionBlurEffect );
  *
  */
  * Actor.SetShaderEffect( MotionBlurEffect );
  *
  */

-class MotionBlurEffect : public ShaderEffect
+class DALI_IMPORT_API MotionBlurEffect : public ShaderEffect

 {
 
 public:
 {
 
 public:


@@ -206,7 +206,7 @@ public:
 
 private:
   // Not intended for application developers
 
 private:
   // Not intended for application developers

-  MotionBlurEffect( ShaderEffect handle );
+  DALI_INTERNAL MotionBlurEffect( ShaderEffect handle );

 };
 
 }
 };
 
 }

diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
index 5353347..dddec68 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/actors/renderable-actor.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 #include <dali/public-api/actors/renderable-actor.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -43,7 +43,7 @@ namespace Toolkit
  * Actor.SetShaderEffect( MotionStretchEffect );
  *
  */
  * Actor.SetShaderEffect( MotionStretchEffect );
  *
  */

-class MotionStretchEffect : public ShaderEffect
+class DALI_IMPORT_API MotionStretchEffect : public ShaderEffect

 {
 
 public:
 {
 
 public:


@@ -157,7 +157,7 @@ public:
 
 private:
   // Not intended for application developers
 
 private:
   // Not intended for application developers

-  MotionStretchEffect( ShaderEffect handle );
+  DALI_INTERNAL MotionStretchEffect( ShaderEffect handle );

 };
 
 }
 };
 
 }

diff --git a/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h b/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
index 16ac097..aadd5e2 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/shear-effect.h b/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
index 128d1e6..444ae3f 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/shear-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * ShearEffect is a custom shader effect to achieve shear effects in Image actors
  */
 /**
  * ShearEffect is a custom shader effect to achieve shear effects in Image actors
  */

-class ShearEffect : public ShaderEffect
+class DALI_IMPORT_API ShearEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -91,7 +91,7 @@ public:
 
 
 private: // Not intended for application developers
 
 
 private: // Not intended for application developers

-  ShearEffect(ShaderEffect handle);
+  DALI_INTERNAL ShearEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
index fb5512a..6b2f3ff 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -49,7 +49,7 @@ namespace Toolkit
  * animation.Play();\n
  *
  */
  * animation.Play();\n
  *
  */

-class SoftButtonEffect : public ShaderEffect
+class DALI_IMPORT_API SoftButtonEffect : public ShaderEffect

 {
 
 public:
 {
 
 public:


@@ -167,7 +167,7 @@ public:
 
 private:
   // Not intended for application developers
 
 private:
   // Not intended for application developers

-  SoftButtonEffect(ShaderEffect handle);
+  DALI_INTERNAL SoftButtonEffect(ShaderEffect handle);

 };
 
 }
 };
 
 }

diff --git a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
index b2b8280..5c69baa 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/spot-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * SpotEffect2D is a custom shader effect to achieve spot effects on Image actors
  */
 /**
  * SpotEffect2D is a custom shader effect to achieve spot effects on Image actors
  */

-class SpotEffect : public ShaderEffect
+class DALI_IMPORT_API SpotEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -78,8 +78,7 @@ public:
   const std::string& GetRadiusPropertyName() const;
 
 private:
   const std::string& GetRadiusPropertyName() const;
 
 private:

-  SpotEffect(ShaderEffect handle);
-
+  DALI_INTERNAL SpotEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
index e6c66da..63e26b1 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -30,7 +30,7 @@ namespace Toolkit
 /**
  * SquareDissolveEffect is a custom shader effect to achieve square effects in Image actors
  */
 /**
  * SquareDissolveEffect is a custom shader effect to achieve square effects in Image actors
  */

-class SquareDissolveEffect : public ShaderEffect
+class DALI_IMPORT_API SquareDissolveEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -106,7 +106,7 @@ public:
   const std::string& GetTexSizePropertyName() const;
 
 private: // Not intended for application developers
   const std::string& GetTexSizePropertyName() const;
 
 private: // Not intended for application developers

-  SquareDissolveEffect(ShaderEffect handle);
+  DALI_INTERNAL SquareDissolveEffect(ShaderEffect handle);

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/shader-effects/water-effect.h b/optional/dali-toolkit/public-api/shader-effects/water-effect.h
index d71c5a6..bd69308 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/water-effect.h
+++ b/optional/dali-toolkit/public-api/shader-effects/water-effect.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/shader-effects/shader-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -54,7 +54,7 @@ class WaterEffect;
  *   std::string propertyName = waterEffect.GetPropagationPropertyName( 1 );
  *   animation.AnimateTo( Property(waterEffect, propertyName), FINAL_RADIUS );
  */
  *   std::string propertyName = waterEffect.GetPropagationPropertyName( 1 );
  *   animation.AnimateTo( Property(waterEffect, propertyName), FINAL_RADIUS );
  */

-class WaterEffect : public ShaderEffect
+class DALI_IMPORT_API WaterEffect : public ShaderEffect

 {
 public:
 
 {
 public:
 


@@ -158,7 +158,7 @@ public:
 
 public: // Not intended for developer use
 
 
 public: // Not intended for developer use
 

-  WaterEffect( ShaderEffect handle, Internal::WaterEffect* shaderExtension );
+  DALI_INTERNAL WaterEffect( ShaderEffect handle, Internal::WaterEffect* shaderExtension );

 };
 
 } // namespace Toolkit
 };
 
 } // namespace Toolkit

diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h
index 22c79d3..a9ff0c3 100644 (file)
--- a/optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h
+++ b/optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h
@@ -20,7 +20,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -39,7 +39,7 @@ namespace Internal DALI_INTERNAL
  * SubClass of CubeTransitionEffect
  * Rotate the neighboring cubes in perpendicular directions to transite from one image to another
  */
  * SubClass of CubeTransitionEffect
  * Rotate the neighboring cubes in perpendicular directions to transite from one image to another
  */

-class CubeTransitionCrossEffect : public CubeTransitionEffect
+class DALI_IMPORT_API CubeTransitionCrossEffect : public CubeTransitionEffect

 {
 
 public:
 {
 
 public:


@@ -60,7 +60,7 @@ public: // Not intended for developer use
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  CubeTransitionCrossEffect( Internal::CubeTransitionCrossEffect* impl );
+  explicit DALI_INTERNAL CubeTransitionCrossEffect( Internal::CubeTransitionCrossEffect* impl );

 
 }; // class CubeTransitionCrossEffect
 
 
 }; // class CubeTransitionCrossEffect
 

diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h
index 96965ee..06d5220 100644 (file)
--- a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h
+++ b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/image-actor.h>
 
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/actors/image-actor.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -74,7 +74,7 @@ class CubeTransitionEffect;
  *
  * @endcode
  */
  *
  * @endcode
  */

-class CubeTransitionEffect : public BaseHandle
+class DALI_IMPORT_API CubeTransitionEffect : public BaseHandle

 {
 public:
 
 {
 public:
 


@@ -192,7 +192,7 @@ public: //Signal
 
 public: // Not intended for developer use
 
 
 public: // Not intended for developer use
 

-  CubeTransitionEffect( Internal::CubeTransitionEffect* impl );
+  explicit DALI_INTERNAL CubeTransitionEffect( Internal::CubeTransitionEffect* impl );

 
 }; //class CubeTransitionEffect
 
 
 }; //class CubeTransitionEffect
 

diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h
index 13005a0..a6bb252 100644 (file)
--- a/optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h
+++ b/optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h
@@ -20,7 +20,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -39,7 +39,7 @@ namespace Internal DALI_INTERNAL
  * SubClass of CubeTransitionEffect
  * Rotate the neighboring cubes in opposite directions to transite from one image to another
  */
  * SubClass of CubeTransitionEffect
  * Rotate the neighboring cubes in opposite directions to transite from one image to another
  */

-class CubeTransitionFoldEffect : public CubeTransitionEffect
+class DALI_IMPORT_API CubeTransitionFoldEffect : public CubeTransitionEffect

 {
 
 public:
 {
 
 public:


@@ -60,7 +60,7 @@ public: // Not intended for developer use
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */
    * This constructor is used by Dali New() methods.
    * @param [in] impl A pointer to a newly allocated Dali resource
    */

-  CubeTransitionFoldEffect( Internal::CubeTransitionFoldEffect* impl );
+  explicit DALI_INTERNAL CubeTransitionFoldEffect( Internal::CubeTransitionFoldEffect* impl );

 
 }; // class CubeTransitionFoldEffect
 
 
 }; // class CubeTransitionFoldEffect
 

diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h b/optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h
index deaa4dd..e807b80 100644 (file)
--- a/optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h
+++ b/optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h
@@ -20,7 +20,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 

-namespace Dali DALI_IMPORT_API
+namespace Dali

 {
 
 namespace Toolkit
 {
 
 namespace Toolkit


@@ -39,7 +39,7 @@ namespace Internal DALI_INTERNAL
  * SubClass of CubeTransitionEffect
  * Rotate the cubes successively according to the finger movement to achieve wave-like transition effect
  */
  * SubClass of CubeTransitionEffect
  * Rotate the cubes successively according to the finger movement to achieve wave-like transition effect
  */

-class CubeTransitionWaveEffect : public CubeTransitionEffect
+class DALI_IMPORT_API CubeTransitionWaveEffect : public CubeTransitionEffect

 {
 
 public:
 {
 
 public:


@@ -60,7 +60,7 @@ public: // Not intended for developer use
    * This constructor is used by Dali New() methods.
    * @param[in] impl A pointer to a newly allocated Dali resource
    */
    * This constructor is used by Dali New() methods.
    * @param[in] impl A pointer to a newly allocated Dali resource
    */

-  CubeTransitionWaveEffect( Internal::CubeTransitionWaveEffect* impl );
+  explicit DALI_INTERNAL CubeTransitionWaveEffect( Internal::CubeTransitionWaveEffect* impl );

 
 }; // class CubeTransitionWaveEffect
 
 
 }; // class CubeTransitionWaveEffect