Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-19 10:39:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix Clang warnings: 'Node::advance' hides overloaded virtual function

Browse source 
warning: 'Node::advance' hides overloaded virtual function [-
Woverloaded-virtual]
    bool advance();
         ^
/usr/include/qt4/QtGui/qgraphicsitem.h:323: hidden overloaded virtual
function 'QGraphicsItem::advance' declared here: different number of
parameters (1 vs 0)
    virtual void advance(int phase);
                 ^
This commit is contained in:
Phenom 2017-03-18 11:32:56 +01:00 • committed by csoler
parent 13c8f7d342
commit 9319caffc7
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/elastic/graphwidget.cpp
View file

@ -362,7 +362,7 @@ void GraphWidget::timerEvent(QTimerEvent *event)
bool itemsMoved = false; bool itemsMoved = false;
foreach (Node *node, _nodes) foreach (Node *node, _nodes)
if(node->advance()) if(node->progress())
itemsMoved = true; itemsMoved = true;
if (!itemsMoved) { if (!itemsMoved) {

2
retroshare-gui/src/gui/elastic/node.cpp
View file

@ -215,7 +215,7 @@ void Node::calculateForces(const double *map,int width,int height,int W,int H,fl
newPos.setY(qMin(qMax(newPos.y(), sceneRect.top()) , sceneRect.bottom())); newPos.setY(qMin(qMax(newPos.y(), sceneRect.top()) , sceneRect.bottom()));
} }
bool Node::advance() bool Node::progress()
{ {
if(_type == GraphWidget::ELASTIC_NODE_TYPE_OWN) if(_type == GraphWidget::ELASTIC_NODE_TYPE_OWN)
return false; return false;

2
retroshare-gui/src/gui/elastic/node.h
View file

@ -77,7 +77,7 @@ public:
std::string descString() const { return _desc_string ; } std::string descString() const { return _desc_string ; }
void calculateForces(const double *data,int width,int height,int W,int H,float x,float y,float speedf); void calculateForces(const double *data,int width,int height,int W,int H,float x,float y,float speedf);
bool advance(); bool progress();
QRectF boundingRect() const; QRectF boundingRect() const;
QPainterPath shape() const; QPainterPath shape() const;