diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-25 00:52:24 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-25 00:52:24 (GMT) |
| commit | fea2f82612fbeb6b1bfc4e3003a18887f245dd2d (patch) | |
| tree | ecf9ffc4e1ff232c42d10ec41dfb37d82c80c9db /src/openscad.cc | |
| parent | ee579894fd01d1c42389250b180f0a08c97519c6 (diff) | |
| parent | 6b8a5e266ca1725e35e76aef0caa639fe77fdc48 (diff) | |
Merge branch 'master' of /Users/kintel/code/OpenSCAD/clang/../openscad
Diffstat (limited to 'src/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 682ccb7..f7cc48e 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -49,6 +49,7 @@ #endif #include <QApplication> +#include <QString> #include <QDir> #include <sstream> @@ -294,7 +295,7 @@ int main(int argc, char **argv) examplesdir = exdir.path(); } - parser_init(QApplication::instance()->applicationDirPath().toStdString()); + parser_init(QApplication::instance()->applicationDirPath().toLocal8Bit().constData()); // Initialize global visitors NodeCache nodecache; @@ -492,7 +493,7 @@ int main(int argc, char **argv) #endif QString qfilename; - if (filename) qfilename = QString::fromStdString(boosty::stringy(boosty::absolute(filename))); + if (filename) qfilename = QString::fromLocal8Bit(boosty::stringy(boosty::absolute(filename)).c_str()); #if 0 /*** disabled by clifford wolf: adds rendering artefacts with OpenCSG ***/ // turn on anti-aliasing @@ -507,7 +508,7 @@ int main(int argc, char **argv) if (vm.count("input-file")) { inputFiles = vm["input-file"].as<vector<string> >(); for (vector<string>::const_iterator infile = inputFiles.begin()+1; infile != inputFiles.end(); infile++) { - new MainWindow(QString::fromStdString(boosty::stringy((original_path / *infile)))); + new MainWindow(QString::fromLocal8Bit(boosty::stringy(original_path / *infile).c_str())); } } app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); |