From 302b126321bd660aa11f2c934d3da878e8fffff2 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Fri, 10 Jun 2016 18:58:35 +0100 Subject: [PATCH 1/1] Remove unnecessary SlotDelegate from Feedback Change-Id: I5df8ee195c5d4642221c74d38cc31c9a98387ed0 --- dali-toolkit/internal/feedback/feedback-style.cpp | 1 - dali-toolkit/internal/feedback/feedback-style.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/dali-toolkit/internal/feedback/feedback-style.cpp b/dali-toolkit/internal/feedback/feedback-style.cpp index 184f37a..b3d867c 100644 --- a/dali-toolkit/internal/feedback/feedback-style.cpp +++ b/dali-toolkit/internal/feedback/feedback-style.cpp @@ -103,7 +103,6 @@ struct FeedbackStyleInfo static const FeedbackStyleInfo DEFAULT_FEEDBACK_STYLE_INFO; FeedbackStyle::FeedbackStyle() -: mConnections( this ) { mFeedback = Dali::FeedbackPlayer::Get(); diff --git a/dali-toolkit/internal/feedback/feedback-style.h b/dali-toolkit/internal/feedback/feedback-style.h index 0f8d270..bf6ea3f 100644 --- a/dali-toolkit/internal/feedback/feedback-style.h +++ b/dali-toolkit/internal/feedback/feedback-style.h @@ -149,8 +149,6 @@ private: std::map mFeedbackPatternLut; ///< Used to convert feedback pattern strings into enumerated values std::map mStyleInfoLut; ///< Converts key strings into style information - - SlotDelegate< FeedbackStyle > mConnections; ///< Maintains the connections to the Object registry. }; } // namespace Toolkit -- 2.7.4