From d137d4444d135a22081f8702b628aee6b9672875 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 2 Dec 2011 20:31:14 +0000 Subject: Joinable => Node. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3751 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/Connection.cpp | 4 ++-- src/gui/Connection.hpp | 4 ++-- src/gui/PatchCanvas.cpp | 8 ++++---- src/gui/PatchCanvas.hpp | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gui/Connection.cpp b/src/gui/Connection.cpp index e554de02..8e6732ff 100644 --- a/src/gui/Connection.cpp +++ b/src/gui/Connection.cpp @@ -27,8 +27,8 @@ namespace GUI { Connection::Connection(FlowCanvas::Canvas& canvas, boost::shared_ptr model, - FlowCanvas::Joinable* src, - FlowCanvas::Joinable* dst, + FlowCanvas::Node* src, + FlowCanvas::Node* dst, uint32_t color) : FlowCanvas::Edge(canvas, src, dst, color) , _connection_model(model) diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp index 5eee2194..bae9f4aa 100644 --- a/src/gui/Connection.hpp +++ b/src/gui/Connection.hpp @@ -39,8 +39,8 @@ class Connection : public FlowCanvas::Edge public: Connection(FlowCanvas::Canvas& canvas, boost::shared_ptr model, - FlowCanvas::Joinable* src, - FlowCanvas::Joinable* dst, + FlowCanvas::Node* src, + FlowCanvas::Node* dst, uint32_t color); SharedPtr model() const { return _connection_model; } diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 1252cfa9..82a72bd5 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -492,8 +492,8 @@ PatchCanvas::disconnection(SharedPtr cm) } void -PatchCanvas::connect(FlowCanvas::Joinable* src_port, - FlowCanvas::Joinable* dst_port) +PatchCanvas::connect(FlowCanvas::Node* src_port, + FlowCanvas::Node* dst_port) { const Ingen::GUI::Port* const src = dynamic_cast(src_port); @@ -508,8 +508,8 @@ PatchCanvas::connect(FlowCanvas::Joinable* src_port, } void -PatchCanvas::disconnect(FlowCanvas::Joinable* src_port, - FlowCanvas::Joinable* dst_port) +PatchCanvas::disconnect(FlowCanvas::Node* src_port, + FlowCanvas::Node* dst_port) { const Ingen::GUI::Port* const src = dynamic_cast(src_port); diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp index 06aa12d5..c0dfe8d8 100644 --- a/src/gui/PatchCanvas.hpp +++ b/src/gui/PatchCanvas.hpp @@ -131,11 +131,11 @@ private: FlowCanvas::Port* get_port_view(SharedPtr port); - void connect(FlowCanvas::Joinable* src, - FlowCanvas::Joinable* dst); + void connect(FlowCanvas::Node* src, + FlowCanvas::Node* dst); - void disconnect(FlowCanvas::Joinable* src, - FlowCanvas::Joinable* dst); + void disconnect(FlowCanvas::Node* src, + FlowCanvas::Node* dst); App& _app; SharedPtr _patch; -- cgit v1.2.1