summaryrefslogtreecommitdiffstats
path: root/src/server/GraphObjectImpl.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-10 06:24:07 +0000
committerDavid Robillard <d@drobilla.net>2012-05-10 06:24:07 +0000
commit0c9e861caa8b1eed5068942edc35d5f91bac816e (patch)
treeb241856ddf49e1b1192f8ea442d1733d9d31b2f2 /src/server/GraphObjectImpl.cpp
parent8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4 (diff)
downloadingen-0c9e861caa8b1eed5068942edc35d5f91bac816e.tar.gz
ingen-0c9e861caa8b1eed5068942edc35d5f91bac816e.tar.bz2
ingen-0c9e861caa8b1eed5068942edc35d5f91bac816e.zip
Work towards translatable strings and a cleaner log interface.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4338 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/GraphObjectImpl.cpp')
-rw-r--r--src/server/GraphObjectImpl.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/GraphObjectImpl.cpp b/src/server/GraphObjectImpl.cpp
index 8d052540..8310b670 100644
--- a/src/server/GraphObjectImpl.cpp
+++ b/src/server/GraphObjectImpl.cpp
@@ -22,14 +22,13 @@
#include "ThreadManager.hpp"
using namespace std;
-using namespace Raul;
namespace Ingen {
namespace Server {
GraphObjectImpl::GraphObjectImpl(Ingen::Shared::URIs& uris,
- GraphObjectImpl* parent,
- const Symbol& symbol)
+ GraphObjectImpl* parent,
+ const Raul::Symbol& symbol)
: ResourceImpl(uris, parent ? parent->path().child(symbol) : Raul::Path::root())
, _parent(parent)
, _path(parent ? parent->path().child(symbol) : "/")
@@ -37,11 +36,11 @@ GraphObjectImpl::GraphObjectImpl(Ingen::Shared::URIs& uris,
{
}
-const Atom&
+const Raul::Atom&
GraphObjectImpl::get_property(const Raul::URI& key) const
{
ThreadManager::assert_not_thread(THREAD_PROCESS);
- static const Atom null_atom;
+ static const Raul::Atom null_atom;
Resource::Properties::const_iterator i = properties().find(key);
return (i != properties().end()) ? i->second : null_atom;
}