diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-30 16:45:41 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-30 22:46:01 +0100 |
| commit | 0c3def85c61cea1f51d712c43c2c25fd788e6573 (patch) | |
| tree | c843242193b9c789ae58ac87761f56696eae395d | |
| parent | b379e880a9d441d9b67c47474d20b3e09b72b9e3 (diff) | |
Get rid of QInputDevicePrivate::extra
Since QPA plugins own the input device objects that they create, they
can also subclass to add arbitrary extra data (as was done with
QWinTabPointingDevice in abb5f0d3768a817b7e30639107210e64b8dbc138);
so this pointer seems unnecessary. It's unused so far AFAIK.
Retaining it also brings up the possibility of a memory leak:
~QInputDevice() doesn't delete it, and whatever code stores something
there would need to make sure it gets deleted.
Change-Id: I7ec264c23c74b83db1f37f64f31857caf551fdae
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/gui/kernel/qinputdevice_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/kernel/qinputdevice_p.h b/src/gui/kernel/qinputdevice_p.h index 7f834adb9f..b2c13351f7 100644 --- a/src/gui/kernel/qinputdevice_p.h +++ b/src/gui/kernel/qinputdevice_p.h @@ -78,7 +78,6 @@ public: QString seatName; QString busId; QRect availableVirtualGeometry; - void *extra = nullptr; // The QPA plugin can store arbitrary device-specific data here void *qqExtra = nullptr; // Qt Quick can store arbitrary device-specific data here qint64 systemId = 0; qint32 capabilities = static_cast<qint32>(QInputDevice::Capability::None); |