summaryrefslogtreecommitdiffstats
path: root/src/gui/ThreadedLoader.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/ThreadedLoader.hpp')
-rw-r--r--src/gui/ThreadedLoader.hpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index ffe7a482..cdf331a4 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -33,10 +33,11 @@ using std::string;
using std::list;
using boost::optional;
-using namespace Ingen::Client;
-using namespace Ingen::Serialisation;
-
namespace Ingen {
+using namespace Shared;
+using namespace Client;
+using namespace Serialisation;
+
namespace GUI {
@@ -56,11 +57,11 @@ class ThreadedLoader : public Raul::Slave
public:
ThreadedLoader(SharedPtr<EngineInterface> engine);
- void load_patch(bool merge,
- const Glib::ustring& document_uri,
- optional<Path> data_path,
- optional<Path> engine_parent,
- optional<Symbol> engine_symbol,
+ void load_patch(bool merge,
+ const Glib::ustring& document_uri,
+ optional<Raul::Path> data_path,
+ optional<Raul::Path> engine_parent,
+ optional<Raul::Symbol> engine_symbol,
optional<GraphObject::Properties> engine_data);
void save_patch(SharedPtr<PatchModel> model, const string& filename);