diff options
| author | Marius Kintel <marius@kintel.net> | 2013-04-24 06:00:04 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-04-24 06:00:04 (GMT) |
| commit | 5f10c9f9c0a9805567ea8f9b560c6e0b50126119 (patch) | |
| tree | 8869b03872b42ce1ffb1755958d05925f9f0bcb4 /src/dxfdata.cc | |
| parent | 3307deee9361883a5297fbcac7f5a1cb428ed40c (diff) | |
| parent | f0ee85e17d474ab9119f82ee6f802d4634743b12 (diff) | |
Merge branch 'master' into issue217
Diffstat (limited to 'src/dxfdata.cc')
| -rw-r--r-- | src/dxfdata.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dxfdata.cc b/src/dxfdata.cc index f34af51..8415228 100644 --- a/src/dxfdata.cc +++ b/src/dxfdata.cc @@ -41,8 +41,9 @@ #include <sstream> #include <map> -#include <QDir> #include "value.h" +#include "boost-utils.h" +#include "boosty.h" /*! \class DxfData @@ -389,10 +390,10 @@ DxfData::DxfData(double fn, double fs, double fa, BOOST_FOREACH(const EntityList::value_type &i, unsupported_entities_list) { if (layername.empty()) { PRINTB("WARNING: Unsupported DXF Entity '%s' (%x) in %s.", - i.first % i.second % QuotedString(QDir::current().relativeFilePath(QString::fromLocal8Bit(filename.c_str())).toLocal8Bit().constData())); + i.first % i.second % QuotedString(boosty::stringy(boostfs_uncomplete(filename, fs::current_path())))); } else { PRINTB("WARNING: Unsupported DXF Entity '%s' (%x) in layer '%s' of %s.", - i.first % i.second % layername % QuotedString(QDir::current().relativeFilePath(QString::fromLocal8Bit(filename.c_str())).toLocal8Bit().constData())); + i.first % i.second % layername % QuotedString(boosty::stringy(boostfs_uncomplete(filename, fs::current_path())))); } } |