From f0e33dd09a390ca946e95a6f55fea397dca0ca1f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 2 Jan 2021 18:17:04 +0100 Subject: Update for latest raul --- include/ingen/Arc.hpp | 8 ++++---- include/ingen/AtomReader.hpp | 6 +++--- include/ingen/AtomWriter.hpp | 4 ++-- include/ingen/ClashAvoider.hpp | 12 ++++++------ include/ingen/Configuration.hpp | 4 ++-- include/ingen/Interface.hpp | 12 ++++++------ include/ingen/LV2Features.hpp | 2 +- include/ingen/Message.hpp | 16 ++++++++-------- include/ingen/Node.hpp | 12 ++++++------ include/ingen/Parser.hpp | 8 ++++---- include/ingen/Resource.hpp | 2 +- include/ingen/Serialiser.hpp | 6 +++--- include/ingen/SocketReader.hpp | 6 +++--- include/ingen/SocketWriter.hpp | 8 ++++---- include/ingen/Store.hpp | 18 +++++++++--------- include/ingen/URIMap.hpp | 2 +- include/ingen/URIs.hpp | 2 +- include/ingen/World.hpp | 2 +- include/ingen/client/ArcModel.hpp | 4 ++-- include/ingen/client/BlockModel.hpp | 14 +++++++------- include/ingen/client/ClientStore.hpp | 18 +++++++++--------- include/ingen/client/GraphModel.hpp | 6 +++--- include/ingen/client/ObjectModel.hpp | 12 ++++++------ include/ingen/client/PluginModel.hpp | 2 +- include/ingen/client/PortModel.hpp | 2 +- include/ingen/client/SocketClient.hpp | 10 +++++----- include/ingen/paths.hpp | 8 ++++---- 27 files changed, 103 insertions(+), 103 deletions(-) (limited to 'include') diff --git a/include/ingen/Arc.hpp b/include/ingen/Arc.hpp index 62c95d67..1d21b65e 100644 --- a/include/ingen/Arc.hpp +++ b/include/ingen/Arc.hpp @@ -20,7 +20,7 @@ #include "ingen/ingen.h" #include "raul/Deletable.hpp" -namespace Raul { class Path; } +namespace raul { class Path; } namespace ingen { @@ -28,11 +28,11 @@ namespace ingen { * * @ingroup Ingen */ -class INGEN_API Arc : public Raul::Deletable +class INGEN_API Arc : public raul::Deletable { public: - virtual const Raul::Path& tail_path() const = 0; - virtual const Raul::Path& head_path() const = 0; + virtual const raul::Path& tail_path() const = 0; + virtual const raul::Path& head_path() const = 0; }; } // namespace ingen diff --git a/include/ingen/AtomReader.hpp b/include/ingen/AtomReader.hpp index 75a3c690..c83e7e4a 100644 --- a/include/ingen/AtomReader.hpp +++ b/include/ingen/AtomReader.hpp @@ -26,9 +26,9 @@ #include -namespace Raul { +namespace raul { class Path; -} // namespace Raul +} // namespace raul namespace ingen { @@ -59,7 +59,7 @@ private: void get_atom(const LV2_Atom* in, Atom& out); boost::optional atom_to_uri(const LV2_Atom* atom); - boost::optional atom_to_path(const LV2_Atom* atom); + boost::optional atom_to_path(const LV2_Atom* atom); Resource::Graph atom_to_context(const LV2_Atom* atom); void get_props(const LV2_Atom_Object* obj, diff --git a/include/ingen/AtomWriter.hpp b/include/ingen/AtomWriter.hpp index f9052d93..492e7ff6 100644 --- a/include/ingen/AtomWriter.hpp +++ b/include/ingen/AtomWriter.hpp @@ -29,7 +29,7 @@ #include -namespace Raul { class Path; } +namespace raul { class Path; } namespace ingen { @@ -69,7 +69,7 @@ public: private: void forge_uri(const URI& uri); void forge_properties(const Properties& properties); - void forge_arc(const Raul::Path& tail, const Raul::Path& head); + void forge_arc(const raul::Path& tail, const raul::Path& head); void forge_request(LV2_Atom_Forge_Frame* frame, LV2_URID type, int32_t id); void forge_context(Resource::Graph ctx); diff --git a/include/ingen/ClashAvoider.hpp b/include/ingen/ClashAvoider.hpp index 1d2cebf0..c1d62754 100644 --- a/include/ingen/ClashAvoider.hpp +++ b/include/ingen/ClashAvoider.hpp @@ -38,9 +38,9 @@ public: explicit ClashAvoider(const Store& store); URI map_uri(const URI& in); - Raul::Path map_path(const Raul::Path& in); + raul::Path map_path(const raul::Path& in); - bool exists(const Raul::Path& path) const; + bool exists(const raul::Path& path) const; /** Adjust a new label by increasing the numeric suffix if any. * @@ -48,13 +48,13 @@ public: * @param new_path The new path that `old_path` was mapped to * @param name The old name. */ - static std::string adjust_name(const Raul::Path& old_path, - const Raul::Path& new_path, + static std::string adjust_name(const raul::Path& old_path, + const raul::Path& new_path, std::string name); private: - using Offsets = std::map; - using SymbolMap = std::map; + using Offsets = std::map; + using SymbolMap = std::map; const Store& _store; Offsets _offsets; diff --git a/include/ingen/Configuration.hpp b/include/ingen/Configuration.hpp index 4b290316..16c20811 100644 --- a/include/ingen/Configuration.hpp +++ b/include/ingen/Configuration.hpp @@ -71,11 +71,11 @@ public: void print_usage(const std::string& program, std::ostream& os); - struct OptionError : public Raul::Exception { + struct OptionError : public raul::Exception { explicit OptionError(const std::string& m) : Exception(m) {} }; - struct FileError : public Raul::Exception { + struct FileError : public raul::Exception { explicit FileError(const std::string& m) : Exception(m) {} }; diff --git a/include/ingen/Interface.hpp b/include/ingen/Interface.hpp index 68de5684..cb17039e 100644 --- a/include/ingen/Interface.hpp +++ b/include/ingen/Interface.hpp @@ -31,9 +31,9 @@ #include #include -namespace Raul { +namespace raul { class Path; -} // namespace Raul +} // namespace raul namespace ingen { @@ -92,24 +92,24 @@ public: message(Copy{_seq++, old_uri, new_uri}); } - inline void move(const Raul::Path& old_path, const Raul::Path& new_path) + inline void move(const raul::Path& old_path, const raul::Path& new_path) { message(Move{_seq++, old_path, new_path}); } inline void del(const URI& uri) { message(Del{_seq++, uri}); } - inline void connect(const Raul::Path& tail, const Raul::Path& head) + inline void connect(const raul::Path& tail, const raul::Path& head) { message(Connect{_seq++, tail, head}); } - inline void disconnect(const Raul::Path& tail, const Raul::Path& head) + inline void disconnect(const raul::Path& tail, const raul::Path& head) { message(Disconnect{_seq++, tail, head}); } - inline void disconnect_all(const Raul::Path& graph, const Raul::Path& path) + inline void disconnect_all(const raul::Path& graph, const raul::Path& path) { message(DisconnectAll{_seq++, graph, path}); } diff --git a/include/ingen/LV2Features.hpp b/include/ingen/LV2Features.hpp index e00e869c..f61b9b85 100644 --- a/include/ingen/LV2Features.hpp +++ b/include/ingen/LV2Features.hpp @@ -64,7 +64,7 @@ public: const char* _uri; }; - class FeatureArray : public Raul::Noncopyable { + class FeatureArray : public raul::Noncopyable { public: using FeatureVector = std::vector>; diff --git a/include/ingen/Message.hpp b/include/ingen/Message.hpp index ad524390..b7342eba 100644 --- a/include/ingen/Message.hpp +++ b/include/ingen/Message.hpp @@ -44,8 +44,8 @@ struct BundleEnd struct Connect { int32_t seq; - Raul::Path tail; - Raul::Path head; + raul::Path tail; + raul::Path head; }; struct Copy @@ -73,15 +73,15 @@ struct Delta struct Disconnect { int32_t seq; - Raul::Path tail; - Raul::Path head; + raul::Path tail; + raul::Path head; }; struct DisconnectAll { int32_t seq; - Raul::Path graph; - Raul::Path path; + raul::Path graph; + raul::Path path; }; struct Error @@ -99,8 +99,8 @@ struct Get struct Move { int32_t seq; - Raul::Path old_path; - Raul::Path new_path; + raul::Path old_path; + raul::Path new_path; }; struct Put diff --git a/include/ingen/Node.hpp b/include/ingen/Node.hpp index 39b33596..3733b51e 100644 --- a/include/ingen/Node.hpp +++ b/include/ingen/Node.hpp @@ -29,10 +29,10 @@ #include #include -namespace Raul { +namespace raul { class Path; class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -79,8 +79,8 @@ public: // All objects virtual GraphType graph_type() const = 0; - virtual const Raul::Path& path() const = 0; - virtual const Raul::Symbol& symbol() const = 0; + virtual const raul::Path& path() const = 0; + virtual const raul::Symbol& symbol() const = 0; virtual Node* graph_parent() const = 0; URI base_uri() const { @@ -92,9 +92,9 @@ public: protected: friend class Store; - virtual void set_path(const Raul::Path& p) = 0; + virtual void set_path(const raul::Path& p) = 0; - Node(const URIs& uris, const Raul::Path& path) + Node(const URIs& uris, const raul::Path& path) : Resource(uris, path_to_uri(path)) {} diff --git a/include/ingen/Parser.hpp b/include/ingen/Parser.hpp index 03175318..f2cd951f 100644 --- a/include/ingen/Parser.hpp +++ b/include/ingen/Parser.hpp @@ -80,8 +80,8 @@ public: World& world, Interface& target, const FilePath& path, - const boost::optional& parent = boost::optional(), - const boost::optional& symbol = boost::optional(), + const boost::optional& parent = boost::optional(), + const boost::optional& symbol = boost::optional(), const boost::optional& data = boost::optional()); virtual boost::optional parse_string( @@ -89,8 +89,8 @@ public: Interface& target, const std::string& str, const URI& base_uri, - const boost::optional& parent = boost::optional(), - const boost::optional& symbol = boost::optional(), + const boost::optional& parent = boost::optional(), + const boost::optional& symbol = boost::optional(), const boost::optional& data = boost::optional()); }; diff --git a/include/ingen/Resource.hpp b/include/ingen/Resource.hpp index e4a7972e..577e8cc0 100644 --- a/include/ingen/Resource.hpp +++ b/include/ingen/Resource.hpp @@ -37,7 +37,7 @@ class Atom; * * @ingroup Ingen */ -class INGEN_API Resource : public Raul::Deletable +class INGEN_API Resource : public raul::Deletable { public: using Graph = Property::Graph; diff --git a/include/ingen/Serialiser.hpp b/include/ingen/Serialiser.hpp index fd5b50b3..37eda462 100644 --- a/include/ingen/Serialiser.hpp +++ b/include/ingen/Serialiser.hpp @@ -25,7 +25,7 @@ #include #include -namespace Raul { class Path; } +namespace raul { class Path; } namespace ingen { @@ -60,7 +60,7 @@ public: * All serialized paths will have the root path chopped from their prefix * (therefore all serialized paths must be descendants of the root) */ - virtual void start_to_string(const Raul::Path& root, + virtual void start_to_string(const raul::Path& root, const URI& base_uri); /** Begin a serialization to a file. @@ -70,7 +70,7 @@ public: * All serialized paths will have the root path chopped from their prefix * (therefore all serialized paths must be descendants of the root) */ - virtual void start_to_file(const Raul::Path& root, + virtual void start_to_file(const raul::Path& root, const FilePath& filename); /** Serialize an object (graph, block, or port). diff --git a/include/ingen/SocketReader.hpp b/include/ingen/SocketReader.hpp index 5efa2143..f86a9bd6 100644 --- a/include/ingen/SocketReader.hpp +++ b/include/ingen/SocketReader.hpp @@ -25,7 +25,7 @@ #include #include -namespace Raul { class Socket; } +namespace raul { class Socket; } namespace ingen { @@ -38,7 +38,7 @@ class INGEN_API SocketReader public: SocketReader(World& world, Interface& iface, - std::shared_ptr sock); + std::shared_ptr sock); virtual ~SocketReader(); @@ -75,7 +75,7 @@ private: SerdEnv* _env; SordInserter* _inserter; SordNode* _msg_node; - std::shared_ptr _socket; + std::shared_ptr _socket; int _socket_error; bool _exit_flag; std::thread _thread; diff --git a/include/ingen/SocketWriter.hpp b/include/ingen/SocketWriter.hpp index 63f2f86f..a0896ad9 100644 --- a/include/ingen/SocketWriter.hpp +++ b/include/ingen/SocketWriter.hpp @@ -24,9 +24,9 @@ #include #include -namespace Raul { +namespace raul { class Socket; -} // namespace Raul +} // namespace raul namespace ingen { @@ -42,14 +42,14 @@ public: SocketWriter(URIMap& map, URIs& uris, const URI& uri, - std::shared_ptr sock); + std::shared_ptr sock); void message(const Message& message) override; size_t text_sink(const void* buf, size_t len) override; protected: - std::shared_ptr _socket; + std::shared_ptr _socket; }; } // namespace ingen diff --git a/include/ingen/Store.hpp b/include/ingen/Store.hpp index 46bec770..67ea16fa 100644 --- a/include/ingen/Store.hpp +++ b/include/ingen/Store.hpp @@ -27,7 +27,7 @@ #include #include -namespace Raul { class Symbol; } +namespace raul { class Symbol; } namespace ingen { @@ -36,20 +36,20 @@ class Node; /** Store of objects in the graph hierarchy. * @ingroup IngenShared */ -class INGEN_API Store : public Raul::Noncopyable, - public Raul::Deletable, - public std::map> +class INGEN_API Store : public raul::Noncopyable, + public raul::Deletable, + public std::map> { public: void add(Node* o); - Node* get(const Raul::Path& path) { + Node* get(const raul::Path& path) { const iterator i = find(path); return (i == end()) ? nullptr : i->second.get(); } using const_range = std::pair; - using Objects = std::map>; + using Objects = std::map>; using Mutex = std::recursive_mutex; iterator find_descendants_end(Store::iterator parent); @@ -70,10 +70,10 @@ public: * * Note this invalidates `i`. */ - void rename(iterator top, const Raul::Path& new_path); + void rename(iterator top, const raul::Path& new_path); - unsigned child_name_offset(const Raul::Path& parent, - const Raul::Symbol& symbol, + unsigned child_name_offset(const raul::Path& parent, + const raul::Symbol& symbol, bool allow_zero=true) const; Mutex& mutex() { return _mutex; } diff --git a/include/ingen/URIMap.hpp b/include/ingen/URIMap.hpp index 8b93e216..465f87f1 100644 --- a/include/ingen/URIMap.hpp +++ b/include/ingen/URIMap.hpp @@ -40,7 +40,7 @@ class World; /** URI to integer map and implementation of LV2 URID extension. * @ingroup IngenShared */ -class INGEN_API URIMap : public Raul::Noncopyable { +class INGEN_API URIMap : public raul::Noncopyable { public: URIMap(Log& log, LV2_URID_Map* map, LV2_URID_Unmap* unmap); diff --git a/include/ingen/URIs.hpp b/include/ingen/URIs.hpp index baa376e9..cfa00f73 100644 --- a/include/ingen/URIs.hpp +++ b/include/ingen/URIs.hpp @@ -37,7 +37,7 @@ class URIMap; * * @ingroup ingen */ -class INGEN_API URIs : public Raul::Noncopyable { +class INGEN_API URIs : public raul::Noncopyable { public: URIs(ingen::Forge& ingen_forge, URIMap* map, LilvWorld* lworld); diff --git a/include/ingen/World.hpp b/include/ingen/World.hpp index bff5f213..ecf1d45a 100644 --- a/include/ingen/World.hpp +++ b/include/ingen/World.hpp @@ -62,7 +62,7 @@ class URIs; * * @ingroup IngenShared */ -class INGEN_API World : public Raul::Noncopyable { +class INGEN_API World : public raul::Noncopyable { public: /** Construct a new Ingen world. * @param map LV2 URID map implementation, or null to use internal. diff --git a/include/ingen/client/ArcModel.hpp b/include/ingen/client/ArcModel.hpp index 635c2d41..a76f274f 100644 --- a/include/ingen/client/ArcModel.hpp +++ b/include/ingen/client/ArcModel.hpp @@ -40,8 +40,8 @@ public: std::shared_ptr tail() const { return _tail; } std::shared_ptr head() const { return _head; } - const Raul::Path& tail_path() const override { return _tail->path(); } - const Raul::Path& head_path() const override { return _head->path(); } + const raul::Path& tail_path() const override { return _tail->path(); } + const raul::Path& head_path() const override { return _head->path(); } private: friend class ClientStore; diff --git a/include/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp index ee2c88d8..060d454f 100644 --- a/include/ingen/client/BlockModel.hpp +++ b/include/ingen/client/BlockModel.hpp @@ -29,10 +29,10 @@ #include #include -namespace Raul { +namespace raul { class Path; class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -57,7 +57,7 @@ public: using Ports = std::vector>; - std::shared_ptr get_port(const Raul::Symbol& symbol) const; + std::shared_ptr get_port(const raul::Symbol& symbol) const; std::shared_ptr get_port(uint32_t index) const; Node* port(uint32_t index) const override; @@ -89,19 +89,19 @@ public: protected: friend class ClientStore; - BlockModel(URIs& uris, URI plugin_uri, const Raul::Path& path); + BlockModel(URIs& uris, URI plugin_uri, const raul::Path& path); BlockModel(URIs& uris, const std::shared_ptr& plugin, - const Raul::Path& path); + const raul::Path& path); - explicit BlockModel(const Raul::Path& path); + explicit BlockModel(const raul::Path& path); void add_child(const std::shared_ptr& c) override; bool remove_child(const std::shared_ptr& c) override; void add_port(const std::shared_ptr& pm); void remove_port(const std::shared_ptr& port); - void remove_port(const Raul::Path& port_path); + void remove_port(const raul::Path& port_path); void set(const std::shared_ptr& model) override; virtual void clear(); diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp index b1d40881..3aec363f 100644 --- a/include/ingen/client/ClientStore.hpp +++ b/include/ingen/client/ClientStore.hpp @@ -28,9 +28,9 @@ #include #include -namespace Raul { +namespace raul { class Path; -} // namespace Raul +} // namespace raul namespace ingen { @@ -61,7 +61,7 @@ public: URI uri() const override { return URI("ingen:/clients/store"); } - std::shared_ptr object(const Raul::Path& path) const; + std::shared_ptr object(const raul::Path& path) const; std::shared_ptr plugin(const URI& uri) const; std::shared_ptr resource(const URI& uri) const; @@ -100,22 +100,22 @@ public: INGEN_SIGNAL(plugin_deleted, void, URI) private: - std::shared_ptr _object(const Raul::Path& path); + std::shared_ptr _object(const raul::Path& path); std::shared_ptr _plugin(const URI& uri); std::shared_ptr _plugin(const Atom& uri); std::shared_ptr _resource(const URI& uri); void add_object(const std::shared_ptr& object); - std::shared_ptr remove_object(const Raul::Path& path); + std::shared_ptr remove_object(const raul::Path& path); void add_plugin(const std::shared_ptr& pm); - std::shared_ptr connection_graph(const Raul::Path& tail_path, - const Raul::Path& head_path); + std::shared_ptr connection_graph(const raul::Path& tail_path, + const raul::Path& head_path); // Slots for SigClientInterface signals - bool attempt_connection(const Raul::Path& tail_path, - const Raul::Path& head_path); + bool attempt_connection(const raul::Path& tail_path, + const raul::Path& head_path); URIs& _uris; Log& _log; diff --git a/include/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp index fb95b716..59d1bb65 100644 --- a/include/ingen/client/GraphModel.hpp +++ b/include/ingen/client/GraphModel.hpp @@ -26,9 +26,9 @@ #include #include -namespace Raul { +namespace raul { class Path; -} // namespace Raul +} // namespace raul namespace ingen { @@ -67,7 +67,7 @@ public: private: friend class ClientStore; - GraphModel(URIs& uris, const Raul::Path& graph_path) + GraphModel(URIs& uris, const raul::Path& graph_path) : BlockModel(uris, static_cast(uris.ingen_Graph), graph_path) diff --git a/include/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp index 73e2080e..e92618f8 100644 --- a/include/ingen/client/ObjectModel.hpp +++ b/include/ingen/client/ObjectModel.hpp @@ -58,8 +58,8 @@ public: void on_property(const URI& uri, const Atom& value) override; void on_property_removed(const URI& uri, const Atom& value) override; - const Raul::Path& path() const override { return _path; } - const Raul::Symbol& symbol() const override { return _symbol; } + const raul::Path& path() const override { return _path; } + const raul::Symbol& symbol() const override { return _symbol; } std::shared_ptr parent() const { return _parent; } bool polyphonic() const; @@ -77,10 +77,10 @@ public: protected: friend class ClientStore; - ObjectModel(URIs& uris, const Raul::Path& path); + ObjectModel(URIs& uris, const raul::Path& path); ObjectModel(const ObjectModel& copy); - void set_path(const Raul::Path& p) override; + void set_path(const raul::Path& p) override; virtual void set_parent(const std::shared_ptr& p); virtual void add_child(const std::shared_ptr& c) {} virtual bool remove_child(const std::shared_ptr& c) { return true; } @@ -90,8 +90,8 @@ protected: std::shared_ptr _parent; private: - Raul::Path _path; - Raul::Symbol _symbol; + raul::Path _path; + raul::Symbol _symbol; }; } // namespace client diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp index 07905ebb..b0a61e94 100644 --- a/include/ingen/client/PluginModel.hpp +++ b/include/ingen/client/PluginModel.hpp @@ -68,7 +68,7 @@ public: const Atom& get_property(const URI& key) const override; - Raul::Symbol default_block_symbol() const; + raul::Symbol default_block_symbol() const; std::string human_name() const; std::string port_human_name(uint32_t index) const; diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp index b081a74d..9323b84b 100644 --- a/include/ingen/client/PortModel.hpp +++ b/include/ingen/client/PortModel.hpp @@ -78,7 +78,7 @@ private: friend class ClientStore; PortModel(URIs& uris, - const Raul::Path& path, + const raul::Path& path, uint32_t index, Direction dir) : ObjectModel(uris, path) diff --git a/include/ingen/client/SocketClient.hpp b/include/ingen/client/SocketClient.hpp index 0e651250..1e75ae80 100644 --- a/include/ingen/client/SocketClient.hpp +++ b/include/ingen/client/SocketClient.hpp @@ -42,7 +42,7 @@ class INGEN_API SocketClient : public SocketWriter public: SocketClient(World& world, const URI& uri, - const std::shared_ptr& sock, + const std::shared_ptr& sock, const std::shared_ptr& respondee) : SocketWriter(world.uri_map(), world.uris(), uri, sock) , _respondee(respondee) @@ -63,11 +63,11 @@ public: const URI& uri, const std::shared_ptr& respondee) { - const Raul::Socket::Type type = (uri.scheme() == "unix" - ? Raul::Socket::Type::UNIX - : Raul::Socket::Type::TCP); + const raul::Socket::Type type = (uri.scheme() == "unix" + ? raul::Socket::Type::UNIX + : raul::Socket::Type::TCP); - std::shared_ptr sock(new Raul::Socket(type)); + std::shared_ptr sock(new raul::Socket(type)); if (!sock->connect(uri)) { world.log().error("Failed to connect <%1%> (%2%)\n", sock->uri(), strerror(errno)); diff --git a/include/ingen/paths.hpp b/include/ingen/paths.hpp index 05496114..fefdf364 100644 --- a/include/ingen/paths.hpp +++ b/include/ingen/paths.hpp @@ -38,14 +38,14 @@ inline bool uri_is_path(const URI& uri) } } -inline Raul::Path uri_to_path(const URI& uri) +inline raul::Path uri_to_path(const URI& uri) { return (uri == main_uri()) - ? Raul::Path("/") - : Raul::Path(uri.string().substr(main_uri().string().length())); + ? raul::Path("/") + : raul::Path(uri.string().substr(main_uri().string().length())); } -inline URI path_to_uri(const Raul::Path& path) +inline URI path_to_uri(const raul::Path& path) { return URI(main_uri().string() + path.c_str()); } -- cgit v1.2.1