Menu: Extract QQuickMenuPopupWindow core popup behavior

... and put it in QQuickPopupWindow.

Change-Id: I6920f5c13904483310faae990c7199db9f1c4708
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

1 files changed, 5 insertions, 31 deletions

diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h
index 4c629219..1e824bea 100644
--- a/src/controls/qquickmenupopupwindow_p.h
+++ b/src/controls/qquickmenupopupwindow_p.h
@@ -42,58 +42,32 @@
 #ifndef QQUICKMENUPOPUPWINDOW_H
 #define QQUICKMENUPOPUPWINDOW_H
 
-#include <QtQuick/qquickwindow.h>
+#include "qquickpopupwindow_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QEvent;
-class QQuickItem;
-
-class QQuickMenuPopupWindow : public QQuickWindow
+class QQuickMenuPopupWindow : public QQuickPopupWindow
 {
     Q_OBJECT
-    Q_PROPERTY(QQuickItem *contentItem READ menuContentItem WRITE setMenuContentItem)
-    Q_CLASSINFO("DefaultProperty", "contentItem")
-    Q_PROPERTY(QQuickItem *parentItem READ parentItem WRITE setParentItem)
 public:
-    QQuickMenuPopupWindow(QWindow *parent = 0);
-
-    QQuickItem *menuContentItem() const { return m_menuContentItem; }
-    void setMenuContentItem(QQuickItem *contentItem);
+    QQuickMenuPopupWindow();
 
     void setItemAt(QQuickItem *menuItem);
     void setParentWindow(QQuickWindow *parentWindow);
     void setGeometry(int posx, int posy, int w, int h);
 
-    QQuickItem *parentItem() const { return m_parentItem; }
     void setParentItem(QQuickItem *);
 
 public Q_SLOTS:
     void show();
-    void dismissMenu();
+
+protected Q_SLOTS:
     void updateSize();
     void updatePosition();
 
-Q_SIGNALS:
-    void menuDismissed();
-
-protected:
-    void mousePressEvent(QMouseEvent *);
-    void mouseReleaseEvent(QMouseEvent *);
-    void mouseMoveEvent(QMouseEvent *);
-    void exposeEvent(QExposeEvent *);
-    void hideEvent(QHideEvent *);
-
 private:
-    void forwardEventToTransientParent(QMouseEvent *);
-
-    bool m_mouseMoved;
-    bool m_needsActivatedEvent;
-    bool m_dismissed;
     QQuickItem *m_itemAt;
     QPointF m_oldItemPos;
-    QQuickItem *m_parentItem;
-    QQuickItem *m_menuContentItem;
     QPointF m_initialPos;
 };