diff options
Diffstat (limited to 'src/server/serverapp/serverapp.cpp')
| -rw-r--r-- | src/server/serverapp/serverapp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/serverapp/serverapp.cpp b/src/server/serverapp/serverapp.cpp index 7ee06e0..f680f89 100644 --- a/src/server/serverapp/serverapp.cpp +++ b/src/server/serverapp/serverapp.cpp @@ -7,7 +7,7 @@ static QSize minimalGridSize(const QMap<QString, QPoint>& clientPositions, QSize ServerApp::ServerApp(int& argc, char** argv) : QApplication(argc, argv), - _mainWindow(NULL), + _mainWindow(nullptr), _managerOnly(false), _isExam(false) { @@ -132,8 +132,8 @@ const Room* ServerApp::getCurrentRoom() if (_rooms.contains(_currentRoom)) { return _rooms[_currentRoom]; } else { - static Room* defaultRoom = NULL; - if (defaultRoom == NULL) { + static Room* defaultRoom = nullptr; + if (defaultRoom == nullptr) { defaultRoom = new Room(QMap<QString, QPoint>(), QSize(8, 6), QSize(1, 1), "", ""); } |