diff options
| author | Christian Klinger | 2016-09-27 15:48:43 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-09-27 15:48:43 +0200 |
| commit | 7b549b0b3c8cfd84377c13ec4f6ee2430867d53b (patch) | |
| tree | eb74f9e0945cdc1b35a2747edcfcea7b94112249 | |
| parent | Implemented 'majority vote' to determine the toolbar options. (diff) | |
| parent | clients in exam-mode no longer send a screenshot. Also some refactoring. (diff) | |
| download | pvs2-7b549b0b3c8cfd84377c13ec4f6ee2430867d53b.tar.gz pvs2-7b549b0b3c8cfd84377c13ec4f6ee2430867d53b.tar.xz pvs2-7b549b0b3c8cfd84377c13ec4f6ee2430867d53b.zip | |
.
| -rw-r--r-- | src/client/clientapp/clientapp.cpp | 7 | ||||
| -rw-r--r-- | src/client/net/serverconnection.cpp | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp index f177d44..def9bb0 100644 --- a/src/client/clientapp/clientapp.cpp +++ b/src/client/clientapp/clientapp.cpp @@ -1,6 +1,10 @@ #include "clientapp.h" +<<<<<<< HEAD ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false) { +======= +ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connectionMode(ConnectionMode::None) { +>>>>>>> 024212d9ebcb9bba74ceb4d318b60d9dbf3b5a42 /* some values */ setOrganizationName("openslx"); setOrganizationDomain("openslx.org"); @@ -32,7 +36,10 @@ ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connec void ClientApp::parseParameters() { for (QString a : arguments()) { if (a == "--exam-mode") { +<<<<<<< HEAD qDebug() << "setting exam-mode to true"; +======= +>>>>>>> 024212d9ebcb9bba74ceb4d318b60d9dbf3b5a42 _examMode = true; } else if (a == "--auto") { _connectionMode = ConnectionMode::Auto; diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp index 418e13c..f4a6fd6 100644 --- a/src/client/net/serverconnection.cpp +++ b/src/client/net/serverconnection.cpp @@ -185,7 +185,6 @@ void ServerConnection::handleMsg() if (id == _THUMB) { if (clientApp->isExamMode()) { - /* but we still have to send a message, to reset the timeout timer of the server */ QByteArray emptyArray; _toServer.setField(_ID, _THUMB); _toServer.setField(_IMG, emptyArray); |