diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 32f2ba75c74..88262659e9a 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -320,16 +320,16 @@ protected: struct SinglePointEventTag { explicit SinglePointEventTag() = default; }; QEvent(Type type, SinglePointEventTag) : QEvent(type, PointerEventTag{}) { m_singlePointEvent = true; } QEventPrivate *d; - ushort t; + quint16 t; private: - ushort posted : 1; - ushort spont : 1; - ushort m_accept : 1; - ushort m_inputEvent : 1; - ushort m_pointerEvent : 1; - ushort m_singlePointEvent : 1; - ushort reserved : 10; + quint16 posted : 1; + quint16 spont : 1; + quint16 m_accept : 1; + quint16 m_inputEvent : 1; + quint16 m_pointerEvent : 1; + quint16 m_singlePointEvent : 1; + quint16 reserved : 10; friend class QCoreApplication; friend class QCoreApplicationPrivate; diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index d6a7fa79bcf..91b387324a0 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -1309,7 +1309,7 @@ bool QWheelEvent::isEndEvent() const in the event. */ QKeyEvent::QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text, - bool autorep, ushort count) + bool autorep, quint16 count) : QInputEvent(type, QInputDevice::primaryKeyboard(), modifiers), m_text(text), m_key(key), m_scanCode(0), m_virtualKey(0), m_modifiers(0), m_count(count), m_autoRepeat(autorep) @@ -1338,7 +1338,7 @@ QKeyEvent::QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const */ QKeyEvent::QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers, - const QString &text, bool autorep, ushort count, const QInputDevice *device) + const QString &text, bool autorep, quint16 count, const QInputDevice *device) : QInputEvent(type, device, modifiers), m_text(text), m_key(key), m_scanCode(nativeScanCode), m_virtualKey(nativeVirtualKey), m_modifiers(nativeModifiers), m_count(count), m_autoRepeat(autorep) diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 7a361591e93..ce61b3a34f3 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -406,10 +406,10 @@ class Q_GUI_EXPORT QKeyEvent : public QInputEvent { public: QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(), - bool autorep = false, ushort count = 1); + bool autorep = false, quint16 count = 1); QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers, - const QString &text = QString(), bool autorep = false, ushort count = 1, + const QString &text = QString(), bool autorep = false, quint16 count = 1, const QInputDevice *device = QInputDevice::primaryKeyboard()); ~QKeyEvent(); @@ -443,8 +443,8 @@ protected: quint32 m_scanCode; quint32 m_virtualKey; quint32 m_modifiers; - ushort m_count; - ushort m_autoRepeat:1; + quint16 m_count; + quint16 m_autoRepeat : 1; // ushort reserved:15; };