diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-25 14:09:52 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-25 14:09:52 (GMT) |
| commit | 312a25f2708fcef22e300f7bd2c1aaed61d3095d (patch) | |
| tree | 9e172f8db53d847f45101dae536ed5b059ba655b /src | |
| parent | d71ec2a3dbdac8e6b1c2c114d439d9caccff1fa2 (diff) | |
Removed Qt dependency from parser_init()
Diffstat (limited to 'src')
| -rw-r--r-- | src/openscad.cc | 2 | ||||
| -rw-r--r-- | src/parsersettings.cc | 6 | ||||
| -rw-r--r-- | src/parsersettings.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index f65b311..6f4d7c7 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -220,7 +220,7 @@ int main(int argc, char **argv) examplesdir = exdir.path(); } - parser_init(); + parser_init(QApplication::instance()->applicationDirPath().toStdString()); // Initialize global visitors NodeCache nodecache; diff --git a/src/parsersettings.cc b/src/parsersettings.cc index e9dc4a7..2d0b1b3 100644 --- a/src/parsersettings.cc +++ b/src/parsersettings.cc @@ -1,15 +1,13 @@ #include "parsersettings.h" -#include <QApplication> -#include <QDir> #include <boost/filesystem.hpp> using namespace boost::filesystem; std::string librarydir; -void parser_init() +void parser_init(const std::string &applicationpath) { - path libdir(QApplication::instance()->applicationDirPath().toStdString()); + path libdir(applicationpath); path tmpdir; #ifdef Q_WS_MAC libdir /= "../Resources"; // Libraries can be bundled diff --git a/src/parsersettings.h b/src/parsersettings.h index e08e581..61dcf99 100644 --- a/src/parsersettings.h +++ b/src/parsersettings.h @@ -6,6 +6,6 @@ extern std::string librarydir; extern int parser_error_pos; -void parser_init(); +void parser_init(const std::string &applicationpath); #endif |