(Gestures) Moved into separate folders

Change-Id: Ib7e0fd665c53312b6e0e39cd2d3eed6eeb15ae78

diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureRecognizer.cpp
index e5ec64b..e07f1f6 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-LongPressGestureRecognizer.cpp
+++ b/automated-tests/src/dali/utc-Dali-LongPressGestureRecognizer.cpp
@@ -23,7 +23,6 @@
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/render-task-list-integ.h>
-#include <dali/internal/event/events/long-press-gesture-event.h>
 #include <dali-test-suite-utils.h>
 #include <test-touch-utils.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
index 52976fb..815bcdc 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp
@@ -24,7 +24,6 @@
 #include <dali/integration-api/render-task-list-integ.h>
 #include <dali/integration-api/profiling.h>
 #include <dali/integration-api/input-options.h>
-#include <dali/internal/event/events/pan-gesture-event.h>
 #include <dali-test-suite-utils.h>
 #include <test-touch-utils.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-PanGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-PanGestureRecognizer.cpp
index 64b4052..4d9f119 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PanGestureRecognizer.cpp
+++ b/automated-tests/src/dali/utc-Dali-PanGestureRecognizer.cpp
@@ -22,7 +22,6 @@
 #include <dali/integration-api/input-options.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/render-task-list-integ.h>
-#include <dali/internal/event/events/pan-gesture-event.h>
 #include <dali-test-suite-utils.h>
 #include <test-touch-utils.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-PinchGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-PinchGestureRecognizer.cpp
index 93c6f29..3a20b67 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PinchGestureRecognizer.cpp
+++ b/automated-tests/src/dali/utc-Dali-PinchGestureRecognizer.cpp
@@ -22,7 +22,6 @@
 #include <dali/integration-api/input-options.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/render-task-list-integ.h>
-#include <dali/internal/event/events/pinch-gesture-event.h>
 #include <dali-test-suite-utils.h>
 #include <test-touch-utils.h>
 

diff --git a/automated-tests/src/dali/utc-Dali-TapGestureRecognizer.cpp b/automated-tests/src/dali/utc-Dali-TapGestureRecognizer.cpp
index 2576fb8..6afd4a2 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TapGestureRecognizer.cpp
+++ b/automated-tests/src/dali/utc-Dali-TapGestureRecognizer.cpp
@@ -21,7 +21,6 @@
 #include <dali/public-api/dali-core.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/render-task-list-integ.h>
-#include <dali/internal/event/events/tap-gesture-event.h>
 #include <dali-test-suite-utils.h>
 #include <test-touch-utils.h>
 

diff --git a/dali/internal/event/events/gesture-event-processor.cpp b/dali/internal/event/events/gesture-event-processor.cpp
index 5c03f60..efe0ace 100644 (file)
--- a/dali/internal/event/events/gesture-event-processor.cpp
+++ b/dali/internal/event/events/gesture-event-processor.cpp
@@ -25,7 +25,7 @@
 // INTERNAL INCLUDES
 #include <dali/integration-api/render-controller.h>
 #include <dali/internal/event/common/stage-impl.h>
-#include <dali/internal/event/events/pinch-gesture-detector-impl.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h>
 #include <dali/internal/update/gestures/scene-graph-pan-gesture.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/integration-api/debug.h>

diff --git a/dali/internal/event/events/gesture-event-processor.h b/dali/internal/event/events/gesture-event-processor.h
index 7a81295..e848f44 100644 (file)
--- a/dali/internal/event/events/gesture-event-processor.h
+++ b/dali/internal/event/events/gesture-event-processor.h
@@ -21,10 +21,10 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/actor.h>
 #include <dali/internal/event/events/gesture-detector-impl.h>
-#include <dali/internal/event/events/long-press-gesture-processor.h>
-#include <dali/internal/event/events/pan-gesture-processor.h>
-#include <dali/internal/event/events/pinch-gesture-processor.h>
-#include <dali/internal/event/events/tap-gesture-processor.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-processor.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-processor.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/long-press-gesture-detector-impl.cpp b/dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.cpp
similarity index 98%
rename from dali/internal/event/events/long-press-gesture-detector-impl.cpp
rename to dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.cpp
index 804e8d4..d7f1778 100644 (file)
--- a/dali/internal/event/events/long-press-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.

diff --git a/dali/internal/event/events/long-press-gesture-detector-impl.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.h
similarity index 100%
rename from dali/internal/event/events/long-press-gesture-detector-impl.h
rename to dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.h

diff --git a/dali/internal/event/events/long-press-gesture-event.cpp b/dali/internal/event/events/long-press-gesture/long-press-gesture-event.cpp
similarity index 91%
rename from dali/internal/event/events/long-press-gesture-event.cpp
rename to dali/internal/event/events/long-press-gesture/long-press-gesture-event.cpp
index 6f1c6ae..c707f05 100644 (file)
--- a/dali/internal/event/events/long-press-gesture-event.cpp
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-event.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/long-press-gesture-event.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-event.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/long-press-gesture-event.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-event.h
similarity index 100%
rename from dali/internal/event/events/long-press-gesture-event.h
rename to dali/internal/event/events/long-press-gesture/long-press-gesture-event.h

diff --git a/dali/internal/event/events/long-press-gesture-processor.cpp b/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.cpp
similarity index 97%
rename from dali/internal/event/events/long-press-gesture-processor.cpp
rename to dali/internal/event/events/long-press-gesture/long-press-gesture-processor.cpp
index 853e748..e08d7e8 100644 (file)
--- a/dali/internal/event/events/long-press-gesture-processor.cpp
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/long-press-gesture-processor.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h>
 
 // EXTERNAL INCLUDES
 #include <algorithm>
@@ -25,12 +25,12 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/long-press-gesture.h>
-#include <dali/internal/event/events/long-press-gesture-event.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-event.h>
 #include <dali/integration-api/debug.h>
 #include <dali/internal/event/actors/actor-impl.h>
 #include <dali/internal/event/common/scene-impl.h>
 #include <dali/internal/event/render-tasks/render-task-impl.h>
-#include <dali/internal/event/events/long-press-gesture-recognizer.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h>
 #include <dali/internal/event/events/gesture-requests.h>
 
 namespace Dali

diff --git a/dali/internal/event/events/long-press-gesture-processor.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h
similarity index 97%
rename from dali/internal/event/events/long-press-gesture-processor.h
rename to dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h
index f711686..4933c46 100644 (file)
--- a/dali/internal/event/events/long-press-gesture-processor.h
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/long-press-gesture-detector-impl.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.h>
 #include <dali/internal/event/events/gesture-processor.h>
 #include <dali/internal/event/render-tasks/render-task-impl.h>
 

diff --git a/dali/internal/event/events/long-press-gesture-recognizer.cpp b/dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.cpp
similarity index 98%
rename from dali/internal/event/events/long-press-gesture-recognizer.cpp
rename to dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.cpp
index c15f8d3..6e0b24d 100644 (file)
--- a/dali/internal/event/events/long-press-gesture-recognizer.cpp
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/long-press-gesture-recognizer.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h>
 
 // EXTERNAL INCLUDES
 #include <cmath>

diff --git a/dali/internal/event/events/long-press-gesture-recognizer.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h
similarity index 97%
rename from dali/internal/event/events/long-press-gesture-recognizer.h
rename to dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h
index 89730ce..7bcab05 100644 (file)
--- a/dali/internal/event/events/long-press-gesture-recognizer.h
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/events/gesture-recognizer.h>
-#include <dali/internal/event/events/long-press-gesture-event.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-event.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/pan-gesture-detector-impl.cpp b/dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.cpp
similarity index 98%
rename from dali/internal/event/events/pan-gesture-detector-impl.cpp
rename to dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.cpp
index c5c0057..d29befc 100644 (file)
--- a/dali/internal/event/events/pan-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 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.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/pan-gesture-detector-impl.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h>
 
 // EXTERNAL INCLUDES
 #include <cstring> // for strcmp

diff --git a/dali/internal/event/events/pan-gesture-detector-impl.h b/dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h
similarity index 100%
rename from dali/internal/event/events/pan-gesture-detector-impl.h
rename to dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h

diff --git a/dali/internal/event/events/pan-gesture-event.cpp b/dali/internal/event/events/pan-gesture/pan-gesture-event.cpp
similarity index 92%
rename from dali/internal/event/events/pan-gesture-event.cpp
rename to dali/internal/event/events/pan-gesture/pan-gesture-event.cpp
index a26941a..cc1bd1c 100644 (file)
--- a/dali/internal/event/events/pan-gesture-event.cpp
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-event.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/pan-gesture-event.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-event.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/pan-gesture-event.h b/dali/internal/event/events/pan-gesture/pan-gesture-event.h
similarity index 100%
rename from dali/internal/event/events/pan-gesture-event.h
rename to dali/internal/event/events/pan-gesture/pan-gesture-event.h

diff --git a/dali/internal/event/events/pan-gesture-processor.cpp b/dali/internal/event/events/pan-gesture/pan-gesture-processor.cpp
similarity index 99%
rename from dali/internal/event/events/pan-gesture-processor.cpp
rename to dali/internal/event/events/pan-gesture/pan-gesture-processor.cpp
index 5ade85c..05589ef 100644 (file)
--- a/dali/internal/event/events/pan-gesture-processor.cpp
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-processor.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/pan-gesture-processor.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-processor.h>
 
 #if defined(DEBUG_ENABLED)
 #include <sstream>
@@ -30,13 +30,13 @@
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/math/vector2.h>
-#include <dali/internal/event/events/pan-gesture-event.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-event.h>
 #include <dali/integration-api/debug.h>
 #include <dali/internal/event/common/scene-impl.h>
 #include <dali/internal/event/render-tasks/render-task-impl.h>
 #include <dali/internal/update/gestures/scene-graph-pan-gesture.h>
 #include <dali/internal/event/events/multi-point-event-util.h>
-#include <dali/internal/event/events/pan-gesture-recognizer.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h>
 #include <dali/internal/event/events/gesture-requests.h>
 
 namespace Dali

diff --git a/dali/internal/event/events/pan-gesture-processor.h b/dali/internal/event/events/pan-gesture/pan-gesture-processor.h
similarity index 99%
rename from dali/internal/event/events/pan-gesture-processor.h
rename to dali/internal/event/events/pan-gesture/pan-gesture-processor.h
index efa443d..f831d8a 100644 (file)
--- a/dali/internal/event/events/pan-gesture-processor.h
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-processor.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/pan-gesture-detector-impl.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h>
 #include <dali/internal/event/events/gesture-processor.h>
 #include <dali/internal/event/render-tasks/render-task-impl.h>
 

diff --git a/dali/internal/event/events/pan-gesture-recognizer.cpp b/dali/internal/event/events/pan-gesture/pan-gesture-recognizer.cpp
similarity index 98%
rename from dali/internal/event/events/pan-gesture-recognizer.cpp
rename to dali/internal/event/events/pan-gesture/pan-gesture-recognizer.cpp
index 7a2d4ad..0256821 100644 (file)
--- a/dali/internal/event/events/pan-gesture-recognizer.cpp
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-recognizer.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/pan-gesture-recognizer.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h>
 
 // EXTERNAL INCLUDES
 #include <cmath>
@@ -27,7 +27,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/common/scene-impl.h>
-#include <dali/internal/event/events/pan-gesture-event.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-event.h>
 #include <dali/internal/event/events/gesture-requests.h>
 namespace Dali
 {

diff --git a/dali/internal/event/events/pan-gesture-recognizer.h b/dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h
similarity index 98%
rename from dali/internal/event/events/pan-gesture-recognizer.h
rename to dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h
index 3953a0b..3a74263 100644 (file)
--- a/dali/internal/event/events/pan-gesture-recognizer.h
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h
@@ -25,7 +25,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/events/gesture-recognizer.h>
-#include <dali/internal/event/events/pan-gesture-event.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-event.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/pinch-gesture-detector-impl.cpp b/dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.cpp
similarity index 95%
rename from dali/internal/event/events/pinch-gesture-detector-impl.cpp
rename to dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.cpp
index e2b49ab..0369322 100644 (file)
--- a/dali/internal/event/events/pinch-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/pinch-gesture-detector-impl.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h>
 
 // EXTERNAL INCLUDES
 #include <cstring> // for strcmp

diff --git a/dali/internal/event/events/pinch-gesture-detector-impl.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h
similarity index 100%
rename from dali/internal/event/events/pinch-gesture-detector-impl.h
rename to dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h

diff --git a/dali/internal/event/events/pinch-gesture-event.cpp b/dali/internal/event/events/pinch-gesture/pinch-gesture-event.cpp
similarity index 92%
rename from dali/internal/event/events/pinch-gesture-event.cpp
rename to dali/internal/event/events/pinch-gesture/pinch-gesture-event.cpp
index 921fa84..161ddca 100644 (file)
--- a/dali/internal/event/events/pinch-gesture-event.cpp
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-event.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/pinch-gesture-event.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-event.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>

diff --git a/dali/internal/event/events/pinch-gesture-event.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-event.h
similarity index 100%
rename from dali/internal/event/events/pinch-gesture-event.h
rename to dali/internal/event/events/pinch-gesture/pinch-gesture-event.h

diff --git a/dali/internal/event/events/pinch-gesture-processor.cpp b/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.cpp
similarity index 97%
rename from dali/internal/event/events/pinch-gesture-processor.cpp
rename to dali/internal/event/events/pinch-gesture/pinch-gesture-processor.cpp
index f638af2..162bf6b 100644 (file)
--- a/dali/internal/event/events/pinch-gesture-processor.cpp
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/pinch-gesture-processor.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h>
 
 // EXTERNAL INCLUDES
 #include <algorithm>
@@ -25,11 +25,11 @@
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/events/pinch-gesture.h>
 #include <dali/public-api/math/vector2.h>
-#include <dali/internal/event/events/pinch-gesture-event.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-event.h>
 #include <dali/integration-api/debug.h>
 #include <dali/internal/event/common/scene-impl.h>
 #include <dali/internal/event/render-tasks/render-task-impl.h>
-#include <dali/internal/event/events/pinch-gesture-recognizer.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h>
 #include <dali/internal/event/events/gesture-requests.h>
 
 namespace Dali

diff --git a/dali/internal/event/events/pinch-gesture-processor.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h
similarity index 98%
rename from dali/internal/event/events/pinch-gesture-processor.h
rename to dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h
index dc99a7a..839175c 100644 (file)
--- a/dali/internal/event/events/pinch-gesture-processor.h
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/pinch-gesture-detector-impl.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h>
 #include <dali/internal/event/events/gesture-processor.h>
 #include <dali/internal/event/render-tasks/render-task-impl.h>
 

diff --git a/dali/internal/event/events/pinch-gesture-recognizer.cpp b/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.cpp
similarity index 98%
rename from dali/internal/event/events/pinch-gesture-recognizer.cpp
rename to dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.cpp
index 6dde864..2dff2b5 100644 (file)
--- a/dali/internal/event/events/pinch-gesture-recognizer.cpp
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/pinch-gesture-recognizer.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h>
 
 // EXTERNAL INCLUDES
 #include <cmath>
@@ -24,7 +24,7 @@
 #include <dali/public-api/events/touch-point.h>
 #include <dali/public-api/math/vector2.h>
 
-#include <dali/internal/event/events/pinch-gesture-event.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-event.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/internal/event/common/scene-impl.h>
 

diff --git a/dali/internal/event/events/pinch-gesture-recognizer.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h
similarity index 97%
rename from dali/internal/event/events/pinch-gesture-recognizer.h
rename to dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h
index 5a614b1..008d7ff 100644 (file)
--- a/dali/internal/event/events/pinch-gesture-recognizer.h
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/events/gesture-recognizer.h>
-#include <dali/internal/event/events/pinch-gesture-event.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-event.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/tap-gesture-detector-impl.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp
similarity index 97%
rename from dali/internal/event/events/tap-gesture-detector-impl.cpp
rename to dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp
index 7f65842..93c4712 100644 (file)
--- a/dali/internal/event/events/tap-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/tap-gesture-detector-impl.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h>
 
 // EXTERNAL INCLUDES
 #include <cstring> // for strcmp

diff --git a/dali/internal/event/events/tap-gesture-detector-impl.h b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h
similarity index 100%
rename from dali/internal/event/events/tap-gesture-detector-impl.h
rename to dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h

diff --git a/dali/internal/event/events/tap-gesture-event.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-event.cpp
similarity index 92%
rename from dali/internal/event/events/tap-gesture-event.cpp
rename to dali/internal/event/events/tap-gesture/tap-gesture-event.cpp
index 9fb5579..d9f5171 100644 (file)
--- a/dali/internal/event/events/tap-gesture-event.cpp
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-event.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/tap-gesture-event.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-event.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/tap-gesture-event.h b/dali/internal/event/events/tap-gesture/tap-gesture-event.h
similarity index 100%
rename from dali/internal/event/events/tap-gesture-event.h
rename to dali/internal/event/events/tap-gesture/tap-gesture-event.h

diff --git a/dali/internal/event/events/tap-gesture-processor.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
similarity index 97%
rename from dali/internal/event/events/tap-gesture-processor.cpp
rename to dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
index 65fc8fd..f003812 100644 (file)
--- a/dali/internal/event/events/tap-gesture-processor.cpp
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/tap-gesture-processor.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-processor.h>
 
 // EXTERNAL INCLUDES
 #include <algorithm>
@@ -30,9 +30,9 @@
 #include <dali/internal/event/actors/actor-impl.h>
 #include <dali/internal/event/render-tasks/render-task-impl.h>
 #include <dali/internal/event/common/scene-impl.h>
-#include <dali/internal/event/events/tap-gesture-recognizer.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h>
 #include <dali/internal/event/events/gesture-requests.h>
-#include <dali/internal/event/events/tap-gesture-event.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-event.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/tap-gesture-processor.h b/dali/internal/event/events/tap-gesture/tap-gesture-processor.h
similarity index 96%
rename from dali/internal/event/events/tap-gesture-processor.h
rename to dali/internal/event/events/tap-gesture/tap-gesture-processor.h
index f31d045..a137ebd 100644 (file)
--- a/dali/internal/event/events/tap-gesture-processor.h
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-processor.h
@@ -19,9 +19,9 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/tap-gesture-detector-impl.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h>
 #include <dali/internal/event/events/gesture-processor.h>
-#include "actor-observer.h"
+#include <dali/internal/event/events/actor-observer.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/events/tap-gesture-recognizer.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp
similarity index 98%
rename from dali/internal/event/events/tap-gesture-recognizer.cpp
rename to dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp
index fa3a0b1..f4e058a 100644 (file)
--- a/dali/internal/event/events/tap-gesture-recognizer.cpp
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/event/events/tap-gesture-recognizer.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h>
 
 // EXTERNAL INCLUDES
 #include <cmath>

diff --git a/dali/internal/event/events/tap-gesture-recognizer.h b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h
similarity index 98%
rename from dali/internal/event/events/tap-gesture-recognizer.h
rename to dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h
index 0c6012f..be4a002 100644 (file)
--- a/dali/internal/event/events/tap-gesture-recognizer.h
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/events/gesture-recognizer.h>
-#include <dali/internal/event/events/tap-gesture-event.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-event.h>
 
 namespace Dali
 {

diff --git a/dali/internal/file.list b/dali/internal/file.list
index 1bca109..fcbb447 100644 (file)
--- a/dali/internal/file.list
+++ b/dali/internal/file.list
@@ -55,26 +55,26 @@ SET( internal_src_files
   ${internal_src_dir}/event/events/gesture-processor.cpp
   ${internal_src_dir}/event/events/hit-test-algorithm-impl.cpp
   ${internal_src_dir}/event/events/hover-event-processor.cpp
-  ${internal_src_dir}/event/events/long-press-gesture-detector-impl.cpp
-  ${internal_src_dir}/event/events/long-press-gesture-event.cpp
-  ${internal_src_dir}/event/events/long-press-gesture-processor.cpp
-  ${internal_src_dir}/event/events/long-press-gesture-recognizer.cpp
   ${internal_src_dir}/event/events/wheel-event-processor.cpp
   ${internal_src_dir}/event/events/multi-point-event-util.cpp
-  ${internal_src_dir}/event/events/pan-gesture-detector-impl.cpp
-  ${internal_src_dir}/event/events/pan-gesture-event.cpp
-  ${internal_src_dir}/event/events/pan-gesture-processor.cpp
-  ${internal_src_dir}/event/events/pan-gesture-recognizer.cpp
-  ${internal_src_dir}/event/events/pinch-gesture-detector-impl.cpp
-  ${internal_src_dir}/event/events/pinch-gesture-event.cpp
-  ${internal_src_dir}/event/events/pinch-gesture-processor.cpp
-  ${internal_src_dir}/event/events/pinch-gesture-recognizer.cpp
-  ${internal_src_dir}/event/events/tap-gesture-detector-impl.cpp
-  ${internal_src_dir}/event/events/tap-gesture-event.cpp
-  ${internal_src_dir}/event/events/tap-gesture-processor.cpp
-  ${internal_src_dir}/event/events/tap-gesture-recognizer.cpp
   ${internal_src_dir}/event/events/touch-data-impl.cpp
   ${internal_src_dir}/event/events/touch-event-processor.cpp
+  ${internal_src_dir}/event/events/long-press-gesture/long-press-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/long-press-gesture/long-press-gesture-event.cpp
+  ${internal_src_dir}/event/events/long-press-gesture/long-press-gesture-processor.cpp
+  ${internal_src_dir}/event/events/long-press-gesture/long-press-gesture-recognizer.cpp
+  ${internal_src_dir}/event/events/pan-gesture/pan-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/pan-gesture/pan-gesture-event.cpp
+  ${internal_src_dir}/event/events/pan-gesture/pan-gesture-processor.cpp
+  ${internal_src_dir}/event/events/pan-gesture/pan-gesture-recognizer.cpp
+  ${internal_src_dir}/event/events/pinch-gesture/pinch-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/pinch-gesture/pinch-gesture-event.cpp
+  ${internal_src_dir}/event/events/pinch-gesture/pinch-gesture-processor.cpp
+  ${internal_src_dir}/event/events/pinch-gesture/pinch-gesture-recognizer.cpp
+  ${internal_src_dir}/event/events/tap-gesture/tap-gesture-detector-impl.cpp
+  ${internal_src_dir}/event/events/tap-gesture/tap-gesture-event.cpp
+  ${internal_src_dir}/event/events/tap-gesture/tap-gesture-processor.cpp
+  ${internal_src_dir}/event/events/tap-gesture/tap-gesture-recognizer.cpp
   ${internal_src_dir}/event/images/bitmap-packed-pixel.cpp
   ${internal_src_dir}/event/images/bitmap-compressed.cpp
   ${internal_src_dir}/event/images/image-impl.cpp

diff --git a/dali/public-api/events/long-press-gesture-detector.cpp b/dali/public-api/events/long-press-gesture-detector.cpp
index 98c7ed3..f623f9a 100644 (file)
--- a/dali/public-api/events/long-press-gesture-detector.cpp
+++ b/dali/public-api/events/long-press-gesture-detector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 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,7 +19,7 @@
 #include <dali/public-api/events/long-press-gesture-detector.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/long-press-gesture-detector-impl.h>
+#include <dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/events/pan-gesture-detector.cpp b/dali/public-api/events/pan-gesture-detector.cpp
index fb31cc8..637c76c 100644 (file)
--- a/dali/public-api/events/pan-gesture-detector.cpp
+++ b/dali/public-api/events/pan-gesture-detector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 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,7 +19,7 @@
 #include <dali/public-api/events/pan-gesture-detector.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/pan-gesture-detector-impl.h>
+#include <dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/events/pinch-gesture-detector.cpp b/dali/public-api/events/pinch-gesture-detector.cpp
index 7eb5d70..cdda6d1 100644 (file)
--- a/dali/public-api/events/pinch-gesture-detector.cpp
+++ b/dali/public-api/events/pinch-gesture-detector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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,7 +19,7 @@
 #include <dali/public-api/events/pinch-gesture-detector.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/pinch-gesture-detector-impl.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/events/tap-gesture-detector.cpp b/dali/public-api/events/tap-gesture-detector.cpp
index e979fb7..7dd90e3 100644 (file)
--- a/dali/public-api/events/tap-gesture-detector.cpp
+++ b/dali/public-api/events/tap-gesture-detector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 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,7 +19,7 @@
 #include <dali/public-api/events/tap-gesture-detector.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/tap-gesture-detector-impl.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h>
 
 namespace Dali
 {