summaryrefslogtreecommitdiffstats
path: root/src/server/mainwindow/mainwindow.h
diff options
context:
space:
mode:
authorManuel Schneider2014-05-27 15:06:04 +0200
committerManuel Schneider2014-05-27 15:06:04 +0200
commitdf4daf91addf43aa5a4b613790cac0a5f362ec45 (patch)
treebc44c751bbdf2cf53ac604700527b7c1a7b7f25e /src/server/mainwindow/mainwindow.h
parentAdjust stopProjection (diff)
parentPut the clients adaption to current class room situation into method. (diff)
downloadpvs2-df4daf91addf43aa5a4b613790cac0a5f362ec45.tar.gz
pvs2-df4daf91addf43aa5a4b613790cac0a5f362ec45.tar.xz
pvs2-df4daf91addf43aa5a4b613790cac0a5f362ec45.zip
Manual merge
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
-rw-r--r--src/server/mainwindow/mainwindow.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 6245155..25eb9aa 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -77,6 +77,7 @@ private:
void savePosition(ConnectionFrame *cf);
bool isValidClient(Client* client);
void changeProjection(Client *from, Mode mode = Mode::Broadcast, Client *to = NULL);
+ void tellClientCurrentSituation(Client* client);
void closeEvent(QCloseEvent *e);
void changeEvent(QEvent *e);