diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/server/serverapp/serverapp.cpp | 10 | ||||
-rw-r--r-- | src/server/serverapp/serverapp.h | 4 |
2 files changed, 8 insertions, 6 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); diff --git a/src/server/serverapp/serverapp.h b/src/server/serverapp/serverapp.h index be6b0ab..a03b2e3 100644 --- a/src/server/serverapp/serverapp.h +++ b/src/server/serverapp/serverapp.h @@ -50,7 +50,7 @@ private: QMap<QString, Room*> _rooms; QString _currentRoom; - bool _manager_only; + bool _managerOnly; bool _isExam; QString _iniPath; @@ -68,7 +68,7 @@ public: const QString& getCurrentRoomName() { return _currentRoom; } const QMap<QString, Room*>& getRooms() { return _rooms; } bool isExam() { return _isExam; } - bool isManagerOnly() { return _manager_only; } + bool isManagerOnly() { return _managerOnly; } const Room* getCurrentRoom(); /* setters */ |