aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/EdgeView.cpp2
-rw-r--r--src/gui/EdgeView.hpp4
-rw-r--r--src/gui/MachinaCanvas.cpp2
-rw-r--r--src/gui/MachinaGUI.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp
index 5bdf227..d8a4ce1 100644
--- a/src/gui/EdgeView.cpp
+++ b/src/gui/EdgeView.cpp
@@ -66,7 +66,7 @@ EdgeView::EdgeView(Canvas& canvas,
SharedPtr<NodeView> src,
SharedPtr<NodeView> dst,
SharedPtr<Machina::Client::ClientObject> edge)
- : FlowCanvas::Connection(canvas, src.get(), dst.get(), 0x9FA0A0F4, true)
+ : FlowCanvas::Edge(canvas, src.get(), dst.get(), 0x9FA0A0F4, true)
, _edge(edge)
{
set_color(edge_color(probability()));
diff --git a/src/gui/EdgeView.hpp b/src/gui/EdgeView.hpp
index 30c5b75..00f9bdb 100644
--- a/src/gui/EdgeView.hpp
+++ b/src/gui/EdgeView.hpp
@@ -18,7 +18,7 @@
#ifndef MACHINA_EDGEVIEW_HPP
#define MACHINA_EDGEVIEW_HPP
-#include "flowcanvas/Connection.hpp"
+#include "flowcanvas/Edge.hpp"
#include "client/ClientObject.hpp"
@@ -27,7 +27,7 @@
class NodeView;
class EdgeView
- : public FlowCanvas::Connection
+ : public FlowCanvas::Edge
, public Machina::Client::ClientObject::View {
public:
EdgeView(FlowCanvas::Canvas& canvas,
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp
index b961a0c..36b39d8 100644
--- a/src/gui/MachinaCanvas.cpp
+++ b/src/gui/MachinaCanvas.cpp
@@ -61,7 +61,7 @@ MachinaCanvas::node_clicked(WeakPtr<NodeView> item, GdkEventButton* event)
if (last) {
if (node != last) {
- if (get_connection(last.get(), node.get()))
+ if (get_edge(last.get(), node.get()))
action_disconnect(last, node);
else
action_connect(last, node);
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 7d39676..87c7807 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -605,8 +605,8 @@ MachinaGUI::show_labels_toggled()
nv->show_label(show);
}
- for (Canvas::Connections::const_iterator c = _canvas->connections().begin();
- c != _canvas->connections().end(); ++c) {
+ for (Canvas::Edges::const_iterator c = _canvas->edges().begin();
+ c != _canvas->edges().end(); ++c) {
EdgeView* const ev = dynamic_cast<EdgeView*>(*c);
if (ev)
ev->show_label(show);