Purge underscored header file barriers

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / feedback / feedback-style.h

diff --git a/dali-toolkit/internal/feedback/feedback-style.h b/dali-toolkit/internal/feedback/feedback-style.h
index 0f8d270..2167ace 100644 (file)
--- 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<const std::string, FeedbackPattern>   mFeedbackPatternLut; ///< Used to convert feedback pattern strings into enumerated values
   std::map<const std::string, FeedbackStyleInfo> 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