AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QPointingDeviceUniqueId: remove deprecated numeric() and constructor

Browse Source 
Followup to 0484473: this is all new stuff for 5.8 and we don't need
to release it with pre-deprecated functions.

Task-number: QTBUG-54616
Change-Id: If17a4bec6fc36ca78d87517992374f101ae13b4f
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
This commit is contained in:
Shawn Rutledge 2016-12-08 10:00:21 +01:00 committed by Jani Heikkinen
parent cae32bd04d
commit 10143ea803
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/kernel/qevent.h
View File

@ -796,10 +796,6 @@ inline bool operator==(QKeySequence::StandardKey key, QKeyEvent *e){return (e ?
class Q_GUI_EXPORT QPointingDeviceUniqueId class Q_GUI_EXPORT QPointingDeviceUniqueId
{ {
Q_GADGET Q_GADGET
// ### kept these to keep other modules compiling. Remove before 5.8.0 final!
#if QT_DEPRECATED_SINCE(5, 8)
Q_PROPERTY(qint64 numeric READ numericId CONSTANT)
#endif
Q_PROPERTY(qint64 numericId READ numericId CONSTANT) Q_PROPERTY(qint64 numericId READ numericId CONSTANT)
public: public:
Q_ALWAYS_INLINE Q_ALWAYS_INLINE
@ -812,11 +808,6 @@ public:
Q_ALWAYS_INLINE Q_DECL_CONSTEXPR bool isValid() const Q_DECL_NOTHROW { return m_numericId != -1; } Q_ALWAYS_INLINE Q_DECL_CONSTEXPR bool isValid() const Q_DECL_NOTHROW { return m_numericId != -1; }
qint64 numericId() const Q_DECL_NOTHROW; qint64 numericId() const Q_DECL_NOTHROW;
// ### kept these to keep other modules compiling. Remove before 5.8.0 final!
#if QT_DEPRECATED_SINCE(5, 8)
Q_ALWAYS_INLINE Q_DECL_DEPRECATED qint64 numeric() const { return numericId(); }
Q_ALWAYS_INLINE Q_DECL_DEPRECATED explicit QPointingDeviceUniqueId(qint64 id) : m_numericId(id) {}
#endif
private: private:
// TODO: for TUIO 2, or any other type of complex token ID, an internal // TODO: for TUIO 2, or any other type of complex token ID, an internal
// array (or hash) can be added to hold additional properties. // array (or hash) can be added to hold additional properties.