[Tizen] Restore Uploaded signal for BufferImage and ResourceImage

[platform/core/uifw/dali-core.git] / dali / internal / event / events / tap-gesture-detector-impl.h

diff --git a/dali/internal/event/events/tap-gesture-detector-impl.h b/dali/internal/event/events/tap-gesture-detector-impl.h
index 2f77b80..9e26d20 100644 (file)
--- a/dali/internal/event/events/tap-gesture-detector-impl.h
+++ b/dali/internal/event/events/tap-gesture-detector-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_INTERNAL_TAP_GESTURE_DETECTOR_H__
 #define __DALI_INTERNAL_TAP_GESTURE_DETECTOR_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/public-api/events/tap-gesture-detector.h>
@@ -50,10 +51,9 @@ public: // Creation
   /**
    * Create a new gesture detector with the specified parameters.
    * @param[in]  tapsRequired     The number of taps required.
-   * @param[in]  touchesRequired  The number of touches required.
    * @return A smart-pointer to the newly allocated detector.
    */
-  static TapGestureDetectorPtr New(unsigned int tapsRequired, unsigned int touchesRequired);
+  static TapGestureDetectorPtr New( unsigned int tapsRequired );
 
   /**
    * Construct a new GestureDetector.
@@ -63,25 +63,35 @@ public: // Creation
   /**
    * Construct a new GestureDetector with the specified parameters.
    * @param[in]  tapsRequired     The number of taps required.
-   * @param[in]  touchesRequired  The number of touches required.
    */
-  TapGestureDetector(unsigned int tapsRequired, unsigned int touchesRequired);
+  TapGestureDetector( unsigned int tapsRequired );
 
 public:
 
   /**
-   * @copydoc Dali::TapGestureDetector::SetTapsRequired(unsigned int)
-   */
-  void SetTapsRequired(unsigned int taps);
-  /**
    * @copydoc Dali::TapGestureDetector::SetTouchesRequired(unsigned int)
    */
   void SetTouchesRequired(unsigned int touches);
 
   /**
-   * @copydoc Dali::TapGestureDetector::GetTapsRequired()
+   * @copydoc Dali::TapGestureDetector::SetMinimumTapsRequired()
+   */
+  void SetMinimumTapsRequired( unsigned int minTaps );
+
+  /**
+   * @copydoc Dali::TapGestureDetector::SetMaximumTapsRequired()
+   */
+  void SetMaximumTapsRequired( unsigned int maxTaps );
+
+  /**
+   * @copydoc Dali::TapGestureDetector::GetMinimumTapsRequired()
+   */
+  unsigned int GetMinimumTapsRequired() const;
+
+  /**
+   * @copydoc Dali::TapGestureDetector::SetMaximumTapsRequired()
    */
-  unsigned int GetTapsRequired() const;
+  unsigned int GetMaximumTapsRequired() const;
 
   /**
    * @copydoc Dali::TapGestureDetector::GetTouchesRequired()
@@ -103,9 +113,9 @@ public: // Signals
   /**
    * @copydoc Dali::TapGestureDetector::DetectedSignal()
    */
-  Dali::TapGestureDetector::DetectedSignalV2& DetectedSignal()
+  Dali::TapGestureDetector::DetectedSignalType& DetectedSignal()
   {
-    return mDetectedSignalV2;
+    return mDetectedSignal;
   }
 
   /**
@@ -151,9 +161,10 @@ private: // GestureDetector overrides
 
 private:
 
-  Dali::TapGestureDetector::DetectedSignalV2 mDetectedSignalV2;
+  Dali::TapGestureDetector::DetectedSignalType mDetectedSignal;
 
-  unsigned int mTapsRequired;
+  unsigned int mMinimumTapsRequired;
+  unsigned int mMaximumTapsRequired;
   unsigned int mTouchesRequired;
 };