4 files changed, 3 insertions, 3 deletions
diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp
index 18ef0de..e1ef22c 100644
--- a/src/client/clientapp/clientapp.cpp
+++ b/src/client/clientapp/clientapp.cpp
@@ -11,6 +11,7 @@ ClientApp::ClientApp(int& argc, char** argv)
 	/* configuration */
 	QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/");
 
+	/* parse parameters and keep the unparsed ones */
 	_arguments = parseParameters();
 
 
diff --git a/src/client/clientapp/clientapp.h b/src/client/clientapp/clientapp.h
index 910eba2..e7e6e57 100644
--- a/src/client/clientapp/clientapp.h
+++ b/src/client/clientapp/clientapp.h
@@ -23,8 +23,8 @@ public:
 	enum ConnectionMode { None, Auto, Session };
 
 private:
-	bool _examMode;
 	ConnectionMode _connectionMode; /* way of automatically connection to a session on startup*/
+	bool _examMode;
 	QString _sessionName; /* only set when _connectionMode == Session */
 	Toolbar* _toolbar;
 	QStringList _arguments;
diff --git a/src/client/util/util.cpp b/src/client/util/util.cpp
index 9dcbebb..ec1ae8a 100644
--- a/src/client/util/util.cpp
+++ b/src/client/util/util.cpp
@@ -14,7 +14,7 @@ namespace Util
 //#
 QDir settingsDir()
 {
-	USER_SETTINGS(settings);
+	QSettings settings(QSettings::IniFormat, QSettings::UserScope, "openslx/pvs2", "pvs2");
 	QFileInfo fi(settings.fileName());
 	QDir path(fi.path());
 	return path;
diff --git a/src/client/util/util.h b/src/client/util/util.h
index dc604e8..1c91d56 100644
--- a/src/client/util/util.h
+++ b/src/client/util/util.h
@@ -7,7 +7,6 @@
 // USER_SETTINGS(settings)
 // settings.value("somekey")
 
-#define USER_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::UserScope, "openslx/pvs2", "pvs2")
 #define SYSTEM_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::SystemScope, "openslx/pvs2", "pvs2")
 
 #include <QDir>