AbstractButton: remove the mouse params from signals

If we ever want to expose these, the name would be something else
than "mouse"... :)

Change-Id: Ie9dad16e84708059fd0b43d4764925db7b014d64
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

3 files changed, 20 insertions, 50 deletions

diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp
index fe39a4e5..664efce5 100644
--- a/src/templates/qquickabstractbutton.cpp
+++ b/src/templates/qquickabstractbutton.cpp
@@ -67,21 +67,15 @@ static const int AUTO_REPEAT_INTERVAL = 100;
 */
 
 /*!
-    \qmlsignal Qt.labs.controls::AbstractButton::pressed(MouseEvent mouse)
+    \qmlsignal Qt.labs.controls::AbstractButton::pressed()
 
     This signal is emitted when the button is interactively pressed by the user.
-
-    The mouse parameter provides information about the press, including the x
-    and y position and which button was pressed.
 */
 
 /*!
-    \qmlsignal Qt.labs.controls::AbstractButton::released(MouseEvent mouse)
+    \qmlsignal Qt.labs.controls::AbstractButton::released()
 
     This signal is emitted when the button is interactively released by the user.
-
-    The mouse parameter provides information about the click, including the x
-    and y position of the release of the click, and whether the click was held.
 */
 
 /*!
@@ -93,21 +87,15 @@ static const int AUTO_REPEAT_INTERVAL = 100;
 */
 
 /*!
-    \qmlsignal Qt.labs.controls::AbstractButton::clicked(MouseEvent mouse)
+    \qmlsignal Qt.labs.controls::AbstractButton::clicked()
 
     This signal is emitted when the button is interactively clicked by the user.
-
-    The mouse parameter provides information about the click, including the x
-    and y position of the release of the click, and whether the click was held.
 */
 
 /*!
-    \qmlsignal Qt.labs.controls::AbstractButton::doubleClicked(MouseEvent mouse)
+    \qmlsignal Qt.labs.controls::AbstractButton::doubleClicked()
 
     This signal is emitted when the button is interactively double clicked by the user.
-
-    The mouse parameter provides information about the click, including the x
-    and y position of the release of the click, and whether the click was held.
 */
 
 QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() :
@@ -461,9 +449,7 @@ void QQuickAbstractButton::keyPressEvent(QKeyEvent *event)
             d->repeatButton = Qt::NoButton;
         }
 
-        QQuickMouseEvent me(d->pressPoint.x(), d->pressPoint.y(), Qt::NoButton, QGuiApplication::mouseButtons(), event->modifiers());
-        emit pressed(&me);
-        event->setAccepted(me.isAccepted());
+        emit pressed();
     }
 }
 
@@ -474,12 +460,9 @@ void QQuickAbstractButton::keyReleaseEvent(QKeyEvent *event)
     if (event->key() == Qt::Key_Space) {
         setPressed(false);
 
-        QQuickMouseEvent mre(d->pressPoint.x(), d->pressPoint.y(), Qt::NoButton, QGuiApplication::mouseButtons(), event->modifiers());
-        emit released(&mre);
-        QQuickMouseEvent mce(d->pressPoint.x(), d->pressPoint.y(), Qt::NoButton, QGuiApplication::mouseButtons(), event->modifiers(), true /* isClick */);
-        emit clicked(&mce);
+        emit released();
+        emit clicked();
         nextCheckState();
-        event->setAccepted(mre.isAccepted() || mce.isAccepted());
 
         if (d->autoRepeat)
             d->stopPressRepeat();
@@ -493,9 +476,7 @@ void QQuickAbstractButton::mousePressEvent(QMouseEvent *event)
     setPressed(true);
     d->pressPoint = event->pos();
 
-    QQuickMouseEvent me(event->x(), event->y(), event->button(), event->buttons(), event->modifiers());
-    emit pressed(&me);
-    event->setAccepted(me.isAccepted());
+    emit pressed();
 
     if (d->autoRepeat) {
         d->startRepeatDelay();
@@ -521,11 +502,8 @@ void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event)
     setPressed(false);
 
     if (wasPressed) {
-        QQuickMouseEvent mre(event->x(), event->y(), event->button(), event->buttons(), event->modifiers());
-        emit released(&mre);
-        QQuickMouseEvent mce(event->x(), event->y(), event->button(), event->buttons(), event->modifiers(), true /* isClick */);
-        emit clicked(&mce);
-        event->setAccepted(mre.isAccepted() || mce.isAccepted());
+        emit released();
+        emit clicked();
     } else {
         emit canceled();
     }
@@ -540,10 +518,7 @@ void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event)
 void QQuickAbstractButton::mouseDoubleClickEvent(QMouseEvent *event)
 {
     QQuickControl::mouseDoubleClickEvent(event);
-
-    QQuickMouseEvent me(event->x(), event->y(), event->button(), event->buttons(), event->modifiers(), true /* isClick */);
-    emit doubleClicked(&me);
-    event->setAccepted(me.isAccepted());
+    emit doubleClicked();
 }
 
 void QQuickAbstractButton::mouseUngrabEvent()
@@ -564,12 +539,9 @@ void QQuickAbstractButton::timerEvent(QTimerEvent *event)
     if (event->timerId() == d->delayTimer) {
         d->startPressRepeat();
     } else if (event->timerId() == d->repeatTimer) {
-        QQuickMouseEvent mre(d->pressPoint.x(), d->pressPoint.y(), d->repeatButton, QGuiApplication::mouseButtons(), QGuiApplication::keyboardModifiers());
-        emit released(&mre);
-        QQuickMouseEvent mce(d->pressPoint.x(), d->pressPoint.y(), d->repeatButton, QGuiApplication::mouseButtons(), QGuiApplication::keyboardModifiers(), true /* isClick */);
-        emit clicked(&mce);
-        QQuickMouseEvent mpe(d->pressPoint.x(), d->pressPoint.y(), d->repeatButton, QGuiApplication::mouseButtons(), QGuiApplication::keyboardModifiers());
-        emit pressed(&mpe);
+        emit released();
+        emit clicked();
+        emit pressed();
     }
 }
 
diff --git a/src/templates/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h
index e0296dc0..0dd94ff5 100644
--- a/src/templates/qquickabstractbutton_p.h
+++ b/src/templates/qquickabstractbutton_p.h
@@ -52,7 +52,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickMouseEvent;
 class QQuickAbstractButtonPrivate;
 
 class Q_LABSTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl
@@ -103,11 +102,11 @@ public Q_SLOTS:
     void toggle();
 
 Q_SIGNALS:
-    void pressed(QQuickMouseEvent *mouse);
-    void released(QQuickMouseEvent *mouse);
+    void pressed();
+    void released();
     void canceled();
-    void clicked(QQuickMouseEvent *mouse);
-    void doubleClicked(QQuickMouseEvent *mouse);
+    void clicked();
+    void doubleClicked();
     void textChanged();
     void pressedChanged();
     void checkedChanged();
diff --git a/src/templates/qquickswitch.cpp b/src/templates/qquickswitch.cpp
index 8544d7ca..f5c1a605 100644
--- a/src/templates/qquickswitch.cpp
+++ b/src/templates/qquickswitch.cpp
@@ -139,9 +139,8 @@ bool QQuickSwitchPrivate::handleMouseReleaseEvent(QQuickItem *child, QMouseEvent
         child->setKeepMouseGrab(false);
         event->accept();
     } else {
-        QQuickMouseEvent me(event->x(), event->y(), event->button(), event->buttons(), event->modifiers(), true /* isClick */);
-        emit q->clicked(&me);
-        event->setAccepted(me.isAccepted());
+        emit q->clicked();
+        event->accept();
         q->toggle();
     }
     return true;