summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-11-30 21:49:37 +0000
committerDavid Robillard <d@drobilla.net>2011-11-30 21:49:37 +0000
commit22b2c802b1a39f72ea431a8a0ace1a1a3ae6048f (patch)
tree1c307b501a9f7e9b09fce03eb2a995a09e3c0386
parentf86930bfeb22428acdb712ab4fd98b77d1bbb2e8 (diff)
downloadingen-22b2c802b1a39f72ea431a8a0ace1a1a3ae6048f.tar.gz
ingen-22b2c802b1a39f72ea431a8a0ace1a1a3ae6048f.tar.bz2
ingen-22b2c802b1a39f72ea431a8a0ace1a1a3ae6048f.zip
Connectable => Joinable.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3706 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/gui/Connection.cpp4
-rw-r--r--src/gui/Connection.hpp4
-rw-r--r--src/gui/PatchCanvas.cpp8
-rw-r--r--src/gui/PatchCanvas.hpp8
4 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/Connection.cpp b/src/gui/Connection.cpp
index de02382a..19cc4a14 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<const ConnectionModel> model,
- FlowCanvas::Connectable* src,
- FlowCanvas::Connectable* dst,
+ FlowCanvas::Joinable* src,
+ FlowCanvas::Joinable* dst,
uint32_t color)
: FlowCanvas::Connection(canvas, src, dst, color)
, _connection_model(model)
diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp
index 395f5e62..aeb7a4c7 100644
--- a/src/gui/Connection.hpp
+++ b/src/gui/Connection.hpp
@@ -39,8 +39,8 @@ class Connection : public FlowCanvas::Connection
public:
Connection(FlowCanvas::Canvas& canvas,
boost::shared_ptr<const ConnectionModel> model,
- FlowCanvas::Connectable* src,
- FlowCanvas::Connectable* dst,
+ FlowCanvas::Joinable* src,
+ FlowCanvas::Joinable* dst,
uint32_t color);
SharedPtr<const ConnectionModel> model() const { return _connection_model; }
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index debdb7a6..9e8b232b 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -492,8 +492,8 @@ PatchCanvas::disconnection(SharedPtr<const ConnectionModel> cm)
}
void
-PatchCanvas::connect(FlowCanvas::Connectable* src_port,
- FlowCanvas::Connectable* dst_port)
+PatchCanvas::connect(FlowCanvas::Joinable* src_port,
+ FlowCanvas::Joinable* dst_port)
{
const Ingen::GUI::Port* const src
= dynamic_cast<Ingen::GUI::Port*>(src_port);
@@ -508,8 +508,8 @@ PatchCanvas::connect(FlowCanvas::Connectable* src_port,
}
void
-PatchCanvas::disconnect(FlowCanvas::Connectable* src_port,
- FlowCanvas::Connectable* dst_port)
+PatchCanvas::disconnect(FlowCanvas::Joinable* src_port,
+ FlowCanvas::Joinable* dst_port)
{
const Ingen::GUI::Port* const src
= dynamic_cast<Ingen::GUI::Port*>(src_port);
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index a21a37b8..06aa12d5 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -131,11 +131,11 @@ private:
FlowCanvas::Port* get_port_view(SharedPtr<PortModel> port);
- void connect(FlowCanvas::Connectable* src,
- FlowCanvas::Connectable* dst);
+ void connect(FlowCanvas::Joinable* src,
+ FlowCanvas::Joinable* dst);
- void disconnect(FlowCanvas::Connectable* src,
- FlowCanvas::Connectable* dst);
+ void disconnect(FlowCanvas::Joinable* src,
+ FlowCanvas::Joinable* dst);
App& _app;
SharedPtr<const PatchModel> _patch;