whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtWidgets: Fix warnings about deprecated QGraphicsView functions. 

Warnings introduced by d76de69b4b .

Change-Id: I613500074a2318a617f18d5b887840ecc3408237
Reviewed-by: Gatis Paeglis <gatis.paeglis@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
bb10
Friedemann Kleint 2012-06-13 15:08:07 +02:00 committed by Qt by Nokia
parent deed9c75b4
commit 9e9ea7c0e6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/graphicsview/qgraphicsitem.cpp
View File

@ -1806,7 +1806,7 @@ static void _q_qgraphicsItemSetFlag(QGraphicsItem *item, QGraphicsItem::Graphics
return;
}
item->setFlag(flag, enabled);
foreach (QGraphicsItem *child, item->children())
foreach (QGraphicsItem *child, item->childItems())
_q_qgraphicsItemSetFlag(child, flag, enabled);
}

2
src/widgets/graphicsview/qgraphicsproxywidget.cpp
View File

@ -288,7 +288,7 @@ void QGraphicsProxyWidgetPrivate::sendWidgetMouseEvent(QGraphicsSceneMouseEvent
// grabber child widget.
if (embeddedMouseGrabber && type == QEvent::MouseButtonRelease && !event->buttons()) {
Q_Q(QGraphicsProxyWidget);
if (q->rect().contains(event->pos()) && q->acceptsHoverEvents())
if (q->rect().contains(event->pos()) && q->acceptHoverEvents())
lastWidgetUnderMouse = alienWidget ? alienWidget : widget;
else // released on the frame our outside the item, or doesn't accept hover events.
lastWidgetUnderMouse = 0;

4
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -2378,7 +2378,7 @@ QGraphicsItemGroup *QGraphicsScene::createItemGroup(const QList<QGraphicsItem *>
*/
void QGraphicsScene::destroyItemGroup(QGraphicsItemGroup *group)
{
foreach (QGraphicsItem *item, group->children())
foreach (QGraphicsItem *item, group->childItems())
group->removeFromGroup(item);
removeItem(group);
delete group;
@ -5585,7 +5585,7 @@ void QGraphicsScene::setActiveWindow(QGraphicsWidget *widget)
QList<QGraphicsItem *> siblingWindows;
QGraphicsItem *parent = panel->parentItem();
// Raise ### inefficient for toplevels
foreach (QGraphicsItem *sibling, parent ? parent->children() : items()) {
foreach (QGraphicsItem *sibling, parent ? parent->childItems() : items()) {
if (sibling != panel && sibling->isWindow())
siblingWindows << sibling;
}

2
src/widgets/graphicsview/qgraphicswidget.cpp
View File

@ -1451,7 +1451,7 @@ bool QGraphicsWidget::event(QEvent *event)
windowFrameEvent(event);
// Filter out hover events if they were sent to us only because of the
// decoration (special case in QGraphicsScenePrivate::dispatchHoverEvent).
if (!acceptsHoverEvents())
if (!acceptHoverEvents())
return true;
}
break;