From 15d1cfd2c5198be8e0105da269de3091568a7c6c Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sun, 25 Jan 2015 21:58:14 +0100 Subject: Removed default arguments -- as supportedTypes has to be supplied, these make no sense. --- src/core/resource/ResourceManager.hpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/core/resource/ResourceManager.hpp b/src/core/resource/ResourceManager.hpp index 6cb3249..cdd0e34 100644 --- a/src/core/resource/ResourceManager.hpp +++ b/src/core/resource/ResourceManager.hpp @@ -149,16 +149,18 @@ public: * (may be empty, in which case the mimetype is deduced from the file * extension) * @param rel is a "relation string" supplied by the user which specifies - * the relationship of the specified resource. + * the relationship of the specified resource. May be empty, in which case + * the relation is deduced from the supported types and the types of the + * parser for the given mimetype. * @param supportedTypes contains the types of the returned Node the caller * can deal with. Note that only the types the parser claims to return are * checked, not the actual result. * @return the parsed node or nullptr if something goes wrong. */ Rooted link(Registry ®istry, ParserContext &ctx, - const std::string &path, const std::string &mimetype = "", - const std::string &rel = "", - const RttiSet &supportedTypes = RttiSet{}); + const std::string &path, const std::string &mimetype, + const std::string &rel, + const RttiSet &supportedTypes); /** * Resolves the reference to the file specified by the given path and parses @@ -179,7 +181,9 @@ public: * (may be empty, in which case the mimetype is deduced from the file * extension) * @param rel is a "relation string" supplied by the user which specifies - * the relationship of the specified resource. + * the relationship of the specified resource. May be empty, in which case + * the relation is deduced from the supported types and the types of the + * parser for the given mimetype. * @param supportedTypes contains the types of the returned Node the caller * can deal with. Note that only the types the parser claims to return are * checked, not the actual result. @@ -187,9 +191,9 @@ public: */ Rooted include(Registry ®istry, ParserContext &ctx, const std::string &path, - const std::string &mimetype = "", - const std::string &rel = "", - const RttiSet &supportedTypes = RttiSet{}); + const std::string &mimetype, + const std::string &rel, + const RttiSet &supportedTypes); /** * Creates and returns a SourceContext structure containing information -- cgit v1.2.3