From 42d8a867c5523b0b45e8236a9629e5485d7d2e2a Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 16 Feb 2011 18:26:57 +0000
Subject: Drop redlandmm for sordmm.

git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2959 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/MachinaGUI.cpp | 12 ++++++------
 src/gui/main.cpp       |  4 ++--
 src/gui/wscript        |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 437d5e1..fe7462e 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -24,7 +24,7 @@
 #include <pthread.h>
 #include <libgnomecanvasmm.h>
 #include <libglademm/xml.h>
-#include "redlandmm/Model.hpp"
+#include "sord/sordmm.hpp"
 #include "machina/Controller.hpp"
 #include "machina/Engine.hpp"
 #include "machina/Machine.hpp"
@@ -448,12 +448,12 @@ MachinaGUI::menu_file_save()
 	if (_save_uri == "" || _save_uri.substr(0, 5) != "file:") {
 		menu_file_save_as();
 	} else {
-		if (!raptor_uri_uri_string_is_file_uri((const unsigned char*)_save_uri.c_str()))
+		if (_save_uri.substr(0, 5) != "file:")
 			menu_file_save_as();
 
-		Redland::Model model(_engine->rdf_world(), _save_uri);
+		Sord::Model model(_engine->rdf_world(), _save_uri);
 		_engine->machine()->write_state(model);
-		model.serialise_to_file(_save_uri, "turtle");
+		model.write_to_file(_save_uri, "turtle");
 	}
 }
 
@@ -503,9 +503,9 @@ MachinaGUI::menu_file_save_as()
 
 		if (confirm) {
 			_save_uri = uri;
-			Redland::Model model(_engine->rdf_world(), _save_uri);
+			Sord::Model model(_engine->rdf_world(), _save_uri);
 			_engine->machine()->write_state(model);
-			model.serialise_to_file(_save_uri, "turtle");
+			model.write_to_file(_save_uri, "turtle");
 		}
 	}
 }
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index a2fd12a..4f23e18 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -20,7 +20,7 @@
 #include <iostream>
 #include <string>
 #include <libgnomecanvasmm.h>
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
 #include "machina/Engine.hpp"
 #include "machina/Loader.hpp"
 #include "machina/Machine.hpp"
@@ -37,7 +37,7 @@ main(int argc, char** argv)
 	if ( ! Glib::thread_supported())
 		Glib::thread_init();
 
-	Redland::World rdf_world;
+	Sord::World rdf_world;
 
 	Machina::URIs::init();
 
diff --git a/src/gui/wscript b/src/gui/wscript
index 2e0aa23..8917642 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -23,7 +23,7 @@ def build(bld):
 		GNOMECANVASMM
 		GTKMM
 		RAUL
-		REDLANDMM
+		SORD
 		SIGCPP
 		EUGENE
 	''')
@@ -39,4 +39,4 @@ def build(bld):
 	obj.includes = ['.', '../..', '../engine']
 	obj.defines  = 'VERSION="' + bld.env['MACHINA_VERSION'] + '"'
 	obj.use      = 'libmachina_engine libmachina_gui'
-	autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM REDLANDMM RAUL MACHINA EUGENE FLOWCANVAS')
+	autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL MACHINA EUGENE FLOWCANVAS')
-- 
cgit v1.2.1