diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-27 21:19:55 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-27 21:19:55 +0100 |
| commit | 32f305fe931ec68b68326cf9f4cd64e7550af326 (patch) | |
| tree | 309baeebae10627e94080d5f56e83d9ade4a86de /src/core/parser/ParserContext.cpp | |
| parent | 048db07ca91505ccfcb98e29ed6868f1aa64a514 (diff) | |
| parent | 4c3d0cd465a4445e1fbd851e975727be064a92f4 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/parser/ParserContext.cpp')
| -rw-r--r-- | src/core/parser/ParserContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/parser/ParserContext.cpp b/src/core/parser/ParserContext.cpp index cc09b5e..b4e2a9a 100644 --- a/src/core/parser/ParserContext.cpp +++ b/src/core/parser/ParserContext.cpp @@ -39,12 +39,12 @@ ParserContext::ParserContext(Registry ®istry, { } -NodeVector<Node> ParserContext::link(const std::string &path, +NodeVector<Node> ParserContext::import(const std::string &path, const std::string mimetype, const std::string rel, const RttiSet &supportedTypes) { - return resourceManager.link(*this, path, mimetype, rel, supportedTypes); + return resourceManager.import(*this, path, mimetype, rel, supportedTypes); } NodeVector<Node> ParserContext::include(const std::string &path, |