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.cpp;h=da2f055f84a6ce8b3f8a0d47a396ae8ff8fcb594;hp=c1dca7ede6cc11f8864d86750c54ab5b8af7f5cf;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=a8bc013df97fad9f1cc2d95c37248464ac553e6e diff --git a/dali-toolkit/internal/feedback/feedback-style.cpp b/dali-toolkit/internal/feedback/feedback-style.cpp index c1dca7e..da2f055 100644 --- a/dali-toolkit/internal/feedback/feedback-style.cpp +++ b/dali-toolkit/internal/feedback/feedback-style.cpp @@ -289,19 +289,19 @@ void FeedbackStyle::LoadFromString( const string& data ) DALI_ASSERT_ALWAYS(type && TreeNode::STRING == type->GetType() && "Signal must have a type"); signalFeedbackInfo.mSignalName = type->GetString(); - GetIfString( (*signalIter).second, "haptic-feedback-pattern", + GetIfString( (*signalIter).second, "hapticFeedbackPattern", signalFeedbackInfo.mHasHapticFeedbackInfo, signalFeedbackInfo.mHapticFeedbackPattern ); - GetIfString( (*signalIter).second, "haptic-feedback-file", + GetIfString( (*signalIter).second, "hapticFeedbackFile", signalFeedbackInfo.mHasHapticFeedbackInfo, signalFeedbackInfo.mHapticFeedbackFile ); - GetIfString( (*signalIter).second, "sound-feedback-pattern", + GetIfString( (*signalIter).second, "soundFeedbackPattern", signalFeedbackInfo.mHasSoundFeedbackInfo, signalFeedbackInfo.mSoundFeedbackPattern ); - GetIfString( (*signalIter).second, "haptic-feedback-file", + GetIfString( (*signalIter).second, "hapticFeedbackFile", signalFeedbackInfo.mHasSoundFeedbackInfo, signalFeedbackInfo.mSoundFeedbackFile );