diff options
| author | Manuel Schneider | 2014-06-03 14:11:46 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-06-03 14:11:46 +0200 |
| commit | 0d9e99a40590e2ef6ef04efa975d2185a244d519 (patch) | |
| tree | ff98bf17d30f9ed73ad944b8f5e23b2071c16e42 /src/server/mainwindow/mainwindow.h | |
| parent | Remove client list from listenServer. Check maxClients in Mainwindow (diff) | |
| parent | Removed some unnecessary qDebug comments. (diff) | |
| download | pvs2-0d9e99a40590e2ef6ef04efa975d2185a244d519.tar.gz pvs2-0d9e99a40590e2ef6ef04efa975d2185a244d519.tar.xz pvs2-0d9e99a40590e2ef6ef04efa975d2185a244d519.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 89361c9..a15c12f 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -78,6 +78,7 @@ private: bool isValidClient(Client* client); void changeProjection(Client *from, Mode mode = Mode::Broadcast, Client *to = NULL); void tellClientCurrentSituation(Client* client); + bool isManagerMachine(Client* client); void reset(); void closeEvent(QCloseEvent *e); @@ -85,7 +86,6 @@ private: void resizeEvent(QResizeEvent *e); void mouseReleaseEvent(QMouseEvent* e); - protected slots: void onTutorListDownloaded(QByteArray& tutorList); void onSessionNameClick(); |