Ported currentdir handling from Qt to boost filesystem

1 files changed, 9 insertions, 10 deletions

diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc
index 52e55c4..7fae3fb 100644
--- a/tests/csgtermtest.cc
+++ b/tests/csgtermtest.cc
@@ -39,9 +39,6 @@
 #include "csgterm.h"
 
 #include <QApplication>
-#include <QFile>
-#include <QDir>
-#include <QSet>
 #ifndef _MSC_VER
 #include <getopt.h>
 #endif
@@ -50,12 +47,15 @@
 #include <sstream>
 #include <fstream>
 
-using std::cout;
+#include <boost/filesystem.hpp>
+namespace fs = boost::filesystem;
 
 std::string commandline_commands;
-QString currentdir;
+std::string currentdir;
 QString examplesdir;
 
+using std::cout;
+
 int main(int argc, char **argv)
 {
 	if (argc != 3) {
@@ -71,9 +71,9 @@ int main(int argc, char **argv)
 	Builtins::instance()->initialize();
 
 	QApplication app(argc, argv, false);
-	QDir original_path = QDir::current();
+	fs::path original_path = fs::current_path();
 
-	currentdir = QDir::currentPath();
+	currentdir = fs::current_path().generic_string();
 
 	parser_init();
 
@@ -89,8 +89,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	QFileInfo fileInfo(filename);
-	QDir::setCurrent(fileInfo.absolutePath());
+	fs::current_path(fs::path(filename).parent_path());
 
 	AbstractNode::resetIndexCounter();
 	root_node = root_module->evaluate(&root_ctx, &root_inst);
@@ -115,7 +114,7 @@ int main(int argc, char **argv)
 	// if (evaluator.background) cout << "Background terms: " << evaluator.background->size() << "\n";
 	// if (evaluator.highlights) cout << "Highlights terms: " << evaluator.highlights->size() << "\n";
 
-	QDir::setCurrent(original_path.absolutePath());
+	current_path(original_path);
 	std::ofstream outfile;
 	outfile.open(outfilename);
 	if (root_term) {