diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-27 20:27:47 +0100 |
---|---|---|
committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-27 20:27:47 +0100 |
commit | 4c3d0cd465a4445e1fbd851e975727be064a92f4 (patch) | |
tree | 3b6832a9b33ace78ceb136020066945929d415ab /src/core/resource/ResourceManager.cpp | |
parent | 34ea1fe74746577f1834b5556183cd230201146f (diff) |
Renamed "link" to "import"
Diffstat (limited to 'src/core/resource/ResourceManager.cpp')
-rw-r--r-- | src/core/resource/ResourceManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/resource/ResourceManager.cpp b/src/core/resource/ResourceManager.cpp index 6b0be3a..2484cb2 100644 --- a/src/core/resource/ResourceManager.cpp +++ b/src/core/resource/ResourceManager.cpp @@ -105,10 +105,10 @@ NodeVector<Node> ResourceManager::parse( std::unique_ptr<std::istream> is = resource.stream(); CharReader reader(*is, sourceId); - // Actually parse the input stream, distinguish the LINK and the + // Actually parse the input stream, distinguish the IMPORT and the // INCLUDE mode switch (mode) { - case ParseMode::LINK: { + case ParseMode::IMPORT: { // Create a new, empty parser scope instance and a new parser // context with this instance in place ParserScope innerScope; @@ -184,13 +184,13 @@ NodeVector<Node> ResourceManager::parse( return parsedNodes; } -NodeVector<Node> ResourceManager::link(ParserContext &ctx, +NodeVector<Node> ResourceManager::import(ParserContext &ctx, const std::string &path, const std::string &mimetype, const std::string &rel, const RttiSet &supportedTypes) { - return parse(ctx, path, mimetype, rel, supportedTypes, ParseMode::LINK); + return parse(ctx, path, mimetype, rel, supportedTypes, ParseMode::IMPORT); } NodeVector<Node> ResourceManager::include(ParserContext &ctx, |