FCL/sf/mw/qt: comparison src/gui/graphicsview/qgraphicsscene.cpp

equal deleted inserted replaced

-:3b1da2848fc7
+:d3bac044e0f0
 updateAll(false),
 calledEmitUpdated(false),
 processDirtyItemsEmitted(false),
 selectionChanging(0),
 needSortTopLevelItems(true),
-unpolishedItemsModified(true),
 holesInTopLevelSiblingIndex(false),
 topLevelSequentialOrdering(true),
 scenePosDescendantsUpdatePending(false),
 stickyFocus(false),
 hasFocus(false),
 /*!
 \internal
 */
 void QGraphicsScenePrivate::_q_polishItems()
 {
-QSet<QGraphicsItem *>::Iterator it = unpolishedItems.begin();
+if (unpolishedItems.isEmpty())
+return;
 const QVariant booleanTrueVariant(true);
-while (!unpolishedItems.isEmpty()) {
+QGraphicsItem *item = 0;
-QGraphicsItem *item = *it;
+QGraphicsItemPrivate *itemd = 0;
-it = unpolishedItems.erase(it);
+const int oldUnpolishedCount = unpolishedItems.count();
-unpolishedItemsModified = false;
-if (!item->d_ptr->explicitlyHidden) {
+for (int i = 0; i < oldUnpolishedCount; ++i) {
+item = unpolishedItems.at(i);
+if (!item)
+continue;
+itemd = item->d_ptr.data();
+itemd->pendingPolish = false;
+if (!itemd->explicitlyHidden) {
 item->itemChange(QGraphicsItem::ItemVisibleChange, booleanTrueVariant);
 item->itemChange(QGraphicsItem::ItemVisibleHasChanged, booleanTrueVariant);
 }
-if (item->isWidget()) {
+if (itemd->isWidget) {
 QEvent event(QEvent::Polish);
 QApplication::sendEvent((QGraphicsWidget *)item, &event);
 }
-if (unpolishedItemsModified)
+}
-it = unpolishedItems.begin();
+if (unpolishedItems.count() == oldUnpolishedCount) {
+// No new items were added to the vector.
+unpolishedItems.clear();
+} else {
+// New items were appended; keep them and remove the old ones.
+unpolishedItems.remove(0, oldUnpolishedCount);
+unpolishedItems.squeeze();
+QMetaObject::invokeMethod(q_ptr, "_q_polishItems", Qt::QueuedConnection);
 }
 }
 void QGraphicsScenePrivate::_q_processDirtyItems()
 {
 // Remove from parent, or unregister from toplevels.
 if (QGraphicsItem *parentItem = item->parentItem()) {
 if (parentItem->scene()) {
 Q_ASSERT_X(parentItem->scene() == q, "QGraphicsScene::removeItem",
 "Parent item's scene is different from this item's scene");
-item->d_ptr->setParentItemHelper(0);
+item->setParentItem(0);
 }
 } else {
 unregisterTopLevelItem(item);
 }
 // Update selected & hovered item bookkeeping
 selectedItems.remove(item);
 hoverItems.removeAll(item);
 cachedItemsUnderMouse.removeAll(item);
-unpolishedItems.remove(item);
+if (item->d_ptr->pendingPolish) {
-unpolishedItemsModified = true;
+const int unpolishedIndex = unpolishedItems.indexOf(item);
+if (unpolishedIndex != -1)
+unpolishedItems[unpolishedIndex] = 0;
+item->d_ptr->pendingPolish = false;
+}
 resetDirtyItem(item);
 //We remove all references of item from the sceneEventFilter arrays
 QMultiMap<QGraphicsItem*, QGraphicsItem*>::iterator iterator = sceneEventFilters.begin();
 while (iterator != sceneEventFilters.end()) {
 \fn QList<QGraphicsItem *> QGraphicsScene::items(qreal x, qreal y, qreal w, qreal h, Qt::ItemSelectionMode mode) const
 \obsolete
 \since 4.3
 This convenience function is equivalent to calling items(QRectF(\a x, \a y, \a w, \a h), \a mode).
 This function is deprecated and returns incorrect results if the scene
 contains items that ignore transformations. Use the overload that takes
 a QTransform instead.
 */
 Q_D(QGraphicsScene);
 if (!item) {
 qWarning("QGraphicsScene::addItem: cannot add null item");
 return;
 }
-if (item->scene() == this) {
+if (item->d_ptr->scene == this) {
 qWarning("QGraphicsScene::addItem: item has already been added to this scene");
 return;
 }
 // Remove this item from its existing scene
-if (QGraphicsScene *oldScene = item->scene())
+if (QGraphicsScene *oldScene = item->d_ptr->scene)
 oldScene->removeItem(item);
 // Notify the item that its scene is changing, and allow the item to
 // react.
 const QVariant newSceneVariant(item->itemChange(QGraphicsItem::ItemSceneChange,
 qVariantFromValue<QGraphicsScene *>(this)));
 QGraphicsScene *targetScene = qVariantValue<QGraphicsScene *>(newSceneVariant);
 if (targetScene != this) {
-if (targetScene && item->scene() != targetScene)
+if (targetScene && item->d_ptr->scene != targetScene)
 targetScene->addItem(item);
 return;
 }
+if (d->unpolishedItems.isEmpty())
+QMetaObject::invokeMethod(this, "_q_polishItems", Qt::QueuedConnection);
+d->unpolishedItems.append(item);
+item->d_ptr->pendingPolish = true;
 // Detach this item from its parent if the parent's scene is different
 // from this scene.
-if (QGraphicsItem *itemParent = item->parentItem()) {
+if (QGraphicsItem *itemParent = item->d_ptr->parent) {
-if (itemParent->scene() != this)
+if (itemParent->d_ptr->scene != this)
 item->setParentItem(0);
 }
 // Add the item to this scene
 item->d_func()->scene = targetScene;
 if (d->allItemsIgnoreHoverEvents && d->itemAcceptsHoverEvents_helper(item)) {
 d->allItemsIgnoreHoverEvents = false;
 d->enableMouseTrackingOnViews();
 }
 #ifndef QT_NO_CURSOR
-if (d->allItemsUseDefaultCursor && item->hasCursor()) {
+if (d->allItemsUseDefaultCursor && item->d_ptr->hasCursor) {
 d->allItemsUseDefaultCursor = false;
 if (d->allItemsIgnoreHoverEvents) // already enabled otherwise
 d->enableMouseTrackingOnViews();
 }
 #endif //QT_NO_CURSOR
 // Enable touch events if the item accepts touch events.
-if (d->allItemsIgnoreTouchEvents && item->acceptTouchEvents()) {
+if (d->allItemsIgnoreTouchEvents && item->d_ptr->acceptTouchEvents) {
 d->allItemsIgnoreTouchEvents = false;
 d->enableTouchEventsOnViews();
 }
 // Update selection lists
 lastNew->d_func()->focusNext = d->tabFocusFirst;
 }
 }
 // Add all children recursively
-foreach (QGraphicsItem *child, item->children())
+item->d_ptr->ensureSortedChildren();
-addItem(child);
+for (int i = 0; i < item->d_ptr->children.size(); ++i)
+addItem(item->d_ptr->children.at(i));
 // Resolve font and palette.
 item->d_ptr->resolveFont(d->font.resolve());
 item->d_ptr->resolvePalette(d->palette.resolve());
-if (d->unpolishedItems.isEmpty())
-QMetaObject::invokeMethod(this, "_q_polishItems", Qt::QueuedConnection);
-d->unpolishedItems.insert(item);
-d->unpolishedItemsModified = true;
 // Reenable selectionChanged() for individual items
 --d->selectionChanging;
 if (!d->selectionChanging && d->selectedItems.size() != oldSelectedItemSize)
 emit selectionChanged();
 else
 d->lastActivePanel = item;
 }
 }
-if (item->flags() & QGraphicsItem::ItemSendsScenePositionChanges)
+if (item->d_ptr->flags & QGraphicsItem::ItemSendsScenePositionChanges)
 d->registerScenePosItem(item);
 // Ensure that newly added items that have subfocus set, gain
 // focus automatically if there isn't a focus item already.
 if (!d->focusItem && item != d->lastFocusItem && item->focusItem() == item)
 #endif
 }
 bool QGraphicsScenePrivate::itemAcceptsHoverEvents_helper(const QGraphicsItem *item) const
 {
-return (!item->isBlockedByModalPanel() &&
+return (item->d_ptr->acceptsHover
-(item->acceptHoverEvents()
+|| (item->d_ptr->isWidget
-|| (item->isWidget()
+&& static_cast<const QGraphicsWidget *>(item)->d_func()->hasDecoration()))
-&& static_cast<const QGraphicsWidget *>(item)->d_func()->hasDecoration())));
+&& !item->isBlockedByModalPanel();
 }
 /*!
 This event handler, for event \a hoverEvent, can be reimplemented in a
 subclass to receive hover enter events. The default implementation
 if (itemHasChildren && itemClipsChildrenToShape)
 painter->restore();
 }
 void QGraphicsScenePrivate::markDirty(QGraphicsItem *item, const QRectF &rect, bool invalidateChildren,
-bool force, bool ignoreOpacity, bool removingItemFromScene)
+bool force, bool ignoreOpacity, bool removingItemFromScene,
+bool updateBoundingRect)
 {
 Q_ASSERT(item);
 if (updateAll)
 return;
 if (force)
 item->d_ptr->ignoreVisible = 1;
 if (ignoreOpacity)
 item->d_ptr->ignoreOpacity = 1;
-QGraphicsItem *p = item->d_ptr->parent;
+if (!updateBoundingRect)
-while (p) {
+item->d_ptr->markParentDirty();
-p->d_ptr->dirtyChildren = 1;
-#ifndef QT_NO_GRAPHICSEFFECT
-if (p->d_ptr->graphicsEffect && p->d_ptr->graphicsEffect->isEnabled()) {
-p->d_ptr->dirty = 1;
-p->d_ptr->fullUpdatePending = 1;
-}
-#endif //QT_NO_GRAPHICSEFFECT
-p = p->d_ptr->parent;
-}
 }
 static inline bool updateHelper(QGraphicsViewPrivate *view, QGraphicsItemPrivate *item,
 const QRectF &rect, bool itemIsUntransformable)
 {

branch	RCL_3
changeset 5	d3bac044e0f0
parent 4	3b1da2848fc7
child 8	3f74d0d4af4c