From ad2ea165501c23cbd85c4ddb155f2d7ea8fc85b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Fri, 30 Jan 2015 18:20:08 +0000 Subject: Fix 1700 override warnings [-Winconsistent-missing-override] Classes should either use or not use override, otherwise it hurts code readability. Some inline keywords were removed because of an error with MSVC2010: error C2216: 'override' cannot be used with 'inline' Change-Id: I7276d5525a92281bd0d743beb11d0dc73441443b Reviewed-by: Marc Mutz --- src/widgets/graphicsview/qgraphicsitem_p.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/widgets/graphicsview') diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index 4af39cac2f..0dd192caed 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -658,28 +658,28 @@ public: : QGraphicsEffectSourcePrivate(), item(i), info(0) {} - inline void detach() + void detach() Q_DECL_OVERRIDE { item->d_ptr->graphicsEffect = 0; item->prepareGeometryChange(); } - inline const QGraphicsItem *graphicsItem() const + const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE { return item; } - inline const QWidget *widget() const + const QWidget *widget() const Q_DECL_OVERRIDE { return 0; } - inline void update() { + void update() Q_DECL_OVERRIDE { item->d_ptr->updateDueToGraphicsEffect = true; item->update(); item->d_ptr->updateDueToGraphicsEffect = false; } - inline void effectBoundingRectChanged() + void effectBoundingRectChanged() Q_DECL_OVERRIDE { item->prepareGeometryChange(); } - inline bool isPixmap() const + bool isPixmap() const Q_DECL_OVERRIDE { return item->type() == QGraphicsPixmapItem::Type && !(item->flags() & QGraphicsItem::ItemIsSelectable) @@ -687,10 +687,10 @@ public: //|| (item->d_ptr->isObject && qobject_cast(q_func())); } - inline const QStyleOption *styleOption() const + const QStyleOption *styleOption() const Q_DECL_OVERRIDE { return info ? info->option : 0; } - inline QRect deviceRect() const + QRect deviceRect() const Q_DECL_OVERRIDE { if (!info || !info->widget) { qWarning("QGraphicsEffectSource::deviceRect: Not yet implemented, lacking device context"); -- cgit v1.2.3