aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/handlers/qquickpointerhandler_p.h
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-07-26 16:33:13 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2018-07-27 10:42:54 +0000
commit0e1f83dcade8cb6428513eea4452dcd500f9e486 (patch)
tree227c4848145b23fde12ad33d3bea3a60c04cb36e /src/quick/handlers/qquickpointerhandler_p.h
parent447e2e024609a22fe052cf458c27efdef2e3d3eb (diff)
Fix PointerHandler constructors and destructors
- Constructors should take QQuickItem* not QObject* to be symmetric with the parentItem() accessor (and other code) which assumes its type - Use header initialization everywhere possible - Reorder variables to minimize padding (somewhat) - Remove empty destructor bodies (the compiler can write them) - Remove override and virtual from destructors in accordance with https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#Rh-override Change-Id: I682a53a803d65e29136bfaec3a5b534e975ecf30 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/handlers/qquickpointerhandler_p.h')
-rw-r--r--src/quick/handlers/qquickpointerhandler_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/handlers/qquickpointerhandler_p.h b/src/quick/handlers/qquickpointerhandler_p.h
index 9644bb959f..69a38706b3 100644
--- a/src/quick/handlers/qquickpointerhandler_p.h
+++ b/src/quick/handlers/qquickpointerhandler_p.h
@@ -73,8 +73,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerHandler : public QObject, public QQmlP
Q_PROPERTY(qreal margin READ margin WRITE setMargin NOTIFY marginChanged)
public:
- explicit QQuickPointerHandler(QObject *parent = nullptr);
- virtual ~QQuickPointerHandler();
+ explicit QQuickPointerHandler(QQuickItem *parent = nullptr);
+ ~QQuickPointerHandler();
enum GrabPermission {
TakeOverForbidden = 0x0,
@@ -120,7 +120,7 @@ Q_SIGNALS:
void canceled(QQuickEventPoint *point);
protected:
- QQuickPointerHandler(QQuickPointerHandlerPrivate &dd, QObject *parent);
+ QQuickPointerHandler(QQuickPointerHandlerPrivate &dd, QQuickItem *parent);
void classBegin() override;
void componentComplete() override;