From 4c3d0cd465a4445e1fbd851e975727be064a92f4 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Tue, 27 Jan 2015 20:27:47 +0100 Subject: Renamed "link" to "import" --- src/core/resource/ResourceManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/resource/ResourceManager.cpp') 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 ResourceManager::parse( std::unique_ptr 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 ResourceManager::parse( return parsedNodes; } -NodeVector ResourceManager::link(ParserContext &ctx, +NodeVector 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 ResourceManager::include(ParserContext &ctx, -- cgit v1.2.3