From c521dda2ec729ffb4b84927218c8bb396d0033cc Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 14 Oct 2015 21:31:24 +0000
Subject: Don't use Glib::ustring

git-svn-id: http://svn.drobilla.net/lad/trunk/machina@5767 a436a847-0d15-0410-975c-d299462d15a1
---
 src/engine/machina/Engine.hpp | 14 ++++++--------
 src/engine/machina/Loader.hpp | 10 ++++------
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'src/engine/machina')

diff --git a/src/engine/machina/Engine.hpp b/src/engine/machina/Engine.hpp
index 4bd907b..dd40f42 100644
--- a/src/engine/machina/Engine.hpp
+++ b/src/engine/machina/Engine.hpp
@@ -19,8 +19,6 @@
 
 #include <string>
 
-#include <glibmm/ustring.h>
-
 #include "machina/Atom.hpp"
 #include "machina/Driver.hpp"
 #include "machina/Loader.hpp"
@@ -47,13 +45,13 @@ public:
 	SPtr<Machine> machine() { return _driver->machine(); }
 	Forge&        forge()   { return _forge; }
 
-	SPtr<Machine> load_machine(const Glib::ustring& uri);
-	SPtr<Machine> load_machine_midi(const Glib::ustring& uri,
-	                                double               q,
-	                                Raul::TimeDuration   dur);
+	SPtr<Machine> load_machine(const std::string& uri);
+	SPtr<Machine> load_machine_midi(const std::string& uri,
+	                                double             q,
+	                                Raul::TimeDuration dur);
 
-	void export_midi(const Glib::ustring& filename,
-	                 Raul::TimeDuration   dur);
+	void export_midi(const std::string& filename,
+	                 Raul::TimeDuration dur);
 
 	void set_bpm(double bpm);
 	void set_quantization(double beat_fraction);
diff --git a/src/engine/machina/Loader.hpp b/src/engine/machina/Loader.hpp
index 0b1e9ec..3fa66ff 100644
--- a/src/engine/machina/Loader.hpp
+++ b/src/engine/machina/Loader.hpp
@@ -17,8 +17,6 @@
 #ifndef MACHINA_LOADER_HPP
 #define MACHINA_LOADER_HPP
 
-#include <glibmm/ustring.h>
-
 #include "machina/Atom.hpp"
 #include "machina/types.hpp"
 #include "raul/TimeStamp.hpp"
@@ -35,11 +33,11 @@ class Loader
 public:
 	Loader(Forge& forge, Sord::World& rdf_world);
 
-	SPtr<Machine> load(const Glib::ustring& filename);
+	SPtr<Machine> load(const std::string& filename);
 
-	SPtr<Machine> load_midi(const Glib::ustring& filename,
-	                        double               q,
-	                        Raul::TimeDuration   dur);
+	SPtr<Machine> load_midi(const std::string& filename,
+	                        double             q,
+	                        Raul::TimeDuration dur);
 
 private:
 	Forge&       _forge;
-- 
cgit v1.2.1