diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-08-30 11:04:37 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-08-31 11:01:42 +0000 |
| commit | 4a7365cd6c451e5f56fa145b134f7fa9b6d2199a (patch) | |
| tree | f095d2784b188fdf6f25c1e618006d78be63230e | |
| parent | d375a74aa586e01e40f0d54d4c12e52d48930272 (diff) | |
qquickapplicationwindow.cpp: de-duplicate item change types
Change-Id: Id2eb59bd696c408335813a27f393350d331f526f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index cee38b23..b39a0c35 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -107,6 +107,9 @@ QT_BEGIN_NAMESPACE \sa {Customizing ApplicationWindow}, Overlay, Page, {Container Controls} */ +static const QQuickItemPrivate::ChangeTypes ItemChanges = QQuickItemPrivate::Visibility + | QQuickItemPrivate::Geometry | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight; + class QQuickApplicationWindowPrivate : public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickApplicationWindow) @@ -329,11 +332,9 @@ QQuickApplicationWindow::~QQuickApplicationWindow() d->setActiveFocusControl(nullptr); disconnect(this, SIGNAL(activeFocusItemChanged()), this, SLOT(_q_updateActiveFocus())); if (d->header) - QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | - QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); + QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, ItemChanges); if (d->footer) - QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | - QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); + QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, ItemChanges); d_ptr.reset(); // QTBUG-52731 } @@ -412,16 +413,14 @@ void QQuickApplicationWindow::setHeader(QQuickItem *header) return; if (d->header) { - QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | - QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); + QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, ItemChanges); d->header->setParentItem(nullptr); } d->header = header; if (header) { header->setParentItem(contentItem()); QQuickItemPrivate *p = QQuickItemPrivate::get(header); - p->addItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | - QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); + p->addItemChangeListener(d, ItemChanges); if (qFuzzyIsNull(header->z())) header->setZ(1); if (QQuickToolBar *toolBar = qobject_cast<QQuickToolBar *>(header)) @@ -469,16 +468,14 @@ void QQuickApplicationWindow::setFooter(QQuickItem *footer) return; if (d->footer) { - QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | - QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); + QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, ItemChanges); d->footer->setParentItem(nullptr); } d->footer = footer; if (footer) { footer->setParentItem(contentItem()); QQuickItemPrivate *p = QQuickItemPrivate::get(footer); - p->addItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | - QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight); + p->addItemChangeListener(d, ItemChanges); if (qFuzzyIsNull(footer->z())) footer->setZ(1); if (QQuickToolBar *toolBar = qobject_cast<QQuickToolBar *>(footer)) |