From: tom.robinson Date: Fri, 30 Jan 2015 16:27:07 +0000 (+0000) Subject: DALi signals refactor to remove V2 naming X-Git-Tag: accepted/tizen/common/20150205.080848~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7e315a440bad7033d19fefa8f9952d625ee6f076 DALi signals refactor to remove V2 naming Change-Id: Ib01d807a8ed6b9b40b438995b2a1bca889655ce7 --- diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp index ccfb863..a117a5d 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp @@ -73,9 +73,9 @@ class TETButton : public Button { public: // PushButton Pressed - typedef SignalV2< bool ( Button ) > PressedSignalV2; + typedef Signal< bool ( Button ) > PressedSignalType; - PressedSignalV2& PressedSignal(); + PressedSignalType& PressedSignal(); /** * Default constructor. @@ -142,7 +142,7 @@ public: /** * @return the pressed signal. */ - Toolkit::TETButton::PressedSignalV2& PressedSignal(); + Toolkit::TETButton::PressedSignalType& PressedSignal(); /** * Callback called when an interrupt events is received. @@ -154,7 +154,7 @@ public: */ void OnButtonDown(); - Toolkit::TETButton::PressedSignalV2 mPressedSignal; ///< Signal emitted when the button is pressed. + Toolkit::TETButton::PressedSignalType mPressedSignal; ///< Signal emitted when the button is pressed. }; } // namespace Internal @@ -187,7 +187,7 @@ TETButton TETButton::DownCast( BaseHandle handle ) return Control::DownCast(handle); } -TETButton::PressedSignalV2& TETButton::PressedSignal() +TETButton::PressedSignalType& TETButton::PressedSignal() { TETButton button( *this ); DALI_ASSERT_ALWAYS( button ); @@ -235,7 +235,7 @@ Toolkit::TETButton TETButton::New() return tetButton; } -Toolkit::TETButton::PressedSignalV2& TETButton::PressedSignal() +Toolkit::TETButton::PressedSignalType& TETButton::PressedSignal() { return mPressedSignal; } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp index ace7cb9..2f58788 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.cpp @@ -48,35 +48,35 @@ public: public: // Signals - Dali::AccessibilityManager::AccessibilityActionSignalV2& StatusChangedSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionNextSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionPreviousSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionActivateSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionReadSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionReadNextSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionReadPreviousSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionOverSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionUpSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionDownSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionClearFocusSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionBackSignal(); - Dali::AccessibilityManager::AccessibilityActionSignalV2& ActionControlPanelOpenSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& StatusChangedSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionNextSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionPreviousSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionActivateSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionReadSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionReadNextSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionReadPreviousSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionOverSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionUpSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionDownSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionClearFocusSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionBackSignal(); + Dali::AccessibilityManager::AccessibilityActionSignalType& ActionControlPanelOpenSignal(); private: - Dali::AccessibilityManager::AccessibilityActionSignalV2 mStatusChangedSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionNextSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionPreviousSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionActivateSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionReadSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionReadNextSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionReadPreviousSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionOverSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionUpSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionDownSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionClearFocusSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionBackSignal; - Dali::AccessibilityManager::AccessibilityActionSignalV2 mActionControlPanelOpenSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mStatusChangedSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionNextSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionPreviousSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionActivateSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionReadSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionReadNextSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionReadPreviousSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionOverSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionUpSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionDownSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionClearFocusSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionBackSignal; + Dali::AccessibilityManager::AccessibilityActionSignalType mActionControlPanelOpenSignal; bool mIsEnabled; Dali::AccessibilityActionHandler* mActionHandler; @@ -121,67 +121,67 @@ void AccessibilityManager::SetGestureHandler(Dali::AccessibilityGestureHandler& mGestureHandler = &handler; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::StatusChangedSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::StatusChangedSignal() { return mStatusChangedSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionNextSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionNextSignal() { return mActionNextSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionPreviousSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionPreviousSignal() { return mActionPreviousSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionActivateSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionActivateSignal() { return mActionActivateSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadSignal() { return mActionReadSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadNextSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadNextSignal() { return mActionReadNextSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadPreviousSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadPreviousSignal() { return mActionReadPreviousSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionOverSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionOverSignal() { return mActionOverSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionUpSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionUpSignal() { return mActionUpSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionDownSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionDownSignal() { return mActionDownSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionClearFocusSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionClearFocusSignal() { return mActionClearFocusSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionBackSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionBackSignal() { return mActionBackSignal; } -Dali::AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionControlPanelOpenSignal() +Dali::AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionControlPanelOpenSignal() { return mActionControlPanelOpenSignal; } @@ -298,62 +298,62 @@ void AccessibilityManager::HandleActionDisableEvent() //Internal::Adaptor::GetImplementation(*this).HandleActionDisableEvent(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::StatusChangedSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::StatusChangedSignal() { return Internal::Adaptor::GetImplementation(*this).StatusChangedSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionNextSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionNextSignal() { return Internal::Adaptor::GetImplementation(*this).ActionNextSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionPreviousSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionPreviousSignal() { return Internal::Adaptor::GetImplementation(*this).ActionPreviousSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionActivateSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionActivateSignal() { return Internal::Adaptor::GetImplementation(*this).ActionActivateSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionOverSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionOverSignal() { return Internal::Adaptor::GetImplementation(*this).ActionOverSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadSignal() { return Internal::Adaptor::GetImplementation(*this).ActionReadSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadNextSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadNextSignal() { return Internal::Adaptor::GetImplementation(*this).ActionReadNextSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadPreviousSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadPreviousSignal() { return Internal::Adaptor::GetImplementation(*this).ActionReadPreviousSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionUpSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionUpSignal() { return Internal::Adaptor::GetImplementation(*this).ActionUpSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionDownSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionDownSignal() { return Internal::Adaptor::GetImplementation(*this).ActionDownSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionClearFocusSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionClearFocusSignal() { return Internal::Adaptor::GetImplementation(*this).ActionClearFocusSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionBackSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionBackSignal() { return Internal::Adaptor::GetImplementation(*this).ActionBackSignal(); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h index d965df3..799b5d5 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include namespace Dali @@ -47,7 +47,7 @@ class TouchPoint; class AccessibilityManager : public BaseHandle { public: // Typedefs - typedef SignalV2< bool ( AccessibilityManager& ) > AccessibilityActionSignalV2; + typedef Signal< bool ( AccessibilityManager& ) > AccessibilityActionSignalType; public: // Construction & Destruction AccessibilityManager(); @@ -74,18 +74,18 @@ public: // Getters void HandleActionDisableEvent(); public: // Signals - AccessibilityActionSignalV2& StatusChangedSignal(); - AccessibilityActionSignalV2& ActionNextSignal(); - AccessibilityActionSignalV2& ActionPreviousSignal(); - AccessibilityActionSignalV2& ActionActivateSignal(); - AccessibilityActionSignalV2& ActionReadSignal(); - AccessibilityActionSignalV2& ActionOverSignal(); - AccessibilityActionSignalV2& ActionReadNextSignal(); - AccessibilityActionSignalV2& ActionReadPreviousSignal(); - AccessibilityActionSignalV2& ActionUpSignal(); - AccessibilityActionSignalV2& ActionDownSignal(); - AccessibilityActionSignalV2& ActionClearFocusSignal(); - AccessibilityActionSignalV2& ActionBackSignal(); + AccessibilityActionSignalType& StatusChangedSignal(); + AccessibilityActionSignalType& ActionNextSignal(); + AccessibilityActionSignalType& ActionPreviousSignal(); + AccessibilityActionSignalType& ActionActivateSignal(); + AccessibilityActionSignalType& ActionReadSignal(); + AccessibilityActionSignalType& ActionOverSignal(); + AccessibilityActionSignalType& ActionReadNextSignal(); + AccessibilityActionSignalType& ActionReadPreviousSignal(); + AccessibilityActionSignalType& ActionUpSignal(); + AccessibilityActionSignalType& ActionDownSignal(); + AccessibilityActionSignalType& ActionClearFocusSignal(); + AccessibilityActionSignalType& ActionBackSignal(); AccessibilityManager( Internal::Adaptor::AccessibilityManager* manager ); }; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp index 9554eaf..8ffff96 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp index 83fe51a..a9f7956 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Dali { @@ -34,7 +34,7 @@ class ClipboardEventNotifier : public Dali::BaseObject { public: - typedef Dali::ClipboardEventNotifier::ClipboardEventSignalV2 ClipboardEventSignalV2; + typedef Dali::ClipboardEventNotifier::ClipboardEventSignalType ClipboardEventSignalType; // Creation static Dali::ClipboardEventNotifier New(); @@ -47,9 +47,9 @@ public: void EmitContentSelectedSignal(); // Signals - ClipboardEventSignalV2& ContentSelectedSignal() + ClipboardEventSignalType& ContentSelectedSignal() { - return mContentSelectedSignalV2; + return mContentSelectedSignal; } private: @@ -64,7 +64,7 @@ private: private: std::string mContent; ///< The current selected content. - ClipboardEventSignalV2 mContentSelectedSignalV2; + ClipboardEventSignalType mContentSelectedSignal; static Dali::ClipboardEventNotifier mToolkitClipboardEventNotifier; @@ -125,10 +125,10 @@ void ClipboardEventNotifier::ClearContent() void ClipboardEventNotifier::EmitContentSelectedSignal() { - if ( !mContentSelectedSignalV2.Empty() ) + if ( !mContentSelectedSignal.Empty() ) { Dali::ClipboardEventNotifier handle( this ); - mContentSelectedSignalV2.Emit( handle ); + mContentSelectedSignal.Emit( handle ); } } @@ -179,7 +179,7 @@ void ClipboardEventNotifier::EmitContentSelectedSignal() Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).EmitContentSelectedSignal(); } -ClipboardEventNotifier::ClipboardEventSignalV2& ClipboardEventNotifier::ContentSelectedSignal() +ClipboardEventNotifier::ClipboardEventSignalType& ClipboardEventNotifier::ContentSelectedSignal() { return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ContentSelectedSignal(); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h index 2600582..d167dc8 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h @@ -24,7 +24,7 @@ // PUBLIC INCLUDES #define __DALI_CLIPBOARD_EVENT_NOTIFIER_H__ #include -#include +#include namespace Dali @@ -41,7 +41,7 @@ class ClipboardEventNotifier; class ClipboardEventNotifier : public BaseHandle { public: - typedef SignalV2< void ( ClipboardEventNotifier& ) > ClipboardEventSignalV2; + typedef Signal< void ( ClipboardEventNotifier& ) > ClipboardEventSignalType; ClipboardEventNotifier(); static ClipboardEventNotifier Get(); @@ -52,7 +52,7 @@ public: void ClearContent(); void EmitContentSelectedSignal(); - ClipboardEventSignalV2& ContentSelectedSignal(); + ClipboardEventSignalType& ContentSelectedSignal(); ClipboardEventNotifier( Internal::Adaptor::ClipboardEventNotifier* notifier ); }; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp index 260e70c..470db7e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp @@ -36,8 +36,8 @@ class RenderSurface; class ImfManager : public Dali::BaseObject { public: - typedef Dali::ImfManager::ImfManagerSignalV2 ImfManagerSignalV2; - typedef Dali::ImfManager::ImfEventSignalV2 ImfEventSignalV2; + typedef Dali::ImfManager::ImfManagerSignalType ImfManagerSignalType; + typedef Dali::ImfManager::ImfEventSignalType ImfEventSignalType; public: static Dali::ImfManager Get(); @@ -58,8 +58,8 @@ public: std::string GetSurroundingText(); public: // Signals - ImfManagerSignalV2& ActivatedSignal() { return mActivatedSignalV2; } - ImfEventSignalV2& EventReceivedSignal() { return mEventSignalV2; } + ImfManagerSignalType& ActivatedSignal() { return mActivatedSignal; } + ImfEventSignalType& EventReceivedSignal() { return mEventSignal; } protected: virtual ~ImfManager(); @@ -80,8 +80,8 @@ private: bool mIdleCallbackConnected:1; ///< Whether the idle callback is already connected. std::vector mKeyEvents; ///< Stores key events to be sent from idle call-back. - ImfManagerSignalV2 mActivatedSignalV2; - ImfEventSignalV2 mEventSignalV2; + ImfManagerSignalType mActivatedSignal; + ImfEventSignalType mEventSignal; static Dali::ImfManager mToolkitImfManager; @@ -276,12 +276,12 @@ std::string ImfManager::GetSurroundingText() return Internal::Adaptor::ImfManager::GetImplementation(*this).GetSurroundingText(); } -ImfManager::ImfManagerSignalV2& ImfManager::ActivatedSignal() +ImfManager::ImfManagerSignalType& ImfManager::ActivatedSignal() { return Internal::Adaptor::ImfManager::GetImplementation(*this).ActivatedSignal(); } -ImfManager::ImfEventSignalV2& ImfManager::EventReceivedSignal() +ImfManager::ImfEventSignalType& ImfManager::EventReceivedSignal() { return Internal::Adaptor::ImfManager::GetImplementation(*this).EventReceivedSignal(); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h index aab3940..842078b 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #define __DALI_IMF_MANAGER_H__ #include -#include +#include namespace Dali DALI_IMPORT_API { @@ -109,9 +109,9 @@ public: bool preeditResetRequired; // flag if preedit reset is required. }; - typedef SignalV2< void (ImfManager&) > ImfManagerSignalV2; + typedef Signal< void (ImfManager&) > ImfManagerSignalType; - typedef SignalV2< ImfCallbackData ( ImfManager&, const ImfEventData& ) > ImfEventSignalV2; + typedef Signal< ImfCallbackData ( ImfManager&, const ImfEventData& ) > ImfEventSignalType; public: @@ -195,13 +195,13 @@ public: * This is emitted when the virtual keyboard is connected to or the hardware keyboard is activated. * @return The IMF Activated signal. */ - ImfManagerSignalV2& ActivatedSignal(); + ImfManagerSignalType& ActivatedSignal(); /** * This is emitted when the IMF manager receives an event from the IMF * @return The Event signal containing the event data. */ - ImfEventSignalV2& EventReceivedSignal(); + ImfEventSignalType& EventReceivedSignal(); // Construction & Destruction diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp index e7e2568..30dd65f 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Dali { @@ -58,7 +58,7 @@ public: // Setters & Getters public: // Signals - Dali::Orientation::OrientationSignalV2& ChangedSignal(); + Dali::Orientation::OrientationSignalType& ChangedSignal(); void EmitChangedSignal() { @@ -67,7 +67,7 @@ public: // Signals private: - Dali::Orientation::OrientationSignalV2 mChangedSignal; + Dali::Orientation::OrientationSignalType mChangedSignal; ToolkitOrientation* mToolkitOrientation; @@ -102,7 +102,7 @@ float Orientation::GetRadians() const return Math::PI * (float)mOrientation / 180.0f; } -Dali::Orientation::OrientationSignalV2& Orientation::ChangedSignal() +Dali::Orientation::OrientationSignalType& Orientation::ChangedSignal() { mToolkitOrientation->mFunctionsCalled.ChangedSignal = true; return mChangedSignal; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp index 94cd960..de4a86e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Dali { @@ -43,10 +43,10 @@ public: bool IsAttached() const; public: // Signals - Dali::PhysicalKeyboard::Signal& StatusChangedSignal(); + Dali::PhysicalKeyboard::PhysicalKeyboardSignalType& StatusChangedSignal(); private: - Dali::PhysicalKeyboard::Signal mStatusChangedSignal; + Dali::PhysicalKeyboard::PhysicalKeyboardSignalType mStatusChangedSignal; bool mIsAttached; static Dali::PhysicalKeyboard mPhysicalKeyboard; }; @@ -76,7 +76,7 @@ bool PhysicalKeyboard::IsAttached() const return mIsAttached; } -Dali::PhysicalKeyboard::Signal& PhysicalKeyboard::StatusChangedSignal() +Dali::PhysicalKeyboard::PhysicalKeyboardSignalType& PhysicalKeyboard::StatusChangedSignal() { return mStatusChangedSignal; } @@ -106,7 +106,7 @@ bool PhysicalKeyboard::IsAttached() const return pyke.IsAttached(); } -PhysicalKeyboard::Signal& PhysicalKeyboard::StatusChangedSignal() +PhysicalKeyboard::PhysicalKeyboardSignalType& PhysicalKeyboard::StatusChangedSignal() { BaseObject& object = GetBaseObject(); Internal::Adaptor::PhysicalKeyboard& pyke = static_cast< Internal::Adaptor::PhysicalKeyboard& >( object ); diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h index f4afb95..8637d20 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include #include -#include +#include namespace Dali { @@ -36,12 +36,12 @@ class PhysicalKeyboard; class PhysicalKeyboard : public BaseHandle { public: - typedef SignalV2< void (PhysicalKeyboard) > Signal; + typedef Signal< void (PhysicalKeyboard) > PhysicalKeyboardSignalType; PhysicalKeyboard(); ~PhysicalKeyboard(); static PhysicalKeyboard Get(); bool IsAttached() const; - Signal& StatusChangedSignal(); + PhysicalKeyboardSignalType& StatusChangedSignal(); PhysicalKeyboard( Internal::Adaptor::PhysicalKeyboard* impl ); }; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp index d92eb15..2f6a046 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include namespace Dali { diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp index e77d521..dc2d39f 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace Dali { @@ -46,7 +46,7 @@ public: // Style Information void SetTheme(std::string theme); public: // Signals - Dali::StyleMonitor::StyleChangeSignalV2& StyleChangeSignal(); + Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal(); void EmitStyleChangeSignal(StyleChange styleChange) { @@ -54,7 +54,7 @@ public: // Signals } private: - Dali::StyleMonitor::StyleChangeSignalV2 mStyleChangeSignal; + Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal; static Dali::StyleMonitor mToolkitStyleMonitor; std::string mTheme; }; @@ -103,7 +103,7 @@ void StyleMonitor::SetTheme(std::string path) EmitStyleChangeSignal(styleChange); } -Dali::StyleMonitor::StyleChangeSignalV2& StyleMonitor::StyleChangeSignal() +Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal() { return mStyleChangeSignal; } @@ -165,7 +165,7 @@ void StyleMonitor::SetTheme(std::string themeFilePath) GetImplementation(*this).SetTheme(themeFilePath); } -StyleMonitor::StyleChangeSignalV2& StyleMonitor::StyleChangeSignal() +StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal() { return GetImplementation(*this).StyleChangeSignal(); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h index e815105..fc8b8f2 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h @@ -24,7 +24,7 @@ // INTERNAL INCLUDES #define __DALI_STYLE_MONITOR_H__ #include -#include +#include #include namespace Dali @@ -41,7 +41,7 @@ class StyleMonitor; class StyleMonitor : public BaseHandle { public: // Typedefs - typedef SignalV2< void (StyleMonitor, StyleChange) > StyleChangeSignalV2; + typedef Signal< void (StyleMonitor, StyleChange) > StyleChangeSignalType; static const std::string DEFAULT_FONT_FAMILY; static const float DEFAULT_FONT_SIZE; @@ -59,7 +59,7 @@ public: // Style Information void SetTheme(std::string themeFilePath); public: // Signals - StyleChangeSignalV2& StyleChangeSignal(); + StyleChangeSignalType& StyleChangeSignal(); void EmitStyleChangeSignal(StyleChange handle); public: // Operators diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp index 4ab6a57..864e41e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp @@ -20,7 +20,7 @@ // INTERNAL INCLUDES #include #include -#include +#include namespace Dali { @@ -53,7 +53,7 @@ public: public: // Signals - Dali::Timer::TimerSignalV2& TickSignal(); + Dali::Timer::TimerSignalType& TickSignal(); private: // Implementation @@ -63,7 +63,7 @@ private: // Implementation private: // Data - Dali::Timer::TimerSignalV2 mTickSignal; + Dali::Timer::TimerSignalType mTickSignal; unsigned int mInterval; }; @@ -128,7 +128,7 @@ bool Timer::Tick() return false; } -Dali::Timer::TimerSignalV2& Timer::TickSignal() +Dali::Timer::TimerSignalType& Timer::TickSignal() { return mTickSignal; } @@ -196,7 +196,7 @@ bool Timer::IsRunning() const return true; } -Timer::TimerSignalV2& Timer::TickSignal() +Timer::TimerSignalType& Timer::TickSignal() { return Internal::Adaptor::GetImplementation( *this ).TickSignal(); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h index c479fb8..a7397e6 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h @@ -24,7 +24,7 @@ // PUBLIC INCLUDES #define __DALI_TIMER_H__ #include -#include +#include namespace Dali { @@ -40,7 +40,7 @@ class Timer; class Timer : public BaseHandle { public: - typedef SignalV2< bool () > TimerSignalV2; + typedef Signal< bool () > TimerSignalType; Timer(); static Timer New( unsigned int milliSec ); Timer( const Timer& timer ); @@ -52,7 +52,7 @@ public: void SetInterval( unsigned int milliSec ); unsigned int GetInterval() const; bool IsRunning() const; - TimerSignalV2& TickSignal(); + TimerSignalType& TickSignal(); private: Timer(Internal::Adaptor::Timer* timer); }; diff --git a/base/dali-toolkit/internal/builder/builder-impl.cpp b/base/dali-toolkit/internal/builder/builder-impl.cpp index ab40d18..82a502f 100644 --- a/base/dali-toolkit/internal/builder/builder-impl.cpp +++ b/base/dali-toolkit/internal/builder/builder-impl.cpp @@ -808,7 +808,7 @@ Path Builder::GetPath( const std::string& name ) return ret; } -Toolkit::Builder::Signal& Builder::QuitSignal() +Toolkit::Builder::BuilderSignalType& Builder::QuitSignal() { return mQuitSignal; } diff --git a/base/dali-toolkit/internal/builder/builder-impl.h b/base/dali-toolkit/internal/builder/builder-impl.h index a51a350..aeb3ff1 100644 --- a/base/dali-toolkit/internal/builder/builder-impl.h +++ b/base/dali-toolkit/internal/builder/builder-impl.h @@ -186,7 +186,7 @@ public: /** * @copydoc Toolkit::Builder::QuitSignal */ - Toolkit::Builder::Signal& QuitSignal(); + Toolkit::Builder::BuilderSignalType& QuitSignal(); /** * Emits the quit signal @@ -243,7 +243,7 @@ private: void SetProperties( const TreeNode& node, Handle& handle, const Replacement& constant ); - Toolkit::Builder::Signal mQuitSignal; + Toolkit::Builder::BuilderSignalType mQuitSignal; }; } // namespace Internal diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp index fc1373d..8300ad9 100644 --- a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/base/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -105,14 +105,14 @@ float Button::OnAnimationTimeRequested() const return 0.f; } -Toolkit::Button::ClickedSignalV2& Button::ClickedSignal() +Toolkit::Button::ClickedSignalType& Button::ClickedSignal() { - return mClickedSignalV2; + return mClickedSignal; } -Toolkit::Button::ToggledSignalV2& Button::ToggledSignal() +Toolkit::Button::ToggledSignalType& Button::ToggledSignal() { - return mToggledSignalV2; + return mToggledSignal; } bool Button::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.h b/base/dali-toolkit/internal/controls/buttons/button-impl.h index 166f315..97a0e0b 100644 --- a/base/dali-toolkit/internal/controls/buttons/button-impl.h +++ b/base/dali-toolkit/internal/controls/buttons/button-impl.h @@ -140,12 +140,12 @@ public: /** * @copydoc Dali::Toolkit::Button::ClickedSignal() */ - Toolkit::Button::ClickedSignalV2& ClickedSignal(); + Toolkit::Button::ClickedSignalType& ClickedSignal(); /** * @copydoc Dali::Toolkit::Button::ToggledSignal() */ - Toolkit::Button::ToggledSignalV2& ToggledSignal(); + Toolkit::Button::ToggledSignalType& ToggledSignal(); /** * Connects a callback function with the object's signals. @@ -235,8 +235,8 @@ protected: // Signals ButtonPainterPtr mPainter; ///< Pointer to a ButtonPainter base class. - Toolkit::Button::ClickedSignalV2 mClickedSignalV2; ///< Signal emitted when the button is clicked. - Toolkit::Button::ToggledSignalV2 mToggledSignalV2; ///< Signal emitted when the button is toggled. + Toolkit::Button::ClickedSignalType mClickedSignal; ///< Signal emitted when the button is clicked. + Toolkit::Button::ToggledSignalType mToggledSignal; ///< Signal emitted when the button is toggled. TapGestureDetector mTapDetector; }; 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 85fe1a6..bc26d3f 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 @@ -86,7 +86,7 @@ void CheckBoxButton::SetChecked( bool checked ) GetCheckBoxButtonPainter( mPainter )->Checked( handle ); // Raise toggled signal - mToggledSignalV2.Emit( handle, mChecked ); + mToggledSignal.Emit( handle, mChecked ); } } 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 9f8452c..d4381fb 100644 --- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -208,7 +208,7 @@ void PushButton::SetToggled( bool toggle ) GetPushButtonPainter( mPainter )->Toggled( handle ); // Emit signal. - mToggledSignalV2.Emit( handle, mToggled ); + mToggledSignal.Emit( handle, mToggled ); } } @@ -355,14 +355,14 @@ Actor& PushButton::GetFadeOutButtonImage() return mFadeOutButtonImage; } -Toolkit::PushButton::PressedSignalV2& PushButton::PressedSignal() +Toolkit::PushButton::PressedSignalType& PushButton::PressedSignal() { - return mPressedSignalV2; + return mPressedSignal; } -Toolkit::PushButton::ReleasedSignalV2& PushButton::ReleasedSignal() +Toolkit::PushButton::ReleasedSignalType& PushButton::ReleasedSignal() { - return mReleasedSignalV2; + return mReleasedSignal; } bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) @@ -561,7 +561,7 @@ void PushButton::OnButtonDown() } //Emit signal. - mPressedSignalV2.Emit( handle ); + mPressedSignal.Emit( handle ); } } @@ -579,7 +579,7 @@ void PushButton::OnButtonUp() GetPushButtonPainter( mPainter )->Toggled( handle ); // Emit signal. - mToggledSignalV2.Emit( handle, mToggled ); + mToggledSignal.Emit( handle, mToggled ); } else { @@ -595,8 +595,8 @@ void PushButton::OnButtonUp() } //Emit signal. - mReleasedSignalV2.Emit( handle ); - mClickedSignalV2.Emit( handle ); + mReleasedSignal.Emit( handle ); + mClickedSignal.Emit( handle ); } } } @@ -618,7 +618,7 @@ void PushButton::OnTouchPointLeave() } //Emit signal. - mReleasedSignalV2.Emit( handle ); + mReleasedSignal.Emit( handle ); } } } @@ -702,9 +702,9 @@ bool PushButton::AutoRepeatingSlot() GetPushButtonPainter( mPainter )->Pressed( handle ); //Emit signal. - consumed = mReleasedSignalV2.Emit( handle ); - consumed |= mClickedSignalV2.Emit( handle ); - consumed |= mPressedSignalV2.Emit( handle ); + consumed = mReleasedSignal.Emit( handle ); + consumed |= mClickedSignal.Emit( handle ); + consumed |= mPressedSignal.Emit( handle ); } return consumed; 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 d27927a..d8a17e4 100644 --- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h +++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.h @@ -245,12 +245,12 @@ public: /** * @copydoc Dali::Toolkit::PushButton::PressedSignal() */ - Toolkit::PushButton::PressedSignalV2& PressedSignal(); + Toolkit::PushButton::PressedSignalType& PressedSignal(); /** * @copydoc Dali::Toolkit::PushButton::ReleasedSignal() */ - Toolkit::PushButton::ReleasedSignalV2& ReleasedSignal(); + Toolkit::PushButton::ReleasedSignalType& ReleasedSignal(); /** * Connects a callback function with the object's signals. @@ -395,8 +395,8 @@ private: bool mToggled; ///< Stores the toggle state. // Signals - Toolkit::PushButton::PressedSignalV2 mPressedSignalV2; ///< Signal emitted when the button is pressed. - Toolkit::PushButton::ReleasedSignalV2 mReleasedSignalV2; ///< Signal emitted when the button is released. + Toolkit::PushButton::PressedSignalType mPressedSignal; ///< Signal emitted when the button is pressed. + Toolkit::PushButton::ReleasedSignalType mReleasedSignal; ///< Signal emitted when the button is released. Actor mButtonImage; ///< Stores the released image. Actor mBackgroundImage; ///< Stores the background image. diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp index 94d4ff4..2ddbdd7 100644 --- a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp +++ b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp @@ -158,7 +158,7 @@ void RadioButton::SetActive(bool active) // Raise toggled signal Toolkit::RadioButton handle( GetOwner() ); - mToggledSignalV2.Emit( handle, mActive ); + mToggledSignal.Emit( handle, mActive ); RelayoutRequest(); } diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp index f5179d7..03c560c 100755 --- a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/base/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -572,18 +572,18 @@ void Popup::HandleStateChangeComplete() // Guard against destruction during signal emission Toolkit::Popup handle( GetOwner() ); - mHiddenSignalV2.Emit(); + mHiddenSignal.Emit(); } } -Toolkit::Popup::TouchedOutsideSignalV2& Popup::OutsideTouchedSignal() +Toolkit::Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal() { - return mTouchedOutsideSignalV2; + return mTouchedOutsideSignal; } -Toolkit::Popup::HiddenSignalV2& Popup::HiddenSignal() +Toolkit::Popup::HiddenSignalType& Popup::HiddenSignal() { - return mHiddenSignalV2; + return mHiddenSignal; } bool Popup::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) @@ -626,7 +626,7 @@ bool Popup::OnBackingTouched(Actor actor, const TouchEvent& event) // Guard against destruction during signal emission Toolkit::Popup handle( GetOwner() ); - mTouchedOutsideSignalV2.Emit(); + mTouchedOutsideSignal.Emit(); } } diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.h b/base/dali-toolkit/internal/controls/popup/popup-impl.h index 5adbb43..1073b25 100755 --- a/base/dali-toolkit/internal/controls/popup/popup-impl.h +++ b/base/dali-toolkit/internal/controls/popup/popup-impl.h @@ -184,12 +184,12 @@ public: // Signals /** * @copydoc Dali::Toolkit::Popup::OutsideTouchedSignal() */ - Toolkit::Popup::TouchedOutsideSignalV2& OutsideTouchedSignal(); + Toolkit::Popup::TouchedOutsideSignalType& OutsideTouchedSignal(); /** * @copydoc Dali::Toolkit::Popup::HiddenSignal() */ - Toolkit::Popup::HiddenSignalV2& HiddenSignal(); + Toolkit::Popup::HiddenSignalType& HiddenSignal(); /** * Connects a callback function with the object's signals. @@ -323,8 +323,8 @@ private: LayoutInfo mLayoutInfo; ///< Stores sizes of all popup components. - Toolkit::Popup::TouchedOutsideSignalV2 mTouchedOutsideSignalV2; - Toolkit::Popup::HiddenSignalV2 mHiddenSignalV2; + Toolkit::Popup::TouchedOutsideSignalType mTouchedOutsideSignal; + Toolkit::Popup::HiddenSignalType mHiddenSignal; Property::Index mPropertyTitle; ///< Property index for Title. Property::Index mPropertyState; ///< Property index for popup state. diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp index 6d4d4b8..3fbf1d4 100644 --- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -572,7 +572,7 @@ void ItemView::DoRefresh(float currentLayoutPosition, bool cacheExtra) RemoveActorsOutsideRange( range ); AddActorsWithinRange( range, 0.0f/*immediate*/ ); - mScrollUpdatedSignalV2.Emit( Vector3(0.0f, currentLayoutPosition, 0.0f) ); + mScrollUpdatedSignal.Emit( Vector3(0.0f, currentLayoutPosition, 0.0f) ); } } @@ -1067,7 +1067,7 @@ bool ItemView::OnTouchEvent(const TouchEvent& event) if(mScrollAnimation) { - mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition()); + mScrollCompletedSignal.Emit(GetCurrentScrollPosition()); } RemoveAnimation(mScrollAnimation); @@ -1088,7 +1088,7 @@ bool ItemView::OnMouseWheelEvent(const MouseWheelEvent& event) mScrollPositionObject.SetProperty( ScrollConnector::SCROLL_POSITION, firstItemScrollPosition ); self.SetProperty(mPropertyPosition, GetScrollPosition(firstItemScrollPosition, layoutSize)); - mScrollStartedSignalV2.Emit(GetCurrentScrollPosition()); + mScrollStartedSignal.Emit(GetCurrentScrollPosition()); mRefreshEnabled = true; } @@ -1120,7 +1120,7 @@ bool ItemView::OnMouseWheelEventFinished() mScrollOvershoot = 0.0f; AnimateScrollOvershoot(0.0f); - mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition()); + mScrollCompletedSignal.Emit(GetCurrentScrollPosition()); } } @@ -1228,7 +1228,7 @@ void ItemView::OnPan( const PanGesture& gesture ) // Reset the overshoot if no scroll animation. if (!mScrollAnimation) { - mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition()); + mScrollCompletedSignal.Emit(GetCurrentScrollPosition()); AnimateScrollOvershoot(0.0f, false); } @@ -1238,7 +1238,7 @@ void ItemView::OnPan( const PanGesture& gesture ) case Gesture::Started: // Fall through { mTotalPanDisplacement = Vector2::ZERO; - mScrollStartedSignalV2.Emit(GetCurrentScrollPosition()); + mScrollStartedSignal.Emit(GetCurrentScrollPosition()); mRefreshEnabled = true; } @@ -1369,7 +1369,7 @@ void ItemView::OnScrollFinished(Animation& source) RemoveAnimation(mScrollAnimation); // mScrollAnimation is used to query whether we're scrolling - mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition()); + mScrollCompletedSignal.Emit(GetCurrentScrollPosition()); if(mIsFlicking && fabsf(mScrollOvershoot) > Math::MACHINE_EPSILON_1) { @@ -1424,7 +1424,7 @@ void ItemView::ScrollToItem(unsigned int itemId, float durationSeconds) AnimateScrollOvershoot(0.0f); } - mScrollStartedSignalV2.Emit(GetCurrentScrollPosition()); + mScrollStartedSignal.Emit(GetCurrentScrollPosition()); mRefreshEnabled = true; } @@ -1541,7 +1541,7 @@ void ItemView::ScrollTo(const Vector3& position, float duration) AnimateScrollOvershoot(0.0f); } - mScrollStartedSignalV2.Emit(GetCurrentScrollPosition()); + mScrollStartedSignal.Emit(GetCurrentScrollPosition()); mRefreshEnabled = true; } diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h index fd421c7..f9a201e 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include // INTERNAL INCLUDES #include diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp index 7522766..c6cc755 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -1154,8 +1154,8 @@ void ScrollView::TransformTo(const Vector3& position, float duration, AlphaFunct { // set mScrolling to false, in case user has code that interrogates mScrolling Getter() in complete. mScrolling = false; - DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 1 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); - mScrollCompletedSignalV2.Emit( currentScrollPosition ); + DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 1 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); + mScrollCompletedSignal.Emit( currentScrollPosition ); } if( mPanning ) // are we interrupting a current pan? @@ -1174,8 +1174,8 @@ void ScrollView::TransformTo(const Vector3& position, float duration, AlphaFunct self.SetProperty(mPropertyScrolling, true); mScrolling = true; - DALI_LOG_SCROLL_STATE("[0x%X] mScrollStartedSignalV2 1 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); - mScrollStartedSignalV2.Emit( currentScrollPosition ); + DALI_LOG_SCROLL_STATE("[0x%X] mScrollStartedSignal 1 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); + mScrollStartedSignal.Emit( currentScrollPosition ); bool animating = AnimateTo(-position, Vector3::ONE * duration, alpha, @@ -1198,9 +1198,9 @@ void ScrollView::TransformTo(const Vector3& position, float duration, AlphaFunct completedPosition = position; } - DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 2 [%.2f, %.2f]", this, completedPosition.x, completedPosition.y); + DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 2 [%.2f, %.2f]", this, completedPosition.x, completedPosition.y); SetScrollUpdateNotification(false); - mScrollCompletedSignalV2.Emit( completedPosition ); + mScrollCompletedSignal.Emit( completedPosition ); } } @@ -1687,8 +1687,8 @@ bool ScrollView::AnimateTo(const Vector3& position, const Vector3& positionDurat snapEvent.position = -mScrollTargetPosition; snapEvent.duration = totalDuration; - DALI_LOG_SCROLL_STATE("[0x%X] mSnapStartedSignalV2 [%.2f, %.2f]", this, snapEvent.position.x, snapEvent.position.y); - mSnapStartedSignalV2.Emit( snapEvent ); + DALI_LOG_SCROLL_STATE("[0x%X] mSnapStartedSignal [%.2f, %.2f]", this, snapEvent.position.x, snapEvent.position.y); + mSnapStartedSignal.Emit( snapEvent ); return (mScrollStateFlags & SCROLL_ANIMATION_FLAGS) != 0; } @@ -1745,9 +1745,9 @@ void ScrollView::RemoveScrollingDirection( Radian direction ) panGesture.RemoveDirection( direction ); } -Toolkit::ScrollView::SnapStartedSignalV2& ScrollView::SnapStartedSignal() +Toolkit::ScrollView::SnapStartedSignalType& ScrollView::SnapStartedSignal() { - return mSnapStartedSignalV2; + return mSnapStartedSignal; } void ScrollView::FindAndUnbindActor(Actor child) @@ -1790,8 +1790,8 @@ void ScrollView::HandleSnapAnimationFinished() self.SetProperty(mPropertyPrePosition, mScrollPrePosition); Vector3 currentScrollPosition = GetCurrentScrollPosition(); - DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 3 current[%.2f, %.2f], mScrollTargetPosition[%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y, -mScrollTargetPosition.x, -mScrollTargetPosition.y ); - mScrollCompletedSignalV2.Emit( currentScrollPosition ); + DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 3 current[%.2f, %.2f], mScrollTargetPosition[%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y, -mScrollTargetPosition.x, -mScrollTargetPosition.y ); + mScrollCompletedSignal.Emit( currentScrollPosition ); mDomainOffset += deltaPosition - mScrollPostPosition; self.SetProperty(mPropertyDomainOffset, mDomainOffset); @@ -1833,7 +1833,7 @@ void ScrollView::OnScrollUpdateNotification(Dali::PropertyNotification& source) Toolkit::ScrollView handle( GetOwner() ); Vector3 currentScrollPosition = GetCurrentScrollPosition(); - mScrollUpdatedSignalV2.Emit( currentScrollPosition ); + mScrollUpdatedSignal.Emit( currentScrollPosition ); } bool ScrollView::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) @@ -1948,8 +1948,8 @@ bool ScrollView::OnTouchDownTimeout() UpdateLocalScrollProperties(); Vector3 currentScrollPosition = GetCurrentScrollPosition(); - DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 4 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); - mScrollCompletedSignalV2.Emit( currentScrollPosition ); + DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 4 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); + mScrollCompletedSignal.Emit( currentScrollPosition ); } } @@ -2332,8 +2332,8 @@ void ScrollView::GestureStarted() mScrolling = false; // send negative scroll position since scroll internal scroll position works as an offset for actors, // give applications the position within the domain from the scroll view's anchor position - DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 5 [%.2f, %.2f]", this, -mScrollPostPosition.x, -mScrollPostPosition.y); - mScrollCompletedSignalV2.Emit( -mScrollPostPosition ); + DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 5 [%.2f, %.2f]", this, -mScrollPostPosition.x, -mScrollPostPosition.y); + mScrollCompletedSignal.Emit( -mScrollPostPosition ); } } } @@ -2457,8 +2457,8 @@ void ScrollView::OnGestureEx(Gesture::State state) Vector3 currentScrollPosition = GetCurrentScrollPosition(); Self().SetProperty(mPropertyScrolling, true); mScrolling = true; - DALI_LOG_SCROLL_STATE("[0x%X] mScrollStartedSignalV2 2 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); - mScrollStartedSignalV2.Emit( currentScrollPosition ); + DALI_LOG_SCROLL_STATE("[0x%X] mScrollStartedSignal 2 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); + mScrollStartedSignal.Emit( currentScrollPosition ); } else if( (state == Gesture::Finished) || (state == Gesture::Cancelled) ) // Finished/default @@ -2512,8 +2512,8 @@ void ScrollView::FinishTransform() SnapInternalYTo(mScrollTargetPosition.y); } Vector3 currentScrollPosition = GetCurrentScrollPosition(); - DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignalV2 6 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); - mScrollCompletedSignalV2.Emit( currentScrollPosition ); + DALI_LOG_SCROLL_STATE("[0x%X] mScrollCompletedSignal 6 [%.2f, %.2f]", this, currentScrollPosition.x, currentScrollPosition.y); + mScrollCompletedSignal.Emit( currentScrollPosition ); } } diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h index 8706c1c..0ffd7d4 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h @@ -492,7 +492,7 @@ public: //Signals /** * @copydoc Dali::Toolkit::ScrollView::SnapStartedSignal() */ - Toolkit::ScrollView::SnapStartedSignalV2& SnapStartedSignal(); + Toolkit::ScrollView::SnapStartedSignalType& SnapStartedSignal(); /** * Connects a callback function with the object's signals. @@ -912,7 +912,7 @@ private: ScrollOvershootIndicatorPtr mOvershootIndicator; - Toolkit::ScrollView::SnapStartedSignalV2 mSnapStartedSignalV2; + Toolkit::ScrollView::SnapStartedSignalType mSnapStartedSignal; bool mInAccessibilityPan : 1; ///< With AccessibilityPan its easier to move between snap positions bool mInitialized:1; diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp index e378a3d..36e713f 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp @@ -189,24 +189,24 @@ float Scrollable::GetOvershootAnimationSpeed() const return mOvershootAnimationSpeed; }; -Toolkit::Scrollable::ScrollStartedSignalV2& Scrollable::ScrollStartedSignal() +Toolkit::Scrollable::ScrollStartedSignalType& Scrollable::ScrollStartedSignal() { - return mScrollStartedSignalV2; + return mScrollStartedSignal; } -Toolkit::Scrollable::ScrollUpdatedSignalV2& Scrollable::ScrollUpdatedSignal() +Toolkit::Scrollable::ScrollUpdatedSignalType& Scrollable::ScrollUpdatedSignal() { - return mScrollUpdatedSignalV2; + return mScrollUpdatedSignal; } -Toolkit::Scrollable::ScrollCompletedSignalV2& Scrollable::ScrollCompletedSignal() +Toolkit::Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal() { - return mScrollCompletedSignalV2; + return mScrollCompletedSignal; } -Toolkit::Scrollable::ScrollClampedSignalV2& Scrollable::ScrollClampedSignal() +Toolkit::Scrollable::ScrollClampedSignalType& Scrollable::ScrollClampedSignal() { - return mScrollClampedSignalV2; + return mScrollClampedSignal; } bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h index 8abf7d5..e100e75 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h +++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h @@ -143,22 +143,22 @@ public: //Signals /** * @copydoc Dali::Toolkit::Scrollable::ScrollStartedSignal() */ - Toolkit::Scrollable::ScrollStartedSignalV2& ScrollStartedSignal(); + Toolkit::Scrollable::ScrollStartedSignalType& ScrollStartedSignal(); /** * @copydoc Dali::Toolkit::Scrollable::ScrollUpdatedSignal() */ - Toolkit::Scrollable::ScrollUpdatedSignalV2& ScrollUpdatedSignal(); + Toolkit::Scrollable::ScrollUpdatedSignalType& ScrollUpdatedSignal(); /** * @copydoc Dali::Toolkit::Scrollable::ScrollCompletedSignal() */ - Toolkit::Scrollable::ScrollCompletedSignalV2& ScrollCompletedSignal(); + Toolkit::Scrollable::ScrollCompletedSignalType& ScrollCompletedSignal(); /** * @copydoc Dali::Toolkit::Scrollable::ScrollClampedSignal() */ - Toolkit::Scrollable::ScrollClampedSignalV2& ScrollClampedSignal(); + Toolkit::Scrollable::ScrollClampedSignalType& ScrollClampedSignal(); /** * Connects a callback function with the object's signals. @@ -245,10 +245,10 @@ protected: std::map mComponent; ///< ScrollComponent (such as a scrollbar/page indicator/status) - Toolkit::Scrollable::ScrollStartedSignalV2 mScrollStartedSignalV2; - Toolkit::Scrollable::ScrollUpdatedSignalV2 mScrollUpdatedSignalV2; - Toolkit::Scrollable::ScrollCompletedSignalV2 mScrollCompletedSignalV2; - Toolkit::Scrollable::ScrollClampedSignalV2 mScrollClampedSignalV2; + Toolkit::Scrollable::ScrollStartedSignalType mScrollStartedSignal; + Toolkit::Scrollable::ScrollUpdatedSignalType mScrollUpdatedSignal; + Toolkit::Scrollable::ScrollCompletedSignalType mScrollCompletedSignal; + Toolkit::Scrollable::ScrollClampedSignalType mScrollClampedSignal; private: diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h index 7d316da..7de78bf 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h +++ b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h @@ -563,8 +563,8 @@ private: public: - typedef SignalV2< bool( Toolkit::Button ) > PressedSignal; - typedef SignalV2< void () > CursorPositionedSignal; + typedef Signal< bool( Toolkit::Button ) > PressedSignal; + typedef Signal< void () > CursorPositionedSignal; /** * @brief Signal emitted when the button is touched. * This is relayed from the PopUp class. It enables the owner of the Decorator to act on the PopUp button press. diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp index 512b163..cbda7fb 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp +++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp @@ -538,24 +538,24 @@ const Vector4& TextInput::GetMaterialDiffuseColor() const // Signals -Toolkit::TextInput::InputSignalV2& TextInput::InputStartedSignal() +Toolkit::TextInput::InputSignalType& TextInput::InputStartedSignal() { - return mInputStartedSignalV2; + return mInputStartedSignal; } -Toolkit::TextInput::InputSignalV2& TextInput::InputFinishedSignal() +Toolkit::TextInput::InputSignalType& TextInput::InputFinishedSignal() { - return mInputFinishedSignalV2; + return mInputFinishedSignal; } -Toolkit::TextInput::InputSignalV2& TextInput::CutAndPasteToolBarDisplayedSignal() +Toolkit::TextInput::InputSignalType& TextInput::CutAndPasteToolBarDisplayedSignal() { - return mCutAndPasteToolBarDisplayedV2; + return mCutAndPasteToolBarDisplayed; } -Toolkit::TextInput::StyleChangedSignalV2& TextInput::StyleChangedSignal() +Toolkit::TextInput::StyleChangedSignalType& TextInput::StyleChangedSignal() { - return mStyleChangedSignalV2; + return mStyleChangedSignal; } Toolkit::TextInput::TextModifiedSignalType& TextInput::TextModifiedSignal() @@ -563,14 +563,14 @@ Toolkit::TextInput::TextModifiedSignalType& TextInput::TextModifiedSignal() return mTextModifiedSignal; } -Toolkit::TextInput::MaxInputCharactersReachedSignalV2& TextInput::MaxInputCharactersReachedSignal() +Toolkit::TextInput::MaxInputCharactersReachedSignalType& TextInput::MaxInputCharactersReachedSignal() { - return mMaxInputCharactersReachedSignalV2; + return mMaxInputCharactersReachedSignal; } -Toolkit::TextInput::InputTextExceedBoundariesSignalV2& TextInput::InputTextExceedBoundariesSignal() +Toolkit::TextInput::InputTextExceedBoundariesSignalType& TextInput::InputTextExceedBoundariesSignal() { - return mInputTextExceedBoundariesSignalV2; + return mInputTextExceedBoundariesSignal; } bool TextInput::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) @@ -1030,7 +1030,7 @@ void TextInput::OnKeyInputFocusGained() StartCursorBlinkTimer(); Toolkit::TextInput handle( GetOwner() ); - mInputStartedSignalV2.Emit( handle ); + mInputStartedSignal.Emit( handle ); ImfManager imfManager = ImfManager::Get(); @@ -1087,7 +1087,7 @@ void TextInput::OnKeyInputFocusLost() VirtualKeyboard::LanguageChangedSignal().Disconnect( this, &TextInput::SetTextDirection ); Toolkit::TextInput handle( GetOwner() ); - mInputFinishedSignalV2.Emit( handle ); + mInputFinishedSignal.Emit( handle ); mEditModeActive = false; mPreEditFlag = false; RemoveHighlight(); @@ -5507,7 +5507,7 @@ void TextInput::EmitStyleChangedSignal() { // emit signal if input style changes. Toolkit::TextInput handle( GetOwner() ); - mStyleChangedSignalV2.Emit( handle, mInputStyle ); + mStyleChangedSignal.Emit( handle, mInputStyle ); } void TextInput::EmitTextModified() @@ -5524,7 +5524,7 @@ void TextInput::EmitMaxInputCharactersReachedSignal() DALI_LOG_INFO(gLogFilter, Debug::General, "EmitMaxInputCharactersReachedSignal \n"); Toolkit::TextInput handle( GetOwner() ); - mMaxInputCharactersReachedSignalV2.Emit( handle ); + mMaxInputCharactersReachedSignal.Emit( handle ); } void TextInput::EmitInputTextExceedsBoundariesSignal() @@ -5532,7 +5532,7 @@ void TextInput::EmitInputTextExceedsBoundariesSignal() // Emit a signal when the input text exceeds the boundaries of the text input. Toolkit::TextInput handle( GetOwner() ); - mInputTextExceedBoundariesSignalV2.Emit( handle ); + mInputTextExceedBoundariesSignal.Emit( handle ); } } // namespace Internal diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h index 76160de..c60d6bc 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h +++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h @@ -125,22 +125,22 @@ public: /** * @copydoc Toolkit::TextInput::InputStartedSignal() */ - Toolkit::TextInput::InputSignalV2& InputStartedSignal(); + Toolkit::TextInput::InputSignalType& InputStartedSignal(); /** * @copydoc Toolkit::TextInput::InputFinishedSignal() */ - Toolkit::TextInput::InputSignalV2& InputFinishedSignal(); + Toolkit::TextInput::InputSignalType& InputFinishedSignal(); /** * @copydoc Toolkit::TextInput::CutAndPasteToolBarDisplayedSignal() */ - Toolkit::TextInput::InputSignalV2& CutAndPasteToolBarDisplayedSignal(); + Toolkit::TextInput::InputSignalType& CutAndPasteToolBarDisplayedSignal(); /** * @copydoc Toolkit::TextInput::StyleChangedSignal() */ - Toolkit::TextInput::StyleChangedSignalV2& StyleChangedSignal(); + Toolkit::TextInput::StyleChangedSignalType& StyleChangedSignal(); /** * @copydoc Toolkit::TextInput::TextModifiedSignal() @@ -150,12 +150,12 @@ public: /** * @copydoc Toolkit::TextInput::MaxInputCharactersReachedSignal() */ - Toolkit::TextInput::MaxInputCharactersReachedSignalV2& MaxInputCharactersReachedSignal(); + Toolkit::TextInput::MaxInputCharactersReachedSignalType& MaxInputCharactersReachedSignal(); /** * @copydoc Toolkit::TextInput::InputTextExceedBoundariesSignal() */ - Toolkit::TextInput::InputTextExceedBoundariesSignalV2& InputTextExceedBoundariesSignal(); + Toolkit::TextInput::InputTextExceedBoundariesSignalType& InputTextExceedBoundariesSignal(); /** * Connects a callback function with the object's signals. @@ -1538,13 +1538,13 @@ private: bool mPlaceHolderSet:1; ///< Whether the place holder text is set. bool mMarkUpEnabled:1; ///< enable to scan for mark-up - Toolkit::TextInput::InputSignalV2 mInputStartedSignalV2; ///< Signal emitted when input starts - Toolkit::TextInput::InputSignalV2 mInputFinishedSignalV2; ///< Signal emitted when input ends - Toolkit::TextInput::StyleChangedSignalV2 mStyleChangedSignalV2; ///< Signal emitted when style changes. + Toolkit::TextInput::InputSignalType mInputStartedSignal; ///< Signal emitted when input starts + Toolkit::TextInput::InputSignalType mInputFinishedSignal; ///< Signal emitted when input ends + Toolkit::TextInput::StyleChangedSignalType mStyleChangedSignal; ///< Signal emitted when style changes. Toolkit::TextInput::TextModifiedSignalType mTextModifiedSignal; ///< Signal emitted when text modified. - Toolkit::TextInput::MaxInputCharactersReachedSignalV2 mMaxInputCharactersReachedSignalV2; ///< Signal emitted when max input characters is reached. - Toolkit::TextInput::InputSignalV2 mCutAndPasteToolBarDisplayedV2; ///< Signal emitted when toolbar displayed - Toolkit::TextInput::InputTextExceedBoundariesSignalV2 mInputTextExceedBoundariesSignalV2; ///< Signal emitted when input text exceeds the boundaries of the text-input. + Toolkit::TextInput::MaxInputCharactersReachedSignalType mMaxInputCharactersReachedSignal; ///< Signal emitted when max input characters is reached. + Toolkit::TextInput::InputSignalType mCutAndPasteToolBarDisplayed; ///< Signal emitted when toolbar displayed + Toolkit::TextInput::InputTextExceedBoundariesSignalType mInputTextExceedBoundariesSignal; ///< Signal emitted when input text exceeds the boundaries of the text-input. }; } // namespace Internal diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp index 63c82fe..5691cec 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp +++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp @@ -889,17 +889,17 @@ void TextInputPopup::OnShowFinished(Animation& source) mShowFinishedSignal.Emit( *this ); } -TextInputPopup::PressedSignalV2& TextInputPopup::PressedSignal() +TextInputPopup::PressedSignalType& TextInputPopup::PressedSignal() { return mPressedSignal; } -TextInputPopup::HideFinishedSignalV2& TextInputPopup::HideFinishedSignal() +TextInputPopup::HideFinishedSignalType& TextInputPopup::HideFinishedSignal() { return mHideFinishedSignal; } -TextInputPopup::ShowFinishedSignalV2& TextInputPopup::ShowFinishedSignal() +TextInputPopup::ShowFinishedSignalType& TextInputPopup::ShowFinishedSignal() { return mShowFinishedSignal; } diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h index 8c951ad..c7f0fc2 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h +++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h @@ -85,30 +85,30 @@ public: static const char* const SIGNAL_SHOW_FINISHED; // Popup Button Pressed - typedef SignalV2< bool( Toolkit::Button ) > PressedSignalV2; + typedef Signal< bool( Toolkit::Button ) > PressedSignalType; // Popup Hide Finished - typedef SignalV2< void( TextInputPopup& ) > HideFinishedSignalV2; + typedef Signal< void( TextInputPopup& ) > HideFinishedSignalType; // Popup Show Finished - typedef SignalV2< void( TextInputPopup& ) > ShowFinishedSignalV2; + typedef Signal< void( TextInputPopup& ) > ShowFinishedSignalType; /** * Signal emitted when the button is touched. */ - PressedSignalV2& PressedSignal(); + PressedSignalType& PressedSignal(); /** * Signal emitted when popup is completely hidden * @note Only occurs after a Show() call with animation enabled. */ - HideFinishedSignalV2& HideFinishedSignal(); + HideFinishedSignalType& HideFinishedSignal(); /** * Signal emitted when popup is completely shown * @note Only occurs after a Hide() call with animation enabled. */ - ShowFinishedSignalV2& ShowFinishedSignal(); + ShowFinishedSignalType& ShowFinishedSignal(); public: @@ -462,9 +462,9 @@ private: std::size_t mPasteOptionPriority; // Position of Paste button std::size_t mClipboardOptionPriority; // Position of Clipboard button - PressedSignalV2 mPressedSignal; ///< Signal emitted when a button within the popup is pressed. - HideFinishedSignalV2 mHideFinishedSignal; ///< Signal emitted when popup is completely hidden - ShowFinishedSignalV2 mShowFinishedSignal; ///< Signal emitted when popup is completely shown + PressedSignalType mPressedSignal; ///< Signal emitted when a button within the popup is pressed. + HideFinishedSignalType mHideFinishedSignal; ///< Signal emitted when popup is completely hidden + ShowFinishedSignalType mShowFinishedSignal; ///< Signal emitted when popup is completely shown }; diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h index dd28daa..29c79ea 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h +++ b/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h @@ -58,13 +58,13 @@ public: static const char* const SIGNAL_SHOW_FINISHED; // Popup Button Pressed - typedef SignalV2< bool( Toolkit::Button ) > PopUpPressedSignal; + typedef Signal< bool( Toolkit::Button ) > PopUpPressedSignal; // Popup Hide Finished - typedef SignalV2< void( TextInputPopupNew& ) > PopUpHideFinishedSignal; + typedef Signal< void( TextInputPopupNew& ) > PopUpHideFinishedSignal; // Popup Show Finished - typedef SignalV2< void( TextInputPopupNew& ) > PopUpShowFinishedSignal; + typedef Signal< void( TextInputPopupNew& ) > PopUpShowFinishedSignal; /** * Signal emitted when the button is touched. diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h index 1bd436d..235923a 100644 --- a/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h +++ b/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include #include // INTERNAL INCLUDES @@ -81,7 +81,7 @@ public: */ /* Input style changed signal.*/ - typedef SignalV2< void( const TextStyle& style ) > StyleChangedSignalType; + typedef Signal< void( const TextStyle& style ) > StyleChangedSignalType; /** * @brief Signal emitted when style changes. diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp index e69956e..6ba6ce1 100644 --- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp @@ -900,9 +900,9 @@ bool TextView::IsScrollPositionTrimmed() const return mVisualParameters.mScrollPositionTrimmed; } -Toolkit::TextView::ScrolledSignalV2& TextView::ScrolledSignal() +Toolkit::TextView::ScrolledSignalType& TextView::ScrolledSignal() { - return mScrolledSignalV2; + return mScrolledSignal; } bool TextView::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) @@ -1793,7 +1793,7 @@ void TextView::DoSetScrollPosition( const Vector2& position ) // Emit the signal. Toolkit::TextView handle( GetOwner() ); - mScrolledSignalV2.Emit( handle, delta ); + mScrolledSignal.Emit( handle, delta ); } void TextView::CombineExceedPolicies() diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h index 8c02e38..ac82fc8 100644 --- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h +++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h @@ -332,7 +332,7 @@ public: /** * @copydoc ScrolledSignal() */ - Toolkit::TextView::ScrolledSignalV2& ScrolledSignal(); + Toolkit::TextView::ScrolledSignalType& ScrolledSignal(); /** * Connects a callback function with the object's signals. @@ -747,7 +747,7 @@ private: bool mPreviousSnapshotModeEnabled:1; ///< Stores the previous snapshot mode value. bool mMarkUpEnabled:1; ///< enable to scan for mark-up - Toolkit::TextView::ScrolledSignalV2 mScrolledSignalV2; ///< Signal emitted when text is scrolled. + Toolkit::TextView::ScrolledSignalType mScrolledSignal; ///< Signal emitted when text is scrolled. }; } // namespace Internal diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp index efe85b7..986c475 100644 --- a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp +++ b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp @@ -338,7 +338,7 @@ bool FocusManager::DoSetCurrentFocusActor(const unsigned int actorID) } // Send notification for the change of focus actor - mFocusChangedSignalV2.Emit( GetCurrentFocusActor(), actor ); + mFocusChangedSignal.Emit( GetCurrentFocusActor(), actor ); // Save the current focused actor mCurrentFocusActor = FocusIDPair(GetFocusOrder(actor), actorID); @@ -463,7 +463,7 @@ void FocusManager::DoActivate(Actor actor) } // Send notification for the activation of focused actor - mFocusedActorActivatedSignalV2.Emit(actor); + mFocusedActorActivatedSignal.Emit(actor); } } @@ -478,7 +478,7 @@ void FocusManager::ClearFocus() mCurrentFocusActor = FocusIDPair(0, 0); // Send notification for the change of focus actor - mFocusChangedSignalV2.Emit(actor, Actor()); + mFocusChangedSignal.Emit(actor, Actor()); if(mIsAccessibilityTtsEnabled) { @@ -611,7 +611,7 @@ bool FocusManager::DoMoveFocus(FocusIDIter focusIDIter, bool forward, bool wrapp { DALI_LOG_INFO( gLogFilter, Debug::General, "[%s:%d] Overshot\n", __FUNCTION__, __LINE__); // Send notification for handling overshooted situation - mFocusOvershotSignalV2.Emit(GetCurrentFocusActor(), forward ? Toolkit::FocusManager::OVERSHOT_NEXT : Toolkit::FocusManager::OVERSHOT_PREVIOUS); + mFocusOvershotSignal.Emit(GetCurrentFocusActor(), forward ? Toolkit::FocusManager::OVERSHOT_NEXT : Toolkit::FocusManager::OVERSHOT_PREVIOUS); return false; // Try to move the focus out of the scope } @@ -951,19 +951,19 @@ bool FocusManager::HandlePanGesture(const Integration::PanGestureEvent& panEvent return handled; } -Toolkit::FocusManager::FocusChangedSignalV2& FocusManager::FocusChangedSignal() +Toolkit::FocusManager::FocusChangedSignalType& FocusManager::FocusChangedSignal() { - return mFocusChangedSignalV2; + return mFocusChangedSignal; } -Toolkit::FocusManager::FocusOvershotSignalV2& FocusManager::FocusOvershotSignal() +Toolkit::FocusManager::FocusOvershotSignalType& FocusManager::FocusOvershotSignal() { - return mFocusOvershotSignalV2; + return mFocusOvershotSignal; } -Toolkit::FocusManager::FocusedActorActivatedSignalV2& FocusManager::FocusedActorActivatedSignal() +Toolkit::FocusManager::FocusedActorActivatedSignalType& FocusManager::FocusedActorActivatedSignal() { - return mFocusedActorActivatedSignalV2; + return mFocusedActorActivatedSignal; } bool FocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h index b07ae55..3c3b027 100644 --- a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h +++ b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h @@ -194,17 +194,17 @@ public: /** * @copydoc Toolkit::FocusManager::FocusChangedSignal() */ - Toolkit::FocusManager::FocusChangedSignalV2& FocusChangedSignal(); + Toolkit::FocusManager::FocusChangedSignalType& FocusChangedSignal(); /** * @copydoc Toolkit::FocusManager::FocusOvershotSignal() */ - Toolkit::FocusManager::FocusOvershotSignalV2& FocusOvershotSignal(); + Toolkit::FocusManager::FocusOvershotSignalType& FocusOvershotSignal(); /** * @copydoc Toolkit::FocusManager::FocusedActorActivatedSignal() */ - Toolkit::FocusManager::FocusedActorActivatedSignalV2& FocusedActorActivatedSignal(); + Toolkit::FocusManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal(); /** * Connects a callback function with the object's signals. @@ -374,9 +374,9 @@ private: private: - Toolkit::FocusManager::FocusChangedSignalV2 mFocusChangedSignalV2; ///< The signal to notify the focus change - Toolkit::FocusManager::FocusOvershotSignalV2 mFocusOvershotSignalV2; ///< The signal to notify the focus overshooted - Toolkit::FocusManager::FocusedActorActivatedSignalV2 mFocusedActorActivatedSignalV2; ///< The signal to notify the activation of focused actor + Toolkit::FocusManager::FocusChangedSignalType mFocusChangedSignal; ///< The signal to notify the focus change + Toolkit::FocusManager::FocusOvershotSignalType mFocusOvershotSignal; ///< The signal to notify the focus overshooted + Toolkit::FocusManager::FocusedActorActivatedSignalType mFocusedActorActivatedSignal; ///< The signal to notify the activation of focused actor bool mIsWrapped; ///< Whether the focus movement is wrapped around or not bool mIsFocusWithinGroup; ///< Whether the focus movement is limited to the current focus group or not diff --git a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp index 0ccc095..93e5feb 100644 --- a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp +++ b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp @@ -147,9 +147,9 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(const unsigned int actorID) } // Send notification for the change of focus actor - if( !mFocusChangedSignalV2.Empty() ) + if( !mFocusChangedSignal.Empty() ) { - mFocusChangedSignalV2.Emit(GetCurrentFocusActor(), actor); + mFocusChangedSignal.Emit(GetCurrentFocusActor(), actor); } DALI_LOG_INFO( gLogFilter, Debug::General, "[%s:%d] Focus Changed\n", __FUNCTION__, __LINE__); @@ -219,11 +219,11 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocusNavigationDi parentLayoutControl = GetParentLayoutControl(parentLayoutControl); } - if(!succeed && !mPreFocusChangeSignalV2.Empty()) + if(!succeed && !mPreFocusChangeSignal.Empty()) { // Don't know how to move the focus further. The application needs to tell us which actor to move the focus to mIsWaitingKeyboardFocusChangeCommit = true; - Actor nextFocusableActor = mPreFocusChangeSignalV2.Emit(currentFocusActor, Actor(), direction); + Actor nextFocusableActor = mPreFocusChangeSignal.Emit(currentFocusActor, Actor(), direction); mIsWaitingKeyboardFocusChangeCommit = false; if ( nextFocusableActor && nextFocusableActor.IsKeyboardFocusable() ) @@ -264,10 +264,10 @@ bool KeyboardFocusManager::DoMoveFocusWithinLayoutControl(Toolkit::Control contr // We will try to move the focus to the actor. Emit a signal to notify the proposed actor to focus // Signal handler can check the proposed actor and return a different actor if it wishes. - if( !mPreFocusChangeSignalV2.Empty() ) + if( !mPreFocusChangeSignal.Empty() ) { mIsWaitingKeyboardFocusChangeCommit = true; - committedFocusActor = mPreFocusChangeSignalV2.Emit(currentFocusActor, nextFocusableActor, direction); + committedFocusActor = mPreFocusChangeSignal.Emit(currentFocusActor, nextFocusableActor, direction); mIsWaitingKeyboardFocusChangeCommit = false; } @@ -323,10 +323,10 @@ bool KeyboardFocusManager::DoMoveFocusToNextFocusGroup(bool forward) parentLayoutControl = GetParentLayoutControl(parentLayoutControl); } - if(!mFocusGroupChangedSignalV2.Empty()) + if(!mFocusGroupChangedSignal.Empty()) { // Emit a focus group changed signal. The applicaton can move the focus to a new focus group - mFocusGroupChangedSignalV2.Emit(GetCurrentFocusActor(), forward); + mFocusGroupChangedSignal.Emit(GetCurrentFocusActor(), forward); } return succeed; @@ -344,9 +344,9 @@ void KeyboardFocusManager::DoActivate(Actor actor) } // Send notification for the activation of focused actor - if( !mFocusedActorActivatedSignalV2.Empty() ) + if( !mFocusedActorActivatedSignal.Empty() ) { - mFocusedActorActivatedSignalV2.Emit(actor); + mFocusedActorActivatedSignal.Emit(actor); } } } @@ -362,9 +362,9 @@ void KeyboardFocusManager::ClearFocus() } // Send notification for the change of focus actor - if( !mFocusChangedSignalV2.Empty() ) + if( !mFocusChangedSignal.Empty() ) { - mFocusChangedSignalV2.Emit(actor, Actor()); + mFocusChangedSignal.Emit(actor, Actor()); } } @@ -695,24 +695,24 @@ void KeyboardFocusManager::OnTouched(const TouchEvent& touchEvent) ClearFocus(); } -Toolkit::KeyboardFocusManager::PreFocusChangeSignalV2& KeyboardFocusManager::PreFocusChangeSignal() +Toolkit::KeyboardFocusManager::PreFocusChangeSignalType& KeyboardFocusManager::PreFocusChangeSignal() { - return mPreFocusChangeSignalV2; + return mPreFocusChangeSignal; } -Toolkit::KeyboardFocusManager::FocusChangedSignalV2& KeyboardFocusManager::FocusChangedSignal() +Toolkit::KeyboardFocusManager::FocusChangedSignalType& KeyboardFocusManager::FocusChangedSignal() { - return mFocusChangedSignalV2; + return mFocusChangedSignal; } -Toolkit::KeyboardFocusManager::FocusGroupChangedSignalV2& KeyboardFocusManager::FocusGroupChangedSignal() +Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType& KeyboardFocusManager::FocusGroupChangedSignal() { - return mFocusGroupChangedSignalV2; + return mFocusGroupChangedSignal; } -Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalV2& KeyboardFocusManager::FocusedActorActivatedSignal() +Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType& KeyboardFocusManager::FocusedActorActivatedSignal() { - return mFocusedActorActivatedSignalV2; + return mFocusedActorActivatedSignal; } bool KeyboardFocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) diff --git a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h index e2e1db3..42adfc3 100644 --- a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h +++ b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h @@ -112,22 +112,22 @@ public: /** * @copydoc Toolkit::KeyboardFocusManager::PreFocusChangeSignal() */ - Toolkit::KeyboardFocusManager::PreFocusChangeSignalV2& PreFocusChangeSignal(); + Toolkit::KeyboardFocusManager::PreFocusChangeSignalType& PreFocusChangeSignal(); /** * @copydoc Toolkit::KeyboardFocusManager::FocusChangedSignal() */ - Toolkit::KeyboardFocusManager::FocusChangedSignalV2& FocusChangedSignal(); + Toolkit::KeyboardFocusManager::FocusChangedSignalType& FocusChangedSignal(); /** * @copydoc Toolkit::KeyboardFocusManager::FocusGroupChangedSignal() */ - Toolkit::KeyboardFocusManager::FocusGroupChangedSignalV2& FocusGroupChangedSignal(); + Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType& FocusGroupChangedSignal(); /** * @copydoc Toolkit::KeyboardFocusManager::FocusedActorActivatedSignal() */ - Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalV2& FocusedActorActivatedSignal(); + Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal(); /** * Connects a callback function with the object's signals. @@ -240,10 +240,10 @@ private: private: - Toolkit::KeyboardFocusManager::PreFocusChangeSignalV2 mPreFocusChangeSignalV2; ///< The signal to notify the focus will be changed - Toolkit::KeyboardFocusManager::FocusChangedSignalV2 mFocusChangedSignalV2; ///< The signal to notify the focus change - Toolkit::KeyboardFocusManager::FocusGroupChangedSignalV2 mFocusGroupChangedSignalV2; ///< The signal to notify the focus group change - Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalV2 mFocusedActorActivatedSignalV2; ///< The signal to notify the activation of focused actor + Toolkit::KeyboardFocusManager::PreFocusChangeSignalType mPreFocusChangeSignal; ///< The signal to notify the focus will be changed + Toolkit::KeyboardFocusManager::FocusChangedSignalType mFocusChangedSignal; ///< The signal to notify the focus change + Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType mFocusGroupChangedSignal; ///< The signal to notify the focus group change + Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType mFocusedActorActivatedSignal; ///< The signal to notify the activation of focused actor unsigned int mCurrentFocusActor; ///< The actor ID of current focused actor diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp index 65a9ec9..dc8cefa 100644 --- a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp +++ b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp @@ -86,9 +86,9 @@ void KeyInputFocusManager::SetFocus( Toolkit::Control control ) control.GetImplementation().OnKeyInputFocusGained(); // Emit the signal to inform focus change to the application. - if ( !mKeyInputFocusChangedSignalV2.Empty() ) + if ( !mKeyInputFocusChangedSignal.Empty() ) { - mKeyInputFocusChangedSignalV2.Emit( control, previousFocusControl ); + mKeyInputFocusChangedSignal.Emit( control, previousFocusControl ); } } @@ -151,14 +151,14 @@ bool KeyInputFocusManager::IsKeyboardListener( Toolkit::Control control ) const return result; } -Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalV2& KeyInputFocusManager::KeyInputFocusChangedSignal() +Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusManager::KeyInputFocusChangedSignal() { - return mKeyInputFocusChangedSignalV2; + return mKeyInputFocusChangedSignal; } -Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalV2& KeyInputFocusManager::UnhandledKeyEventSignal() +Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalType& KeyInputFocusManager::UnhandledKeyEventSignal() { - return mUnhandledKeyEventSignalV2; + return mUnhandledKeyEventSignal; } KeyInputFocusManager::FocusStackIterator KeyInputFocusManager::FindFocusControlInStack( Toolkit::Control control ) const @@ -191,9 +191,9 @@ void KeyInputFocusManager::OnKeyEvent( const KeyEvent& event ) if( !consumed ) { // Emit signal to inform that a key event is not consumed. - if( !mUnhandledKeyEventSignalV2.Empty() ) + if( !mUnhandledKeyEventSignal.Empty() ) { - mUnhandledKeyEventSignalV2.Emit(event); + mUnhandledKeyEventSignal.Emit(event); } } } diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h index 3db0743..8b03970 100644 --- a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h +++ b/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h @@ -77,12 +77,12 @@ public: /** * @copydoc Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignal() */ - Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalV2& KeyInputFocusChangedSignal(); + Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusChangedSignal(); /** * @copydoc Toolkit::KeyInputFocusManager::UnhandledKeyEventSignal() */ - Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalV2& UnhandledKeyEventSignal(); + Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalType& UnhandledKeyEventSignal(); /** * Connects a callback function with the object's signals. @@ -139,10 +139,10 @@ private: private: // The key input focus change signal - Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalV2 mKeyInputFocusChangedSignalV2; + Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType mKeyInputFocusChangedSignal; // The un-handled key event signal - Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalV2 mUnhandledKeyEventSignalV2; + Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalType mUnhandledKeyEventSignal; // Keyboard events are sent to the current focus actor, which will be the actor on the top of the focus actors stack. FocusStack mFocusStack; diff --git a/base/dali-toolkit/public-api/builder/builder.cpp b/base/dali-toolkit/public-api/builder/builder.cpp index bd85719..38c5475 100644 --- a/base/dali-toolkit/public-api/builder/builder.cpp +++ b/base/dali-toolkit/public-api/builder/builder.cpp @@ -149,7 +149,7 @@ Path Builder::GetPath( const std::string &name ) return GetImpl(*this).GetPath( name ); } -Builder::Signal& Builder::QuitSignal() +Builder::BuilderSignalType& Builder::QuitSignal() { return GetImpl( *this ).QuitSignal(); } diff --git a/base/dali-toolkit/public-api/builder/builder.h b/base/dali-toolkit/public-api/builder/builder.h index 98d3d8c..e8e4ad4 100644 --- a/base/dali-toolkit/public-api/builder/builder.h +++ b/base/dali-toolkit/public-api/builder/builder.h @@ -413,12 +413,12 @@ class DALI_IMPORT_API Builder : public BaseHandle /** * @brief Builder signal type */ - typedef SignalV2< void () > Signal; + typedef Signal< void () > BuilderSignalType; /** * @brief Signal emitted when a quit action is requested by the builder. */ - Signal& QuitSignal(); + BuilderSignalType& QuitSignal(); private: explicit DALI_INTERNAL Builder(Internal::Builder *impl); diff --git a/base/dali-toolkit/public-api/controls/buttons/button.cpp b/base/dali-toolkit/public-api/controls/buttons/button.cpp index cd0bf52..189e325 100644 --- a/base/dali-toolkit/public-api/controls/buttons/button.cpp +++ b/base/dali-toolkit/public-api/controls/buttons/button.cpp @@ -78,12 +78,12 @@ float Button::GetAnimationTime() const return Dali::Toolkit::GetImplementation( *this ).GetAnimationTime(); } -Button::ClickedSignalV2& Button::ClickedSignal() +Button::ClickedSignalType& Button::ClickedSignal() { return Dali::Toolkit::GetImplementation( *this ).ClickedSignal(); } -Button::ToggledSignalV2& Button::ToggledSignal() +Button::ToggledSignalType& Button::ToggledSignal() { return Dali::Toolkit::GetImplementation( *this ).ToggledSignal(); } diff --git a/base/dali-toolkit/public-api/controls/buttons/button.h b/base/dali-toolkit/public-api/controls/buttons/button.h index eb62d05..d89ddc8 100644 --- a/base/dali-toolkit/public-api/controls/buttons/button.h +++ b/base/dali-toolkit/public-api/controls/buttons/button.h @@ -124,22 +124,22 @@ public: //Signals /** * @brief Button Clicked signal type */ - typedef SignalV2< bool ( Button ) > ClickedSignalV2; + typedef Signal< bool ( Button ) > ClickedSignalType; /** * @brief Button toggled signal type */ - typedef SignalV2< bool ( Button, bool ) > ToggledSignalV2; + typedef Signal< bool ( Button, bool ) > ToggledSignalType; /** * @brief Signal emitted when the button is touched and the touch point doesn't leave the boundary of the button. */ - ClickedSignalV2& ClickedSignal(); + ClickedSignalType& ClickedSignal(); /** * @brief Signal emitted when the button's state is toggled. */ - ToggledSignalV2& ToggledSignal(); + ToggledSignalType& ToggledSignal(); public: // Not intended for application developers diff --git a/base/dali-toolkit/public-api/controls/buttons/push-button.cpp b/base/dali-toolkit/public-api/controls/buttons/push-button.cpp index f6e2775..249623d 100644 --- a/base/dali-toolkit/public-api/controls/buttons/push-button.cpp +++ b/base/dali-toolkit/public-api/controls/buttons/push-button.cpp @@ -218,12 +218,12 @@ Actor PushButton::GetLabelText() const return Dali::Toolkit::GetImplementation( *this ).GetLabelText(); } -PushButton::PressedSignalV2& PushButton::PressedSignal() +PushButton::PressedSignalType& PushButton::PressedSignal() { return Dali::Toolkit::GetImplementation( *this ).PressedSignal(); } -PushButton::ReleasedSignalV2& PushButton::ReleasedSignal() +PushButton::ReleasedSignalType& PushButton::ReleasedSignal() { return Dali::Toolkit::GetImplementation( *this ).ReleasedSignal(); } 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 7db2644..f5c5251 100644 --- a/base/dali-toolkit/public-api/controls/buttons/push-button.h +++ b/base/dali-toolkit/public-api/controls/buttons/push-button.h @@ -333,20 +333,20 @@ public: public: //Signals /// @brief PushButton Pressed signal type. - typedef SignalV2< bool ( Button ) > PressedSignalV2; + typedef Signal< bool ( Button ) > PressedSignalType; /// @brief PushButton Released signal type. - typedef SignalV2< bool ( Button ) > ReleasedSignalV2; + typedef Signal< bool ( Button ) > ReleasedSignalType; /** * @brief Signal emitted when the button is touched. */ - PressedSignalV2& PressedSignal(); + PressedSignalType& PressedSignal(); /** * @brief Signal emitted when the button is touched and the touch point leaves the boundary of the button. */ - ReleasedSignalV2& ReleasedSignal(); + ReleasedSignalType& ReleasedSignal(); public: // Not intended for application developers diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp index d678af6..8a924f9 100644 --- a/base/dali-toolkit/public-api/controls/control-impl.cpp +++ b/base/dali-toolkit/public-api/controls/control-impl.cpp @@ -245,7 +245,7 @@ public: : mControlImpl( controlImpl ), mBackground( NULL ), mStartingPinchScale( NULL ), - mKeyEventSignalV2(), + mKeyEventSignal(), mPinchGestureDetector(), mPanGestureDetector(), mTapGestureDetector(), @@ -548,7 +548,7 @@ public: Control& mControlImpl; Background* mBackground; ///< Only create the background if we use it Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this - Toolkit::Control::KeyEventSignalV2 mKeyEventSignalV2; + Toolkit::Control::KeyEventSignalType mKeyEventSignal; // Gesture Detection PinchGestureDetector mPinchGestureDetector; @@ -1053,9 +1053,9 @@ bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* t return connected; } -Toolkit::Control::KeyEventSignalV2& Control::KeyEventSignal() +Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal() { - return mImpl->mKeyEventSignalV2; + return mImpl->mKeyEventSignal; } bool Control::EmitKeyEventSignal( const KeyEvent& event ) @@ -1066,9 +1066,9 @@ bool Control::EmitKeyEventSignal( const KeyEvent& event ) bool consumed = false; // signals are allocated dynamically when someone connects - if ( !mImpl->mKeyEventSignalV2.Empty() ) + if ( !mImpl->mKeyEventSignal.Empty() ) { - consumed = mImpl->mKeyEventSignalV2.Emit( handle, event ); + consumed = mImpl->mKeyEventSignal.Emit( handle, event ); } if (!consumed) diff --git a/base/dali-toolkit/public-api/controls/control-impl.h b/base/dali-toolkit/public-api/controls/control-impl.h index 1e095bf..ff01046 100644 --- a/base/dali-toolkit/public-api/controls/control-impl.h +++ b/base/dali-toolkit/public-api/controls/control-impl.h @@ -373,7 +373,7 @@ public: /** * @copydoc Dali::Toolkit::Control::KeyEventSignal() */ - Toolkit::Control::KeyEventSignalV2& KeyEventSignal(); + Toolkit::Control::KeyEventSignalType& KeyEventSignal(); /** * @brief Called by the KeyInputFocusManager to emit key event signals. diff --git a/base/dali-toolkit/public-api/controls/control.cpp b/base/dali-toolkit/public-api/controls/control.cpp index d01ad83..77cb876 100644 --- a/base/dali-toolkit/public-api/controls/control.cpp +++ b/base/dali-toolkit/public-api/controls/control.cpp @@ -179,7 +179,7 @@ Actor Control::GetBackgroundActor() const return GetImplementation().GetBackgroundActor(); } -Control::KeyEventSignalV2& Control::KeyEventSignal() +Control::KeyEventSignalType& Control::KeyEventSignal() { return GetImplementation().KeyEventSignal(); } diff --git a/base/dali-toolkit/public-api/controls/control.h b/base/dali-toolkit/public-api/controls/control.h index e50c544..1911030 100644 --- a/base/dali-toolkit/public-api/controls/control.h +++ b/base/dali-toolkit/public-api/controls/control.h @@ -112,7 +112,7 @@ public: // Typedefs /// @brief Key Event signal type; - typedef SignalV2 KeyEventSignalV2; + typedef Signal KeyEventSignalType; public: // Creation & Destruction @@ -378,7 +378,7 @@ public: * @pre The Control has been initialized. * @return The signal to connect to. */ - KeyEventSignalV2& KeyEventSignal(); + KeyEventSignalType& KeyEventSignal(); public: // Intended for control developers diff --git a/base/dali-toolkit/public-api/controls/popup/popup.cpp b/base/dali-toolkit/public-api/controls/popup/popup.cpp index ee1ee18..d3a8187 100644 --- a/base/dali-toolkit/public-api/controls/popup/popup.cpp +++ b/base/dali-toolkit/public-api/controls/popup/popup.cpp @@ -137,12 +137,12 @@ void Popup::HideTail() GetImpl(*this).HideTail(); } -Popup::TouchedOutsideSignalV2& Popup::OutsideTouchedSignal() +Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal() { return GetImpl(*this).OutsideTouchedSignal(); } -Popup::HiddenSignalV2& Popup::HiddenSignal() +Popup::HiddenSignalType& Popup::HiddenSignal() { return GetImpl(*this).HiddenSignal(); } diff --git a/base/dali-toolkit/public-api/controls/popup/popup.h b/base/dali-toolkit/public-api/controls/popup/popup.h index 5bfaac9..0c876a2 100644 --- a/base/dali-toolkit/public-api/controls/popup/popup.h +++ b/base/dali-toolkit/public-api/controls/popup/popup.h @@ -82,18 +82,18 @@ public: POPUP_SHOW, ///< Shown (visible in default size) }; - typedef SignalV2< void () > TouchedOutsideSignalV2; ///< Touched outside signal type. - typedef SignalV2< void () > HiddenSignalV2; ///< Hidden signal type. + typedef Signal< void () > TouchedOutsideSignalType; ///< Touched outside signal type. + typedef Signal< void () > HiddenSignalType; ///< Hidden signal type. /** * @brief Signal emitted when user has touched outside of the Dialog. */ - TouchedOutsideSignalV2& OutsideTouchedSignal(); + TouchedOutsideSignalType& OutsideTouchedSignal(); /** * @brief Signal emitted when popup has been hidden. */ - HiddenSignalV2& HiddenSignal(); + HiddenSignalType& HiddenSignal(); public: 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 73c2b8a..734bd7c 100755 --- a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h +++ b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h @@ -50,7 +50,7 @@ public: // Signals static const char* const SCROLL_POSITION_NOTIFIED_SIGNAL_NAME; ///< "scroll-position-notified" signal name - typedef SignalV2< void ( float ) > ScrollPositionNotifiedSignalType; + typedef Signal< void ( float ) > ScrollPositionNotifiedSignalType; // Properties static const Property::Index PROPERTY_INDICATOR_HEIGHT_POLICY; ///< name "indicator-height-policy", @see SetIndicatorHeightPolicy(), type STRING 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 c9f4955..578756c 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h +++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h @@ -63,10 +63,10 @@ public: // Signals static const char* const DOMAIN_CHANGED_SIGNAL_NAME; ///< "domain-changed" signal name - typedef SignalV2< void ( float min, float max, float size ) > DomainChangedSignalType; + typedef Signal< void ( float min, float max, float size ) > DomainChangedSignalType; static const char* const SCROLL_POSITION_CHANGED_SIGNAL_NAME; ///< "scroll-position-changed" signal name - typedef SignalV2< void ( float position ) > ScrollPositionChangedSignalType; + typedef Signal< void ( float position ) > ScrollPositionChangedSignalType; /** * Create a ScrollConnector. diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp index 85aec94..4bf5e2a 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp +++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp @@ -634,7 +634,7 @@ void ScrollView::UnbindActor(Actor child) GetImpl(*this).UnbindActor(child); } -ScrollView::SnapStartedSignalV2& ScrollView::SnapStartedSignal() +ScrollView::SnapStartedSignalType& ScrollView::SnapStartedSignal() { return GetImpl(*this).SnapStartedSignal(); } 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 c89eb21..b357900 100644 --- 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 @@ -437,13 +437,13 @@ public: float duration; ///< Duration of snap animation. }; - typedef SignalV2< void ( const SnapEvent& ) > SnapStartedSignalV2; ///< SnapStarted signal type + typedef Signal< void ( const SnapEvent& ) > SnapStartedSignalType; ///< SnapStarted signal type /** * @brief Signal emitted when the ScrollView has started to snap or flick (it tells the target * position, scale, rotation for the snap or flick) */ - SnapStartedSignalV2& SnapStartedSignal(); + SnapStartedSignalType& SnapStartedSignal(); public: diff --git a/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp b/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp index 18ecb27..0c7ec06 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp +++ b/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp @@ -74,22 +74,22 @@ Scrollable Scrollable::DownCast( BaseHandle handle ) return Control::DownCast(handle); } -Scrollable::ScrollStartedSignalV2& Scrollable::ScrollStartedSignal() +Scrollable::ScrollStartedSignalType& Scrollable::ScrollStartedSignal() { return GetImpl(*this).ScrollStartedSignal(); } -Scrollable::ScrollUpdatedSignalV2& Scrollable::ScrollUpdatedSignal() +Scrollable::ScrollUpdatedSignalType& Scrollable::ScrollUpdatedSignal() { return GetImpl(*this).ScrollUpdatedSignal(); } -Scrollable::ScrollCompletedSignalV2& Scrollable::ScrollCompletedSignal() +Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal() { return GetImpl(*this).ScrollCompletedSignal(); } -Scrollable::ScrollClampedSignalV2& Scrollable::ScrollClampedSignal() +Scrollable::ScrollClampedSignalType& Scrollable::ScrollClampedSignal() { return GetImpl(*this).ScrollClampedSignal(); } diff --git a/base/dali-toolkit/public-api/controls/scrollable/scrollable.h b/base/dali-toolkit/public-api/controls/scrollable/scrollable.h index d357b8a..907f7a1 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/scrollable.h +++ b/base/dali-toolkit/public-api/controls/scrollable/scrollable.h @@ -114,25 +114,25 @@ public: public: - typedef SignalV2< void ( const Vector3& ) > ScrollStartedSignalV2; ///< ScrollStarted signal type - typedef SignalV2< void ( const Vector3& ) > ScrollCompletedSignalV2; ///< ScrollCompleted signal type - typedef SignalV2< void ( const Vector3& ) > ScrollUpdatedSignalV2; ///< Scroll updated signal type - typedef SignalV2< void ( const ClampEvent& ) > ScrollClampedSignalV2; ///< Scroll clamped signal type + typedef Signal< void ( const Vector3& ) > ScrollStartedSignalType; ///< ScrollStarted signal type + typedef Signal< void ( const Vector3& ) > ScrollCompletedSignalType; ///< ScrollCompleted signal type + typedef Signal< void ( const Vector3& ) > ScrollUpdatedSignalType; ///< Scroll updated signal type + typedef Signal< void ( const ClampEvent& ) > ScrollClampedSignalType; ///< Scroll clamped signal type /** * @brief Signal emitted when the Scrollable has moved (whether by touch or animation). */ - ScrollStartedSignalV2& ScrollStartedSignal(); + ScrollStartedSignalType& ScrollStartedSignal(); /** * @brief Signal emitted when the Scrollable has moved (whether by touch or animation). */ - ScrollUpdatedSignalV2& ScrollUpdatedSignal(); + ScrollUpdatedSignalType& ScrollUpdatedSignal(); /** * @brief Signal emitted when the Scrollable has completed movement (whether by touch or animation). */ - ScrollCompletedSignalV2& ScrollCompletedSignal(); + ScrollCompletedSignalType& ScrollCompletedSignal(); /** * @brief Signal emitted when the Scrollable is pushing against a domain boundary @@ -140,7 +140,7 @@ public: * * @return The signal to connect to */ - ScrollClampedSignalV2& ScrollClampedSignal(); + ScrollClampedSignalType& ScrollClampedSignal(); public: diff --git a/base/dali-toolkit/public-api/controls/text-input/text-input.cpp b/base/dali-toolkit/public-api/controls/text-input/text-input.cpp index b735c76..d888a2b 100644 --- a/base/dali-toolkit/public-api/controls/text-input/text-input.cpp +++ b/base/dali-toolkit/public-api/controls/text-input/text-input.cpp @@ -335,22 +335,22 @@ Vector2 TextInput::GetScrollPosition() const return GetImpl( *this ).GetScrollPosition(); } -TextInput::InputSignalV2& TextInput::InputStartedSignal() +TextInput::InputSignalType& TextInput::InputStartedSignal() { return GetImpl(*this).InputStartedSignal(); } -TextInput::InputSignalV2& TextInput::InputFinishedSignal() +TextInput::InputSignalType& TextInput::InputFinishedSignal() { return GetImpl(*this).InputFinishedSignal(); } -TextInput::InputSignalV2& TextInput::CutAndPasteToolBarDisplayedSignal() +TextInput::InputSignalType& TextInput::CutAndPasteToolBarDisplayedSignal() { return GetImpl(*this).CutAndPasteToolBarDisplayedSignal(); } -TextInput::StyleChangedSignalV2& TextInput::StyleChangedSignal() +TextInput::StyleChangedSignalType& TextInput::StyleChangedSignal() { return GetImpl(*this).StyleChangedSignal(); } @@ -360,12 +360,12 @@ TextInput::TextModifiedSignalType& TextInput::TextModifiedSignal() return GetImpl(*this).TextModifiedSignal(); } -TextInput::MaxInputCharactersReachedSignalV2& TextInput::MaxInputCharactersReachedSignal() +TextInput::MaxInputCharactersReachedSignalType& TextInput::MaxInputCharactersReachedSignal() { return GetImpl(*this).MaxInputCharactersReachedSignal(); } -TextInput::InputTextExceedBoundariesSignalV2& TextInput::InputTextExceedBoundariesSignal() +TextInput::InputTextExceedBoundariesSignalType& TextInput::InputTextExceedBoundariesSignal() { return GetImpl(*this).InputTextExceedBoundariesSignal(); } 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 836a1b3..f8202db 100644 --- a/base/dali-toolkit/public-api/controls/text-input/text-input.h +++ b/base/dali-toolkit/public-api/controls/text-input/text-input.h @@ -564,24 +564,24 @@ public: public: /* Signals */ /// @brief Input Signal. - typedef SignalV2< void ( TextInput textInput ) > InputSignalV2; + typedef Signal< void ( TextInput textInput ) > InputSignalType; /// @brief Input style changed signal. - typedef SignalV2< void ( TextInput textInput, const TextStyle& style ) > StyleChangedSignalV2; + typedef Signal< void ( TextInput textInput, const TextStyle& style ) > StyleChangedSignalType; /// @brief Text modified signal. - typedef SignalV2< void ( TextInput textInput ) > TextModifiedSignalType; + typedef Signal< void ( TextInput textInput ) > TextModifiedSignalType; /// @brief Max input characters reached signal. - typedef SignalV2< void ( TextInput textInput ) > MaxInputCharactersReachedSignalV2; + typedef Signal< void ( TextInput textInput ) > MaxInputCharactersReachedSignalType; /// @brief Input text exceeds boundaries signal. - typedef SignalV2< void ( TextInput textInput ) > InputTextExceedBoundariesSignalV2; + typedef Signal< void ( TextInput textInput ) > InputTextExceedBoundariesSignalType; /** * @brief Signal emitted when the Text-Input starts receiving input. */ - InputSignalV2& InputStartedSignal(); + InputSignalType& InputStartedSignal(); /** * @brief Signal emitted when the Text-Input is finished receiving input. @@ -589,21 +589,21 @@ public: /* Signals */ * TextInput::GetText() can be called to get current text string. * @return The signal to connect to */ - InputSignalV2& InputFinishedSignal(); + InputSignalType& InputFinishedSignal(); /** * @brief Signal emitted when the cut and paste toolbar is displayed. * * @return The signal to connect to */ - InputSignalV2& CutAndPasteToolBarDisplayedSignal(); + InputSignalType& CutAndPasteToolBarDisplayedSignal(); /** * @brief Signal emitted when style changes. * * @return The signal to connect to */ - StyleChangedSignalV2& StyleChangedSignal(); + StyleChangedSignalType& StyleChangedSignal(); /** * @brief Signal emitted when text changes. @@ -617,14 +617,14 @@ public: /* Signals */ * * @return The signal to connect to */ - MaxInputCharactersReachedSignalV2& MaxInputCharactersReachedSignal(); + MaxInputCharactersReachedSignalType& MaxInputCharactersReachedSignal(); /** * @brief Signal emitted when input text exceeds the boundaries of the text-input. * * @return The signal to connect to */ - InputTextExceedBoundariesSignalV2& InputTextExceedBoundariesSignal(); + InputTextExceedBoundariesSignalType& InputTextExceedBoundariesSignal(); public: // Not intended for application developers diff --git a/base/dali-toolkit/public-api/controls/text-view/text-view.cpp b/base/dali-toolkit/public-api/controls/text-view/text-view.cpp index f8fefc0..36d7ec3 100644 --- a/base/dali-toolkit/public-api/controls/text-view/text-view.cpp +++ b/base/dali-toolkit/public-api/controls/text-view/text-view.cpp @@ -364,7 +364,7 @@ bool TextView::IsScrollPositionTrimmed() const return GetImpl( *this ).IsScrollPositionTrimmed(); } -TextView::ScrolledSignalV2& TextView::ScrolledSignal() +TextView::ScrolledSignalType& TextView::ScrolledSignal() { return GetImpl( *this ).ScrolledSignal(); } 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 5529aa4..34dbe35 100644 --- a/base/dali-toolkit/public-api/controls/text-view/text-view.h +++ b/base/dali-toolkit/public-api/controls/text-view/text-view.h @@ -614,7 +614,7 @@ public: public: /// @brief Signal types - typedef SignalV2< void ( TextView textView, Vector2 scrollDelta ) > ScrolledSignalV2; + typedef Signal< void ( TextView textView, Vector2 scrollDelta ) > ScrolledSignalType; /** * @brief Signal emitted when the text is scrolled inside the text-view. @@ -627,7 +627,7 @@ public: * \e scrollDelta is the differente of the current scroll position with the previous one. * @return The signal to connect to */ - ScrolledSignalV2& ScrolledSignal(); + ScrolledSignalType& ScrolledSignal(); public: // Not intended for application developers diff --git a/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp index bd3bbec..1bd721a 100644 --- a/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp +++ b/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp @@ -188,17 +188,17 @@ Actor FocusManager::GetFocusGroup(Actor actor) return GetImpl(*this).GetFocusGroup(actor); } -FocusManager::FocusChangedSignalV2& FocusManager::FocusChangedSignal() +FocusManager::FocusChangedSignalType& FocusManager::FocusChangedSignal() { return GetImpl(*this).FocusChangedSignal(); } -FocusManager::FocusOvershotSignalV2& FocusManager::FocusOvershotSignal() +FocusManager::FocusOvershotSignalType& FocusManager::FocusOvershotSignal() { return GetImpl(*this).FocusOvershotSignal(); } -FocusManager::FocusedActorActivatedSignalV2& FocusManager::FocusedActorActivatedSignal() +FocusManager::FocusedActorActivatedSignalType& FocusManager::FocusedActorActivatedSignal() { return GetImpl(*this).FocusedActorActivatedSignal(); } 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 ed96b6c..3d15023 100644 --- a/base/dali-toolkit/public-api/focus-manager/focus-manager.h +++ b/base/dali-toolkit/public-api/focus-manager/focus-manager.h @@ -79,13 +79,13 @@ public: public: /// @brief Focus changed signal - typedef SignalV2< void ( Actor, Actor ) > FocusChangedSignalV2; + typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType; /// @brief Focus overshooted signal - typedef SignalV2< void ( Actor, FocusOvershotDirection ) > FocusOvershotSignalV2; + typedef Signal< void ( Actor, FocusOvershotDirection ) > FocusOvershotSignalType; /// @brief Focused actor activated signal - typedef SignalV2< void ( Actor ) > FocusedActorActivatedSignalV2; + typedef Signal< void ( Actor ) > FocusedActorActivatedSignalType; /** * @brief Create a FocusManager handle; this can be initialised with FocusManager::New(). @@ -375,7 +375,7 @@ public: * @pre The Object has been initialized. * @return The signal to connect to. */ - FocusChangedSignalV2& FocusChangedSignal(); + FocusChangedSignalType& FocusChangedSignal(); /** * @brief This signal is emitted when there is no way to move focus further. @@ -387,7 +387,7 @@ public: * @pre The Object has been initialized. * @return The signal to connect to. */ - FocusOvershotSignalV2& FocusOvershotSignal(); + FocusOvershotSignalType& FocusOvershotSignal(); /** * @brief This signal is emitted when the current focused actor is activated. @@ -399,7 +399,7 @@ public: * @pre The Object has been initialized. * @return The signal to connect to. */ - FocusedActorActivatedSignalV2& FocusedActorActivatedSignal(); + FocusedActorActivatedSignalType& FocusedActorActivatedSignal(); private: diff --git a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp index 458c230..b47228d 100644 --- a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp +++ b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp @@ -111,22 +111,22 @@ Actor KeyboardFocusManager::GetFocusIndicatorActor() return GetImpl(*this).GetFocusIndicatorActor(); } -KeyboardFocusManager::PreFocusChangeSignalV2& KeyboardFocusManager::PreFocusChangeSignal() +KeyboardFocusManager::PreFocusChangeSignalType& KeyboardFocusManager::PreFocusChangeSignal() { return GetImpl(*this).PreFocusChangeSignal(); } -KeyboardFocusManager::FocusChangedSignalV2& KeyboardFocusManager::FocusChangedSignal() +KeyboardFocusManager::FocusChangedSignalType& KeyboardFocusManager::FocusChangedSignal() { return GetImpl(*this).FocusChangedSignal(); } -KeyboardFocusManager::FocusGroupChangedSignalV2& KeyboardFocusManager::FocusGroupChangedSignal() +KeyboardFocusManager::FocusGroupChangedSignalType& KeyboardFocusManager::FocusGroupChangedSignal() { return GetImpl(*this).FocusGroupChangedSignal(); } -KeyboardFocusManager::FocusedActorActivatedSignalV2& KeyboardFocusManager::FocusedActorActivatedSignal() +KeyboardFocusManager::FocusedActorActivatedSignalType& KeyboardFocusManager::FocusedActorActivatedSignal() { return GetImpl(*this).FocusedActorActivatedSignal(); } 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 cce6c58..3822fc6 100644 --- a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h +++ b/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h @@ -53,16 +53,16 @@ public: public: /// @brief Pre focus change signal - typedef SignalV2< Actor ( Actor, Actor, Control::KeyboardFocusNavigationDirection ) > PreFocusChangeSignalV2; + typedef Signal< Actor ( Actor, Actor, Control::KeyboardFocusNavigationDirection ) > PreFocusChangeSignalType; /// @brief Focus changed signal - typedef SignalV2< void ( Actor, Actor ) > FocusChangedSignalV2; + typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType; /// @brief Focus group changed signal - typedef SignalV2< void ( Actor, bool ) > FocusGroupChangedSignalV2; + typedef Signal< void ( Actor, bool ) > FocusGroupChangedSignalType; /// @brief Focused actor activated signal - typedef SignalV2< void ( Actor ) > FocusedActorActivatedSignalV2; + typedef Signal< void ( Actor ) > FocusedActorActivatedSignalType; /** * @brief Create a KeyboardFocusManager handle; this can be initialised with KeyboardFocusManager::New(). @@ -217,7 +217,7 @@ public: // Signals * @pre The Object has been initialized. * @return The signal to connect to. */ - PreFocusChangeSignalV2& PreFocusChangeSignal(); + PreFocusChangeSignalType& PreFocusChangeSignal(); /** * @brief This signal is emitted after the current focused actor has been changed. @@ -229,7 +229,7 @@ public: // Signals * @pre The Object has been initialized. * @return The signal to connect to. */ - FocusChangedSignalV2& FocusChangedSignal(); + FocusChangedSignalType& FocusChangedSignal(); /** * @brief This signal is emitted when the focus group has been changed. @@ -246,7 +246,7 @@ public: // Signals * @pre The Object has been initialized. * @return The signal to connect to. */ - FocusGroupChangedSignalV2& FocusGroupChangedSignal(); + FocusGroupChangedSignalType& FocusGroupChangedSignal(); /** * @brief This signal is emitted when the current focused actor is activated. @@ -258,7 +258,7 @@ public: // Signals * @pre The Object has been initialized. * @return The signal to connect to. */ - FocusedActorActivatedSignalV2& FocusedActorActivatedSignal(); + FocusedActorActivatedSignalType& FocusedActorActivatedSignal(); // Not intended for application developers diff --git a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp index f39c81f..91b79e8 100644 --- a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp +++ b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp @@ -92,12 +92,12 @@ bool KeyInputFocusManager::IsKeyboardListener(Control control) return GetImpl(*this).IsKeyboardListener(control); } -KeyInputFocusManager::KeyInputFocusChangedSignalV2& KeyInputFocusManager::KeyInputFocusChangedSignal() +KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusManager::KeyInputFocusChangedSignal() { return GetImpl(*this).KeyInputFocusChangedSignal(); } -KeyInputFocusManager::UnhandledKeyEventSignalV2& KeyInputFocusManager::UnhandledKeyEventSignal() +KeyInputFocusManager::UnhandledKeyEventSignalType& KeyInputFocusManager::UnhandledKeyEventSignal() { return GetImpl(*this).UnhandledKeyEventSignal(); } 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 d481771..85fa87c 100644 --- a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h +++ b/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h @@ -48,10 +48,10 @@ public: static const char* const SIGNAL_UNHANDLED_KEY_EVENT; // KeyInputFocusChanged - typedef SignalV2< void (Control, Control) > KeyInputFocusChangedSignalV2; + typedef Signal< void (Control, Control) > KeyInputFocusChangedSignalType; // Unhandled Key Event - typedef SignalV2< void (const KeyEvent&) > UnhandledKeyEventSignalV2; + typedef Signal< void (const KeyEvent&) > UnhandledKeyEventSignalType; public: @@ -119,7 +119,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - KeyInputFocusChangedSignalV2& KeyInputFocusChangedSignal(); + KeyInputFocusChangedSignalType& KeyInputFocusChangedSignal(); /** * This signal is emitted when a key event was received, and none of the focused controls on the stage have consumed it. @@ -129,7 +129,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - UnhandledKeyEventSignalV2& UnhandledKeyEventSignal(); + UnhandledKeyEventSignalType& UnhandledKeyEventSignal(); private: diff --git a/base/dali-toolkit/public-api/styling/style-manager.h b/base/dali-toolkit/public-api/styling/style-manager.h index 8f44266..f7f22a6 100644 --- a/base/dali-toolkit/public-api/styling/style-manager.h +++ b/base/dali-toolkit/public-api/styling/style-manager.h @@ -64,7 +64,7 @@ class DALI_IMPORT_API StyleManager : public BaseHandle public: // Signals - typedef SignalV2< void ( StyleManager, StyleChange ) > StyleChangeSignalType; + typedef Signal< void ( StyleManager, StyleChange ) > StyleChangeSignalType; /** * @brief Create a StyleManager handle; this can be initialised with StyleManager::Get() 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 be4245f..6ac4c6f 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 @@ -403,12 +403,12 @@ void NavigationControl::OnPopupTouchedOutside() } } -Toolkit::NavigationControl::ItemPushedSignalV2& NavigationControl::ItemPushedSignal() +Toolkit::NavigationControl::ItemPushedSignalType& NavigationControl::ItemPushedSignal() { return mItemPushedSignal; } -Toolkit::NavigationControl::ItemPoppedSignalV2& NavigationControl::ItemPoppedSignal() +Toolkit::NavigationControl::ItemPoppedSignalType& NavigationControl::ItemPoppedSignal() { return mItemPoppedSignal; } 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 8221a8f..516a7da 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 @@ -129,12 +129,12 @@ public: /** * @copydoc Dali::Toolkit::NavigatinControl::ItemPushedSignal() */ - Toolkit::NavigationControl::ItemPushedSignalV2& ItemPushedSignal(); + Toolkit::NavigationControl::ItemPushedSignalType& ItemPushedSignal(); /** * @copydoc Dali::Toolkit::NavigatinControl::ItemPoppedSignal() */ - Toolkit::NavigationControl::ItemPoppedSignalV2& ItemPoppedSignal(); + Toolkit::NavigationControl::ItemPoppedSignalType& ItemPoppedSignal(); private: // override functions from Control @@ -234,8 +234,8 @@ private: Toolkit::Popup mPopupMenu; private: - Toolkit::NavigationControl::ItemPushedSignalV2 mItemPushedSignal; ///< The signal to notify the item push - Toolkit::NavigationControl::ItemPoppedSignalV2 mItemPoppedSignal; ///< The signal to notify the item pop + Toolkit::NavigationControl::ItemPushedSignalType mItemPushedSignal; ///< The signal to notify the item push + Toolkit::NavigationControl::ItemPoppedSignalType mItemPoppedSignal; ///< The signal to notify the item pop }; } // namespace Internal diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.cpp b/optional/dali-toolkit/internal/controls/view/view-impl.cpp index d98fc47..82b91b7 100644 --- a/optional/dali-toolkit/internal/controls/view/view-impl.cpp +++ b/optional/dali-toolkit/internal/controls/view/view-impl.cpp @@ -234,7 +234,7 @@ void View::OrientationChanged( Dali::Orientation orientation ) } Toolkit::View handle( GetOwner() ); - mOrientationAnimationStartedSignalV2.Emit( handle, mRotateAnimation, orientation ); + mOrientationAnimationStartedSignal.Emit( handle, mRotateAnimation, orientation ); mRotateAnimation.Play(); } @@ -244,9 +244,9 @@ void View::SetAutoRotate( bool enabled ) mAutoRotateEnabled = enabled; } -Toolkit::View::OrientationAnimationStartedSignalV2& View::OrientationAnimationStartedSignal() +Toolkit::View::OrientationAnimationStartedSignalType& View::OrientationAnimationStartedSignal() { - return mOrientationAnimationStartedSignalV2; + return mOrientationAnimationStartedSignal; } bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h index c94dd8e..b956eae 100644 --- a/optional/dali-toolkit/internal/controls/view/view-impl.h +++ b/optional/dali-toolkit/internal/controls/view/view-impl.h @@ -117,7 +117,7 @@ public: /** * @copydoc Dali::Toolkit::View::AnimationStartedSignalOrientation() */ - Toolkit::View::OrientationAnimationStartedSignalV2& OrientationAnimationStartedSignal(); + Toolkit::View::OrientationAnimationStartedSignalType& OrientationAnimationStartedSignal(); /** * Connects a callback function with the object's signals. @@ -175,7 +175,7 @@ private: float mOrientationFunction[4]; ///< The orientation function used to transform from degrees to the internal orientation. bool mAutoRotateEnabled; ///< Whether the view rotates if the OrientationChanged method is called. - Toolkit::View::OrientationAnimationStartedSignalV2 mOrientationAnimationStartedSignalV2; + Toolkit::View::OrientationAnimationStartedSignalType mOrientationAnimationStartedSignal; }; } // namespace Internal diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp index 0641200..42c121d 100644 --- a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp +++ b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp @@ -337,12 +337,12 @@ void CubeTransitionEffect::OnTransitionFinished(Animation& source) //Emit signal Toolkit::CubeTransitionEffect handle( this ); - mTransitionCompletedSignalV2.Emit( handle, mCurrentImage ); + mTransitionCompletedSignal.Emit( handle, mCurrentImage ); } -Toolkit::CubeTransitionEffect::TransitionCompletedSignalV2& CubeTransitionEffect::TransitionCompletedSignal() +Toolkit::CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffect::TransitionCompletedSignal() { - return mTransitionCompletedSignalV2; + return mTransitionCompletedSignal; } } // namespace Internal diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h index b2a0312..8e7b983 100644 --- a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h +++ b/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h @@ -207,7 +207,7 @@ public: //Signal /** * @copydoc Toolkit::CubeTransitionEffect::TransitionCompletedSignal() */ - Toolkit::CubeTransitionEffect::TransitionCompletedSignalV2& TransitionCompletedSignal(); + Toolkit::CubeTransitionEffect::TransitionCompletedSignalType& TransitionCompletedSignal(); protected: @@ -318,7 +318,7 @@ protected: private: - Toolkit::CubeTransitionEffect::TransitionCompletedSignalV2 mTransitionCompletedSignalV2; + Toolkit::CubeTransitionEffect::TransitionCompletedSignalType mTransitionCompletedSignal; }; 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 2d2848f..f4cce46 100644 --- 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 @@ -102,7 +102,7 @@ public: /** * Signal type for notifications */ - typedef SignalV2< void (GaussianBlurView source) > GaussianBlurViewSignal; + typedef Signal< void (GaussianBlurView source) > GaussianBlurViewSignal; /** * Create an uninitialized GaussianBlurView; this can be initialized with GaussianBlurView::New() 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 9c15f43..f914279 100644 --- 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 @@ -266,7 +266,7 @@ public: public: /* Signals */ /// @brief Finished signal type. - typedef SignalV2< void (MaskedImageView& source) > MaskedImageViewSignal; + typedef Signal< void (MaskedImageView& source) > MaskedImageViewSignal; /** * @brief Signal emitted when the render task which targets the diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp index 3f5da36..821737d 100644 --- a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp +++ b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp @@ -126,12 +126,12 @@ void NavigationControl::SetOrientationRotateAnimation( float duration, AlphaFunc GetImpl( *this ).SetOrientationRotateAnimation( duration, alphaFunc ); } -NavigationControl::ItemPushedSignalV2& NavigationControl::ItemPushedSignal() +NavigationControl::ItemPushedSignalType& NavigationControl::ItemPushedSignal() { return GetImpl( *this ).ItemPushedSignal(); } -NavigationControl::ItemPoppedSignalV2& NavigationControl::ItemPoppedSignal() +NavigationControl::ItemPoppedSignalType& NavigationControl::ItemPoppedSignal() { return GetImpl( *this ).ItemPoppedSignal(); } 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 5b3fa6d..7ebaf8d 100644 --- a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h +++ b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h @@ -196,8 +196,8 @@ public: public: //Signal - typedef SignalV2< void( NavigationControl, Page ) > ItemPushedSignalV2; - typedef SignalV2< void( NavigationControl, Page ) > ItemPoppedSignalV2; + typedef Signal< void( NavigationControl, Page ) > ItemPushedSignalType; + typedef Signal< void( NavigationControl, Page ) > ItemPoppedSignalType; /** * Signal emitted right after a new item is pushed into the navigation stack. @@ -207,7 +207,7 @@ public: //Signal * @endcode * @return The signal to connect to. */ - ItemPushedSignalV2& ItemPushedSignal(); + ItemPushedSignalType& ItemPushedSignal(); /** * Signal emitted right after an item is popped out from the navigation stack. @@ -219,7 +219,7 @@ public: //Signal * The app can use this signal and check the poppedItem to be uninitialized to know the app window should be lower * @return The signal to connect to. */ - ItemPoppedSignalV2& ItemPoppedSignal(); + ItemPoppedSignalType& ItemPoppedSignal(); 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 2a4edf9..dbf9fc9 100644 --- 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 @@ -80,7 +80,7 @@ public: //Signal /** * Signal type for notification */ - typedef SignalV2< void ( int ) > RefreshSignal; + typedef Signal< void ( int ) > RefreshSignal; /** * Signal emitted when the Actor tree is ready for rendering into the page image. 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 0e320cd..fa068ec 100644 --- 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 @@ -153,8 +153,8 @@ public: public: //Signal // Page Turned signal, with page index and boolean turning direction (true = forward, false = backward) - typedef SignalV2< void ( PageTurnView, unsigned int, bool ) > PageTurnSignal; - typedef SignalV2< void ( PageTurnView ) > PagePanSignal; + typedef Signal< void ( PageTurnView, unsigned int, bool ) > PageTurnSignal; + typedef Signal< void ( PageTurnView ) > PagePanSignal; /** * Signal emitted when a page has started to turn over. diff --git a/optional/dali-toolkit/public-api/controls/slider/slider.h b/optional/dali-toolkit/public-api/controls/slider/slider.h index 4a82afa..1a382bd 100644 --- a/optional/dali-toolkit/public-api/controls/slider/slider.h +++ b/optional/dali-toolkit/public-api/controls/slider/slider.h @@ -115,8 +115,8 @@ public: // Signals // Value changed - typedef SignalV2< bool ( Slider, float ) > ValueChangedSignalType; - typedef SignalV2< bool ( Slider, int ) > MarkSignalType; + typedef Signal< bool ( Slider, float ) > ValueChangedSignalType; + typedef Signal< bool ( Slider, int ) > MarkSignalType; /** * Signal emitted when the slider value changes 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 f327cab..c4e57b0 100644 --- 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 @@ -62,7 +62,7 @@ public: /** * @brief Signal type for notifications. */ - typedef SignalV2< void (SuperBlurView source) > SuperBlurViewSignal; + typedef Signal< void (SuperBlurView source) > SuperBlurViewSignal; /** * @brief Creates an empty SuperBlurView handle. diff --git a/optional/dali-toolkit/public-api/controls/view/view.cpp b/optional/dali-toolkit/public-api/controls/view/view.cpp index bf2b822..4f3ce8b 100644 --- a/optional/dali-toolkit/public-api/controls/view/view.cpp +++ b/optional/dali-toolkit/public-api/controls/view/view.cpp @@ -105,7 +105,7 @@ void View::SetAutoRotate( bool enabled ) GetImpl( *this ).SetAutoRotate( enabled ); } -View::OrientationAnimationStartedSignalV2& View::OrientationAnimationStartedSignal() +View::OrientationAnimationStartedSignalType& View::OrientationAnimationStartedSignal() { return GetImpl( *this ).OrientationAnimationStartedSignal(); } diff --git a/optional/dali-toolkit/public-api/controls/view/view.h b/optional/dali-toolkit/public-api/controls/view/view.h index a0a29b0..bb31adc 100644 --- a/optional/dali-toolkit/public-api/controls/view/view.h +++ b/optional/dali-toolkit/public-api/controls/view/view.h @@ -187,12 +187,12 @@ public: public: //Signals // Orientation change animation starts. - typedef SignalV2< void ( View, Animation&, const Orientation& ) > OrientationAnimationStartedSignalV2; + typedef Signal< void ( View, Animation&, const Orientation& ) > OrientationAnimationStartedSignalType; /** * Signal emitted just before the rotate animation starts when the device orientation changes. */ - OrientationAnimationStartedSignalV2& OrientationAnimationStartedSignal(); + OrientationAnimationStartedSignalType& OrientationAnimationStartedSignal(); public: // Not intended for application developers diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp index df4c369..363cf58 100644 --- a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp +++ b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp @@ -107,7 +107,7 @@ void CubeTransitionEffect::StopTransition() GetImpl(*this).StopTransition(); } -CubeTransitionEffect::TransitionCompletedSignalV2& CubeTransitionEffect::TransitionCompletedSignal() +CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffect::TransitionCompletedSignal() { return GetImpl( *this ).TransitionCompletedSignal(); } 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 06d5220..e57f4bd 100644 --- a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h +++ b/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h @@ -178,7 +178,7 @@ public: //Signal static const char* const SIGNAL_TRANSITION_COMPLETED; //Transition animation completed signal - typedef SignalV2< void ( CubeTransitionEffect, ImageActor ) > TransitionCompletedSignalV2; + typedef Signal< void ( CubeTransitionEffect, ImageActor ) > TransitionCompletedSignalType; /** * Signal emitted when the transition has completed animation @@ -188,7 +188,7 @@ public: //Signal * @endcode * @return The Signal to connect to. */ - TransitionCompletedSignalV2& TransitionCompletedSignal(); + TransitionCompletedSignalType& TransitionCompletedSignal(); public: // Not intended for developer use