X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffeedback%2Ffeedback-style.cpp;h=4375a29021bc9263f995c94af30df9317d84caef;hb=refs%2Fchanges%2F99%2F210399%2F9;hp=c1dca7ede6cc11f8864d86750c54ab5b8af7f5cf;hpb=5cc78df05271786e4c1c18a0eaab32e05612df9d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/feedback/feedback-style.cpp b/dali-toolkit/internal/feedback/feedback-style.cpp
index c1dca7e..4375a29 100644
--- a/dali-toolkit/internal/feedback/feedback-style.cpp
+++ b/dali-toolkit/internal/feedback/feedback-style.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/feedback/feedback-style.h>
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/object-registry.h>
@@ -102,7 +103,6 @@ struct FeedbackStyleInfo
 static const FeedbackStyleInfo DEFAULT_FEEDBACK_STYLE_INFO;
 
 FeedbackStyle::FeedbackStyle()
-: mConnections( this )
 {
   mFeedback = Dali::FeedbackPlayer::Get();
 
@@ -195,7 +195,7 @@ const FeedbackStyleInfo& FeedbackStyle::GetStyleInfo( const string& type ) const
 
 void FeedbackStyle::StyleChanged( const std::string& userDefinedThemePath, Dali::StyleChange::Type styleChange )
 {
-  if( StyleChange::THEME_CHANGE )
+  if( styleChange == StyleChange::THEME_CHANGE )
   {
     string userDefinedTheme;
 
@@ -289,25 +289,25 @@ 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 );
 
             if( signalFeedbackInfo.mHasHapticFeedbackInfo || signalFeedbackInfo.mHasSoundFeedbackInfo )
             {
-              AddSignalInfo( themeInfo, signalFeedbackInfo );
+              AddSignalInfo( themeInfo, std::move( signalFeedbackInfo ) );
             }
           }
         }
@@ -320,10 +320,10 @@ void FeedbackStyle::LoadFromString( const string& data )
 
 } // LoadFromString()
 
-void FeedbackStyle::AddSignalInfo( FeedbackStyleInfo& styleInfo, SignalFeedbackInfo signalInfo )
+void FeedbackStyle::AddSignalInfo( FeedbackStyleInfo& styleInfo, SignalFeedbackInfo&& signalInfo )
 {
   bool updated = false;
-  std::vector<SignalFeedbackInfo>::iterator iter;
+  SignalFeedbackInfoContainer::iterator iter;
 
   // If info exists for the signal then update it, else add new
   for( iter = styleInfo.mSignalFeedbackInfoList.begin(); iter != styleInfo.mSignalFeedbackInfoList.end(); ++iter )
@@ -344,7 +344,7 @@ void FeedbackStyle::AddSignalInfo( FeedbackStyleInfo& styleInfo, SignalFeedbackI
 
   if( !updated )
   {
-    styleInfo.mSignalFeedbackInfoList.push_back( signalInfo );
+    styleInfo.mSignalFeedbackInfoList.emplace_back( std::move( signalInfo ) );
   }
 }