diff options
| author | David Robillard <d@drobilla.net> | 2011-12-02 04:07:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-12-02 04:07:05 +0000 |
| commit | ac472a5510b477085020e608a5bee5e8cd3816c8 (patch) | |
| tree | 14f89fdf89eed14d7bec7396c5a4ba7be348fc41 /src | |
| parent | 71ec01c3749093df7dc7167467fb9e2c2f289669 (diff) | |
| download | ingen-ac472a5510b477085020e608a5bee5e8cd3816c8.tar.gz ingen-ac472a5510b477085020e608a5bee5e8cd3816c8.tar.bz2 ingen-ac472a5510b477085020e608a5bee5e8cd3816c8.zip | |
Connection => Edge.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3745 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/App.cpp | 2 | ||||
| -rw-r--r-- | src/gui/Connection.cpp | 2 | ||||
| -rw-r--r-- | src/gui/Connection.hpp | 4 | ||||
| -rw-r--r-- | src/gui/PatchCanvas.cpp | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp index dac6eeae..c93980a1 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -23,7 +23,7 @@ #include <gtk/gtkwindow.h> -#include "flowcanvas/Connection.hpp" +#include "flowcanvas/Edge.hpp" #include "ingen/ServerInterface.hpp" #include "ingen/EngineBase.hpp" #include "ingen/client/ClientStore.hpp" diff --git a/src/gui/Connection.cpp b/src/gui/Connection.cpp index 19cc4a14..e554de02 100644 --- a/src/gui/Connection.cpp +++ b/src/gui/Connection.cpp @@ -30,7 +30,7 @@ Connection::Connection(FlowCanvas::Canvas& canvas, FlowCanvas::Joinable* src, FlowCanvas::Joinable* dst, uint32_t color) - : FlowCanvas::Connection(canvas, src, dst, color) + : FlowCanvas::Edge(canvas, src, dst, color) , _connection_model(model) { } diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp index aeb7a4c7..5eee2194 100644 --- a/src/gui/Connection.hpp +++ b/src/gui/Connection.hpp @@ -20,7 +20,7 @@ #include <cassert> #include <string> -#include "flowcanvas/Connection.hpp" +#include "flowcanvas/Edge.hpp" #include "raul/SharedPtr.hpp" namespace Ingen { @@ -34,7 +34,7 @@ namespace GUI { * * \ingroup GUI */ -class Connection : public FlowCanvas::Connection +class Connection : public FlowCanvas::Edge { public: Connection(FlowCanvas::Canvas& canvas, diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 9b77683b..89cb541c 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -485,7 +485,7 @@ PatchCanvas::disconnection(SharedPtr<const ConnectionModel> cm) FlowCanvas::Port* const dst = get_port_view(cm->dst_port()); if (src && dst) - remove_connection(src, dst); + remove_edge(src, dst); else LOG(error) << "Unable to find ports to disconnect " << cm->src_port_path() << " -> " << cm->dst_port_path() << endl; @@ -642,8 +642,8 @@ PatchCanvas::copy_selection() } } - for (SelectedConnections::const_iterator c = selected_connections().begin(); - c != selected_connections().end(); ++c) { + for (SelectedEdges::const_iterator c = selected_edges().begin(); + c != selected_edges().end(); ++c) { Connection* const connection = dynamic_cast<Connection*>(*c); if (connection) { const Sord::URI subject(*_app.world()->rdf_world(), |