summaryrefslogtreecommitdiffstats
path: root/src/server/serverapp/serverapp.cpp
diff options
context:
space:
mode:
authorSimon Rettberg2016-10-10 17:47:51 +0200
committerSimon Rettberg2016-10-10 17:47:51 +0200
commit6ef199e2444615e68ec0653a49eb109dbb091805 (patch)
tree1118d0acc5976a12999b7d6e95d909627a66091c /src/server/serverapp/serverapp.cpp
parent[server] Don't ignore entire config if a single room doesn't have a mgrIP ass... (diff)
downloadpvs2-6ef199e2444615e68ec0653a49eb109dbb091805.tar.gz
pvs2-6ef199e2444615e68ec0653a49eb109dbb091805.tar.xz
pvs2-6ef199e2444615e68ec0653a49eb109dbb091805.zip
[server] Fix parsing of command line arguments, init class members of ServerApp
Diffstat (limited to 'src/server/serverapp/serverapp.cpp')
-rw-r--r--src/server/serverapp/serverapp.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server/serverapp/serverapp.cpp b/src/server/serverapp/serverapp.cpp
index 8ad896f..a57c456 100644
--- a/src/server/serverapp/serverapp.cpp
+++ b/src/server/serverapp/serverapp.cpp
@@ -4,7 +4,10 @@
#include "serverapp.h"
ServerApp::ServerApp(int& argc, char** argv)
- : QApplication(argc, argv)
+ : QApplication(argc, argv),
+ _mainWindow(NULL),
+ _managerOnly(false),
+ _isExam(false)
{
setOrganizationName("openslx");
setOrganizationDomain("openslx.org");
@@ -24,15 +27,14 @@ ServerApp::ServerApp(int& argc, char** argv)
QFileInfo sysfi(sys->fileName());
_mainWindow = new MainWindow();
-
}
QStringList ServerApp::parseParameters()
{
QStringList rest;
- for (QString a : arguments()) {
+ for (QString a : QApplication::arguments()) {
if (a == "--manager-only") {
- _manager_only = true;
+ _managerOnly = true;
break;
} else if (a.startsWith("--config=")) {
_iniPath = a.mid(9);