diff options
author | Christian Klinger | 2016-09-27 16:49:55 +0200 |
---|---|---|
committer | Christian Klinger | 2016-09-27 16:49:55 +0200 |
commit | 7b131b37d1dc642c3870ecca4dd04fdcfd19810d (patch) | |
tree | 1eca459e50c37c539a028b70502788c128865aee /src/client/clientapp/clientapp.cpp | |
parent | reduced noise in the output (old debug messages...) (diff) | |
download | pvs2-7b131b37d1dc642c3870ecca4dd04fdcfd19810d.tar.gz pvs2-7b131b37d1dc642c3870ecca4dd04fdcfd19810d.tar.xz pvs2-7b131b37d1dc642c3870ecca4dd04fdcfd19810d.zip |
[client] removed some old code regarding settings.
Diffstat (limited to 'src/client/clientapp/clientapp.cpp')
-rw-r--r-- | src/client/clientapp/clientapp.cpp | 41 |
1 files changed, 10 insertions, 31 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; |