diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
| commit | 23f6b0623c86eba96dfb1296b862522cf02b0734 (patch) | |
| tree | 998500ef16763f6f08f9f7cb8917c98b1643af68 /src/context.cc | |
| parent | 52dfffd97ba49b603b4814d843cd9be08d040364 (diff) | |
| parent | 5044ea928d72da800d11b2b80f6148265c13d10f (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'src/context.cc')
| -rw-r--r-- | src/context.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/context.cc b/src/context.cc index f636b05..354195f 100644 --- a/src/context.cc +++ b/src/context.cc @@ -30,9 +30,9 @@ #include "module.h" #include "builtin.h" #include "printutils.h" -#include <QFileInfo> -#include <QDir> #include <boost/foreach.hpp> +#include <boost/filesystem.hpp> +using namespace boost::filesystem; std::vector<const Context*> Context::ctx_stack; @@ -176,8 +176,7 @@ AbstractNode *Context::evaluate_module(const ModuleInstantiation &inst) const std::string Context::getAbsolutePath(const std::string &filename) const { if (!filename.empty()) { - return QFileInfo(QDir(QString::fromStdString(this->document_path)), - QString::fromStdString(filename)).absoluteFilePath().toStdString(); + return absolute(path(this->document_path) / filename).string(); } else { return filename; |