summaryrefslogtreecommitdiffstats
path: root/ingen/client
diff options
context:
space:
mode:
Diffstat (limited to 'ingen/client')
-rw-r--r--ingen/client/ClientStore.hpp12
-rw-r--r--ingen/client/PluginModel.hpp8
-rw-r--r--ingen/client/SigClientInterface.hpp16
-rw-r--r--ingen/client/ThreadedSigClientInterface.hpp15
4 files changed, 25 insertions, 26 deletions
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index de603458..84a95b7b 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -73,13 +73,13 @@ public:
URIs& uris() { return _uris; }
- void put(const Raul::URI& uri,
- const Resource::Properties& properties,
- Resource::Graph ctx=Resource::Graph::DEFAULT);
+ void put(const Raul::URI& uri,
+ const Properties& properties,
+ Resource::Graph ctx = Resource::Graph::DEFAULT);
- void delta(const Raul::URI& uri,
- const Resource::Properties& remove,
- const Resource::Properties& add);
+ void delta(const Raul::URI& uri,
+ const Properties& remove,
+ const Properties& add);
void copy(const Raul::URI& old_uri,
const Raul::URI& new_uri);
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index e468aede..ad425904 100644
--- a/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
@@ -48,10 +48,10 @@ class PluginUI;
class INGEN_API PluginModel : public Ingen::Resource
{
public:
- PluginModel(URIs& uris,
- const Raul::URI& uri,
- const Atom& type,
- const Ingen::Resource::Properties& properties);
+ PluginModel(URIs& uris,
+ const Raul::URI& uri,
+ const Atom& type,
+ const Ingen::Properties& properties);
const Atom& type() const { return _type; }
const Raul::URI type_uri() const {
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 33430480..a65806f4 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -52,8 +52,8 @@ public:
INGEN_SIGNAL(bundle_begin, void)
INGEN_SIGNAL(bundle_end, void)
INGEN_SIGNAL(error, void, std::string)
- INGEN_SIGNAL(put, void, Raul::URI, Resource::Properties, Resource::Graph)
- INGEN_SIGNAL(delta, void, Raul::URI, Resource::Properties, Resource::Properties)
+ INGEN_SIGNAL(put, void, Raul::URI, Properties, Resource::Graph)
+ INGEN_SIGNAL(delta, void, Raul::URI, Properties, Properties)
INGEN_SIGNAL(object_copied, void, Raul::URI, Raul::URI)
INGEN_SIGNAL(object_moved, void, Raul::Path, Raul::Path)
INGEN_SIGNAL(object_deleted, void, Raul::URI)
@@ -83,14 +83,14 @@ protected:
void error(const std::string& msg)
{ EMIT(error, msg); }
- void put(const Raul::URI& uri,
- const Resource::Properties& properties,
- Resource::Graph ctx=Resource::Graph::DEFAULT)
+ void put(const Raul::URI& uri,
+ const Properties& properties,
+ Resource::Graph ctx = Resource::Graph::DEFAULT)
{ EMIT(put, uri, properties, ctx); }
- void delta(const Raul::URI& uri,
- const Resource::Properties& remove,
- const Resource::Properties& add)
+ void delta(const Raul::URI& uri,
+ const Properties& remove,
+ const Properties& add)
{ EMIT(delta, uri, remove, add); }
void connect(const Raul::Path& tail, const Raul::Path& head)
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 79795421..db3aad44 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -80,14 +80,14 @@ public:
void error(const std::string& msg)
{ push_sig(sigc::bind(error_slot, msg)); }
- void put(const Raul::URI& path,
- const Resource::Properties& properties,
- Resource::Graph ctx=Resource::Graph::DEFAULT)
+ void put(const Raul::URI& path,
+ const Properties& properties,
+ Resource::Graph ctx = Resource::Graph::DEFAULT)
{ push_sig(sigc::bind(put_slot, path, properties, ctx)); }
- void delta(const Raul::URI& path,
- const Resource::Properties& remove,
- const Resource::Properties& add)
+ void delta(const Raul::URI& path,
+ const Properties& remove,
+ const Properties& add)
{ push_sig(sigc::bind(delta_slot, path, remove, add)); }
void connect(const Raul::Path& tail, const Raul::Path& head)
@@ -149,8 +149,7 @@ private:
Raul::SRSWQueue<Closure> _sigs;
- typedef Resource::Properties Properties;
- typedef Resource::Graph Graph;
+ typedef Resource::Graph Graph;
sigc::slot<void> bundle_begin_slot;
sigc::slot<void> bundle_end_slot;