From 6f3a80bb9c80b8e0cf486d198c2e107512b2cc46 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 4 Feb 2010 23:53:17 +0000
Subject: Tidy up DeprecatedLoader, fix predicates.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2428 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/DeprecatedLoader.cpp | 14 ++++----------
 src/client/DeprecatedLoader.hpp |  3 ---
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'src/client')

diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp
index 5fd5720d..7d6e9fee 100644
--- a/src/client/DeprecatedLoader.cpp
+++ b/src/client/DeprecatedLoader.cpp
@@ -153,9 +153,9 @@ DeprecatedLoader::add_variable(GraphObject::Properties& data, string old_key, st
 {
 	string key;
 	if (old_key == "module-x")
-		key = "ingenui:canvas-x";
+		key = "http://drobilla.net/ns/ingenuity#canvas-x";
 	else if (old_key == "module-y")
-		key = "ingenui:canvas-y";
+		key = "http://drobilla.net/ns/ingenuity#canvas-y";
 
 	if (!key.empty()) {
 		// FIXME: should this overwrite existing values?
@@ -368,8 +368,6 @@ DeprecatedLoader::load_patch(const Glib::ustring&    filename,
 }
 
 
-/** Build a NodeModel given a pointer to a Node in a patch file.
- */
 bool
 DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
 {
@@ -516,7 +514,7 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
 			for (GraphObject::Properties::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
 				_engine->set_property(path, i->first, i->second);
 
-			return SharedPtr<NodeModel>();
+			return false;
 
 		} else {
 			if (plugin_label == "note_in") {
@@ -602,8 +600,6 @@ DeprecatedLoader::load_subpatch(const string& base_filename, const Path& parent,
 }
 
 
-/** Build a ConnectionModel given a pointer to a connection in a patch file.
- */
 bool
 DeprecatedLoader::load_connection(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
 {
@@ -651,8 +647,7 @@ DeprecatedLoader::load_connection(const Path& parent, xmlDocPtr doc, const xmlNo
 }
 
 
-/** Build a PresetModel given a pointer to a preset in a patch file.
- */
+/** Build a PresetModel given a pointer to a preset in a patch file. */
 SharedPtr<PresetModel>
 DeprecatedLoader::load_preset(const Path& parent, xmlDocPtr doc, const xmlNodePtr node)
 {
@@ -715,7 +710,6 @@ DeprecatedLoader::load_preset(const Path& parent, xmlDocPtr doc, const xmlNodePt
 	}
 	if (pm->name().empty()) {
 		LOG(error) << "Preset in patch file has no name." << endl;
-		//m_client_hooks->error("Preset in patch file has no name.");
 		pm->name("Unnamed");
 	}
 
diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp
index 5ae96e2d..79878107 100644
--- a/src/client/DeprecatedLoader.hpp
+++ b/src/client/DeprecatedLoader.hpp
@@ -35,9 +35,6 @@ namespace Raul { class Path; }
 namespace Ingen {
 namespace Client {
 
-class PatchModel;
-class NodeModel;
-class ConnectionModel;
 class PresetModel; // defined in DeprecatedLoader.cpp
 
 
-- 
cgit v1.2.1