X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffeedback%2Ffeedback-style.h;h=2167acea0eba5e07621d58d57ab9905a6dda2c6a;hp=0f8d270f877d75fbf3aee28e6781c5bb3cf8c83d;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=5cc78df05271786e4c1c18a0eaab32e05612df9d diff --git a/dali-toolkit/internal/feedback/feedback-style.h b/dali-toolkit/internal/feedback/feedback-style.h index 0f8d270..2167ace 100644 --- a/dali-toolkit/internal/feedback/feedback-style.h +++ b/dali-toolkit/internal/feedback/feedback-style.h @@ -1,8 +1,8 @@ -#ifndef __DALI_INTERNAL_FEEDBACK_STYLE_H__ -#define __DALI_INTERNAL_FEEDBACK_STYLE_H__ +#ifndef DALI_INTERNAL_FEEDBACK_STYLE_H +#define DALI_INTERNAL_FEEDBACK_STYLE_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -121,7 +121,7 @@ private: * @param [in] styleInfo The information will be stored here. * @param [in] signalInfo The information to add. */ - void AddSignalInfo( FeedbackStyleInfo& styleInfo, SignalFeedbackInfo signalInfo ); + void AddSignalInfo( FeedbackStyleInfo& styleInfo, SignalFeedbackInfo&& signalInfo ); /** * Map a pattern string to feedback pattern ID. @@ -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 @@ -159,4 +157,4 @@ private: } // namespace Dali -#endif // __DALI_INTERNAL_FEEDBACK_STYLE_H__ +#endif // DALI_INTERNAL_FEEDBACK_STYLE_H