Rename QQuickPressAndHoldHelper to QQuickPressHandler

The editors need also pressed() and released() signals. The actual
signals will be added in a follow-up commit. This just renames the
class to something that is not exclusively tied to press-and-hold.

Task-number: QTBUG-51009
Change-Id: Ib6c7ec9f213c0c9deb08bb450206661ec34aaa82
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

7 files changed, 55 insertions, 55 deletions

diff --git a/src/templates/qquickpressandholdhelper.cpp b/src/templates/qquickpresshandler.cpp
index 6f3ddcbc..e505ab7d 100644
--- a/src/templates/qquickpressandholdhelper.cpp
+++ b/src/templates/qquickpresshandler.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickpressandholdhelper_p.h"
+#include "qquickpresshandler_p_p.h"
 
 #include <QtCore/private/qobject_p.h>
 #include <QtGui/qguiapplication.h>
@@ -44,14 +44,14 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickPressAndHoldHelper::QQuickPressAndHoldHelper()
+QQuickPressHandler::QQuickPressHandler()
     : control(nullptr)
     , longPress(false)
     , pressAndHoldSignalIndex(-1)
     , delayedMousePressEvent(nullptr)
 { }
 
-void QQuickPressAndHoldHelper::mousePressEvent(QMouseEvent *event)
+void QQuickPressHandler::mousePressEvent(QMouseEvent *event)
 {
     longPress = false;
     pressPos = event->localPos();
@@ -63,19 +63,19 @@ void QQuickPressAndHoldHelper::mousePressEvent(QMouseEvent *event)
     }
 }
 
-void QQuickPressAndHoldHelper::mouseMoveEvent(QMouseEvent *event)
+void QQuickPressHandler::mouseMoveEvent(QMouseEvent *event)
 {
     if (qAbs(int(event->localPos().x() - pressPos.x())) > QGuiApplication::styleHints()->startDragDistance())
         timer.stop();
 }
 
-void QQuickPressAndHoldHelper::mouseReleaseEvent(QMouseEvent *)
+void QQuickPressHandler::mouseReleaseEvent(QMouseEvent *)
 {
     if (!longPress)
         timer.stop();
 }
 
-void QQuickPressAndHoldHelper::timerEvent(QTimerEvent *)
+void QQuickPressHandler::timerEvent(QTimerEvent *)
 {
     timer.stop();
     clearDelayedMouseEvent();
@@ -98,7 +98,7 @@ void QQuickPressAndHoldHelper::timerEvent(QTimerEvent *)
     }
 }
 
-void QQuickPressAndHoldHelper::clearDelayedMouseEvent()
+void QQuickPressHandler::clearDelayedMouseEvent()
 {
     if (delayedMousePressEvent) {
         delete delayedMousePressEvent;
@@ -106,7 +106,7 @@ void QQuickPressAndHoldHelper::clearDelayedMouseEvent()
     }
 }
 
-bool QQuickPressAndHoldHelper::isActive()
+bool QQuickPressHandler::isActive()
 {
     return !(timer.isActive() || longPress);
 }
diff --git a/src/templates/qquickpressandholdhelper_p.h b/src/templates/qquickpresshandler_p_p.h
index 7599c6bd..526695e0 100644
--- a/src/templates/qquickpressandholdhelper_p.h
+++ b/src/templates/qquickpresshandler_p_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKPRESSANDHOLDHELPER_H
-#define QQUICKPRESSANDHOLDHELPER_H
+#ifndef QQUICKPRESSHANDLER_P_P_H
+#define QQUICKPRESSHANDLER_P_P_H
 
 //
 //  W A R N I N G
@@ -57,9 +57,9 @@ class QQuickItem;
 class QMouseEvent;
 class QTimerEvent;
 
-struct QQuickPressAndHoldHelper
+struct QQuickPressHandler
 {
-    QQuickPressAndHoldHelper();
+    QQuickPressHandler();
 
     void mousePressEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
@@ -79,4 +79,4 @@ struct QQuickPressAndHoldHelper
 
 QT_END_NAMESPACE
 
-#endif // QQUICKPRESSANDHOLDHELPER_H
+#endif // QQUICKPRESSHANDLER_P_P_H
diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp
index 6eaae4ea..50b2ee78 100644
--- a/src/templates/qquicktextarea.cpp
+++ b/src/templates/qquicktextarea.cpp
@@ -141,7 +141,7 @@ QQuickTextArea::QQuickTextArea(QQuickItem *parent) :
     Q_D(QQuickTextArea);
     setActiveFocusOnTab(true);
     d->setImplicitResizeEnabled(false);
-    d->pressAndHoldHelper.control = this;
+    d->pressHandler.control = this;
     QObjectPrivate::connect(this, &QQuickTextEdit::readOnlyChanged,
                             d, &QQuickTextAreaPrivate::_q_readOnlyChanged);
 }
@@ -376,11 +376,11 @@ void QQuickTextArea::focusOutEvent(QFocusEvent *event)
 void QQuickTextArea::mousePressEvent(QMouseEvent *event)
 {
     Q_D(QQuickTextArea);
-    d->pressAndHoldHelper.mousePressEvent(event);
-    if (d->pressAndHoldHelper.isActive()) {
-        if (d->pressAndHoldHelper.delayedMousePressEvent) {
-            QQuickTextEdit::mousePressEvent(d->pressAndHoldHelper.delayedMousePressEvent);
-            d->pressAndHoldHelper.clearDelayedMouseEvent();
+    d->pressHandler.mousePressEvent(event);
+    if (d->pressHandler.isActive()) {
+        if (d->pressHandler.delayedMousePressEvent) {
+            QQuickTextEdit::mousePressEvent(d->pressHandler.delayedMousePressEvent);
+            d->pressHandler.clearDelayedMouseEvent();
         }
         QQuickTextEdit::mousePressEvent(event);
     }
@@ -389,11 +389,11 @@ void QQuickTextArea::mousePressEvent(QMouseEvent *event)
 void QQuickTextArea::mouseMoveEvent(QMouseEvent *event)
 {
     Q_D(QQuickTextArea);
-    d->pressAndHoldHelper.mouseMoveEvent(event);
-    if (d->pressAndHoldHelper.isActive()) {
-        if (d->pressAndHoldHelper.delayedMousePressEvent) {
-            QQuickTextEdit::mousePressEvent(d->pressAndHoldHelper.delayedMousePressEvent);
-            d->pressAndHoldHelper.clearDelayedMouseEvent();
+    d->pressHandler.mouseMoveEvent(event);
+    if (d->pressHandler.isActive()) {
+        if (d->pressHandler.delayedMousePressEvent) {
+            QQuickTextEdit::mousePressEvent(d->pressHandler.delayedMousePressEvent);
+            d->pressHandler.clearDelayedMouseEvent();
         }
         QQuickTextEdit::mouseMoveEvent(event);
     }
@@ -402,11 +402,11 @@ void QQuickTextArea::mouseMoveEvent(QMouseEvent *event)
 void QQuickTextArea::mouseReleaseEvent(QMouseEvent *event)
 {
     Q_D(QQuickTextArea);
-    d->pressAndHoldHelper.mouseReleaseEvent(event);
-    if (d->pressAndHoldHelper.isActive()) {
-        if (d->pressAndHoldHelper.delayedMousePressEvent) {
-            QQuickTextEdit::mousePressEvent(d->pressAndHoldHelper.delayedMousePressEvent);
-            d->pressAndHoldHelper.clearDelayedMouseEvent();
+    d->pressHandler.mouseReleaseEvent(event);
+    if (d->pressHandler.isActive()) {
+        if (d->pressHandler.delayedMousePressEvent) {
+            QQuickTextEdit::mousePressEvent(d->pressHandler.delayedMousePressEvent);
+            d->pressHandler.clearDelayedMouseEvent();
         }
         QQuickTextEdit::mouseReleaseEvent(event);
     }
@@ -415,8 +415,8 @@ void QQuickTextArea::mouseReleaseEvent(QMouseEvent *event)
 void QQuickTextArea::timerEvent(QTimerEvent *event)
 {
     Q_D(QQuickTextArea);
-    if (event->timerId() == d->pressAndHoldHelper.timer.timerId()) {
-        d->pressAndHoldHelper.timerEvent(event);
+    if (event->timerId() == d->pressHandler.timer.timerId()) {
+        d->pressHandler.timerEvent(event);
     } else {
         QQuickTextEdit::timerEvent(event);
     }
diff --git a/src/templates/qquicktextarea_p_p.h b/src/templates/qquicktextarea_p_p.h
index d63ea5cd..d92f03c8 100644
--- a/src/templates/qquicktextarea_p_p.h
+++ b/src/templates/qquicktextarea_p_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextedit_p_p.h>
-#include <QtQuickTemplates/private/qquickpressandholdhelper_p.h>
+#include <QtQuickTemplates/private/qquickpresshandler_p_p.h>
 
 #include "qquicktextarea_p.h"
 
@@ -96,7 +96,7 @@ public:
     QQuickItem *background;
     QString placeholder;
     Qt::FocusReason focusReason;
-    QQuickPressAndHoldHelper pressAndHoldHelper;
+    QQuickPressHandler pressHandler;
     QQuickAccessibleAttached *accessibleAttached;
 };
 
diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp
index b45c34a6..a9e6a35e 100644
--- a/src/templates/qquicktextfield.cpp
+++ b/src/templates/qquicktextfield.cpp
@@ -151,7 +151,7 @@ QQuickTextField::QQuickTextField(QQuickItem *parent) :
     QQuickTextInput(*(new QQuickTextFieldPrivate), parent)
 {
     Q_D(QQuickTextField);
-    d->pressAndHoldHelper.control = this;
+    d->pressHandler.control = this;
     d->setImplicitResizeEnabled(false);
     setActiveFocusOnTab(true);
     QObjectPrivate::connect(this, &QQuickTextInput::readOnlyChanged,
@@ -401,11 +401,11 @@ void QQuickTextField::focusOutEvent(QFocusEvent *event)
 void QQuickTextField::mousePressEvent(QMouseEvent *event)
 {
     Q_D(QQuickTextField);
-    d->pressAndHoldHelper.mousePressEvent(event);
-    if (d->pressAndHoldHelper.isActive()) {
-        if (d->pressAndHoldHelper.delayedMousePressEvent) {
-            QQuickTextInput::mousePressEvent(d->pressAndHoldHelper.delayedMousePressEvent);
-            d->pressAndHoldHelper.clearDelayedMouseEvent();
+    d->pressHandler.mousePressEvent(event);
+    if (d->pressHandler.isActive()) {
+        if (d->pressHandler.delayedMousePressEvent) {
+            QQuickTextInput::mousePressEvent(d->pressHandler.delayedMousePressEvent);
+            d->pressHandler.clearDelayedMouseEvent();
         }
         QQuickTextInput::mousePressEvent(event);
     }
@@ -414,11 +414,11 @@ void QQuickTextField::mousePressEvent(QMouseEvent *event)
 void QQuickTextField::mouseMoveEvent(QMouseEvent *event)
 {
     Q_D(QQuickTextField);
-    d->pressAndHoldHelper.mouseMoveEvent(event);
-    if (d->pressAndHoldHelper.isActive()) {
-        if (d->pressAndHoldHelper.delayedMousePressEvent) {
-            QQuickTextInput::mousePressEvent(d->pressAndHoldHelper.delayedMousePressEvent);
-            d->pressAndHoldHelper.clearDelayedMouseEvent();
+    d->pressHandler.mouseMoveEvent(event);
+    if (d->pressHandler.isActive()) {
+        if (d->pressHandler.delayedMousePressEvent) {
+            QQuickTextInput::mousePressEvent(d->pressHandler.delayedMousePressEvent);
+            d->pressHandler.clearDelayedMouseEvent();
         }
         QQuickTextInput::mouseMoveEvent(event);
     }
@@ -427,11 +427,11 @@ void QQuickTextField::mouseMoveEvent(QMouseEvent *event)
 void QQuickTextField::mouseReleaseEvent(QMouseEvent *event)
 {
     Q_D(QQuickTextField);
-    d->pressAndHoldHelper.mouseReleaseEvent(event);
-    if (d->pressAndHoldHelper.isActive()) {
-        if (d->pressAndHoldHelper.delayedMousePressEvent) {
-            QQuickTextInput::mousePressEvent(d->pressAndHoldHelper.delayedMousePressEvent);
-            d->pressAndHoldHelper.clearDelayedMouseEvent();
+    d->pressHandler.mouseReleaseEvent(event);
+    if (d->pressHandler.isActive()) {
+        if (d->pressHandler.delayedMousePressEvent) {
+            QQuickTextInput::mousePressEvent(d->pressHandler.delayedMousePressEvent);
+            d->pressHandler.clearDelayedMouseEvent();
         }
         QQuickTextInput::mouseReleaseEvent(event);
     }
@@ -440,8 +440,8 @@ void QQuickTextField::mouseReleaseEvent(QMouseEvent *event)
 void QQuickTextField::timerEvent(QTimerEvent *event)
 {
     Q_D(QQuickTextField);
-    if (event->timerId() == d->pressAndHoldHelper.timer.timerId()) {
-        d->pressAndHoldHelper.timerEvent(event);
+    if (event->timerId() == d->pressHandler.timer.timerId()) {
+        d->pressHandler.timerEvent(event);
     } else {
         QQuickTextInput::timerEvent(event);
     }
diff --git a/src/templates/qquicktextfield_p_p.h b/src/templates/qquicktextfield_p_p.h
index 5a48e5b7..e8e68cbb 100644
--- a/src/templates/qquicktextfield_p_p.h
+++ b/src/templates/qquicktextfield_p_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtQuick/private/qquicktextinput_p_p.h>
-#include <QtQuickTemplates/private/qquickpressandholdhelper_p.h>
+#include <QtQuickTemplates/private/qquickpresshandler_p_p.h>
 
 #include "qquicktextfield_p.h"
 
@@ -97,7 +97,7 @@ public:
     QQuickItem *background;
     QString placeholder;
     Qt::FocusReason focusReason;
-    QQuickPressAndHoldHelper pressAndHoldHelper;
+    QQuickPressHandler pressHandler;
     QQuickAccessibleAttached *accessibleAttached;
 };
 
diff --git a/src/templates/templates.pri b/src/templates/templates.pri
index c7e4bb4a..130bd12b 100644
--- a/src/templates/templates.pri
+++ b/src/templates/templates.pri
@@ -31,7 +31,7 @@ HEADERS += \
     $$PWD/qquickpane_p_p.h \
     $$PWD/qquickpopup_p.h \
     $$PWD/qquickpopup_p_p.h \
-    $$PWD/qquickpressandholdhelper_p.h \
+    $$PWD/qquickpresshandler_p_p.h \
     $$PWD/qquickprogressbar_p.h \
     $$PWD/qquickradiobutton_p.h \
     $$PWD/qquickrangeslider_p.h \
@@ -77,7 +77,7 @@ SOURCES += \
     $$PWD/qquickpageindicator.cpp \
     $$PWD/qquickpane.cpp \
     $$PWD/qquickpopup.cpp \
-    $$PWD/qquickpressandholdhelper.cpp \
+    $$PWD/qquickpresshandler.cpp \
     $$PWD/qquickprogressbar.cpp \
     $$PWD/qquickradiobutton.cpp \
     $$PWD/qquickrangeslider.cpp \