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>

1 files changed, 1 insertions, 186 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 7fb289e3..ab8da297 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -36,6 +36,7 @@
 
 #include "qquickpopup_p.h"
 #include "qquickpopup_p_p.h"
+#include "qquickpopupitem_p_p.h"
 #include "qquickapplicationwindow_p.h"
 #include "qquickoverlay_p_p.h"
 #include "qquickcontrol_p_p.h"
@@ -342,190 +343,6 @@ void QQuickPopupPrivate::setWindow(QQuickWindow *newWindow)
     emit q->windowChanged(newWindow);
 }
 
-class QQuickPopupItemPrivate : public QQuickControlPrivate
-{
-    Q_DECLARE_PUBLIC(QQuickPopupItem)
-
-public:
-    QQuickPopupItemPrivate(QQuickPopup *popup);
-
-    void implicitWidthChanged() override;
-    void implicitHeightChanged() override;
-
-    void resolveFont() override;
-
-    QQuickItem *getContentItem() override;
-
-    QQuickPopup *popup;
-};
-
-QQuickPopupItemPrivate::QQuickPopupItemPrivate(QQuickPopup *popup) : popup(popup)
-{
-    isTabFence = true;
-}
-
-void QQuickPopupItemPrivate::implicitWidthChanged()
-{
-    QQuickControlPrivate::implicitWidthChanged();
-    emit popup->implicitWidthChanged();
-}
-
-void QQuickPopupItemPrivate::implicitHeightChanged()
-{
-    QQuickControlPrivate::implicitHeightChanged();
-    emit popup->implicitHeightChanged();
-}
-
-void QQuickPopupItemPrivate::resolveFont()
-{
-    if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window()))
-        inheritFont(window->font());
-}
-
-QQuickItem *QQuickPopupItemPrivate::getContentItem()
-{
-    Q_Q(QQuickPopupItem);
-    if (!contentItem)
-        contentItem = new QQuickItem(q);
-    return contentItem;
-}
-
-QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup) :
-    QQuickControl(*(new QQuickPopupItemPrivate(popup)), nullptr)
-{
-    setParent(popup);
-    setVisible(false);
-    setFlag(ItemIsFocusScope);
-    setAcceptedMouseButtons(Qt::AllButtons);
-
-    // TODO: switch to QStyleHints::useHoverEffects in Qt 5.8
-    setHoverEnabled(true);
-    // setAcceptHoverEvents(QGuiApplication::styleHints()->useHoverEffects());
-    // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, this, &QQuickItem::setAcceptHoverEvents);
-}
-
-bool QQuickPopupItem::childMouseEventFilter(QQuickItem *child, QEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    return d->popup->childMouseEventFilter(child, event);
-}
-
-void QQuickPopupItem::focusInEvent(QFocusEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->focusInEvent(event);
-}
-
-void QQuickPopupItem::focusOutEvent(QFocusEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->focusOutEvent(event);
-}
-
-void QQuickPopupItem::keyPressEvent(QKeyEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->keyPressEvent(event);
-}
-
-void QQuickPopupItem::keyReleaseEvent(QKeyEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->keyReleaseEvent(event);
-}
-
-void QQuickPopupItem::mousePressEvent(QMouseEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->mousePressEvent(event);
-}
-
-void QQuickPopupItem::mouseMoveEvent(QMouseEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->mouseMoveEvent(event);
-}
-
-void QQuickPopupItem::mouseReleaseEvent(QMouseEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->mouseReleaseEvent(event);
-}
-
-void QQuickPopupItem::mouseDoubleClickEvent(QMouseEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->mouseDoubleClickEvent(event);
-}
-
-void QQuickPopupItem::mouseUngrabEvent()
-{
-    Q_D(QQuickPopupItem);
-    d->popup->mouseUngrabEvent();
-}
-
-void QQuickPopupItem::wheelEvent(QWheelEvent *event)
-{
-    Q_D(QQuickPopupItem);
-    d->popup->wheelEvent(event);
-}
-
-void QQuickPopupItem::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
-{
-    Q_D(QQuickPopupItem);
-    QQuickControl::contentItemChange(newItem, oldItem);
-    d->popup->contentItemChange(newItem, oldItem);
-}
-
-void QQuickPopupItem::fontChange(const QFont &newFont, const QFont &oldFont)
-{
-    Q_D(QQuickPopupItem);
-    QQuickControl::fontChange(newFont, oldFont);
-    d->popup->fontChange(newFont, oldFont);
-}
-
-void QQuickPopupItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
-{
-    Q_D(QQuickPopupItem);
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
-    d->popup->geometryChanged(newGeometry, oldGeometry);
-}
-
-void QQuickPopupItem::localeChange(const QLocale &newLocale, const QLocale &oldLocale)
-{
-    Q_D(QQuickPopupItem);
-    QQuickControl::localeChange(newLocale, oldLocale);
-    d->popup->localeChange(newLocale, oldLocale);
-}
-
-void QQuickPopupItem::itemChange(ItemChange change, const ItemChangeData &data)
-{
-    Q_D(QQuickPopupItem);
-    QQuickControl::itemChange(change, data);
-    d->popup->itemChange(change, data);
-}
-
-void QQuickPopupItem::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding)
-{
-    Q_D(QQuickPopupItem);
-    QQuickControl::paddingChange(newPadding, oldPadding);
-    d->popup->paddingChange(newPadding, oldPadding);
-}
-
-QFont QQuickPopupItem::defaultFont() const
-{
-    Q_D(const QQuickPopupItem);
-    return d->popup->defaultFont();
-}
-
-#ifndef QT_NO_ACCESSIBILITY
-QAccessible::Role QQuickPopupItem::accessibleRole() const
-{
-    Q_D(const QQuickPopupItem);
-    return d->popup->accessibleRole();
-}
-#endif // QT_NO_ACCESSIBILITY
-
 void QQuickPopupPrivate::itemDestroyed(QQuickItem *item)
 {
     Q_Q(QQuickPopup);
@@ -2061,5 +1878,3 @@ QAccessible::Role QQuickPopup::accessibleRole() const
 #endif // QT_NO_ACCESSIBILITY
 
 QT_END_NAMESPACE
-
-#include "moc_qquickpopup_p.cpp"