diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-25 17:08:44 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-26 09:20:01 +0000 |
commit | b2c608e8559552b34547f8fa90bb7f1d4b1dcaa5 (patch) | |
tree | 92c4c9d348b3a72adc74224c05a34122c62bb3e5 /src/quicktemplates2/qquickpopup_p_p.h | |
parent | bcd1bed0b49e4ea8174bd323b6ad1f613abc0b13 (diff) |
Move QQuickPopupItem out of qquickpopup.*
We'll start slowly refactoring all QQuickPopupItem-specific things
out of QQuickPopup. In the future the presentation/backend of a popup
could be, under certain circumstances, a native menu popup window, for
example.
Change-Id: I8508da14ab52c65221afc3a9b7f07c371f0416d2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickpopup_p_p.h | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index fb2e6950..a44f193b 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -62,8 +62,8 @@ QT_BEGIN_NAMESPACE class QQuickTransition; class QQuickTransitionManager; class QQuickPopup; +class QQuickPopupItem; class QQuickPopupPrivate; -class QQuickPopupItemPrivate; class QQuickPopupTransitionManager : public QQuickTransitionManager { @@ -80,45 +80,6 @@ private: QQuickPopupPrivate *popup; }; -class QQuickPopupItem : public QQuickControl -{ - Q_OBJECT - -public: - explicit QQuickPopupItem(QQuickPopup *popup); - -protected: - bool childMouseEventFilter(QQuickItem *child, QEvent *event) override; - void focusInEvent(QFocusEvent *event) override; - void focusOutEvent(QFocusEvent *event) override; - void keyPressEvent(QKeyEvent *event) override; - void keyReleaseEvent(QKeyEvent *event) override; - void mousePressEvent(QMouseEvent *event) override; - void mouseMoveEvent(QMouseEvent *event) override; - void mouseReleaseEvent(QMouseEvent *event) override; - void mouseDoubleClickEvent(QMouseEvent *event) override; - void mouseUngrabEvent() override; - void wheelEvent(QWheelEvent *event) override; - - void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; - void fontChange(const QFont &newFont, const QFont &oldFont) override; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; - void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; - void itemChange(ItemChange change, const ItemChangeData &data) override; - void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; - - QFont defaultFont() const override; - -#ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const override; -#endif - -private: - Q_DECLARE_PRIVATE(QQuickPopupItem) - - friend class QQuickPopup; -}; - class Q_AUTOTEST_EXPORT QQuickPopupPrivate : public QObjectPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickPopup) |