From 9e9ea7c0e604e50ef66393f85fa2e5b6dafe187e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 13 Jun 2012 15:08:07 +0200 Subject: [PATCH] QtWidgets: Fix warnings about deprecated QGraphicsView functions. Warnings introduced by d76de69b4b60e7e13d5b0602768702e4bf219804 . Change-Id: I613500074a2318a617f18d5b887840ecc3408237 Reviewed-by: Gatis Paeglis Reviewed-by: Jason McDonald --- src/widgets/graphicsview/qgraphicsitem.cpp | 2 +- src/widgets/graphicsview/qgraphicsproxywidget.cpp | 2 +- src/widgets/graphicsview/qgraphicsscene.cpp | 4 ++-- src/widgets/graphicsview/qgraphicswidget.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index dea0d76..cd88a9b 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -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); } diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp index f4d43e4..dbff872 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp +++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp @@ -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; diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 6feeb94..07e94e0 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -2378,7 +2378,7 @@ QGraphicsItemGroup *QGraphicsScene::createItemGroup(const QList */ 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 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; } diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index cf55827..3a3d3e3 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -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; -- 2.7.4