diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-24 22:08:38 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-24 22:08:38 (GMT) |
| commit | bafbc89aa07f984ac74a3dded0f67158fe225a81 (patch) | |
| tree | 91fa4fcafb52df5d93adc529d368d60ae0b08292 /src/parsersettings.cc | |
| parent | 51fada9a585fd6e32843d11e9bf11e85bb89a566 (diff) | |
Ported lexer code from QFile to boost filesystem
Diffstat (limited to 'src/parsersettings.cc')
| -rw-r--r-- | src/parsersettings.cc | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/parsersettings.cc b/src/parsersettings.cc index bdd5eeb..e9dc4a7 100644 --- a/src/parsersettings.cc +++ b/src/parsersettings.cc @@ -1,25 +1,29 @@ #include "parsersettings.h" #include <QApplication> #include <QDir> +#include <boost/filesystem.hpp> -QString librarydir; +using namespace boost::filesystem; + +std::string librarydir; void parser_init() { - QDir libdir(QApplication::instance()->applicationDirPath()); + path libdir(QApplication::instance()->applicationDirPath().toStdString()); + path tmpdir; #ifdef Q_WS_MAC - libdir.cd("../Resources"); // Libraries can be bundled - if (!libdir.exists("libraries")) libdir.cd("../../.."); + libdir /= "../Resources"; // Libraries can be bundled + if (!is_directory(libdir / "libraries")) libdir /= "../../.."; #elif defined(Q_OS_UNIX) - if (libdir.cd("../share/openscad/libraries")) { - librarydir = libdir.path(); - } else if (libdir.cd("../../share/openscad/libraries")) { - librarydir = libdir.path(); - } else if (libdir.cd("../../libraries")) { - librarydir = libdir.path(); + if (is_directory(tmpdir = libdir / "../share/openscad/libraries")) { + librarydir = tmpdir.generic_string(); + } else if (is_directory(tmpdir = libdir / "../../share/openscad/libraries")) { + librarydir = tmpdir.generic_string(); + } else if (is_directory(tmpdir = libdir / "../../libraries")) { + librarydir = tmpdir.generic_string(); } else #endif - if (libdir.cd("libraries")) { - librarydir = libdir.path(); + if (is_directory(tmpdir = libdir / "libraries")) { + librarydir = tmpdir.generic_string(); } } |