summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-01-25 21:58:14 +0100
committerAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-01-25 21:58:14 +0100
commit15d1cfd2c5198be8e0105da269de3091568a7c6c (patch)
tree3b68a98b6c72ff5f872364eb1d268d8d48657c5e /src
parent6b6e0afbafac7a018d529f7fb67a8a7226723e04 (diff)
Removed default arguments -- as supportedTypes has to be supplied, these make no sense.
Diffstat (limited to 'src')
-rw-r--r--src/core/resource/ResourceManager.hpp20
1 files 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<Node> link(Registry &registry, 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<Node> include(Registry &registry, 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