diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2022-06-01 14:38:01 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2022-06-16 12:34:07 +0200 |
| commit | abc85505933a64cbceedd8e6fbc60288ac56fc1a (patch) | |
| tree | 6b5114d262db19f7b3e3ebbbecb7356fd70768b5 /src/quicklayouts | |
| parent | 8e0672da668e57c91d598bf000cddb90c2a4e0d4 (diff) | |
Remove all usage of m_ignoredItems
It's not used anymore in the base class, so its existence is currently
pointless
Pick-to: 6.2 6.3 6.4
Change-Id: I7838ae9a570b3167a14558422fd6938fb4dac200
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicklayouts')
| -rw-r--r-- | src/quicklayouts/qquicklayout_p.h | 1 | ||||
| -rw-r--r-- | src/quicklayouts/qquickstacklayout.cpp | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/quicklayouts/qquicklayout_p.h b/src/quicklayouts/qquicklayout_p.h index 2dee0e08df..f459418d91 100644 --- a/src/quicklayouts/qquicklayout_p.h +++ b/src/quicklayouts/qquicklayout_p.h @@ -149,7 +149,6 @@ protected: unsigned m_isReady : 1; unsigned m_disableRearrange : 1; unsigned m_hasItemChangeListeners : 1; // if false, we don't need to remove its item change listeners... - mutable QSet<QQuickItem *> m_ignoredItems; }; diff --git a/src/quicklayouts/qquickstacklayout.cpp b/src/quicklayouts/qquickstacklayout.cpp index 1e6ba4d27d..5b2b0dcbcd 100644 --- a/src/quicklayouts/qquickstacklayout.cpp +++ b/src/quicklayouts/qquickstacklayout.cpp @@ -276,7 +276,6 @@ void QQuickStackLayout::invalidate(QQuickItem *childItem) void QQuickStackLayout::childItemsChanged() { Q_D(QQuickStackLayout); - d->m_ignoredItems.clear(); const int count = itemCount(); const int oldIndex = d->currentIndex; if (!d->explicitCurrentIndex) @@ -346,10 +345,7 @@ void QQuickStackLayout::collectItemSizeHints(QQuickItem *item, QSizeF *sizeHints bool QQuickStackLayout::shouldIgnoreItem(QQuickItem *item) const { - const bool ignored = QQuickItemPrivate::get(item)->isTransparentForPositioner(); - if (ignored) - d_func()->m_ignoredItems << item; - return ignored; + return QQuickItemPrivate::get(item)->isTransparentForPositioner(); } QQuickStackLayoutAttached::QQuickStackLayoutAttached(QObject *object) |