From: tom.robinson Date: Fri, 30 Jan 2015 16:26:06 +0000 (+0000) Subject: DALi signals refactor to remove V2 naming X-Git-Tag: accepted/tizen/common/20150205.080850~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F34701%2F2;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git DALi signals refactor to remove V2 naming Change-Id: I675f19a97276f7dbda1d6f8569f6d3b49b9eb297 --- diff --git a/adaptors/common/accessibility-manager-impl.h b/adaptors/common/accessibility-manager-impl.h index 0b2002d..c2f20b7 100644 --- a/adaptors/common/accessibility-manager-impl.h +++ b/adaptors/common/accessibility-manager-impl.h @@ -49,8 +49,8 @@ class AccessibilityManager : public Dali::BaseObject { public: - typedef Dali::AccessibilityManager::AccessibilityActionSignalV2 AccessibilityActionSignalV2; - typedef Dali::AccessibilityManager::AccessibilityActionScrollSignalV2 AccessibilityActionScrollSignalV2; + typedef Dali::AccessibilityManager::AccessibilityActionSignalType AccessibilityActionSignalType; + typedef Dali::AccessibilityManager::AccessibilityActionScrollSignalType AccessibilityActionScrollSignalType; // Creation @@ -179,105 +179,105 @@ public: // Signals /** * @copydoc Dali::AccessibilityManager::StatusChangedSignal */ - AccessibilityActionSignalV2& StatusChangedSignal() + AccessibilityActionSignalType& StatusChangedSignal() { - return mStatusChangedSignalV2; + return mStatusChangedSignal; } /** * @copydoc Dali::AccessibilityManager::ActionNextSignal */ - AccessibilityActionSignalV2& ActionNextSignal() + AccessibilityActionSignalType& ActionNextSignal() { - return mActionNextSignalV2; + return mActionNextSignal; } /** * @copydoc Dali::AccessibilityManager::ActionPreviousSignal */ - AccessibilityActionSignalV2& ActionPreviousSignal() + AccessibilityActionSignalType& ActionPreviousSignal() { - return mActionPreviousSignalV2; + return mActionPreviousSignal; } /** * @copydoc Dali::AccessibilityManager::ActionActivateSignal */ - AccessibilityActionSignalV2& ActionActivateSignal() + AccessibilityActionSignalType& ActionActivateSignal() { - return mActionActivateSignalV2; + return mActionActivateSignal; } /** * @copydoc Dali::AccessibilityManager::ActionOverSignal */ - AccessibilityActionSignalV2& ActionOverSignal() + AccessibilityActionSignalType& ActionOverSignal() { - return mActionOverSignalV2; + return mActionOverSignal; } /** * @copydoc Dali::AccessibilityManager::ActionReadSignal */ - AccessibilityActionSignalV2& ActionReadSignal() + AccessibilityActionSignalType& ActionReadSignal() { - return mActionReadSignalV2; + return mActionReadSignal; } /** * @copydoc Dali::AccessibilityManager::ActionReadNextSignal */ - AccessibilityActionSignalV2& ActionReadNextSignal() + AccessibilityActionSignalType& ActionReadNextSignal() { - return mActionReadNextSignalV2; + return mActionReadNextSignal; } /** * @copydoc Dali::AccessibilityManager::ActionReadPreviousSignal */ - AccessibilityActionSignalV2& ActionReadPreviousSignal() + AccessibilityActionSignalType& ActionReadPreviousSignal() { - return mActionReadPreviousSignalV2; + return mActionReadPreviousSignal; } /** * @copydoc Dali::AccessibilityManager::ActionUpSignal */ - AccessibilityActionSignalV2& ActionUpSignal() + AccessibilityActionSignalType& ActionUpSignal() { - return mActionUpSignalV2; + return mActionUpSignal; } /** * @copydoc Dali::AccessibilityManager::ActionDownSignal */ - AccessibilityActionSignalV2& ActionDownSignal() + AccessibilityActionSignalType& ActionDownSignal() { - return mActionDownSignalV2; + return mActionDownSignal; } /** * @copydoc Dali::AccessibilityManager::ActionClearFocusSignal */ - AccessibilityActionSignalV2& ActionClearFocusSignal() + AccessibilityActionSignalType& ActionClearFocusSignal() { - return mActionClearFocusSignalV2; + return mActionClearFocusSignal; } /** * @copydoc Dali::AccessibilityManager::ActionBackSignal */ - AccessibilityActionSignalV2& ActionBackSignal() + AccessibilityActionSignalType& ActionBackSignal() { - return mActionBackSignalV2; + return mActionBackSignal; } /** * @copydoc Dali::AccessibilityManager::ActionScrollSignal */ - AccessibilityActionScrollSignalV2& ActionScrollSignal() + AccessibilityActionScrollSignalType& ActionScrollSignal() { - return mActionScrollSignalV2; + return mActionScrollSignal; } private: @@ -307,19 +307,19 @@ private: Indicator* mIndicator; ///< The indicator bool mIndicatorFocused; ///< Whether the Indicator is focused - AccessibilityActionSignalV2 mStatusChangedSignalV2; - AccessibilityActionSignalV2 mActionNextSignalV2; - AccessibilityActionSignalV2 mActionPreviousSignalV2; - AccessibilityActionSignalV2 mActionActivateSignalV2; - AccessibilityActionSignalV2 mActionOverSignalV2; - AccessibilityActionSignalV2 mActionReadSignalV2; - AccessibilityActionSignalV2 mActionReadNextSignalV2; - AccessibilityActionSignalV2 mActionReadPreviousSignalV2; - AccessibilityActionSignalV2 mActionUpSignalV2; - AccessibilityActionSignalV2 mActionDownSignalV2; - AccessibilityActionSignalV2 mActionClearFocusSignalV2; - AccessibilityActionSignalV2 mActionBackSignalV2; - AccessibilityActionScrollSignalV2 mActionScrollSignalV2; + AccessibilityActionSignalType mStatusChangedSignal; + AccessibilityActionSignalType mActionNextSignal; + AccessibilityActionSignalType mActionPreviousSignal; + AccessibilityActionSignalType mActionActivateSignal; + AccessibilityActionSignalType mActionOverSignal; + AccessibilityActionSignalType mActionReadSignal; + AccessibilityActionSignalType mActionReadNextSignal; + AccessibilityActionSignalType mActionReadPreviousSignal; + AccessibilityActionSignalType mActionUpSignal; + AccessibilityActionSignalType mActionDownSignal; + AccessibilityActionSignalType mActionClearFocusSignal; + AccessibilityActionSignalType mActionBackSignal; + AccessibilityActionScrollSignalType mActionScrollSignal; public: diff --git a/adaptors/common/adaptor-impl.cpp b/adaptors/common/adaptor-impl.cpp index 31f2f38..f91c1a6 100644 --- a/adaptors/common/adaptor-impl.cpp +++ b/adaptors/common/adaptor-impl.cpp @@ -809,12 +809,12 @@ void Adaptor::SurfaceSizeChanged(const PositionSize& positionSize) // let the core know the surface size has changed mCore->SurfaceResized(positionSize.width, positionSize.height); - mResizedSignalV2.Emit( mAdaptor ); + mResizedSignal.Emit( mAdaptor ); } void Adaptor::NotifyLanguageChanged() { - mLanguageChangedSignalV2.Emit( mAdaptor ); + mLanguageChangedSignal.Emit( mAdaptor ); } void Adaptor::RequestUpdateOnce() @@ -837,8 +837,8 @@ void Adaptor::ProcessCoreEventsFromIdle() } Adaptor::Adaptor(Dali::Adaptor& adaptor, RenderSurface* surface, const DeviceLayout& baseLayout) -: mResizedSignalV2(), - mLanguageChangedSignalV2(), +: mResizedSignal(), + mLanguageChangedSignal(), mAdaptor(adaptor), mState(READY), mCore(NULL), diff --git a/adaptors/common/adaptor-impl.h b/adaptors/common/adaptor-impl.h index 7b1ddbd..b62080d 100644 --- a/adaptors/common/adaptor-impl.h +++ b/adaptors/common/adaptor-impl.h @@ -88,7 +88,7 @@ class Adaptor : public Integration::RenderController, { public: - typedef Dali::Adaptor::AdaptorSignalV2 AdaptorSignalV2; + typedef Dali::Adaptor::AdaptorSignalType AdaptorSignalType; /** * Creates a New Adaptor @@ -374,17 +374,17 @@ public: // Signals /** * @copydoc Dali::Adaptor::SignalResized */ - AdaptorSignalV2& ResizedSignal() + AdaptorSignalType& ResizedSignal() { - return mResizedSignalV2; + return mResizedSignal; } /** * @copydoc Dali::Adaptor::LanguageChangedSignal */ - AdaptorSignalV2& LanguageChangedSignal() + AdaptorSignalType& LanguageChangedSignal() { - return mLanguageChangedSignalV2; + return mLanguageChangedSignal; } private: // From Dali::Internal::Adaptor::CoreEventInterface @@ -487,8 +487,8 @@ private: // Types private: // Data - AdaptorSignalV2 mResizedSignalV2; ///< Resized signal. - AdaptorSignalV2 mLanguageChangedSignalV2; ///< Language changed signal. + AdaptorSignalType mResizedSignal; ///< Resized signal. + AdaptorSignalType mLanguageChangedSignal; ///< Language changed signal. Dali::Adaptor& mAdaptor; ///< Reference to public adaptor instance. State mState; ///< Current state of the adaptor diff --git a/adaptors/common/adaptor.cpp b/adaptors/common/adaptor.cpp index bbede1e..cf13b18 100644 --- a/adaptors/common/adaptor.cpp +++ b/adaptors/common/adaptor.cpp @@ -76,12 +76,12 @@ bool Adaptor::AddIdle( boost::function callBack ) return mImpl->AddIdle(callBack); } -Adaptor::AdaptorSignalV2& Adaptor::ResizedSignal() +Adaptor::AdaptorSignalType& Adaptor::ResizedSignal() { return mImpl->ResizedSignal(); } -Adaptor::AdaptorSignalV2& Adaptor::LanguageChangedSignal() +Adaptor::AdaptorSignalType& Adaptor::LanguageChangedSignal() { return mImpl->LanguageChangedSignal(); } diff --git a/adaptors/common/adaptor.h b/adaptors/common/adaptor.h index cffa76b..01c7beb 100644 --- a/adaptors/common/adaptor.h +++ b/adaptors/common/adaptor.h @@ -23,7 +23,7 @@ #include "window.h" #include "application-configuration.h" #include "tts-player.h" -#include +#include #include #include @@ -103,7 +103,7 @@ class Adaptor { public: - typedef SignalV2< void (Adaptor&) > AdaptorSignalV2; ///< Generic Type for adaptor signals + typedef Signal< void (Adaptor&) > AdaptorSignalType; ///< Generic Type for adaptor signals public: /** @@ -246,14 +246,14 @@ public: // Signals * * @return The signal to connect to */ - AdaptorSignalV2& ResizedSignal(); + AdaptorSignalType& ResizedSignal(); /** * @brief This signal is emitted when the language is changed on the device. * * @return The signal to connect to */ - AdaptorSignalV2& LanguageChangedSignal(); + AdaptorSignalType& LanguageChangedSignal(); private: diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp index 159e109..894607f 100644 --- a/adaptors/common/application-impl.cpp +++ b/adaptors/common/application-impl.cpp @@ -68,13 +68,13 @@ ApplicationPtr Application::New( } Application::Application( int* argc, char** argv[], const std::string& name, const DeviceLayout& baseLayout, Dali::Application::WINDOW_MODE windowMode) -: mInitSignalV2(), - mTerminateSignalV2(), - mPauseSignalV2(), - mResumeSignalV2(), - mResetSignalV2(), - mResizeSignalV2(), - mLanguageChangedSignalV2(), +: mInitSignal(), + mTerminateSignal(), + mPauseSignal(), + mResumeSignal(), + mResetSignal(), + mResizeSignal(), + mLanguageChangedSignal(), mEventLoop( NULL ), mFramework( NULL ), mCommandLineOptions( NULL ), @@ -163,7 +163,7 @@ void Application::QuitFromMainLoop() mAdaptor->Stop(); Dali::Application application(this); - mTerminateSignalV2.Emit( application ); + mTerminateSignal.Emit( application ); mFramework->Quit(); // This will trigger OnTerminate(), below, after the main loop has completed. @@ -211,7 +211,7 @@ void Application::OnInit() LanguageChangedSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnLanguageChanged ); Dali::Application application(this); - mInitSignalV2.Emit( application ); + mInitSignal.Emit( application ); Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).GetCore().SceneCreated(); } @@ -229,14 +229,14 @@ void Application::OnPause() { mAdaptor->Pause(); Dali::Application application(this); - mPauseSignalV2.Emit( application ); + mPauseSignal.Emit( application ); } void Application::OnResume() { mAdaptor->Resume(); Dali::Application application(this); - mResumeSignalV2.Emit( application ); + mResumeSignal.Emit( application ); } void Application::OnReset() @@ -246,7 +246,7 @@ void Application::OnReset() * because Application class already handled initialization in OnInit(), OnReset do nothing. */ Dali::Application application(this); - mResetSignalV2.Emit( application ); + mResetSignal.Emit( application ); mWindow.Raise(); } @@ -259,7 +259,7 @@ void Application::OnLanguageChanged() void Application::OnResize(Dali::Adaptor& adaptor) { Dali::Application application(this); - mResizeSignalV2.Emit( application ); + mResizeSignal.Emit( application ); } bool Application::AddIdle(boost::function callBack) diff --git a/adaptors/common/application-impl.h b/adaptors/common/application-impl.h index e9bdf0b..7dc75f6 100644 --- a/adaptors/common/application-impl.h +++ b/adaptors/common/application-impl.h @@ -58,7 +58,7 @@ class Application : public BaseObject, public Framework::Observer { public: - typedef Dali::Application::AppSignalV2 AppSignalV2; + typedef Dali::Application::AppSignalType AppSignalType; /** * Constructor @@ -194,37 +194,37 @@ public: // Signals /** * @copydoc Dali::Application::InitSignal() */ - Dali::Application::AppSignalV2& InitSignal() { return mInitSignalV2; } + Dali::Application::AppSignalType& InitSignal() { return mInitSignal; } /** * @copydoc Dali::Application::TerminateSignal() */ - Dali::Application::AppSignalV2& TerminateSignal() { return mTerminateSignalV2; } + Dali::Application::AppSignalType& TerminateSignal() { return mTerminateSignal; } /** * @copydoc Dali::Application::PauseSignal() */ - Dali::Application::AppSignalV2& PauseSignal() { return mPauseSignalV2; } + Dali::Application::AppSignalType& PauseSignal() { return mPauseSignal; } /** * @copydoc Dali::Application::ResumeSignal() */ - Dali::Application::AppSignalV2& ResumeSignal() { return mResumeSignalV2; } + Dali::Application::AppSignalType& ResumeSignal() { return mResumeSignal; } /** * @copydoc Dali::Application::ResetSignal() */ - Dali::Application::AppSignalV2& ResetSignal() { return mResetSignalV2; } + Dali::Application::AppSignalType& ResetSignal() { return mResetSignal; } /** * @copydoc Dali::Application::ResizeSignal() */ - Dali::Application::AppSignalV2& ResizeSignal() { return mResizeSignalV2; } + Dali::Application::AppSignalType& ResizeSignal() { return mResizeSignal; } /** * @copydoc Dali::Application::LanguageChangedSignal() */ - Dali::Application::AppSignalV2& LanguageChangedSignal() { return mLanguageChangedSignalV2; } + Dali::Application::AppSignalType& LanguageChangedSignal() { return mLanguageChangedSignal; } private: @@ -250,13 +250,13 @@ private: private: - AppSignalV2 mInitSignalV2; - AppSignalV2 mTerminateSignalV2; - AppSignalV2 mPauseSignalV2; - AppSignalV2 mResumeSignalV2; - AppSignalV2 mResetSignalV2; - AppSignalV2 mResizeSignalV2; - AppSignalV2 mLanguageChangedSignalV2; + AppSignalType mInitSignal; + AppSignalType mTerminateSignal; + AppSignalType mPauseSignal; + AppSignalType mResumeSignal; + AppSignalType mResetSignal; + AppSignalType mResizeSignal; + AppSignalType mLanguageChangedSignal; EventLoop* mEventLoop; Framework* mFramework; diff --git a/adaptors/common/clipboard-event-notifier-impl.cpp b/adaptors/common/clipboard-event-notifier-impl.cpp index c28dcf0..17dd5bc 100644 --- a/adaptors/common/clipboard-event-notifier-impl.cpp +++ b/adaptors/common/clipboard-event-notifier-impl.cpp @@ -99,10 +99,10 @@ void ClipboardEventNotifier::ClearContent() void ClipboardEventNotifier::EmitContentSelectedSignal() { - if ( !mContentSelectedSignalV2.Empty() ) + if ( !mContentSelectedSignal.Empty() ) { Dali::ClipboardEventNotifier handle( this ); - mContentSelectedSignalV2.Emit( handle ); + mContentSelectedSignal.Emit( handle ); } } diff --git a/adaptors/common/clipboard-event-notifier-impl.h b/adaptors/common/clipboard-event-notifier-impl.h index ff7caaa..9a2659c 100644 --- a/adaptors/common/clipboard-event-notifier-impl.h +++ b/adaptors/common/clipboard-event-notifier-impl.h @@ -42,7 +42,7 @@ class ClipboardEventNotifier : public Dali::BaseObject { public: - typedef Dali::ClipboardEventNotifier::ClipboardEventSignalV2 ClipboardEventSignalV2; + typedef Dali::ClipboardEventNotifier::ClipboardEventSignalType ClipboardEventSignalType; // Creation @@ -85,9 +85,9 @@ public: // Signals /** * @copydoc Dali::ClipboardEventNotifier::ContentSelectedSignal */ - ClipboardEventSignalV2& ContentSelectedSignal() + ClipboardEventSignalType& ContentSelectedSignal() { - return mContentSelectedSignalV2; + return mContentSelectedSignal; } private: @@ -112,7 +112,7 @@ private: std::string mContent; ///< The current selected content. - ClipboardEventSignalV2 mContentSelectedSignalV2; + ClipboardEventSignalType mContentSelectedSignal; public: diff --git a/adaptors/common/lifecycle-controller-impl.cpp b/adaptors/common/lifecycle-controller-impl.cpp index ba43537..9a0e1d9 100644 --- a/adaptors/common/lifecycle-controller-impl.cpp +++ b/adaptors/common/lifecycle-controller-impl.cpp @@ -88,7 +88,7 @@ LifecycleController::~LifecycleController() { } -Dali::LifecycleController::LifecycleSignalV2& LifecycleController::InitSignal() +Dali::LifecycleController::LifecycleSignalType& LifecycleController::InitSignal() { return mInitSignal; } @@ -101,7 +101,7 @@ void LifecycleController::EmitInitSignal() } } -Dali::LifecycleController::LifecycleSignalV2& LifecycleController::TerminateSignal() +Dali::LifecycleController::LifecycleSignalType& LifecycleController::TerminateSignal() { return mTerminateSignal; } @@ -114,7 +114,7 @@ void LifecycleController::EmitTerminateSignal() } } -Dali::LifecycleController::LifecycleSignalV2& LifecycleController::PauseSignal() +Dali::LifecycleController::LifecycleSignalType& LifecycleController::PauseSignal() { return mPauseSignal; } @@ -127,7 +127,7 @@ void LifecycleController::EmitPauseSignal() } } -Dali::LifecycleController::LifecycleSignalV2& LifecycleController::ResumeSignal() +Dali::LifecycleController::LifecycleSignalType& LifecycleController::ResumeSignal() { return mResumeSignal; } @@ -140,7 +140,7 @@ void LifecycleController::EmitResumeSignal() } } -Dali::LifecycleController::LifecycleSignalV2& LifecycleController::ResetSignal() +Dali::LifecycleController::LifecycleSignalType& LifecycleController::ResetSignal() { return mResetSignal; } @@ -153,7 +153,7 @@ void LifecycleController::EmitResetSignal() } } -Dali::LifecycleController::LifecycleSignalV2& LifecycleController::ResizeSignal() +Dali::LifecycleController::LifecycleSignalType& LifecycleController::ResizeSignal() { return mResizeSignal; } @@ -166,7 +166,7 @@ void LifecycleController::EmitResizeSignal() } } -Dali::LifecycleController::LifecycleSignalV2& LifecycleController::LanguageChangedSignal() +Dali::LifecycleController::LifecycleSignalType& LifecycleController::LanguageChangedSignal() { return mLanguageChangedSignal; } diff --git a/adaptors/common/lifecycle-controller-impl.h b/adaptors/common/lifecycle-controller-impl.h index 73cd6ca..486a8ed 100644 --- a/adaptors/common/lifecycle-controller-impl.h +++ b/adaptors/common/lifecycle-controller-impl.h @@ -62,37 +62,37 @@ public: /** * @copydoc Dali::StyleMonitor::InitSignal() */ - Dali::LifecycleController::LifecycleSignalV2& InitSignal(); + Dali::LifecycleController::LifecycleSignalType& InitSignal(); /** * @copydoc Dali::StyleMonitor::TerminateSignal() */ - Dali::LifecycleController::LifecycleSignalV2& TerminateSignal(); + Dali::LifecycleController::LifecycleSignalType& TerminateSignal(); /** * @copydoc Dali::StyleMonitor::PauseSignal() */ - Dali::LifecycleController::LifecycleSignalV2& PauseSignal(); + Dali::LifecycleController::LifecycleSignalType& PauseSignal(); /** * @copydoc Dali::StyleMonitor::ResumeSignal() */ - Dali::LifecycleController::LifecycleSignalV2& ResumeSignal(); + Dali::LifecycleController::LifecycleSignalType& ResumeSignal(); /** * @copydoc Dali::StyleMonitor::ResetSignal() */ - Dali::LifecycleController::LifecycleSignalV2& ResetSignal(); + Dali::LifecycleController::LifecycleSignalType& ResetSignal(); /** * @copydoc Dali::StyleMonitor::ResizeSignal() */ - Dali::LifecycleController::LifecycleSignalV2& ResizeSignal(); + Dali::LifecycleController::LifecycleSignalType& ResizeSignal(); /** * @copydoc Dali::StyleMonitor::LanguageChangedSignal() */ - Dali::LifecycleController::LifecycleSignalV2& LanguageChangedSignal(); + Dali::LifecycleController::LifecycleSignalType& LanguageChangedSignal(); public: @@ -192,13 +192,13 @@ private: private: // Signals - Dali::LifecycleController::LifecycleSignalV2 mInitSignal; - Dali::LifecycleController::LifecycleSignalV2 mTerminateSignal; - Dali::LifecycleController::LifecycleSignalV2 mPauseSignal; - Dali::LifecycleController::LifecycleSignalV2 mResumeSignal; - Dali::LifecycleController::LifecycleSignalV2 mResetSignal; - Dali::LifecycleController::LifecycleSignalV2 mResizeSignal; - Dali::LifecycleController::LifecycleSignalV2 mLanguageChangedSignal; + Dali::LifecycleController::LifecycleSignalType mInitSignal; + Dali::LifecycleController::LifecycleSignalType mTerminateSignal; + Dali::LifecycleController::LifecycleSignalType mPauseSignal; + Dali::LifecycleController::LifecycleSignalType mResumeSignal; + Dali::LifecycleController::LifecycleSignalType mResetSignal; + Dali::LifecycleController::LifecycleSignalType mResizeSignal; + Dali::LifecycleController::LifecycleSignalType mLanguageChangedSignal; }; diff --git a/adaptors/common/orientation-impl.cpp b/adaptors/common/orientation-impl.cpp index ddac990..73c2a4d 100644 --- a/adaptors/common/orientation-impl.cpp +++ b/adaptors/common/orientation-impl.cpp @@ -70,7 +70,7 @@ float Orientation::GetRadians() const return Math::PI * (float)mOrientation / 180.0f; } -Orientation::OrientationSignalV2& Orientation::ChangedSignal() +Orientation::OrientationSignalType& Orientation::ChangedSignal() { return mChangedSignal; } diff --git a/adaptors/common/orientation-impl.h b/adaptors/common/orientation-impl.h index d00da39..12d28c9 100644 --- a/adaptors/common/orientation-impl.h +++ b/adaptors/common/orientation-impl.h @@ -45,7 +45,7 @@ class Orientation : public BaseObject, public RotationObserver { public: - typedef Dali::Orientation::OrientationSignalV2 OrientationSignalV2; + typedef Dali::Orientation::OrientationSignalType OrientationSignalType; static Orientation* New(Window* window); @@ -84,7 +84,7 @@ public: // Signals /** * @copydoc Dali::Orientation::ChangedSignal() */ - OrientationSignalV2& ChangedSignal(); + OrientationSignalType& ChangedSignal(); private: /** @@ -111,7 +111,7 @@ private: Window* mWindow; - OrientationSignalV2 mChangedSignal; + OrientationSignalType mChangedSignal; int mOrientation; int mWindowWidth; diff --git a/adaptors/common/physical-keyboard-impl.h b/adaptors/common/physical-keyboard-impl.h index d263bd1..03aef0f 100644 --- a/adaptors/common/physical-keyboard-impl.h +++ b/adaptors/common/physical-keyboard-impl.h @@ -64,7 +64,7 @@ public: /** * @copydoc Dali::PhysicalKeyboard::StatusChangedSignal() */ - Dali::PhysicalKeyboard::Signal& StatusChangedSignal() { return mStatusChangedSignal; } + Dali::PhysicalKeyboard::PhysicalKeyboardSignalType& StatusChangedSignal() { return mStatusChangedSignal; } protected: @@ -86,7 +86,7 @@ private: private: - Dali::PhysicalKeyboard::Signal mStatusChangedSignal; ///< Status changed signal + Dali::PhysicalKeyboard::PhysicalKeyboardSignalType mStatusChangedSignal; ///< Status changed signal bool mAttached; ///< true if the physical keyboard is attached, false otherwise }; diff --git a/adaptors/common/sound-player-impl.cpp b/adaptors/common/sound-player-impl.cpp index b52876c..37ba5de 100644 --- a/adaptors/common/sound-player-impl.cpp +++ b/adaptors/common/sound-player-impl.cpp @@ -90,9 +90,9 @@ void SoundPlayer::Stop( int handle ) mPlugin.StopSound( handle ); } -SoundPlayer::SoundPlayFinishedSignalV2& SoundPlayer::SoundPlayFinishedSignal() +SoundPlayer::SoundPlayFinishedSignalType& SoundPlayer::SoundPlayFinishedSignal() { - return mSoundPlayFinishedSignalV2; + return mSoundPlayFinishedSignal; } bool SoundPlayer::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) @@ -126,10 +126,10 @@ void SoundPlayer::EmitSoundPlayFinishedSignal() { // Emit SoundPlayFinished signal - if ( !mSoundPlayFinishedSignalV2.Empty() ) + if ( !mSoundPlayFinishedSignal.Empty() ) { Dali::SoundPlayer handle( this ); - mSoundPlayFinishedSignalV2.Emit( handle ); + mSoundPlayFinishedSignal.Emit( handle ); } } diff --git a/adaptors/common/sound-player-impl.h b/adaptors/common/sound-player-impl.h index eafc84a..f30245a 100644 --- a/adaptors/common/sound-player-impl.h +++ b/adaptors/common/sound-player-impl.h @@ -43,7 +43,7 @@ class SoundPlayer : public Dali::BaseObject public: - typedef Dali::SoundPlayer::SoundPlayFinishedSignalV2 SoundPlayFinishedSignalV2; + typedef Dali::SoundPlayer::SoundPlayFinishedSignalType SoundPlayFinishedSignalType; /** * Create a SoundPlayer. @@ -70,7 +70,7 @@ public: /** * @copydoc Dali::SoundPlayer::SoundPlayFinishedSignal() */ - SoundPlayFinishedSignalV2& SoundPlayFinishedSignal(); + SoundPlayFinishedSignalType& SoundPlayFinishedSignal(); /** * Connects a callback function with the object's signals. @@ -110,7 +110,7 @@ private: private: FeedbackPluginProxy mPlugin; - SoundPlayFinishedSignalV2 mSoundPlayFinishedSignalV2; + SoundPlayFinishedSignalType mSoundPlayFinishedSignal; }; } // namespace Adaptor diff --git a/adaptors/common/style-monitor-impl.cpp b/adaptors/common/style-monitor-impl.cpp index 58e02e2..7358bab 100644 --- a/adaptors/common/style-monitor-impl.cpp +++ b/adaptors/common/style-monitor-impl.cpp @@ -120,17 +120,17 @@ void StyleMonitor::SetTheme(const std::string& path) EmitStyleChangeSignal(styleChange); } -Dali::StyleMonitor::StyleChangeSignalV2& StyleMonitor::StyleChangeSignal() +Dali::StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal() { - return mStyleChangeSignalV2; + return mStyleChangeSignal; } void StyleMonitor::EmitStyleChangeSignal(StyleChange styleChange) { - if( !mStyleChangeSignalV2.Empty() ) + if( !mStyleChangeSignal.Empty() ) { Dali::StyleMonitor handle( this ); - mStyleChangeSignalV2.Emit( handle, styleChange ); + mStyleChangeSignal.Emit( handle, styleChange ); } } diff --git a/adaptors/common/style-monitor-impl.h b/adaptors/common/style-monitor-impl.h index 17d79e9..ca3e845 100644 --- a/adaptors/common/style-monitor-impl.h +++ b/adaptors/common/style-monitor-impl.h @@ -92,7 +92,7 @@ public: /** * @copydoc Dali::StyleMonitor::StyleChangeSignal() */ - Dali::StyleMonitor::StyleChangeSignalV2& StyleChangeSignal(); + Dali::StyleMonitor::StyleChangeSignalType& StyleChangeSignal(); protected: @@ -111,7 +111,7 @@ private: private: - Dali::StyleMonitor::StyleChangeSignalV2 mStyleChangeSignalV2; ///< Emitted when the style changes + Dali::StyleMonitor::StyleChangeSignalType mStyleChangeSignal; ///< Emitted when the style changes Integration::PlatformAbstraction& mPlatformAbstraction; ///< Reference to the PlatformAbstraction (for retrieving defaults) std::string mUserDefinedThemeFilePath;///< String containing the user defined theme file path diff --git a/adaptors/common/timer-impl.cpp b/adaptors/common/timer-impl.cpp index 34574c7..5c3f479 100644 --- a/adaptors/common/timer-impl.cpp +++ b/adaptors/common/timer-impl.cpp @@ -140,7 +140,7 @@ bool Timer::Tick() return retVal; } -Dali::Timer::TimerSignalV2& Timer::TickSignal() +Dali::Timer::TimerSignalType& Timer::TickSignal() { return mTickSignal; } diff --git a/adaptors/common/timer-impl.h b/adaptors/common/timer-impl.h index 91f649d..98f6f91 100644 --- a/adaptors/common/timer-impl.h +++ b/adaptors/common/timer-impl.h @@ -91,7 +91,7 @@ public: public: // Signals - Dali::Timer::TimerSignalV2& TickSignal(); + Dali::Timer::TimerSignalType& TickSignal(); private: // Implementation @@ -101,7 +101,7 @@ private: // Implementation private: // Data - Dali::Timer::TimerSignalV2 mTickSignal; + Dali::Timer::TimerSignalType mTickSignal; // To hide away implementation details struct Impl; diff --git a/adaptors/common/virtual-keyboard-impl.cpp b/adaptors/common/virtual-keyboard-impl.cpp index de66901..25299b2 100644 --- a/adaptors/common/virtual-keyboard-impl.cpp +++ b/adaptors/common/virtual-keyboard-impl.cpp @@ -53,9 +53,9 @@ void InputPanelGeometryChangedCallback ( void *data, Ecore_IMF_Context *context, void InputPanelLanguageChangeCallback( void* data, Ecore_IMF_Context* context, int value ); // Signals -Dali::VirtualKeyboard::StatusSignalV2 gKeyboardStatusSignalV2; -Dali::VirtualKeyboard::VoidSignalV2 gKeyboardResizeSignalV2; -Dali::VirtualKeyboard::VoidSignalV2 gKeyboardLanguageChangedSignalV2; +Dali::VirtualKeyboard::StatusSignalType gKeyboardStatusSignal; +Dali::VirtualKeyboard::VoidSignalType gKeyboardResizeSignal; +Dali::VirtualKeyboard::VoidSignalType gKeyboardLanguageChangedSignal; Dali::VirtualKeyboard::ReturnKeyType gReturnKeyType = Dali::VirtualKeyboard::DEFAULT; // the currently used return key type. @@ -67,7 +67,7 @@ void InputPanelStateChangeCallback( void* data, Ecore_IMF_Context* context, int { DALI_LOG_INFO( gLogFilter, Debug::General, "VKB ECORE_IMF_INPUT_PANEL_STATE_SHOW\n" ); - gKeyboardStatusSignalV2.Emit( true ); + gKeyboardStatusSignal.Emit( true ); break; } @@ -76,7 +76,7 @@ void InputPanelStateChangeCallback( void* data, Ecore_IMF_Context* context, int { DALI_LOG_INFO( gLogFilter, Debug::General, "VKB ECORE_IMF_INPUT_PANEL_STATE_HIDE\n" ); - gKeyboardStatusSignalV2.Emit( false ); + gKeyboardStatusSignal.Emit( false ); break; } @@ -95,7 +95,7 @@ void InputPanelLanguageChangeCallback( void* data, Ecore_IMF_Context* context, i DALI_LOG_INFO( gLogFilter, Debug::General, "VKB InputPanelLanguageChangeCallback" ); // Emit the signal that the language has changed - gKeyboardLanguageChangedSignalV2.Emit(); + gKeyboardLanguageChangedSignal.Emit(); } void InputPanelGeometryChangedCallback ( void *data, Ecore_IMF_Context *context, int value ) @@ -103,7 +103,7 @@ void InputPanelGeometryChangedCallback ( void *data, Ecore_IMF_Context *context, DALI_LOG_INFO( gLogFilter, Debug::General, "VKB InputPanelGeometryChangedCallback\n" ); // Emit signal that the keyboard is resized - gKeyboardResizeSignalV2.Emit(); + gKeyboardResizeSignal.Emit(); } } // unnamed namespace @@ -250,19 +250,19 @@ Rect GetSizeAndPosition() return Rect(xPos,yPos,width,height); } -Dali::VirtualKeyboard::StatusSignalV2& StatusChangedSignal() +Dali::VirtualKeyboard::StatusSignalType& StatusChangedSignal() { - return gKeyboardStatusSignalV2; + return gKeyboardStatusSignal; } -Dali::VirtualKeyboard::VoidSignalV2& ResizedSignal() +Dali::VirtualKeyboard::VoidSignalType& ResizedSignal() { - return gKeyboardResizeSignalV2; + return gKeyboardResizeSignal; } -Dali::VirtualKeyboard::VoidSignalV2& LanguageChangedSignal() +Dali::VirtualKeyboard::VoidSignalType& LanguageChangedSignal() { - return gKeyboardLanguageChangedSignalV2; + return gKeyboardLanguageChangedSignal; } Dali::VirtualKeyboard::TextDirection GetTextDirection() diff --git a/adaptors/common/virtual-keyboard-impl.h b/adaptors/common/virtual-keyboard-impl.h index 426cbeb..671f399 100644 --- a/adaptors/common/virtual-keyboard-impl.h +++ b/adaptors/common/virtual-keyboard-impl.h @@ -101,17 +101,17 @@ void RotateTo(int angle); /** * @copydox Dali::VirtualKeyboard::StatusChangedSignal() */ -Dali::VirtualKeyboard::StatusSignalV2& StatusChangedSignal(); +Dali::VirtualKeyboard::StatusSignalType& StatusChangedSignal(); /** * @copydox Dali::VirtualKeyboard::ResizedSignal() */ -Dali::VirtualKeyboard::VoidSignalV2& ResizedSignal(); +Dali::VirtualKeyboard::VoidSignalType& ResizedSignal(); /** * @copydox Dali::VirtualKeyboard::LanguageChangedSignal() */ -Dali::VirtualKeyboard::VoidSignalV2& LanguageChangedSignal(); +Dali::VirtualKeyboard::VoidSignalType& LanguageChangedSignal(); /** * @copydoc Dali::VirtualKeyboard::GetTextDirection diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h index 86b82ed..cd7cdb4 100644 --- a/adaptors/common/window-impl.h +++ b/adaptors/common/window-impl.h @@ -59,7 +59,7 @@ typedef IntrusivePtr OrientationPtr; class Window : public Dali::BaseObject, public Indicator::Observer, public LifeCycleObserver { public: - typedef Dali::Window::IndicatorSignalV2 IndicatorSignalV2; + typedef Dali::Window::IndicatorSignalType IndicatorSignalType; /** * Create a new Window. This should only be called once by the Application class @@ -260,7 +260,7 @@ public: // Signals /** * The user should connect to this signal to get a timing when indicator was shown / hidden. */ - IndicatorSignalV2& IndicatorVisibilityChangedSignal() { return mIndicatorVisibilityChangedSignalV2; } + IndicatorSignalType& IndicatorVisibilityChangedSignal() { return mIndicatorVisibilityChangedSignal; } private: @@ -290,7 +290,7 @@ private: Dali::Window::WindowOrientation mPreferredOrientation; // Signals - IndicatorSignalV2 mIndicatorVisibilityChangedSignalV2; + IndicatorSignalType mIndicatorVisibilityChangedSignal; }; } // namespace Adaptor diff --git a/adaptors/public-api/adaptor-framework/accessibility-manager.cpp b/adaptors/public-api/adaptor-framework/accessibility-manager.cpp index 255a408..b3fefee 100644 --- a/adaptors/public-api/adaptor-framework/accessibility-manager.cpp +++ b/adaptors/public-api/adaptor-framework/accessibility-manager.cpp @@ -127,67 +127,67 @@ void AccessibilityManager::HandleActionDisableEvent() Internal::Adaptor::AccessibilityManager::GetImplementation(*this).HandleActionDisableEvent(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::StatusChangedSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::StatusChangedSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).StatusChangedSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionNextSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionNextSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionNextSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionPreviousSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionPreviousSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionPreviousSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionActivateSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionActivateSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionActivateSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionOverSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionOverSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionOverSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionReadSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadNextSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadNextSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionReadNextSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionReadPreviousSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionReadPreviousSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionReadPreviousSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionUpSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionUpSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionUpSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionDownSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionDownSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionDownSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionClearFocusSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionClearFocusSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionClearFocusSignal(); } -AccessibilityManager::AccessibilityActionSignalV2& AccessibilityManager::ActionBackSignal() +AccessibilityManager::AccessibilityActionSignalType& AccessibilityManager::ActionBackSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionBackSignal(); } -AccessibilityManager::AccessibilityActionScrollSignalV2& AccessibilityManager::ActionScrollSignal() +AccessibilityManager::AccessibilityActionScrollSignalType& AccessibilityManager::ActionScrollSignal() { return Internal::Adaptor::AccessibilityManager::GetImplementation(*this).ActionScrollSignal(); } diff --git a/adaptors/public-api/adaptor-framework/accessibility-manager.h b/adaptors/public-api/adaptor-framework/accessibility-manager.h index 8fc57e2..084462d 100644 --- a/adaptors/public-api/adaptor-framework/accessibility-manager.h +++ b/adaptors/public-api/adaptor-framework/accessibility-manager.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include namespace Dali @@ -55,8 +55,8 @@ public: * * Signal connected callback should return the result */ - typedef SignalV2< bool ( AccessibilityManager& ) > AccessibilityActionSignalV2; ///< Generic signal type - typedef SignalV2< bool (AccessibilityManager&, const Dali::TouchEvent&)> AccessibilityActionScrollSignalV2; ///< Scroll signal type + typedef Signal< bool ( AccessibilityManager& ) > AccessibilityActionSignalType; ///< Generic signal type + typedef Signal< bool (AccessibilityManager&, const Dali::TouchEvent&)> AccessibilityActionScrollSignalType; ///< Scroll signal type /** * @brief Create an uninitialized handle. @@ -235,7 +235,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& StatusChangedSignal(); + AccessibilityActionSignalType& StatusChangedSignal(); /** * @brief This is emitted when accessibility action is received to move focus to the next @@ -247,7 +247,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionNextSignal(); + AccessibilityActionSignalType& ActionNextSignal(); /** * @brief This is emitted when accessibility action is received to move focus to the previous @@ -259,7 +259,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionPreviousSignal(); + AccessibilityActionSignalType& ActionPreviousSignal(); /** * @brief This is emitted when accessibility action is received to activate the current focused @@ -271,7 +271,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionActivateSignal(); + AccessibilityActionSignalType& ActionActivateSignal(); /** * @brief This is emitted when accessibility action is received to focus and read the actor @@ -283,7 +283,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionReadSignal(); + AccessibilityActionSignalType& ActionReadSignal(); /** * @brief This is emitted when accessibility action is received to focus and read the actor @@ -295,7 +295,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionOverSignal(); + AccessibilityActionSignalType& ActionOverSignal(); /** * @brief This is emitted when accessibility action is received to move focus to the next @@ -307,7 +307,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionReadNextSignal(); + AccessibilityActionSignalType& ActionReadNextSignal(); /** * @brief This is emitted when accessibility action is received to move focus to the previous @@ -319,7 +319,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionReadPreviousSignal(); + AccessibilityActionSignalType& ActionReadPreviousSignal(); /** * @brief This is emitted when accessibility action is received to change the value when the @@ -331,7 +331,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionUpSignal(); + AccessibilityActionSignalType& ActionUpSignal(); /** * @brief This is emitted when accessibility action is received to change the value when the @@ -343,7 +343,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionDownSignal(); + AccessibilityActionSignalType& ActionDownSignal(); /** * @brief This is emitted when accessibility action is received to clear the focus from the @@ -355,7 +355,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionClearFocusSignal(); + AccessibilityActionSignalType& ActionClearFocusSignal(); /** * @brief This is emitted when accessibility action is received to navigate back (by two @@ -367,7 +367,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionSignalV2& ActionBackSignal(); + AccessibilityActionSignalType& ActionBackSignal(); /** * @brief This is emitted when accessibility action is received to handle scroll event (by two @@ -379,7 +379,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - AccessibilityActionScrollSignalV2& ActionScrollSignal(); + AccessibilityActionScrollSignalType& ActionScrollSignal(); public: // Not intended for application developers diff --git a/adaptors/public-api/adaptor-framework/application.cpp b/adaptors/public-api/adaptor-framework/application.cpp index 642790b..d4a9056 100644 --- a/adaptors/public-api/adaptor-framework/application.cpp +++ b/adaptors/public-api/adaptor-framework/application.cpp @@ -151,37 +151,37 @@ float Application::GetStereoBase() const return Internal::Adaptor::GetImplementation(*this).GetStereoBase(); } -Application::AppSignalV2& Application::InitSignal() +Application::AppSignalType& Application::InitSignal() { return Internal::Adaptor::GetImplementation(*this).InitSignal(); } -Application::AppSignalV2& Application::TerminateSignal() +Application::AppSignalType& Application::TerminateSignal() { return Internal::Adaptor::GetImplementation(*this).TerminateSignal(); } -Application::AppSignalV2& Application::PauseSignal() +Application::AppSignalType& Application::PauseSignal() { return Internal::Adaptor::GetImplementation(*this).PauseSignal(); } -Application::AppSignalV2& Application::ResumeSignal() +Application::AppSignalType& Application::ResumeSignal() { return Internal::Adaptor::GetImplementation(*this).ResumeSignal(); } -Application::AppSignalV2& Application::ResetSignal() +Application::AppSignalType& Application::ResetSignal() { return Internal::Adaptor::GetImplementation(*this).ResetSignal(); } -Application::AppSignalV2& Application::ResizeSignal() +Application::AppSignalType& Application::ResizeSignal() { return Internal::Adaptor::GetImplementation(*this).ResizeSignal(); } -Application::AppSignalV2& Application::LanguageChangedSignal() +Application::AppSignalType& Application::LanguageChangedSignal() { return Internal::Adaptor::GetImplementation(*this).LanguageChangedSignal(); } diff --git a/adaptors/public-api/adaptor-framework/application.h b/adaptors/public-api/adaptor-framework/application.h index 37a3577..8d7c212 100644 --- a/adaptors/public-api/adaptor-framework/application.h +++ b/adaptors/public-api/adaptor-framework/application.h @@ -90,7 +90,7 @@ class DALI_IMPORT_API Application : public BaseHandle { public: - typedef SignalV2< void (Application&) > AppSignalV2; + typedef Signal< void (Application&) > AppSignalType; /** * Decides whether a Dali application window is opaque or transparent. @@ -290,40 +290,40 @@ public: // Signals * The user should connect to this signal to determine when they should initialise * their application. */ - AppSignalV2& InitSignal(); + AppSignalType& InitSignal(); /** * The user should connect to this signal to determine when they should terminate * their application */ - AppSignalV2& TerminateSignal(); + AppSignalType& TerminateSignal(); /** * The user should connect to this signal if they need to perform any special * activities when the application is about to be paused. */ - AppSignalV2& PauseSignal(); + AppSignalType& PauseSignal(); /** * The user should connect to this signal if they need to perform any special * activities when the application has resumed. */ - AppSignalV2& ResumeSignal(); + AppSignalType& ResumeSignal(); /** * This signal is sent when the system requires the user to reinitialise itself. */ - AppSignalV2& ResetSignal(); + AppSignalType& ResetSignal(); /** * This signal is emitted when the window the application is rendering on is resized. */ - AppSignalV2& ResizeSignal(); + AppSignalType& ResizeSignal(); /** * This signal is emitted when the language is changed on the device. */ - AppSignalV2& LanguageChangedSignal(); + AppSignalType& LanguageChangedSignal(); public: // Not intended for application developers /** diff --git a/adaptors/public-api/adaptor-framework/clipboard-event-notifier.cpp b/adaptors/public-api/adaptor-framework/clipboard-event-notifier.cpp index 4ca2b22..6707494 100644 --- a/adaptors/public-api/adaptor-framework/clipboard-event-notifier.cpp +++ b/adaptors/public-api/adaptor-framework/clipboard-event-notifier.cpp @@ -57,7 +57,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/adaptors/public-api/adaptor-framework/clipboard-event-notifier.h b/adaptors/public-api/adaptor-framework/clipboard-event-notifier.h index 857e0f3..d38344f 100644 --- a/adaptors/public-api/adaptor-framework/clipboard-event-notifier.h +++ b/adaptors/public-api/adaptor-framework/clipboard-event-notifier.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Dali { @@ -47,7 +47,7 @@ public: /** * @brief Clipboard event */ - typedef SignalV2< void ( ClipboardEventNotifier& ) > ClipboardEventSignalV2; + typedef Signal< void ( ClipboardEventNotifier& ) > ClipboardEventSignalType; /** * @brief Create an uninitialized handle. @@ -103,7 +103,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - ClipboardEventSignalV2& ContentSelectedSignal(); + ClipboardEventSignalType& ContentSelectedSignal(); public: // Not intended for application developers diff --git a/adaptors/public-api/adaptor-framework/drag-and-drop-detector.h b/adaptors/public-api/adaptor-framework/drag-and-drop-detector.h index a40cefc..b8f4472 100644 --- a/adaptors/public-api/adaptor-framework/drag-and-drop-detector.h +++ b/adaptors/public-api/adaptor-framework/drag-and-drop-detector.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace Dali { @@ -93,7 +93,7 @@ public: // Typedefs - typedef SignalV2< void ( DragAndDropDetector ) > DragAndDropSignal; ///< Drag & Drop signal + typedef Signal< void ( DragAndDropDetector ) > DragAndDropSignal; ///< Drag & Drop signal /** * @brief Create an uninitialized handle. diff --git a/adaptors/public-api/adaptor-framework/imf-manager.cpp b/adaptors/public-api/adaptor-framework/imf-manager.cpp index 5dcd038..1aef6da 100644 --- a/adaptors/public-api/adaptor-framework/imf-manager.cpp +++ b/adaptors/public-api/adaptor-framework/imf-manager.cpp @@ -93,12 +93,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/adaptors/public-api/adaptor-framework/imf-manager.h b/adaptors/public-api/adaptor-framework/imf-manager.h index b12beb5..2dc629d 100644 --- a/adaptors/public-api/adaptor-framework/imf-manager.h +++ b/adaptors/public-api/adaptor-framework/imf-manager.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -124,9 +124,9 @@ public: bool preeditResetRequired; ///< flag if preedit reset is required. }; - typedef SignalV2< void (ImfManager&) > ImfManagerSignalV2; ///< Keyboard actived signal + typedef Signal< void (ImfManager&) > ImfManagerSignalType; ///< Keyboard actived signal - typedef SignalV2< ImfCallbackData ( ImfManager&, const ImfEventData& ) > ImfEventSignalV2; ///< keyboard events + typedef Signal< ImfCallbackData ( ImfManager&, const ImfEventData& ) > ImfEventSignalType; ///< keyboard events public: @@ -221,14 +221,14 @@ public: * * @return The IMF Activated signal. */ - ImfManagerSignalV2& ActivatedSignal(); + ImfManagerSignalType& ActivatedSignal(); /** * @brief 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/adaptors/public-api/adaptor-framework/lifecycle-controller.cpp b/adaptors/public-api/adaptor-framework/lifecycle-controller.cpp index a5996f7..9935588 100644 --- a/adaptors/public-api/adaptor-framework/lifecycle-controller.cpp +++ b/adaptors/public-api/adaptor-framework/lifecycle-controller.cpp @@ -42,37 +42,37 @@ LifecycleController::~LifecycleController() { } -LifecycleController::LifecycleSignalV2& LifecycleController::InitSignal() +LifecycleController::LifecycleSignalType& LifecycleController::InitSignal() { return GetImplementation(*this).InitSignal(); } -LifecycleController::LifecycleSignalV2& LifecycleController::TerminateSignal() +LifecycleController::LifecycleSignalType& LifecycleController::TerminateSignal() { return GetImplementation(*this).TerminateSignal(); } -LifecycleController::LifecycleSignalV2& LifecycleController::PauseSignal() +LifecycleController::LifecycleSignalType& LifecycleController::PauseSignal() { return GetImplementation(*this).PauseSignal(); } -LifecycleController::LifecycleSignalV2& LifecycleController::ResumeSignal() +LifecycleController::LifecycleSignalType& LifecycleController::ResumeSignal() { return GetImplementation(*this).ResumeSignal(); } -LifecycleController::LifecycleSignalV2& LifecycleController::ResetSignal() +LifecycleController::LifecycleSignalType& LifecycleController::ResetSignal() { return GetImplementation(*this).ResetSignal(); } -LifecycleController::LifecycleSignalV2& LifecycleController::ResizeSignal() +LifecycleController::LifecycleSignalType& LifecycleController::ResizeSignal() { return GetImplementation(*this).ResizeSignal(); } -LifecycleController::LifecycleSignalV2& LifecycleController::LanguageChangedSignal() +LifecycleController::LifecycleSignalType& LifecycleController::LanguageChangedSignal() { return GetImplementation(*this).LanguageChangedSignal(); } diff --git a/adaptors/public-api/adaptor-framework/lifecycle-controller.h b/adaptors/public-api/adaptor-framework/lifecycle-controller.h index 0549a59..535bed3 100644 --- a/adaptors/public-api/adaptor-framework/lifecycle-controller.h +++ b/adaptors/public-api/adaptor-framework/lifecycle-controller.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -57,7 +57,7 @@ class DALI_IMPORT_API LifecycleController : public BaseHandle { public: // Typedefs - typedef SignalV2< void (void) > LifecycleSignalV2; ///< Lifecycle Signal type + typedef Signal< void (void) > LifecycleSignalType; ///< Lifecycle Signal type public: // Creation & Destruction @@ -95,40 +95,40 @@ public: // Signals * The user should connect to this signal to determine when they should initialise * their application. */ - LifecycleSignalV2& InitSignal(); + LifecycleSignalType& InitSignal(); /** * The user should connect to this signal to determine when they should terminate * their application */ - LifecycleSignalV2& TerminateSignal(); + LifecycleSignalType& TerminateSignal(); /** * The user should connect to this signal if they need to perform any special * activities when the application is about to be paused. */ - LifecycleSignalV2& PauseSignal(); + LifecycleSignalType& PauseSignal(); /** * The user should connect to this signal if they need to perform any special * activities when the application has resumed. */ - LifecycleSignalV2& ResumeSignal(); + LifecycleSignalType& ResumeSignal(); /** * This signal is sent when the system requires the user to reinitialise itself. */ - LifecycleSignalV2& ResetSignal(); + LifecycleSignalType& ResetSignal(); /** * This signal is emitted when the window the application is rendering on is resized. */ - LifecycleSignalV2& ResizeSignal(); + LifecycleSignalType& ResizeSignal(); /** * This signal is emitted when the language is changed on the device. */ - LifecycleSignalV2& LanguageChangedSignal(); + LifecycleSignalType& LanguageChangedSignal(); public: // Operators diff --git a/adaptors/public-api/adaptor-framework/orientation.cpp b/adaptors/public-api/adaptor-framework/orientation.cpp index 245b047..19c6f40 100644 --- a/adaptors/public-api/adaptor-framework/orientation.cpp +++ b/adaptors/public-api/adaptor-framework/orientation.cpp @@ -53,7 +53,7 @@ float Orientation::GetRadians() const return Internal::Adaptor::GetImplementation(*this).GetRadians(); } -Orientation::OrientationSignalV2& Orientation::ChangedSignal() +Orientation::OrientationSignalType& Orientation::ChangedSignal() { return Internal::Adaptor::GetImplementation(*this).ChangedSignal(); } diff --git a/adaptors/public-api/adaptor-framework/orientation.h b/adaptors/public-api/adaptor-framework/orientation.h index de70243..e1ee579 100644 --- a/adaptors/public-api/adaptor-framework/orientation.h +++ b/adaptors/public-api/adaptor-framework/orientation.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include -#include +#include #include namespace Dali @@ -46,7 +46,7 @@ class DALI_IMPORT_API Orientation : public BaseHandle { public: - typedef SignalV2< void (Orientation) > OrientationSignalV2; ///< Orientation changed signal type + typedef Signal< void (Orientation) > OrientationSignalType; ///< Orientation changed signal type /** * @brief Create an unintialized handle. @@ -105,7 +105,7 @@ public: * * @return The orientation change signal. */ - OrientationSignalV2& ChangedSignal(); + OrientationSignalType& ChangedSignal(); public: // Not intended for application developers /** diff --git a/adaptors/public-api/adaptor-framework/physical-keyboard.cpp b/adaptors/public-api/adaptor-framework/physical-keyboard.cpp index 5b07828..450a507 100644 --- a/adaptors/public-api/adaptor-framework/physical-keyboard.cpp +++ b/adaptors/public-api/adaptor-framework/physical-keyboard.cpp @@ -51,7 +51,7 @@ bool PhysicalKeyboard::IsAttached() const return GetImplementation( *this ).IsAttached(); } -PhysicalKeyboard::Signal& PhysicalKeyboard::StatusChangedSignal() +PhysicalKeyboard::PhysicalKeyboardSignalType& PhysicalKeyboard::StatusChangedSignal() { return GetImplementation( *this ).StatusChangedSignal(); } diff --git a/adaptors/public-api/adaptor-framework/physical-keyboard.h b/adaptors/public-api/adaptor-framework/physical-keyboard.h index 2ba0974..57753b1 100644 --- a/adaptors/public-api/adaptor-framework/physical-keyboard.h +++ b/adaptors/public-api/adaptor-framework/physical-keyboard.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -40,7 +40,7 @@ class DALI_IMPORT_API PhysicalKeyboard : public BaseHandle { public: - typedef SignalV2< void (PhysicalKeyboard) > Signal; + typedef Signal< void (PhysicalKeyboard) > PhysicalKeyboardSignalType; public: @@ -80,7 +80,7 @@ public: * @pre The PhysicalKeyboard has been initialized. * @return The status changed signal. */ - Signal& StatusChangedSignal(); + PhysicalKeyboardSignalType& StatusChangedSignal(); // Not intended for application developers diff --git a/adaptors/public-api/adaptor-framework/sound-player.cpp b/adaptors/public-api/adaptor-framework/sound-player.cpp index 9c45dab..70e38b1 100644 --- a/adaptors/public-api/adaptor-framework/sound-player.cpp +++ b/adaptors/public-api/adaptor-framework/sound-player.cpp @@ -47,7 +47,7 @@ void SoundPlayer::Stop(int handle) GetImplementation(*this).Stop(handle); } -SoundPlayer::SoundPlayFinishedSignalV2& SoundPlayer::SoundPlayFinishedSignal() +SoundPlayer::SoundPlayFinishedSignalType& SoundPlayer::SoundPlayFinishedSignal() { return GetImplementation(*this).SoundPlayFinishedSignal(); } diff --git a/adaptors/public-api/adaptor-framework/sound-player.h b/adaptors/public-api/adaptor-framework/sound-player.h index dc8a155..91e03c3 100644 --- a/adaptors/public-api/adaptor-framework/sound-player.h +++ b/adaptors/public-api/adaptor-framework/sound-player.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -40,7 +40,7 @@ class DALI_IMPORT_API SoundPlayer : public BaseHandle { public: - typedef SignalV2< void (SoundPlayer&) > SoundPlayFinishedSignalV2; ///< Sound play finished signal + typedef Signal< void (SoundPlayer&) > SoundPlayFinishedSignalType; ///< Sound play finished signal /** * @brief Create an uninitialized handle. @@ -88,7 +88,7 @@ public: * * @note The signal name is "sound-play-finished" if using BaseHandle::ConnectSignal() */ - SoundPlayFinishedSignalV2& SoundPlayFinishedSignal(); + SoundPlayFinishedSignalType& SoundPlayFinishedSignal(); public: // Not intended for application developers diff --git a/adaptors/public-api/adaptor-framework/style-monitor.cpp b/adaptors/public-api/adaptor-framework/style-monitor.cpp index cb2848b..ad79f6b 100644 --- a/adaptors/public-api/adaptor-framework/style-monitor.cpp +++ b/adaptors/public-api/adaptor-framework/style-monitor.cpp @@ -67,7 +67,7 @@ void StyleMonitor::SetTheme(const std::string& themFilePath) return GetImplementation(*this).SetTheme(themFilePath); } -StyleMonitor::StyleChangeSignalV2& StyleMonitor::StyleChangeSignal() +StyleMonitor::StyleChangeSignalType& StyleMonitor::StyleChangeSignal() { return GetImplementation(*this).StyleChangeSignal(); } diff --git a/adaptors/public-api/adaptor-framework/style-monitor.h b/adaptors/public-api/adaptor-framework/style-monitor.h index fdb6590..5de1792 100644 --- a/adaptors/public-api/adaptor-framework/style-monitor.h +++ b/adaptors/public-api/adaptor-framework/style-monitor.h @@ -23,7 +23,7 @@ #include #include -#include +#include // INTERNAL INCLUDES #include "style-change.h" @@ -50,7 +50,7 @@ class DALI_IMPORT_API StyleMonitor : public BaseHandle { public: // Typedefs - typedef SignalV2< void (StyleMonitor, StyleChange) > StyleChangeSignalV2; ///< StyleChange Signal type + typedef Signal< void (StyleMonitor, StyleChange) > StyleChangeSignalType; ///< StyleChange Signal type public: // Creation & Destruction @@ -132,7 +132,7 @@ public: // Signals * @endcode * @return The signal to connect to. */ - StyleChangeSignalV2& StyleChangeSignal(); + StyleChangeSignalType& StyleChangeSignal(); public: // Operators diff --git a/adaptors/public-api/adaptor-framework/tilt-sensor.cpp b/adaptors/public-api/adaptor-framework/tilt-sensor.cpp index e145091..7cdead6 100644 --- a/adaptors/public-api/adaptor-framework/tilt-sensor.cpp +++ b/adaptors/public-api/adaptor-framework/tilt-sensor.cpp @@ -70,7 +70,7 @@ Quaternion TiltSensor::GetRotation() const return GetImplementation(*this).GetRotation(); } -TiltSensor::TiltedSignalV2& TiltSensor::TiltedSignal() +TiltSensor::TiltedSignalType& TiltSensor::TiltedSignal() { return GetImplementation(*this).TiltedSignal(); } diff --git a/adaptors/public-api/adaptor-framework/tilt-sensor.h b/adaptors/public-api/adaptor-framework/tilt-sensor.h index f53c910..c8809cc 100644 --- a/adaptors/public-api/adaptor-framework/tilt-sensor.h +++ b/adaptors/public-api/adaptor-framework/tilt-sensor.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Dali { @@ -81,7 +81,7 @@ class DALI_IMPORT_API TiltSensor : public BaseHandle { public: - typedef SignalV2< void (const TiltSensor&) > TiltedSignalV2; + typedef Signal< void (const TiltSensor&) > TiltedSignalType; static const float DEFAULT_UPDATE_FREQUENCY; // 60 hertz @@ -159,7 +159,7 @@ public: * * @note The signal name is "tilted" if using BaseHandle::ConnectSignal() */ - TiltedSignalV2& TiltedSignal(); + TiltedSignalType& TiltedSignal(); /** * Set the sensor update frequency. diff --git a/adaptors/public-api/adaptor-framework/timer.cpp b/adaptors/public-api/adaptor-framework/timer.cpp index 5a1b940..f8e30a5 100644 --- a/adaptors/public-api/adaptor-framework/timer.cpp +++ b/adaptors/public-api/adaptor-framework/timer.cpp @@ -86,7 +86,7 @@ bool Timer::IsRunning() const return Internal::Adaptor::GetImplementation(*this).IsRunning(); } -Timer::TimerSignalV2& Timer::TickSignal() +Timer::TimerSignalType& Timer::TickSignal() { return Internal::Adaptor::GetImplementation(*this).TickSignal(); } diff --git a/adaptors/public-api/adaptor-framework/timer.h b/adaptors/public-api/adaptor-framework/timer.h index 1617af2..0d6da84 100644 --- a/adaptors/public-api/adaptor-framework/timer.h +++ b/adaptors/public-api/adaptor-framework/timer.h @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include -#include +#include namespace Dali { @@ -50,7 +50,7 @@ class DALI_IMPORT_API Timer : public BaseHandle { public: // Signal typedefs - typedef SignalV2< bool () > TimerSignalV2; ///< Timer finished signal callback type + typedef Signal< bool () > TimerSignalType; ///< Timer finished signal callback type public: // API @@ -145,7 +145,7 @@ public: // Signals * This return value is ignored for one-shot events, which will always stop after the first execution. * @returns The signal to Connect() with. */ - TimerSignalV2& TickSignal(); + TimerSignalType& TickSignal(); public: // Not intended for application developers explicit DALI_INTERNAL Timer(Internal::Adaptor::Timer* timer); diff --git a/adaptors/public-api/adaptor-framework/virtual-keyboard.cpp b/adaptors/public-api/adaptor-framework/virtual-keyboard.cpp index 4dfff4a..1d32500 100644 --- a/adaptors/public-api/adaptor-framework/virtual-keyboard.cpp +++ b/adaptors/public-api/adaptor-framework/virtual-keyboard.cpp @@ -72,17 +72,17 @@ void RotateTo(int angle) Internal::Adaptor::VirtualKeyboard::RotateTo(angle); } -StatusSignalV2& StatusChangedSignal() +StatusSignalType& StatusChangedSignal() { return Internal::Adaptor::VirtualKeyboard::StatusChangedSignal(); } -VoidSignalV2& ResizedSignal() +VoidSignalType& ResizedSignal() { return Internal::Adaptor::VirtualKeyboard::ResizedSignal(); } -VoidSignalV2& LanguageChangedSignal() +VoidSignalType& LanguageChangedSignal() { return Internal::Adaptor::VirtualKeyboard::LanguageChangedSignal(); } diff --git a/adaptors/public-api/adaptor-framework/virtual-keyboard.h b/adaptors/public-api/adaptor-framework/virtual-keyboard.h index 8930bfc..7e0c5f2 100644 --- a/adaptors/public-api/adaptor-framework/virtual-keyboard.h +++ b/adaptors/public-api/adaptor-framework/virtual-keyboard.h @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include #include namespace Dali @@ -35,8 +35,8 @@ namespace VirtualKeyboard // Types -typedef SignalV2< void () > VoidSignalV2; -typedef SignalV2< void (bool) > StatusSignalV2; +typedef Signal< void () > VoidSignalType; +typedef Signal< void (bool) > StatusSignalType; // Enumerations @@ -146,7 +146,7 @@ DALI_IMPORT_API TextDirection GetTextDirection(); * has just been hidden. * @return The signal to connect to. */ -DALI_IMPORT_API StatusSignalV2& StatusChangedSignal(); +DALI_IMPORT_API StatusSignalType& StatusChangedSignal(); /** * @brief Connect to this signal to be notified when the virtual keyboard is resized. @@ -158,7 +158,7 @@ DALI_IMPORT_API StatusSignalV2& StatusChangedSignal(); * User can get changed size by using GetSizeAndPosition() in the callback * @return The signal to connect to. */ -DALI_IMPORT_API VoidSignalV2& ResizedSignal(); +DALI_IMPORT_API VoidSignalType& ResizedSignal(); /** * @brief Connect to this signal to be notified when the virtual keyboard's language is changed. @@ -170,7 +170,7 @@ DALI_IMPORT_API VoidSignalV2& ResizedSignal(); * User can get the text direction of the language by calling GetTextDirection() in the callback. * @return The signal to connect to. */ -DALI_IMPORT_API VoidSignalV2& LanguageChangedSignal(); +DALI_IMPORT_API VoidSignalType& LanguageChangedSignal(); } // namespace VirtualKeyboard diff --git a/adaptors/public-api/adaptor-framework/window.cpp b/adaptors/public-api/adaptor-framework/window.cpp index 04eac7c..33d81d3 100644 --- a/adaptors/public-api/adaptor-framework/window.cpp +++ b/adaptors/public-api/adaptor-framework/window.cpp @@ -60,7 +60,7 @@ void Window::ShowIndicator( IndicatorVisibleMode visibleMode ) GetImplementation(*this).ShowIndicator( visibleMode ); } -Window::IndicatorSignalV2& Window::IndicatorVisibilityChangedSignal() +Window::IndicatorSignalType& Window::IndicatorVisibilityChangedSignal() { return GetImplementation(*this).IndicatorVisibilityChangedSignal(); } diff --git a/adaptors/public-api/adaptor-framework/window.h b/adaptors/public-api/adaptor-framework/window.h index f360f08..c7f2511 100644 --- a/adaptors/public-api/adaptor-framework/window.h +++ b/adaptors/public-api/adaptor-framework/window.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace Dali { @@ -51,7 +51,7 @@ class Orientation; class DALI_IMPORT_API Window : public BaseHandle { public: - typedef SignalV2< void (bool) > IndicatorSignalV2; + typedef Signal< void (bool) > IndicatorSignalType; public: @@ -248,7 +248,7 @@ public: // Signals /** * The user should connect to this signal to get a timing when indicator was shown / hidden. */ - IndicatorSignalV2& IndicatorVisibilityChangedSignal(); + IndicatorSignalType& IndicatorVisibilityChangedSignal(); public: // Not intended for application developers /** diff --git a/adaptors/tizen/accessibility-manager-impl-tizen.cpp b/adaptors/tizen/accessibility-manager-impl-tizen.cpp index e561fb4..fad28b3 100644 --- a/adaptors/tizen/accessibility-manager-impl-tizen.cpp +++ b/adaptors/tizen/accessibility-manager-impl-tizen.cpp @@ -134,9 +134,9 @@ bool AccessibilityManager::HandleActionClearFocusEvent() */ if ( !mIndicatorFocused ) { - if( !mActionClearFocusSignalV2.Empty() ) + if( !mActionClearFocusSignal.Empty() ) { - mActionClearFocusSignalV2.Emit( handle ); + mActionClearFocusSignal.Emit( handle ); } } @@ -165,9 +165,9 @@ bool AccessibilityManager::HandleActionScrollEvent(const TouchPoint& point, unsi */ if ( !mIndicatorFocused ) { - if( !mActionScrollSignalV2.Empty() ) + if( !mActionScrollSignal.Empty() ) { - mActionScrollSignalV2.Emit( handle, event ); + mActionScrollSignal.Emit( handle, event ); } } @@ -213,9 +213,9 @@ bool AccessibilityManager::HandleActionBackEvent() */ if ( !mIndicatorFocused ) { - if( !mActionBackSignalV2.Empty() ) + if( !mActionBackSignal.Empty() ) { - mActionBackSignalV2.Emit( handle ); + mActionBackSignal.Emit( handle ); } } @@ -252,7 +252,7 @@ void AccessibilityManager::EnableAccessibility() //emit status changed signal Dali::AccessibilityManager handle( this ); - mStatusChangedSignalV2.Emit( handle ); + mStatusChangedSignal.Emit( handle ); } } @@ -269,7 +269,7 @@ void AccessibilityManager::DisableAccessibility() //emit status changed signal Dali::AccessibilityManager handle( this ); - mStatusChangedSignalV2.Emit( handle ); + mStatusChangedSignal.Emit( handle ); // Destroy the TtsPlayer if exists. if ( Adaptor::IsAvailable() ) diff --git a/adaptors/tizen/tilt-sensor-impl-tizen.cpp b/adaptors/tizen/tilt-sensor-impl-tizen.cpp index 23807ad..a9be264 100644 --- a/adaptors/tizen/tilt-sensor-impl-tizen.cpp +++ b/adaptors/tizen/tilt-sensor-impl-tizen.cpp @@ -156,9 +156,9 @@ Quaternion TiltSensor::GetRotation() const return mRotation; } -TiltSensor::TiltedSignalV2& TiltSensor::TiltedSignal() +TiltSensor::TiltedSignalType& TiltSensor::TiltedSignal() { - return mTiltedSignalV2; + return mTiltedSignal; } void TiltSensor::SetUpdateFrequency( float frequencyHertz ) @@ -298,10 +298,10 @@ bool TiltSensor::Update() mPitch = newPitch; mRotation = newRotation; - if ( !mTiltedSignalV2.Empty() ) + if ( !mTiltedSignal.Empty() ) { Dali::TiltSensor handle( this ); - mTiltedSignalV2.Emit( handle ); + mTiltedSignal.Emit( handle ); } } diff --git a/adaptors/tizen/tilt-sensor-impl.h b/adaptors/tizen/tilt-sensor-impl.h index 20c68d9..599b169 100644 --- a/adaptors/tizen/tilt-sensor-impl.h +++ b/adaptors/tizen/tilt-sensor-impl.h @@ -42,7 +42,7 @@ class TiltSensor : public Dali::BaseObject { public: - typedef Dali::TiltSensor::TiltedSignalV2 TiltedSignalV2; + typedef Dali::TiltSensor::TiltedSignalType TiltedSignalType; /** * Create a TiltSensor. @@ -89,7 +89,7 @@ public: /** * @copydoc Dali::TiltSensor::TiltedSignal() */ - TiltedSignalV2& TiltedSignal(); + TiltedSignalType& TiltedSignal(); /** * @copydoc Dali::TiltSensor::SetUpdateFrequency() @@ -162,7 +162,7 @@ private: std::deque mRollValues; std::deque mPitchValues; - TiltedSignalV2 mTiltedSignalV2; + TiltedSignalType mTiltedSignal; }; } // namespace Adaptor diff --git a/adaptors/ubuntu/accessibility-manager-impl-ubuntu.cpp b/adaptors/ubuntu/accessibility-manager-impl-ubuntu.cpp index 278bf6c..e70db6a 100644 --- a/adaptors/ubuntu/accessibility-manager-impl-ubuntu.cpp +++ b/adaptors/ubuntu/accessibility-manager-impl-ubuntu.cpp @@ -115,9 +115,9 @@ bool AccessibilityManager::HandleActionClearFocusEvent() */ if ( !mIndicatorFocused ) { - if( !mActionClearFocusSignalV2.Empty() ) + if( !mActionClearFocusSignal.Empty() ) { - mActionClearFocusSignalV2.Emit( handle ); + mActionClearFocusSignal.Emit( handle ); } } @@ -146,9 +146,9 @@ bool AccessibilityManager::HandleActionScrollEvent(const TouchPoint& point, unsi */ if ( !mIndicatorFocused ) { - if( !mActionScrollSignalV2.Empty() ) + if( !mActionScrollSignal.Empty() ) { - mActionScrollSignalV2.Emit( handle, event ); + mActionScrollSignal.Emit( handle, event ); } } @@ -194,9 +194,9 @@ bool AccessibilityManager::HandleActionBackEvent() */ if ( !mIndicatorFocused ) { - if( !mActionBackSignalV2.Empty() ) + if( !mActionBackSignal.Empty() ) { - mActionBackSignalV2.Emit( handle ); + mActionBackSignal.Emit( handle ); } } @@ -233,7 +233,7 @@ void AccessibilityManager::EnableAccessibility() //emit status changed signal Dali::AccessibilityManager handle( this ); - mStatusChangedSignalV2.Emit( handle ); + mStatusChangedSignal.Emit( handle ); } } @@ -250,7 +250,7 @@ void AccessibilityManager::DisableAccessibility() //emit status changed signal Dali::AccessibilityManager handle( this ); - mStatusChangedSignalV2.Emit( handle ); + mStatusChangedSignal.Emit( handle ); // Destroy the TtsPlayer if exists. if ( Adaptor::IsAvailable() ) @@ -307,9 +307,9 @@ bool AccessibilityManager::HandleActionNextEvent(bool allowEndFeedback) */ if( !mIndicatorFocused ) { - if( !mActionNextSignalV2.Empty() ) + if( !mActionNextSignal.Empty() ) { - mActionNextSignalV2.Emit( handle ); + mActionNextSignal.Emit( handle ); } } @@ -335,9 +335,9 @@ bool AccessibilityManager::HandleActionPreviousEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionPreviousSignalV2.Empty() ) + if( !mActionPreviousSignal.Empty() ) { - mActionPreviousSignalV2.Emit( handle ); + mActionPreviousSignal.Emit( handle ); } } @@ -363,9 +363,9 @@ bool AccessibilityManager::HandleActionActivateEvent() */ if ( !mIndicatorFocused ) { - if( !mActionActivateSignalV2.Empty() ) + if( !mActionActivateSignal.Empty() ) { - mActionActivateSignalV2.Emit( handle ); + mActionActivateSignal.Emit( handle ); } } @@ -438,9 +438,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y, */ if( !mIndicatorFocused ) { - if ( !mActionReadSignalV2.Empty() ) + if ( !mActionReadSignal.Empty() ) { - mActionReadSignalV2.Emit( handle ); + mActionReadSignal.Emit( handle ); } } } @@ -452,9 +452,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y, */ if( !mIndicatorFocused ) { - if ( !mActionOverSignalV2.Empty() ) + if ( !mActionOverSignal.Empty() ) { - mActionOverSignalV2.Emit( handle ); + mActionOverSignal.Emit( handle ); } } } @@ -482,9 +482,9 @@ bool AccessibilityManager::HandleActionReadNextEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionReadNextSignalV2.Empty() ) + if( !mActionReadNextSignal.Empty() ) { - mActionReadNextSignalV2.Emit( handle ); + mActionReadNextSignal.Emit( handle ); } } @@ -510,9 +510,9 @@ bool AccessibilityManager::HandleActionReadPreviousEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionReadPreviousSignalV2.Empty() ) + if( !mActionReadPreviousSignal.Empty() ) { - mActionReadPreviousSignalV2.Emit( handle ); + mActionReadPreviousSignal.Emit( handle ); } } @@ -538,9 +538,9 @@ bool AccessibilityManager::HandleActionUpEvent() */ if ( !mIndicatorFocused ) { - if( !mActionUpSignalV2.Empty() ) + if( !mActionUpSignal.Empty() ) { - mActionUpSignalV2.Emit( handle ); + mActionUpSignal.Emit( handle ); } } @@ -566,9 +566,9 @@ bool AccessibilityManager::HandleActionDownEvent() */ if ( !mIndicatorFocused ) { - if( !mActionDownSignalV2.Empty() ) + if( !mActionDownSignal.Empty() ) { - mActionDownSignalV2.Emit( handle ); + mActionDownSignal.Emit( handle ); } } diff --git a/adaptors/ubuntu/accessibility-manager-impl.h b/adaptors/ubuntu/accessibility-manager-impl.h index 0b2002d..c2f20b7 100644 --- a/adaptors/ubuntu/accessibility-manager-impl.h +++ b/adaptors/ubuntu/accessibility-manager-impl.h @@ -49,8 +49,8 @@ class AccessibilityManager : public Dali::BaseObject { public: - typedef Dali::AccessibilityManager::AccessibilityActionSignalV2 AccessibilityActionSignalV2; - typedef Dali::AccessibilityManager::AccessibilityActionScrollSignalV2 AccessibilityActionScrollSignalV2; + typedef Dali::AccessibilityManager::AccessibilityActionSignalType AccessibilityActionSignalType; + typedef Dali::AccessibilityManager::AccessibilityActionScrollSignalType AccessibilityActionScrollSignalType; // Creation @@ -179,105 +179,105 @@ public: // Signals /** * @copydoc Dali::AccessibilityManager::StatusChangedSignal */ - AccessibilityActionSignalV2& StatusChangedSignal() + AccessibilityActionSignalType& StatusChangedSignal() { - return mStatusChangedSignalV2; + return mStatusChangedSignal; } /** * @copydoc Dali::AccessibilityManager::ActionNextSignal */ - AccessibilityActionSignalV2& ActionNextSignal() + AccessibilityActionSignalType& ActionNextSignal() { - return mActionNextSignalV2; + return mActionNextSignal; } /** * @copydoc Dali::AccessibilityManager::ActionPreviousSignal */ - AccessibilityActionSignalV2& ActionPreviousSignal() + AccessibilityActionSignalType& ActionPreviousSignal() { - return mActionPreviousSignalV2; + return mActionPreviousSignal; } /** * @copydoc Dali::AccessibilityManager::ActionActivateSignal */ - AccessibilityActionSignalV2& ActionActivateSignal() + AccessibilityActionSignalType& ActionActivateSignal() { - return mActionActivateSignalV2; + return mActionActivateSignal; } /** * @copydoc Dali::AccessibilityManager::ActionOverSignal */ - AccessibilityActionSignalV2& ActionOverSignal() + AccessibilityActionSignalType& ActionOverSignal() { - return mActionOverSignalV2; + return mActionOverSignal; } /** * @copydoc Dali::AccessibilityManager::ActionReadSignal */ - AccessibilityActionSignalV2& ActionReadSignal() + AccessibilityActionSignalType& ActionReadSignal() { - return mActionReadSignalV2; + return mActionReadSignal; } /** * @copydoc Dali::AccessibilityManager::ActionReadNextSignal */ - AccessibilityActionSignalV2& ActionReadNextSignal() + AccessibilityActionSignalType& ActionReadNextSignal() { - return mActionReadNextSignalV2; + return mActionReadNextSignal; } /** * @copydoc Dali::AccessibilityManager::ActionReadPreviousSignal */ - AccessibilityActionSignalV2& ActionReadPreviousSignal() + AccessibilityActionSignalType& ActionReadPreviousSignal() { - return mActionReadPreviousSignalV2; + return mActionReadPreviousSignal; } /** * @copydoc Dali::AccessibilityManager::ActionUpSignal */ - AccessibilityActionSignalV2& ActionUpSignal() + AccessibilityActionSignalType& ActionUpSignal() { - return mActionUpSignalV2; + return mActionUpSignal; } /** * @copydoc Dali::AccessibilityManager::ActionDownSignal */ - AccessibilityActionSignalV2& ActionDownSignal() + AccessibilityActionSignalType& ActionDownSignal() { - return mActionDownSignalV2; + return mActionDownSignal; } /** * @copydoc Dali::AccessibilityManager::ActionClearFocusSignal */ - AccessibilityActionSignalV2& ActionClearFocusSignal() + AccessibilityActionSignalType& ActionClearFocusSignal() { - return mActionClearFocusSignalV2; + return mActionClearFocusSignal; } /** * @copydoc Dali::AccessibilityManager::ActionBackSignal */ - AccessibilityActionSignalV2& ActionBackSignal() + AccessibilityActionSignalType& ActionBackSignal() { - return mActionBackSignalV2; + return mActionBackSignal; } /** * @copydoc Dali::AccessibilityManager::ActionScrollSignal */ - AccessibilityActionScrollSignalV2& ActionScrollSignal() + AccessibilityActionScrollSignalType& ActionScrollSignal() { - return mActionScrollSignalV2; + return mActionScrollSignal; } private: @@ -307,19 +307,19 @@ private: Indicator* mIndicator; ///< The indicator bool mIndicatorFocused; ///< Whether the Indicator is focused - AccessibilityActionSignalV2 mStatusChangedSignalV2; - AccessibilityActionSignalV2 mActionNextSignalV2; - AccessibilityActionSignalV2 mActionPreviousSignalV2; - AccessibilityActionSignalV2 mActionActivateSignalV2; - AccessibilityActionSignalV2 mActionOverSignalV2; - AccessibilityActionSignalV2 mActionReadSignalV2; - AccessibilityActionSignalV2 mActionReadNextSignalV2; - AccessibilityActionSignalV2 mActionReadPreviousSignalV2; - AccessibilityActionSignalV2 mActionUpSignalV2; - AccessibilityActionSignalV2 mActionDownSignalV2; - AccessibilityActionSignalV2 mActionClearFocusSignalV2; - AccessibilityActionSignalV2 mActionBackSignalV2; - AccessibilityActionScrollSignalV2 mActionScrollSignalV2; + AccessibilityActionSignalType mStatusChangedSignal; + AccessibilityActionSignalType mActionNextSignal; + AccessibilityActionSignalType mActionPreviousSignal; + AccessibilityActionSignalType mActionActivateSignal; + AccessibilityActionSignalType mActionOverSignal; + AccessibilityActionSignalType mActionReadSignal; + AccessibilityActionSignalType mActionReadNextSignal; + AccessibilityActionSignalType mActionReadPreviousSignal; + AccessibilityActionSignalType mActionUpSignal; + AccessibilityActionSignalType mActionDownSignal; + AccessibilityActionSignalType mActionClearFocusSignal; + AccessibilityActionSignalType mActionBackSignal; + AccessibilityActionScrollSignalType mActionScrollSignal; public: diff --git a/adaptors/ubuntu/tilt-sensor-impl-ubuntu.cpp b/adaptors/ubuntu/tilt-sensor-impl-ubuntu.cpp index cd373d5..491c1f7 100644 --- a/adaptors/ubuntu/tilt-sensor-impl-ubuntu.cpp +++ b/adaptors/ubuntu/tilt-sensor-impl-ubuntu.cpp @@ -147,9 +147,9 @@ Quaternion TiltSensor::GetRotation() const return mRotation; } -TiltSensor::TiltedSignalV2& TiltSensor::TiltedSignal() +TiltSensor::TiltedSignalType& TiltSensor::TiltedSignal() { - return mTiltedSignalV2; + return mTiltedSignal; } void TiltSensor::SetUpdateFrequency( float frequencyHertz ) @@ -227,10 +227,10 @@ bool TiltSensor::Update() mPitch = newPitch; mRotation = newRotation; - if ( !mTiltedSignalV2.Empty() ) + if ( !mTiltedSignal.Empty() ) { Dali::TiltSensor handle( this ); - mTiltedSignalV2.Emit( handle ); + mTiltedSignal.Emit( handle ); } } diff --git a/adaptors/ubuntu/tilt-sensor-impl.h b/adaptors/ubuntu/tilt-sensor-impl.h index 20c68d9..599b169 100644 --- a/adaptors/ubuntu/tilt-sensor-impl.h +++ b/adaptors/ubuntu/tilt-sensor-impl.h @@ -42,7 +42,7 @@ class TiltSensor : public Dali::BaseObject { public: - typedef Dali::TiltSensor::TiltedSignalV2 TiltedSignalV2; + typedef Dali::TiltSensor::TiltedSignalType TiltedSignalType; /** * Create a TiltSensor. @@ -89,7 +89,7 @@ public: /** * @copydoc Dali::TiltSensor::TiltedSignal() */ - TiltedSignalV2& TiltedSignal(); + TiltedSignalType& TiltedSignal(); /** * @copydoc Dali::TiltSensor::SetUpdateFrequency() @@ -162,7 +162,7 @@ private: std::deque mRollValues; std::deque mPitchValues; - TiltedSignalV2 mTiltedSignalV2; + TiltedSignalType mTiltedSignal; }; } // namespace Adaptor diff --git a/adaptors/wayland/accessibility-manager-impl-wl.cpp b/adaptors/wayland/accessibility-manager-impl-wl.cpp index 0147608..0232c8b 100644 --- a/adaptors/wayland/accessibility-manager-impl-wl.cpp +++ b/adaptors/wayland/accessibility-manager-impl-wl.cpp @@ -49,9 +49,9 @@ bool AccessibilityManager::HandleActionNextEvent(bool allowEndFeedback) */ if( !mIndicatorFocused ) { - if( !mActionNextSignalV2.Empty() ) + if( !mActionNextSignal.Empty() ) { - mActionNextSignalV2.Emit( handle ); + mActionNextSignal.Emit( handle ); } } @@ -77,9 +77,9 @@ bool AccessibilityManager::HandleActionPreviousEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionPreviousSignalV2.Empty() ) + if( !mActionPreviousSignal.Empty() ) { - mActionPreviousSignalV2.Emit( handle ); + mActionPreviousSignal.Emit( handle ); } } @@ -105,9 +105,9 @@ bool AccessibilityManager::HandleActionActivateEvent() */ if ( !mIndicatorFocused ) { - if( !mActionActivateSignalV2.Empty() ) + if( !mActionActivateSignal.Empty() ) { - mActionActivateSignalV2.Emit( handle ); + mActionActivateSignal.Emit( handle ); } } @@ -182,9 +182,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y, */ if( !mIndicatorFocused ) { - if ( !mActionReadSignalV2.Empty() ) + if ( !mActionReadSignal.Empty() ) { - mActionReadSignalV2.Emit( handle ); + mActionReadSignal.Emit( handle ); } } } @@ -196,9 +196,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y, */ if( !mIndicatorFocused ) { - if ( !mActionOverSignalV2.Empty() ) + if ( !mActionOverSignal.Empty() ) { - mActionOverSignalV2.Emit( handle ); + mActionOverSignal.Emit( handle ); } } } @@ -226,9 +226,9 @@ bool AccessibilityManager::HandleActionReadNextEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionReadNextSignalV2.Empty() ) + if( !mActionReadNextSignal.Empty() ) { - mActionReadNextSignalV2.Emit( handle ); + mActionReadNextSignal.Emit( handle ); } } @@ -254,9 +254,9 @@ bool AccessibilityManager::HandleActionReadPreviousEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionReadPreviousSignalV2.Empty() ) + if( !mActionReadPreviousSignal.Empty() ) { - mActionReadPreviousSignalV2.Emit( handle ); + mActionReadPreviousSignal.Emit( handle ); } } @@ -282,9 +282,9 @@ bool AccessibilityManager::HandleActionUpEvent() */ if ( !mIndicatorFocused ) { - if( !mActionUpSignalV2.Empty() ) + if( !mActionUpSignal.Empty() ) { - mActionUpSignalV2.Emit( handle ); + mActionUpSignal.Emit( handle ); } } @@ -310,9 +310,9 @@ bool AccessibilityManager::HandleActionDownEvent() */ if ( !mIndicatorFocused ) { - if( !mActionDownSignalV2.Empty() ) + if( !mActionDownSignal.Empty() ) { - mActionDownSignalV2.Emit( handle ); + mActionDownSignal.Emit( handle ); } } diff --git a/adaptors/wayland/imf-manager-impl.h b/adaptors/wayland/imf-manager-impl.h index 1de693c..11e4059 100644 --- a/adaptors/wayland/imf-manager-impl.h +++ b/adaptors/wayland/imf-manager-impl.h @@ -44,8 +44,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: @@ -156,12 +156,12 @@ public: // Signals /** * @copydoc Dali::ImfManager::ActivatedSignal() */ - ImfManagerSignalV2& ActivatedSignal() { return mActivatedSignalV2; } + ImfManagerSignalType& ActivatedSignal() { return mActivatedSignal; } /** * @copydoc Dali::ImfManager::EventReceivedSignal() */ - ImfEventSignalV2& EventReceivedSignal() { return mEventSignalV2; } + ImfEventSignalType& EventReceivedSignal() { return mEventSignal; } protected: @@ -191,8 +191,8 @@ private: std::vector mKeyEvents; ///< Stores key events to be sent from idle call-back. - ImfManagerSignalV2 mActivatedSignalV2; - ImfEventSignalV2 mEventSignalV2; + ImfManagerSignalType mActivatedSignal; + ImfEventSignalType mEventSignal; public: diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp index 528a9bc..ec119e7 100644 --- a/adaptors/wayland/window-impl-wl.cpp +++ b/adaptors/wayland/window-impl-wl.cpp @@ -312,7 +312,7 @@ void Window::IndicatorClosed( Indicator* indicator ) void Window::IndicatorVisibilityChanged(bool isVisible) { - mIndicatorVisibilityChangedSignalV2.Emit(isVisible); + mIndicatorVisibilityChangedSignal.Emit(isVisible); } void Window::SetIndicatorActorRotation() diff --git a/adaptors/x11/accessibility-manager-impl-x.cpp b/adaptors/x11/accessibility-manager-impl-x.cpp index 97ff5dd..dd3c781 100644 --- a/adaptors/x11/accessibility-manager-impl-x.cpp +++ b/adaptors/x11/accessibility-manager-impl-x.cpp @@ -56,9 +56,9 @@ bool AccessibilityManager::HandleActionNextEvent(bool allowEndFeedback) */ if( !mIndicatorFocused ) { - if( !mActionNextSignalV2.Empty() ) + if( !mActionNextSignal.Empty() ) { - mActionNextSignalV2.Emit( handle ); + mActionNextSignal.Emit( handle ); } } @@ -91,9 +91,9 @@ bool AccessibilityManager::HandleActionPreviousEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionPreviousSignalV2.Empty() ) + if( !mActionPreviousSignal.Empty() ) { - mActionPreviousSignalV2.Emit( handle ); + mActionPreviousSignal.Emit( handle ); } } @@ -126,9 +126,9 @@ bool AccessibilityManager::HandleActionActivateEvent() */ if ( !mIndicatorFocused ) { - if( !mActionActivateSignalV2.Empty() ) + if( !mActionActivateSignal.Empty() ) { - mActionActivateSignalV2.Emit( handle ); + mActionActivateSignal.Emit( handle ); } } @@ -232,9 +232,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y, */ if( !mIndicatorFocused ) { - if ( !mActionReadSignalV2.Empty() ) + if ( !mActionReadSignal.Empty() ) { - mActionReadSignalV2.Emit( handle ); + mActionReadSignal.Emit( handle ); } } } @@ -246,9 +246,9 @@ bool AccessibilityManager::HandleActionReadEvent(unsigned int x, unsigned int y, */ if( !mIndicatorFocused ) { - if ( !mActionOverSignalV2.Empty() ) + if ( !mActionOverSignal.Empty() ) { - mActionOverSignalV2.Emit( handle ); + mActionOverSignal.Emit( handle ); } } } @@ -276,9 +276,9 @@ bool AccessibilityManager::HandleActionReadNextEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionReadNextSignalV2.Empty() ) + if( !mActionReadNextSignal.Empty() ) { - mActionReadNextSignalV2.Emit( handle ); + mActionReadNextSignal.Emit( handle ); } } @@ -311,9 +311,9 @@ bool AccessibilityManager::HandleActionReadPreviousEvent(bool allowEndFeedback) */ if ( !mIndicatorFocused ) { - if( !mActionReadPreviousSignalV2.Empty() ) + if( !mActionReadPreviousSignal.Empty() ) { - mActionReadPreviousSignalV2.Emit( handle ); + mActionReadPreviousSignal.Emit( handle ); } } @@ -346,9 +346,9 @@ bool AccessibilityManager::HandleActionUpEvent() */ if ( !mIndicatorFocused ) { - if( !mActionUpSignalV2.Empty() ) + if( !mActionUpSignal.Empty() ) { - mActionUpSignalV2.Emit( handle ); + mActionUpSignal.Emit( handle ); } } @@ -381,9 +381,9 @@ bool AccessibilityManager::HandleActionDownEvent() */ if ( !mIndicatorFocused ) { - if( !mActionDownSignalV2.Empty() ) + if( !mActionDownSignal.Empty() ) { - mActionDownSignalV2.Emit( handle ); + mActionDownSignal.Emit( handle ); } } diff --git a/adaptors/x11/imf-manager-impl-x.cpp b/adaptors/x11/imf-manager-impl-x.cpp index cdbaffe..8bbade6 100644 --- a/adaptors/x11/imf-manager-impl-x.cpp +++ b/adaptors/x11/imf-manager-impl-x.cpp @@ -283,7 +283,7 @@ void ImfManager::Activate() // emit keyboard activated signal Dali::ImfManager handle( this ); - mActivatedSignalV2.Emit( handle ); + mActivatedSignal.Emit( handle ); } } @@ -394,7 +394,7 @@ void ImfManager::PreEditChanged( void *, Ecore_IMF_Context *imfContext, void *ev Dali::ImfManager handle( this ); Dali::ImfManager::ImfEventData imfEventData ( Dali::ImfManager::PREEDIT, keyString, cursorPosition, numberOfChars ); - Dali::ImfManager::ImfCallbackData callbackData = mEventSignalV2.Emit( handle, imfEventData ); + Dali::ImfManager::ImfCallbackData callbackData = mEventSignal.Emit( handle, imfEventData ); if ( callbackData.update ) { @@ -424,7 +424,7 @@ void ImfManager::CommitReceived( void *, Ecore_IMF_Context *imfContext, void *ev Dali::ImfManager handle( this ); Dali::ImfManager::ImfEventData imfEventData ( Dali::ImfManager::COMMIT, keyString, cursorOffset, numberOfChars ); - Dali::ImfManager::ImfCallbackData callbackData = mEventSignalV2.Emit( handle, imfEventData ); + Dali::ImfManager::ImfCallbackData callbackData = mEventSignal.Emit( handle, imfEventData ); if ( callbackData.update ) { @@ -451,7 +451,7 @@ Eina_Bool ImfManager::RetrieveSurrounding( void *data, Ecore_IMF_Context *imfCon Dali::ImfManager::ImfEventData imfData ( Dali::ImfManager::GETSURROUNDING , keyString, cursorOffset, numberOfChars ); Dali::ImfManager handle( this ); - mEventSignalV2.Emit( handle, imfData ); + mEventSignal.Emit( handle, imfData ); if ( text ) { @@ -494,7 +494,7 @@ void ImfManager::DeleteSurrounding( void *data, Ecore_IMF_Context *imfContext, v Dali::ImfManager::ImfEventData imfData ( Dali::ImfManager::DELETESURROUNDING , keyString, cursorOffset, numberOfChars ); Dali::ImfManager handle( this ); - mEventSignalV2.Emit( handle, imfData ); + mEventSignal.Emit( handle, imfData ); } } diff --git a/adaptors/x11/imf-manager-impl.h b/adaptors/x11/imf-manager-impl.h index 0e2de67..ced5124 100644 --- a/adaptors/x11/imf-manager-impl.h +++ b/adaptors/x11/imf-manager-impl.h @@ -43,8 +43,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: @@ -161,12 +161,12 @@ public: // Signals /** * @copydoc Dali::ImfManager::ActivatedSignal() */ - ImfManagerSignalV2& ActivatedSignal() { return mActivatedSignalV2; } + ImfManagerSignalType& ActivatedSignal() { return mActivatedSignal; } /** * @copydoc Dali::ImfManager::EventReceivedSignal() */ - ImfEventSignalV2& EventReceivedSignal() { return mEventSignalV2; } + ImfEventSignalType& EventReceivedSignal() { return mEventSignal; } protected: @@ -202,8 +202,8 @@ private: std::vector mKeyEvents; ///< Stores key events to be sent from idle call-back. - ImfManagerSignalV2 mActivatedSignalV2; - ImfEventSignalV2 mEventSignalV2; + ImfManagerSignalType mActivatedSignal; + ImfEventSignalType mEventSignal; public: diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp index b617086..a2d051f 100644 --- a/adaptors/x11/window-impl-x.cpp +++ b/adaptors/x11/window-impl-x.cpp @@ -489,7 +489,7 @@ void Window::IndicatorClosed( Indicator* indicator ) void Window::IndicatorVisibilityChanged(bool isVisible) { - mIndicatorVisibilityChangedSignalV2.Emit(isVisible); + mIndicatorVisibilityChangedSignal.Emit(isVisible); } void Window::SetIndicatorActorRotation()