Cleanup QQuickPopupAnchors

Don't access QQuickPopupPositioner directly, but call QQuickPopup's
reposition() method instead so that we can lazy-create the positioner.

Change-Id: Ieb6a6adf187fba8b4829e32e7656a25c5e82cfc3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 6 insertions, 24 deletions

diff --git a/src/quicktemplates2/qquickpopupanchors.cpp b/src/quicktemplates2/qquickpopupanchors.cpp
index 1311a322..5acc2934 100644
--- a/src/quicktemplates2/qquickpopupanchors.cpp
+++ b/src/quicktemplates2/qquickpopupanchors.cpp
@@ -36,33 +36,15 @@
 
 #include "qquickpopupanchors_p.h"
 #include "qquickpopupanchors_p_p.h"
-#include "qquickpopuppositioner_p_p.h"
-
-#include <QtQuick/qquickwindow.h>
+#include "qquickpopup_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQuickPopupAnchorsPrivate::QQuickPopupAnchorsPrivate(QQuickPopupPositioner *positioner)
-    : positioner(positioner)
-{
-}
-
-QQuickPopupAnchorsPrivate::~QQuickPopupAnchorsPrivate()
-{
-}
-
-QQuickPopupAnchors::QQuickPopupAnchors(QQuickPopupPositioner *positioner, QObject *parent)
-    : QObject(*(new QQuickPopupAnchorsPrivate(positioner)), parent)
-{
-}
-
-QQuickPopupAnchors::QQuickPopupAnchors(QQuickPopupAnchorsPrivate &dd, QObject *parent)
-    : QObject(dd, parent)
-{
-}
-
-QQuickPopupAnchors::~QQuickPopupAnchors()
+QQuickPopupAnchors::QQuickPopupAnchors(QQuickPopup *popup)
+    : QObject(*(new QQuickPopupAnchorsPrivate), popup)
 {
+    Q_D(QQuickPopupAnchors);
+    d->popup = popup;
 }
 
 QQuickItem *QQuickPopupAnchors::centerIn() const
@@ -78,7 +60,7 @@ void QQuickPopupAnchors::setCenterIn(QQuickItem *item)
         return;
 
     d->centerIn = item;
-    d->positioner->reposition();
+    QQuickPopupPrivate::get(d->popup)->reposition();
     emit centerInChanged();
 }