summaryrefslogtreecommitdiffstats
path: root/src/client/clientapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/clientapp')
-rw-r--r--src/client/clientapp/clientapp.cpp8
-rw-r--r--src/client/clientapp/clientapp.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp
index 2f65bd1..962ec42 100644
--- a/src/client/clientapp/clientapp.cpp
+++ b/src/client/clientapp/clientapp.cpp
@@ -5,7 +5,7 @@
#include "../net/serverconnection.h"
ClientApp::ClientApp(int& argc, char** argv)
- : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false), _connection(NULL), _isManagerPc(false)
+ : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false), _connection(nullptr), _isManagerPc(false)
{
/* some values */
setOrganizationName("openslx");
@@ -31,7 +31,7 @@ ClientApp::ClientApp(int& argc, char** argv)
readIsManagerPc();
- _connectWindow = new ConnectWindow(NULL);
+ _connectWindow = new ConnectWindow(nullptr);
connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(connected(ServerConnection*)));
if (_connectionMode == ConnectionMode::Auto) {
_toolbar = new Toolbar(true); // auto connect client without session ID.
@@ -114,10 +114,10 @@ void ClientApp::connected(ServerConnection* connection)
void ClientApp::disconnected(ServerConnection* connection)
{
- if (connection != NULL)
+ if (connection != nullptr)
connection->blockSignals(true);
if (_connection == connection) {
- _connection = NULL;
+ _connection = nullptr;
}
}
diff --git a/src/client/clientapp/clientapp.h b/src/client/clientapp/clientapp.h
index 0f7cb5b..91dccf3 100644
--- a/src/client/clientapp/clientapp.h
+++ b/src/client/clientapp/clientapp.h
@@ -58,7 +58,7 @@ public:
bool isConfiguredAsManager() { return _isManagerPc; }
- bool isConnectedToLocalManager() { return _connection != NULL && _connection->isLocalConnection(); }
+ bool isConnectedToLocalManager() { return _connection != nullptr && _connection->isLocalConnection(); }
private slots: