aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickabstractbutton_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-19 17:00:14 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-20 06:12:48 +0000
commit3824cdb9c43ab26fcf5c2f6dcc267d18c4aa4b2b (patch)
tree49c348a04f005f9e3a3347c7a027d06ee79dc55e /src/quicktemplates2/qquickabstractbutton_p_p.h
parent211014bfcac08ae763f8b8c8497425c48eac6a77 (diff)
QQuickAbstractButton: align handleXxx() with QQuickControl
Match the signature of the upcoming QQuickControlPrivate::handleXxx() virtuals. Change-Id: Ieed3587443bea715b1b6eb2cc334130b2df7deb8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton_p_p.h')
-rw-r--r--src/quicktemplates2/qquickabstractbutton_p_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h
index 6d149b4f..574027f0 100644
--- a/src/quicktemplates2/qquickabstractbutton_p_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
@@ -67,10 +67,10 @@ public:
return button->d_func();
}
- virtual void handlePress(const QPointF &point, Qt::MouseButton button = Qt::LeftButton, Qt::MouseButtons buttons = Qt::LeftButton);
+ virtual void handlePress(const QPointF &point);
virtual void handleMove(const QPointF &point);
virtual void handleRelease(const QPointF &point);
- virtual void handleCancel();
+ virtual void handleUngrab();
bool isPressAndHoldConnected();
void startPressAndHold();
@@ -99,7 +99,7 @@ public:
int delayTimer;
int repeatTimer;
QPointF pressPoint;
- Qt::MouseButton repeatButton;
+ Qt::MouseButtons pressButtons;
QQuickItem *indicator;
QQuickButtonGroup *group;
};