[client] removed some old code regarding settings.

4 files changed, 15 insertions, 32 deletions

diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp
index 8ae804e..6e1a555 100644
--- a/src/client/clientapp/clientapp.cpp
+++ b/src/client/clientapp/clientapp.cpp
@@ -1,13 +1,16 @@
 #include "clientapp.h"
 
-ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false) {
+ClientApp::ClientApp(int& argc, char** argv)
+    : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false) {
     /* some values */
     setOrganizationName("openslx");
     setOrganizationDomain("openslx.org");
     setApplicationName("pvsclient");
-    
+
+    /* configuration */
+    QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/");
+
     _arguments = parseParameters();
-    initConfiguration();
 
 
     /* TODO: Move the connection handling to ClientApp */
@@ -21,10 +24,10 @@ ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connec
     _toolbar->setVisible(!_examMode);
 
     /* set translator */
-	/* use system locale as language to translate gui */
-	QTranslator translator;
-	translator.load(":pvsclient");
-	installTranslator(&translator);
+    /* use system locale as language to translate gui */
+    QTranslator translator;
+    translator.load(":pvsclient");
+    installTranslator(&translator);
 
 };
 
@@ -45,30 +48,6 @@ QStringList ClientApp::parseParameters() {
     }
     return rest;
 }
-void ClientApp::initConfiguration() {
-    /* configuration */	
-	QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/");
-	do {
-		// Make sure settings directory exists
-		USER_SETTINGS(settings);
-		QFileInfo fi(settings.fileName());
-		QDir path(fi.path());
-		if (!path.exists())
-			path.mkpath(path.absolutePath());
-		// Now check if settings file exists. If not, copy system default (if available)
-		if (!fi.exists())
-		{
-			SYSTEM_SETTINGS(sys);
-			qDebug() << "System settings are in:" << sys.fileName();
-			QFileInfo sysfi(sys.fileName());
-			if (sysfi.exists())
-			{
-				if (!QFile::copy(sys.fileName(), settings.fileName()))
-					qDebug() << "Copying default settings from " << sys.fileName() << " to " << settings.fileName() << " failed.";
-			}
-		}
-	} while (false);
-}
 
 QStringList ClientApp::arguments() {
     return _arguments;
diff --git a/src/client/clientapp/clientapp.h b/src/client/clientapp/clientapp.h
index 0636080..996d48d 100644
--- a/src/client/clientapp/clientapp.h
+++ b/src/client/clientapp/clientapp.h
@@ -28,7 +28,6 @@ class ClientApp : public QApplication {
     Toolbar* _toolbar;
     QStringList _arguments;
 
-    void initConfiguration();
     QStringList parseParameters();
 
   public:
diff --git a/src/client/main.cpp b/src/client/main.cpp
index 2730475..d0c6bd9 100644
--- a/src/client/main.cpp
+++ b/src/client/main.cpp
@@ -2,12 +2,16 @@
 #include "clientapp/clientapp.h"
 #include "util/util.h"
 
+
+/* instantiates the ClientApp, handles some extra parameters and starts the
+ * main-loop of ClientApp */
 int main(int argc, char** argv)
 {
 
     ClientApp app(argc, argv);
     qsrand((uint)QDateTime::currentMSecsSinceEpoch());
 
+    /* here we handle the arguments that were not handled by ClientApp */
     for (QString a : app.arguments()) {
         if (a == "--usage" || a == "--help") {
             qStdout() << "Usage: pvsclient [--exam-mode] [--auto|--session=xxx|\"\"]" << endl;
diff --git a/src/client/util/util.h b/src/client/util/util.h
index f61684d..b47d3b1 100644
--- a/src/client/util/util.h
+++ b/src/client/util/util.h
@@ -6,6 +6,7 @@
 // Use like this:
 // 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")