From 7957e6e4dd4c6f97a7296d3125c7410a4b6bc5d7 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Wed, 12 Nov 2014 13:32:39 +0000 Subject: [PATCH] Cleaning up property public API and usage of typedefs Change-Id: I613d4bf08c5e9dd09136f3f4fabe415e32d26c08 --- base/dali-toolkit/internal/builder/builder-signals.cpp | 6 +++--- .../internal/controls/buttons/check-box-button-impl.cpp | 4 ++-- base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h | 2 +- base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp | 4 ++-- base/dali-toolkit/internal/controls/buttons/push-button-impl.h | 2 +- base/dali-toolkit/public-api/controls/control-impl.cpp | 2 +- base/dali-toolkit/public-api/controls/control-impl.h | 3 ++- docs/content/programming-guide/script-howto.h | 2 +- optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp | 2 +- optional/dali-toolkit/internal/controls/cluster/cluster-impl.h | 2 +- .../internal/controls/navigation-frame/navigation-control-impl.cpp | 2 +- .../internal/controls/navigation-frame/navigation-control-impl.h | 2 +- 12 files changed, 17 insertions(+), 16 deletions(-) diff --git a/base/dali-toolkit/internal/builder/builder-signals.cpp b/base/dali-toolkit/internal/builder/builder-signals.cpp index 63345fb..c323fab 100644 --- a/base/dali-toolkit/internal/builder/builder-signals.cpp +++ b/base/dali-toolkit/internal/builder/builder-signals.cpp @@ -49,7 +49,7 @@ struct ChildActorAction std::string actorName; std::string actionName; std::string childAlias; - std::vector parameters; + PropertyValueContainer parameters; void operator()(void) { @@ -110,7 +110,7 @@ struct GenericAction { std::string actorName; std::string actionName; - std::vector parameters; + PropertyValueContainer parameters; void operator()(void) { @@ -194,7 +194,7 @@ Property::Value GetPropertyValue(const TreeNode &child) * Gets Parmeter list from child * params is be cleared before insertion */ -void GetParameters(const TreeNode &child, std::vector ¶ms) +void GetParameters(const TreeNode& child, PropertyValueContainer& params) { if( OptionalChild c = IsChild(child, "parameters") ) { diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp index 6fbea47..85fe1a6 100644 --- a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp +++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp @@ -217,7 +217,7 @@ float CheckBoxButton::OnAnimationTimeRequested() const void CheckBoxButton::OnActivated() { // When the button is activated, it performs the click action - std::vector attributes; + PropertyValueContainer attributes; DoClickAction(attributes); } @@ -233,7 +233,7 @@ void CheckBoxButton::DoClickAction(const PropertyValueContainer& attributes) } } -bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes) +bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) { bool ret = false; diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h index b607050..ad2494b 100644 --- a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h +++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h @@ -178,7 +178,7 @@ public: * @param[in] attributes The attributes with which to perfrom this action. * @return true if action has been accepted by this control */ - static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes); + static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes); protected: // From Button diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index 8a28fcf..9f8452c 100644 --- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -713,7 +713,7 @@ bool PushButton::AutoRepeatingSlot() void PushButton::OnActivated() { // When the button is activated, it performs the click action - std::vector attributes; + PropertyValueContainer attributes; DoClickAction(attributes); } @@ -794,7 +794,7 @@ void PushButton::DoClickAction(const PropertyValueContainer& attributes) } } -bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes) +bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) { bool ret = false; diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h index 873b3e7..d27927a 100644 --- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h +++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h @@ -351,7 +351,7 @@ public: * @param[in] attributes The attributes with which to perfrom this action. * @return true if action has been accepted by this control */ - static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes); + static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes); /** * Construct a new PushButton. diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp index 089034d..2666cd7 100644 --- a/base/dali-toolkit/public-api/controls/control-impl.cpp +++ b/base/dali-toolkit/public-api/controls/control-impl.cpp @@ -961,7 +961,7 @@ Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit: return Actor(); } -bool Control::DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes) +bool Control::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) { bool ret = false; diff --git a/base/dali-toolkit/public-api/controls/control-impl.h b/base/dali-toolkit/public-api/controls/control-impl.h index 9533b21..470fb27 100644 --- a/base/dali-toolkit/public-api/controls/control-impl.h +++ b/base/dali-toolkit/public-api/controls/control-impl.h @@ -26,6 +26,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -182,7 +183,7 @@ public: * @param[in] attributes The attributes with which to perfrom this action. * @return true if action has been accepted by this control */ - static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes); + static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes); /** * Connects a callback function with the object's signals. diff --git a/docs/content/programming-guide/script-howto.h b/docs/content/programming-guide/script-howto.h index 915269e..9a1632b 100644 --- a/docs/content/programming-guide/script-howto.h +++ b/docs/content/programming-guide/script-howto.h @@ -55,7 +55,7 @@ * return connection ; * } * - * bool MyActor::DoActionCustom(BaseObject* object, const std::string& actionName, const std::vector& attributes) + * bool MyActor::DoActionCustom(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) * { * bool actioned = false ; * diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp index e53c0b5..fa9ee42 100644 --- a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp +++ b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp @@ -529,7 +529,7 @@ void Cluster::OnControlChildRemove(Actor& child) child.RemoveConstraints(); } -bool Cluster::DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes) +bool Cluster::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) { bool ret = false; diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h index 863417f..398b6a2 100644 --- a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h +++ b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h @@ -247,7 +247,7 @@ public: * @param[in] attributes The attributes with which to perfrom this action. * @return true if action has been accepted by this control */ - static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes); + static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes); private: // From Control diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp index da5ee5b..be4245f 100644 --- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp +++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp @@ -413,7 +413,7 @@ Toolkit::NavigationControl::ItemPoppedSignalV2& NavigationControl::ItemPoppedSig return mItemPoppedSignal; } -bool NavigationControl::DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes) +bool NavigationControl::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) { bool ret = false; diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h index f722836..8221a8f 100644 --- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h +++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h @@ -122,7 +122,7 @@ public: * @param[in] attributes The attributes with which to perfrom this action. * @return true if action has been accepted by this control */ - static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes); + static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes); public: -- 2.7.4