Minor refactor: use set/get_librarydir() to access global variable

1 files changed, 13 insertions, 0 deletions

diff --git a/src/parsersettings.cc b/src/parsersettings.cc
index 330e2e2..a3a02b7 100644
--- a/src/parsersettings.cc
+++ b/src/parsersettings.cc
@@ -1,13 +1,25 @@
 #include "parsersettings.h"
 #include <boost/filesystem.hpp>
+#include <qglobal.h> // Needed for Q_ defines - move the offending code somewhere else
 
 using namespace boost::filesystem;
 #include "boosty.h"
 
 std::string librarydir;
 
+void set_librarydir(const std::string &libdir)
+{
+	librarydir = libdir;
+}
+
+const std::string &get_librarydir()
+{
+	return librarydir;
+}
+
 void parser_init(const std::string &applicationpath)
 {
+	std::string librarydir;
 	path libdir(applicationpath);
 	path tmpdir;
 #ifdef Q_WS_MAC
@@ -25,4 +37,5 @@ void parser_init(const std::string &applicationpath)
 		if (is_directory(tmpdir = libdir / "libraries")) {
 			librarydir = boosty::stringy( tmpdir );
 		}
+	set_librarydir(librarydir);
 }