From 312a25f2708fcef22e300f7bd2c1aaed61d3095d Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sun, 25 Dec 2011 15:09:52 +0100
Subject: Removed Qt dependency from parser_init()


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
diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc
index 7aa740d..ca37572 100644
--- a/tests/cgalpngtest.cc
+++ b/tests/cgalpngtest.cc
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
 
 	currentdir = fs::current_path().generic_string();
 
-	parser_init();
+	parser_init(QApplication::instance()->applicationDirPath().toStdString());
 
 	Context root_ctx;
 	register_builtin(root_ctx);
diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc
index 8bdf417..956bf43 100644
--- a/tests/cgaltest.cc
+++ b/tests/cgaltest.cc
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 
 	currentdir = fs::current_path().generic_string();
 
-	parser_init();
+	parser_init(QApplication::instance()->applicationDirPath().toStdString());
 
 	Context root_ctx;
 	register_builtin(root_ctx);
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc
index 7fae3fb..016285e 100644
--- a/tests/csgtermtest.cc
+++ b/tests/csgtermtest.cc
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
 
 	currentdir = fs::current_path().generic_string();
 
-	parser_init();
+	parser_init(QApplication::instance()->applicationDirPath().toStdString());
 
 	Context root_ctx;
 	register_builtin(root_ctx);
diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc
index 4cb612a..2406349 100644
--- a/tests/csgtestcore.cc
+++ b/tests/csgtestcore.cc
@@ -255,7 +255,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type)
 
 	std::string currentdir = fs::current_path().generic_string();
 
-	parser_init();
+	parser_init(QApplication::instance()->applicationDirPath().toStdString());
 
 	Context root_ctx;
 	register_builtin(root_ctx);
diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc
index d0d27ce..daed4e4 100644
--- a/tests/csgtexttest.cc
+++ b/tests/csgtexttest.cc
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
 
 	currentdir = fs::current_path().generic_string();
 
-	parser_init();
+	parser_init(QApplication::instance()->applicationDirPath().toStdString());
 
 	Context root_ctx;
 	register_builtin(root_ctx);
diff --git a/tests/dumptest.cc b/tests/dumptest.cc
index bc48011..cca4d82 100644
--- a/tests/dumptest.cc
+++ b/tests/dumptest.cc
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 
 	currentdir = fs::current_path().generic_string();
 
-	parser_init();
+	parser_init(QApplication::instance()->applicationDirPath().toStdString());
 
 	Context root_ctx;
 	register_builtin(root_ctx);
diff --git a/tests/echotest.cc b/tests/echotest.cc
index 7f05149..96b8d1c 100644
--- a/tests/echotest.cc
+++ b/tests/echotest.cc
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 
 	currentdir = fs::current_path().generic_string();
 
-	parser_init();
+	parser_init(QApplication::instance()->applicationDirPath().toStdString());
 
 	Context root_ctx;
 	register_builtin(root_ctx);
-- 
cgit v0.10.1