← Back to branch summary

~mzanetti/unity8/fix-1648251

« back to all changes in this revision

Viewing changes to plugins/Ubuntu/Gestures/TouchGate.cpp

  • Committer: Michael Zanetti
  • Date: 2016-10-13 11:02:11 UTC
  • mfrom: (2525.1.132 unity8)
  • Revision ID: michael.zanetti@canonical.com-20161013110211-tj2gly2dxaqj5t2e
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Ubuntu/Gestures/TouchGate.cpp
20
20
#include <QDebug>
21
21
#include <QQuickWindow>
22
22
 
23
 
#include <TouchOwnershipEvent>
24
 
#include <TouchRegistry>
 
23
#include <UbuntuGestures/private/touchownershipevent_p.h>
 
24
#include <UbuntuGestures/private/touchregistry_p.h>
25
25
 
26
26
#if TOUCHGATE_DEBUG
27
27
#define ugDebug(params) qDebug().nospace() << "[TouchGate(" << (void*)this << ")] " << params
28
 
#include <DebugHelpers.h>
 
28
#include <UbuntuGestures/private/debughelpers_p.h>
29
29
#else // TOUCHGATE_DEBUG
30
30
#define ugDebug(params) ((void)0)
31
31
#endif // TOUCHGATE_DEBUG
32
32
 
 
33
UG_USE_NAMESPACE
 
34
 
33
35
TouchGate::TouchGate(QQuickItem *parent)
34
36
    : QQuickItem(parent)
35
37
{
40
42
bool TouchGate::event(QEvent *e)
41
43
{
42
44
    if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
43
 
        touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(e));
 
45
        touchOwnershipEvent(static_cast<TouchOwnershipEvent*>(e));
44
46
        return true;
45
47
    } else {
46
48
        return QQuickItem::event(e);