Revert "[Tizen] Added 'make clean' on each profile build."

[platform/core/uifw/dali-adaptor.git] / adaptors / common / drag-and-drop-detector-impl.h

diff --git a/adaptors/common/drag-and-drop-detector-impl.h b/adaptors/common/drag-and-drop-detector-impl.h
index a3361fb..d4a1395 100644 (file)
--- a/adaptors/common/drag-and-drop-detector-impl.h
+++ b/adaptors/common/drag-and-drop-detector-impl.h
@@ -23,9 +23,9 @@
 
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/math/vector2.h>
-#include <drag-and-drop-detector.h>
 
 // INTERNAL INCLUDES
+#include <drag-and-drop-detector.h>
 
 namespace Dali
 {
@@ -45,7 +45,7 @@ class DragAndDropDetector : public Dali::BaseObject
 {
 public:
 
-  typedef Dali::DragAndDropDetector::DragAndDropSignalV2 DragAndDropSignalV2;
+  typedef Dali::DragAndDropDetector::DragAndDropSignal DragAndDropSignal;
 
   // Creation
 
@@ -117,33 +117,33 @@ public: // Signals
   /**
    * @copydoc Dali::DragAndDropDetector::EnteredSignal
    */
-  DragAndDropSignalV2& EnteredSignal()
+  DragAndDropSignal& EnteredSignal()
   {
-    return mEnteredSignalV2;
+    return mEnteredSignal;
   }
 
   /**
    * @copydoc Dali::DragAndDropDetector::ExitedSignal
    */
-  DragAndDropSignalV2& ExitedSignal()
+  DragAndDropSignal& ExitedSignal()
   {
-    return mExitedSignalV2;
+    return mExitedSignal;
   }
 
   /**
    * @copydoc Dali::DragAndDropDetector::MovedSignal
    */
-  DragAndDropSignalV2& MovedSignal()
+  DragAndDropSignal& MovedSignal()
   {
-    return mMovedSignalV2;
+    return mMovedSignal;
   }
 
   /**
    * @copydoc Dali::DragAndDropDetector::DroppedSignal
    */
-  DragAndDropSignalV2& DroppedSignal()
+  DragAndDropSignal& DroppedSignal()
   {
-    return mDroppedSignalV2;
+    return mDroppedSignal;
   }
 
 private:
@@ -169,10 +169,10 @@ private:
   std::string mContent;    ///< The current Drag & drop content.
   Vector2 mScreenPosition; ///< The screen position of the drop location.
 
-  DragAndDropSignalV2 mEnteredSignalV2;
-  DragAndDropSignalV2 mExitedSignalV2;
-  DragAndDropSignalV2 mMovedSignalV2;
-  DragAndDropSignalV2 mDroppedSignalV2;
+  DragAndDropSignal mEnteredSignal;
+  DragAndDropSignal mExitedSignal;
+  DragAndDropSignal mMovedSignal;
+  DragAndDropSignal mDroppedSignal;
 };
 
 } // namespace Adaptor