diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-27 15:33:21 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-02 09:35:49 +0000 |
commit | 9b8fc8dd13dbf0e3bb446a23e82f24cfa7889f1c (patch) | |
tree | 4ac596f4d5478b65fe59d23efa87a63952ad48a8 /examples/widgets/graphicsview/elasticnodes | |
parent | 23b139038a1dc9a769a358ab112453abcdd39290 (diff) |
Examples: Fix Clang warning about hiding QGraphicsItem:::advance()
In file included from edge.cpp:52:
./node.h(76,10): warning: 'Node::advance' hides overloaded virtual function [-Woverloaded-virtual]
bool advance();
Change-Id: I9d437059362c367e452b1b4f16077d4e0abd18de
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'examples/widgets/graphicsview/elasticnodes')
-rw-r--r-- | examples/widgets/graphicsview/elasticnodes/graphwidget.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/graphicsview/elasticnodes/node.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/graphicsview/elasticnodes/node.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp index 4259aab803..81928a4ee1 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp @@ -174,7 +174,7 @@ void GraphWidget::timerEvent(QTimerEvent *event) bool itemsMoved = false; foreach (Node *node, nodes) { - if (node->advance()) + if (node->advancePosition()) itemsMoved = true; } diff --git a/examples/widgets/graphicsview/elasticnodes/node.cpp b/examples/widgets/graphicsview/elasticnodes/node.cpp index 94df45524a..71737c984b 100644 --- a/examples/widgets/graphicsview/elasticnodes/node.cpp +++ b/examples/widgets/graphicsview/elasticnodes/node.cpp @@ -138,7 +138,7 @@ void Node::calculateForces() //! [6] //! [7] -bool Node::advance() +bool Node::advancePosition() { if (newPos == pos()) return false; diff --git a/examples/widgets/graphicsview/elasticnodes/node.h b/examples/widgets/graphicsview/elasticnodes/node.h index 487ae0d68e..43ea1fb24b 100644 --- a/examples/widgets/graphicsview/elasticnodes/node.h +++ b/examples/widgets/graphicsview/elasticnodes/node.h @@ -73,7 +73,7 @@ public: int type() const override { return Type; } void calculateForces(); - bool advance(); + bool advancePosition(); QRectF boundingRect() const override; QPainterPath shape() const override; |