Nicer Flowcanvas naming.

git-svn-id: http://svn.drobilla.net/lad/machina@529 a436a847-0d15-0410-975c-d299462d15a1

6 files changed, 29 insertions, 29 deletions

diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp
index dceb0d0..e47d9fc 100644
--- a/src/gui/EdgeView.cpp
+++ b/src/gui/EdgeView.cpp
@@ -17,18 +17,18 @@
 
 #include <iomanip>
 #include <sstream>
-#include <flowcanvas/FlowCanvas.h>
+#include <flowcanvas/Canvas.h>
 #include <machina/Edge.hpp>
 #include "EdgeView.hpp"
 #include "NodeView.hpp"
 
-using namespace LibFlowCanvas;
+using namespace FlowCanvas;
 
-EdgeView::EdgeView(SharedPtr<FlowCanvas>    canvas,
+EdgeView::EdgeView(SharedPtr<Canvas>        canvas,
                    SharedPtr<NodeView>      src,
                    SharedPtr<NodeView>      dst,
                    SharedPtr<Machina::Edge> edge)
-	: LibFlowCanvas::Connection(canvas, src, dst, 0x9999AAff, true)
+	: FlowCanvas::Connection(canvas, src, dst, 0x9999AAff, true)
 	, _edge(edge)
 {
 }
diff --git a/src/gui/EdgeView.hpp b/src/gui/EdgeView.hpp
index 8416ce1..6dbc611 100644
--- a/src/gui/EdgeView.hpp
+++ b/src/gui/EdgeView.hpp
@@ -24,12 +24,12 @@ namespace Machina { class Edge; }
 class NodeView;
 
 
-class EdgeView : public LibFlowCanvas::Connection {
+class EdgeView : public FlowCanvas::Connection {
 public:
-	EdgeView(SharedPtr<LibFlowCanvas::FlowCanvas> canvas,
-	         SharedPtr<NodeView>                  src,
-	         SharedPtr<NodeView>                  dst,
-	         SharedPtr<Machina::Edge>             edge);
+	EdgeView(SharedPtr<FlowCanvas::Canvas> canvas,
+	         SharedPtr<NodeView>           src,
+	         SharedPtr<NodeView>           dst,
+	         SharedPtr<Machina::Edge>      edge);
 
 	SharedPtr<Machina::Edge> edge() { return _edge; }
 
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp
index d78c89d..741c0db 100644
--- a/src/gui/MachinaCanvas.cpp
+++ b/src/gui/MachinaCanvas.cpp
@@ -27,11 +27,11 @@
 #include "NodeView.hpp"
 #include "EdgeView.hpp"
 
-using namespace LibFlowCanvas;
+using namespace FlowCanvas;
 
 
 MachinaCanvas::MachinaCanvas(MachinaGUI* app, int width, int height)
-: FlowCanvas(width, height),
+: Canvas(width, height),
   _app(app)
 {
 
@@ -107,7 +107,7 @@ MachinaCanvas::canvas_event(GdkEvent* event)
 		return true;
 	
 	} else {
-		return FlowCanvas::canvas_event(event);
+		return Canvas::canvas_event(event);
 	}
 }
 
diff --git a/src/gui/MachinaCanvas.hpp b/src/gui/MachinaCanvas.hpp
index ad9b225..47c0174 100644
--- a/src/gui/MachinaCanvas.hpp
+++ b/src/gui/MachinaCanvas.hpp
@@ -21,15 +21,15 @@
 #include <string>
 #include <raul/SharedPtr.h>
 #include <raul/WeakPtr.h>
-#include <flowcanvas/FlowCanvas.h>
+#include <flowcanvas/Canvas.h>
 
-using namespace LibFlowCanvas;
+using namespace FlowCanvas;
 
 class MachinaGUI;
 class NodeView;
 
 
-class MachinaCanvas : public FlowCanvas
+class MachinaCanvas : public Canvas
 {
 public:
 	MachinaCanvas(MachinaGUI* app, int width, int height);
diff --git a/src/gui/NodeView.cpp b/src/gui/NodeView.cpp
index 271a137..18db225 100644
--- a/src/gui/NodeView.cpp
+++ b/src/gui/NodeView.cpp
@@ -20,13 +20,13 @@
 #include "NodePropertiesWindow.hpp"
 
 
-NodeView::NodeView(Gtk::Window*                         window,
-                   SharedPtr<LibFlowCanvas::FlowCanvas> canvas,
-                   SharedPtr<Machina::Node>             node,
-                   const std::string&                   name,
-                   double                               x,
-                   double                               y)
-	: LibFlowCanvas::Ellipse(canvas, name, x, y, 20, 20, false)
+NodeView::NodeView(Gtk::Window*                  window,
+                   SharedPtr<FlowCanvas::Canvas> canvas,
+                   SharedPtr<Machina::Node>      node,
+                   const std::string&            name,
+                   double                        x,
+                   double                        y)
+	: FlowCanvas::Ellipse(canvas, name, x, y, 20, 20, false)
 	, _window(window)
 	, _node(node)
 {
diff --git a/src/gui/NodeView.hpp b/src/gui/NodeView.hpp
index 16069fb..fd4e43d 100644
--- a/src/gui/NodeView.hpp
+++ b/src/gui/NodeView.hpp
@@ -22,14 +22,14 @@
 #include "machina/Node.hpp"
 
 
-class NodeView : public LibFlowCanvas::Ellipse {
+class NodeView : public FlowCanvas::Ellipse {
 public:
-	NodeView(Gtk::Window*                         window,
-	         SharedPtr<LibFlowCanvas::FlowCanvas> canvas,
-	         SharedPtr<Machina::Node>             node,
-	         const std::string&                   name,
-	         double                               x,
-	         double                               y);
+	NodeView(Gtk::Window*                  window,
+	         SharedPtr<FlowCanvas::Canvas> canvas,
+	         SharedPtr<Machina::Node>      node,
+	         const std::string&            name,
+	         double                        x,
+	         double                        y);
 
 	SharedPtr<Machina::Node> node() { return _node; }