diff options
Diffstat (limited to 'src/gui/kernel/qevent.h')
-rw-r--r-- | src/gui/kernel/qevent.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index ab8a341d26..a24f0c471c 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -14,7 +14,6 @@ #include <QtCore/qiodevice.h> #include <QtCore/qlist.h> #include <QtCore/qnamespace.h> -#include <QtCore/qpointer.h> #include <QtCore/qstring.h> #include <QtCore/qurl.h> #include <QtCore/qvariant.h> @@ -34,8 +33,12 @@ QT_BEGIN_NAMESPACE class QFile; class QAction; class QMouseEvent; +template <typename T> class QPointer; class QPointerEvent; class QScreen; +#if QT_CONFIG(shortcut) +class QShortcut; +#endif class QTabletEvent; class QTouchEvent; #if QT_CONFIG(gestures) @@ -68,6 +71,7 @@ protected: class Q_GUI_EXPORT QPointerEvent : public QInputEvent { + Q_GADGET Q_DECL_EVENT_COMMON(QPointerEvent) public: explicit QPointerEvent(Type type, const QPointingDevice *dev, @@ -78,7 +82,7 @@ public: return pointingDevice() ? pointingDevice()->pointerType() : QPointingDevice::PointerType::Unknown; } void setTimestamp(quint64 timestamp) override; - qsizetype pointCount() const { return m_points.count(); } + qsizetype pointCount() const { return m_points.size(); } QEventPoint &point(qsizetype i); const QList<QEventPoint> &points() const { return m_points; } QEventPoint *pointById(int id); @@ -242,7 +246,7 @@ class Q_GUI_EXPORT QHoverEvent : public QSinglePointEvent { Q_DECL_EVENT_COMMON(QHoverEvent) public: - QHoverEvent(Type type, const QPointF &pos, const QPointF &globalPos, const QPointF &oldPos, + QHoverEvent(Type type, const QPointF &scenePos, const QPointF &globalPos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier, const QPointingDevice *device = QPointingDevice::primaryPointingDevice()); #if QT_DEPRECATED_SINCE(6, 3) @@ -849,7 +853,10 @@ public: inline QString file() const { return m_file; } QUrl url() const { return m_url; } +#if QT_DEPRECATED_SINCE(6, 6) + QT_DEPRECATED_VERSION_X_6_6("Interpret the string returned by file()") bool openFile(QFile &file, QIODevice::OpenMode flags) const; +#endif private: QString m_file; QUrl m_url; @@ -873,9 +880,12 @@ class Q_GUI_EXPORT QShortcutEvent : public QEvent { Q_DECL_EVENT_COMMON(QShortcutEvent) public: + // Note this is publicly deprecated, but should remain as internal constructor: QShortcutEvent(const QKeySequence &key, int id, bool ambiguous = false); + QShortcutEvent(const QKeySequence &key, const QShortcut *shortcut = nullptr, bool ambiguous = false); inline const QKeySequence &key() const { return m_sequence; } + // Note this is publicly deprecated, but should remain as internal getter: inline int shortcutId() const { return m_shortcutId; } inline bool isAmbiguous() const { return m_ambiguous; } protected: @@ -1011,6 +1021,17 @@ private: Qt::ApplicationState m_applicationState; }; +class Q_GUI_EXPORT QChildWindowEvent : public QEvent +{ + Q_DECL_EVENT_COMMON(QChildWindowEvent) +public: + explicit QChildWindowEvent(Type type, QWindow *childWindow); + QWindow *child() const { return c; } + +private: + QWindow *c; +}; + QT_END_NAMESPACE #endif // QEVENT_H |