summaryrefslogtreecommitdiffstats
path: root/src/server/serverapp/serverapp.h
diff options
context:
space:
mode:
authorSimon Rettberg2016-11-02 13:57:36 +0100
committerSimon Rettberg2016-11-02 13:57:36 +0100
commit1511f2ad55d5941e94af4accfb618b3245c158cd (patch)
tree20b6cc0326c7fe16b0a64f0474c0cc9f57ee9ae7 /src/server/serverapp/serverapp.h
parent[server] Show IP address in room layout right after loading it (diff)
downloadpvs2-1511f2ad55d5941e94af4accfb618b3245c158cd.tar.gz
pvs2-1511f2ad55d5941e94af4accfb618b3245c158cd.tar.xz
pvs2-1511f2ad55d5941e94af4accfb618b3245c158cd.zip
[server] Run "manager only" logic before creating main window
This prevents the window popping up for a split second when --manager-only is given and the machine it's running on is not configured as a manager.
Diffstat (limited to 'src/server/serverapp/serverapp.h')
-rw-r--r--src/server/serverapp/serverapp.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/serverapp/serverapp.h b/src/server/serverapp/serverapp.h
index a03b2e3..e0a1351 100644
--- a/src/server/serverapp/serverapp.h
+++ b/src/server/serverapp/serverapp.h
@@ -42,7 +42,6 @@ class ServerApp : public QApplication
private:
QStringList _arguments;
- QStringList parseParameters();
MainWindow* _mainWindow;
QString _sessionName;
@@ -54,6 +53,9 @@ private:
bool _isExam;
QString _iniPath;
+ QStringList parseParameters();
+ void loadRooms();
+
public:
ServerApp(int& argc, char** argv);
@@ -70,18 +72,15 @@ public:
bool isExam() { return _isExam; }
bool isManagerOnly() { return _managerOnly; }
const Room* getCurrentRoom();
+ QSharedPointer<QSettings> getSettings();
/* setters */
void setSessionName(const QString& name);
void setSessionName();
- void setRooms(const QMap<QString, Room*> & roomList) { _rooms = roomList; }
void setIniPath(QString s) { _iniPath = s; };
void setCurrentRoom(const QString& room) { _currentRoom = room; }
void setExam(bool exam) { _isExam = exam; }
- QSharedPointer<QSettings> getSettings();
-
-
};
#endif