diff options
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 7 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopupanchors.cpp | 30 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopupanchors_p.h | 8 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopupanchors_p_p.h | 10 |
4 files changed, 15 insertions, 40 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 08b3ee63..53af9ec0 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -644,10 +644,9 @@ void QQuickPopupPrivate::setBottomMargin(qreal value, bool reset) */ QQuickPopupAnchors *QQuickPopupPrivate::getAnchors() { - if (!anchors) { - Q_Q(QQuickPopup); - anchors = new QQuickPopupAnchors(positioner, q); - } + Q_Q(QQuickPopup); + if (!anchors) + anchors = new QQuickPopupAnchors(q); return anchors; } 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(); } diff --git a/src/quicktemplates2/qquickpopupanchors_p.h b/src/quicktemplates2/qquickpopupanchors_p.h index 490a4867..531c494e 100644 --- a/src/quicktemplates2/qquickpopupanchors_p.h +++ b/src/quicktemplates2/qquickpopupanchors_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QQuickItem; class QQuickPopupAnchorsPrivate; -class QQuickPopupPositioner; +class QQuickPopup; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupAnchors : public QObject { @@ -64,8 +64,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupAnchors : public QObject Q_PROPERTY(QQuickItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn NOTIFY centerInChanged) public: - explicit QQuickPopupAnchors(QQuickPopupPositioner *positioner, QObject *parent); - ~QQuickPopupAnchors(); + explicit QQuickPopupAnchors(QQuickPopup *popup); QQuickItem *centerIn() const; void setCenterIn(QQuickItem *item); @@ -74,9 +73,6 @@ public: Q_SIGNALS: void centerInChanged(); -protected: - QQuickPopupAnchors(QQuickPopupAnchorsPrivate &dd, QObject *parent); - private: Q_DISABLE_COPY(QQuickPopupAnchors) Q_DECLARE_PRIVATE(QQuickPopupAnchors) diff --git a/src/quicktemplates2/qquickpopupanchors_p_p.h b/src/quicktemplates2/qquickpopupanchors_p_p.h index c2f577bf..989dc6df 100644 --- a/src/quicktemplates2/qquickpopupanchors_p_p.h +++ b/src/quicktemplates2/qquickpopupanchors_p_p.h @@ -49,26 +49,24 @@ // #include <QtCore/private/qobject_p.h> +#include <QtQuickTemplates2/private/qquickpopup_p_p.h> QT_BEGIN_NAMESPACE -class QQuickPopupAnchors; -class QQuickPopupPositioner; +class QQuickItem; +class QQuickPopup; class QQuickPopupAnchorsPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQuickPopupAnchors) public: - QQuickPopupAnchorsPrivate(QQuickPopupPositioner *positioner); - ~QQuickPopupAnchorsPrivate(); - static QQuickPopupAnchorsPrivate *get(QQuickPopupAnchors *popupAnchors) { return popupAnchors->d_func(); } - QQuickPopupPositioner *positioner = nullptr; + QQuickPopup *popup = nullptr; QQuickItem *centerIn = nullptr; }; |