diff options
author | Simjees Abraham <simjees.abraham@nokia.com> | 2012-04-16 11:33:41 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 12:02:39 +0200 |
commit | 3e4d20f13ced528f5366b0f485c4cbe636cb4756 (patch) | |
tree | ad9bfee0a6485d87af293dbb74ff2eb452eecb37 /src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp | |
parent | 4fda752da39af7826bd3195a52eab70135c7aea0 (diff) |
QPointer used instead of QWeakPointer
Correctly used QPointer instead of QWeakPointer in QuickViewInspector
and Highlight classes.
Change-Id: I579bd148e71803b029d7a036cdcb7255740dbd91
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp index 9fd5954b90..f92fbb94c6 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp @@ -225,9 +225,9 @@ QList<QQuickItem *> QQuickViewInspector::itemsAt(const QPointF &pos) const QList<QQuickItem*> QQuickViewInspector::selectedItems() const { QList<QQuickItem *> selection; - foreach (const QWeakPointer<QQuickItem> &selectedItem, m_selectedItems) { + foreach (const QPointer<QQuickItem> &selectedItem, m_selectedItems) { if (selectedItem) - selection << selectedItem.data(); + selection << selectedItem; } return selection; } @@ -249,16 +249,16 @@ bool QQuickViewInspector::syncSelectedItems(const QList<QQuickItem *> &items) bool selectionChanged = false; // Disconnect and remove items that are no longer selected - foreach (const QWeakPointer<QQuickItem> &item, m_selectedItems) { + foreach (const QPointer<QQuickItem> &item, m_selectedItems) { if (!item) // Don't see how this can happen due to handling of destroyed() continue; - if (items.contains(item.data())) + if (items.contains(item)) continue; selectionChanged = true; - item.data()->disconnect(this); + item->disconnect(this); m_selectedItems.removeOne(item); - delete m_highlightItems.take(item.data()); + delete m_highlightItems.take(item); } // Connect and add newly selected items |