Skip to content

Commit

Permalink
Fix build with graphviz 10 (#3115)
Browse files Browse the repository at this point in the history
* Fix build with graphviz 11

* Update changelog

---------

Co-authored-by: Marco Randazzo <[email protected]>
  • Loading branch information
traversaro and randaz81 authored Aug 26, 2024
1 parent 2fd8e69 commit 61a4a05
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions doc/release/master.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Fixes
* `yarpbatterygui` now compatible with battery_nwc_yarp.
* Fixed compilation of portmonitor carrier when a custom non-system swig is used
* Fixed compatibility with ffmpeg 7 (https://github.com/robotology/yarp/pull/3109).
* Fixed compilation with graphviz 10 (https://github.com/robotology/yarp/pull/3115).
* Fix sending empty yarp::sig::Vector when building in Debug (https://github.com/robotology/yarp/pull/3123).

New Features
Expand Down
8 changes: 4 additions & 4 deletions extern/qgv/qgv/QGVCore/QGVScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void QGVScene::setEdgeAttribute(const QString &name, const QString &value)

QGVNode *QGVScene::addNode(const QString &label)
{
Agnode_t *node = agnode(_graph->graph(), NULL, TRUE);
Agnode_t *node = agnode(_graph->graph(), NULL, true);
if(node == NULL)
{
qWarning()<<"Invalid node :"<<label;
Expand All @@ -81,7 +81,7 @@ QGVNode *QGVScene::addNode(const QString &label)

QGVEdge *QGVScene::addEdge(QGVNode *source, QGVNode *target, const QString &label)
{
Agedge_t* edge = agedge(_graph->graph(), source->_node->node(), target->_node->node(), NULL, TRUE);
Agedge_t* edge = agedge(_graph->graph(), source->_node->node(), target->_node->node(), NULL, true);
if(edge == NULL)
{
qWarning()<<"Invalid egde :"<<label;
Expand All @@ -99,9 +99,9 @@ QGVSubGraph *QGVScene::addSubGraph(const QString &name, bool cluster)
{
Agraph_t* sgraph;
if(cluster)
sgraph = agsubg(_graph->graph(), ("cluster_" + name).toLocal8Bit().data(), TRUE);
sgraph = agsubg(_graph->graph(), ("cluster_" + name).toLocal8Bit().data(), true);
else
sgraph = agsubg(_graph->graph(), name.toLocal8Bit().data(), TRUE);
sgraph = agsubg(_graph->graph(), name.toLocal8Bit().data(), true);

if(sgraph == NULL)
{
Expand Down
8 changes: 4 additions & 4 deletions extern/qgv/qgv/QGVCore/QGVSubGraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ QString QGVSubGraph::name() const

QGVNode *QGVSubGraph::addNode(const QString &label)
{
Agnode_t *node = agnode(_sgraph->graph(), NULL, TRUE);
Agnode_t *node = agnode(_sgraph->graph(), NULL, true);
if(node == NULL)
{
qWarning()<<"Invalid sub node :"<<label;
return 0;
}
agsubnode(_sgraph->graph(), node, TRUE);
agsubnode(_sgraph->graph(), node, true);

QGVNode *item = new QGVNode(new QGVNodePrivate(node, _sgraph->graph()), _scene);
item->setLabel(label);
Expand All @@ -62,9 +62,9 @@ QGVSubGraph *QGVSubGraph::addSubGraph(const QString &name, bool cluster)
{
Agraph_t* sgraph;
if(cluster)
sgraph = agsubg(_sgraph->graph(), ("cluster_" + name).toLocal8Bit().data(), TRUE);
sgraph = agsubg(_sgraph->graph(), ("cluster_" + name).toLocal8Bit().data(), true);
else
sgraph = agsubg(_sgraph->graph(), name.toLocal8Bit().data(), TRUE);
sgraph = agsubg(_sgraph->graph(), name.toLocal8Bit().data(), true);

if(sgraph == NULL)
{
Expand Down

0 comments on commit 61a4a05

Please sign in to comment.