"Connection" => "Edge"

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4345 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 10 insertions, 10 deletions

diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index c79181ff..b3f005f1 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -14,7 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/Connection.hpp"
+#include "ingen/Edge.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/Node.hpp"
 #include "ingen/Patch.hpp"
@@ -51,10 +51,10 @@ Builder::build(SharedPtr<const GraphObject> object)
 		}
 
 		build_object(object);
-		/*for (Patch::Connections::const_iterator i = patch->connections().begin();
-				i != patch->connections().end(); ++i) {
-			_interface.connect((*i)->src_port_path(), (*i)->dst_port_path());
-		}*/
+		/*for (Patch::Edges::const_iterator i = patch->edges().begin();
+		  i != patch->edges().end(); ++i) {
+		  _interface.connect((*i)->src_port_path(), (*i)->dst_port_path());
+		  }*/
 		return;
 	}
 
@@ -82,8 +82,8 @@ Builder::connect(SharedPtr<const GraphObject> object)
 {
 	SharedPtr<const Patch> patch = PtrCast<const Patch>(object);
 	if (patch) {
-		for (Patch::Connections::const_iterator i = patch->connections().begin();
-				i != patch->connections().end(); ++i) {
+		for (Patch::Edges::const_iterator i = patch->edges().begin();
+		     i != patch->edges().end(); ++i) {
 			_interface.connect(i->second->tail_path(), i->second->head_path());
 		}
 		return;
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index 9873246f..d5c29e9c 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -104,8 +104,8 @@ public:
 		, argv(a_argv)
 		, lv2_features(NULL)
 		, rdf_world(new Sord::World())
-		, forge(new Ingen::Forge(*uri_map))
 		, uri_map(new Ingen::Shared::URIMap(map, unmap))
+		, forge(new Ingen::Forge(*uri_map))
 		, uris(new Shared::URIs(*forge, uri_map))
 		, lilv_world(lilv_world_new())
 	{
@@ -144,9 +144,9 @@ public:
 
 		delete rdf_world;
 		delete lv2_features;
+		delete uris;
 		delete forge;
 		delete uri_map;
-		delete uris;
 	}
 
 	typedef std::map< const std::string, SharedPtr<Module> > Modules;
@@ -164,8 +164,8 @@ public:
 	Shared::Configuration                conf;
 	LV2Features*                         lv2_features;
 	Sord::World*                         rdf_world;
-	Ingen::Forge*                        forge;
 	URIMap*                              uri_map;
+	Ingen::Forge*                        forge;
 	URIs*                                uris;
 	SharedPtr<Interface>                 interface;
 	SharedPtr<EngineBase>                engine;