diff options
Diffstat (limited to 'src/client/net')
| -rw-r--r-- | src/client/net/serverconnection.cpp | 28 | ||||
| -rw-r--r-- | src/client/net/serverconnection.h | 2 | ||||
| -rw-r--r-- | src/client/net/serverdiscovery.cpp | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp index 0cbd4c2..6350418 100644 --- a/src/client/net/serverconnection.cpp +++ b/src/client/net/serverconnection.cpp @@ -19,7 +19,7 @@ #define CHALLENGE_LEN 20 ServerConnection::ServerConnection(const QString& host, const quint16 port, const QByteArray& sessionName, const QByteArray& certHash, bool autoConnect) : - QObject(NULL), _timerDelete(0), _jpegQuality(80), _authed(0), _autoConnect(autoConnect), _isLocalConnection(-1), _sessionName(sessionName), _certHash(certHash) + QObject(nullptr), _timerDelete(0), _jpegQuality(80), _authed(0), _autoConnect(autoConnect), _isLocalConnection(-1), _sessionName(sessionName), _certHash(certHash) { _socket = new QSslSocket(); _blank = new BlankScreen(); @@ -46,13 +46,13 @@ ServerConnection::ServerConnection(const QString& host, const quint16 port, cons ServerConnection::~ServerConnection() { this->disconnectFromServer(); - if (_socket != NULL) { + if (_socket != nullptr) { qCritical("**** SOCKET DELETE IN DESTRUCTOR"); _socket->deleteLater(); } qDebug("*** Server connection destroyed."); _blank->deleteLater(); - _blank = NULL; + _blank = nullptr; } /** @@ -60,7 +60,7 @@ ServerConnection::~ServerConnection() */ void ServerConnection::sendMessage(NetworkMessage& message) { - if (_socket == NULL || _socket->state() != QAbstractSocket::ConnectedState) + if (_socket == nullptr || _socket->state() != QAbstractSocket::ConnectedState) return; message.writeMessage(_socket); if (!message.writeComplete()) { @@ -89,7 +89,7 @@ void ServerConnection::disconnectFromServer() emit disconnected(this); _timerDelete = startTimer(500); qDebug("Closing connection to server"); - if (_socket != NULL) { + if (_socket != nullptr) { _socket->blockSignals(true); _socket->abort(); } @@ -144,11 +144,11 @@ void ServerConnection::handleMsg() } emit stateChange(ConnectWindow::LoggingIn); const char *user = getpwuid(getuid())->pw_name; - if (user == NULL || *user == '\0') + if (user == nullptr || *user == '\0') user = getenv("USER"); - if (user == NULL || *user == '\0') + if (user == nullptr || *user == '\0') user = getenv("USERNAME"); - if (user == NULL || *user == '\0') + if (user == nullptr || *user == '\0') user = "Hans Affe"; _toServer.reset(); _toServer.setField(_ID, _LOGIN); @@ -269,7 +269,7 @@ void ServerConnection::handleMsg() void ServerConnection::checkLocalConnection() { - if (_socket == NULL) { + if (_socket == nullptr) { return; } if (_socket->peerAddress() == _socket->localAddress()) { @@ -297,10 +297,10 @@ void ServerConnection::timerEvent(QTimerEvent *event) _timerId = 0; this->disconnectFromServer(); } else if (event->timerId() == _timerDelete) { - if (_socket == NULL || _socket->state() == QAbstractSocket::UnconnectedState) { - if (_socket != NULL) + if (_socket == nullptr || _socket->state() == QAbstractSocket::UnconnectedState) { + if (_socket != nullptr) _socket->deleteLater(); - _socket = NULL; + _socket = nullptr; killTimer(_timerDelete); this->deleteLater(); return; @@ -375,7 +375,7 @@ void ServerConnection::sslErrors(const QList<QSslError> & errors) void ServerConnection::sock_dataArrival() { - if (_socket == NULL || _socket->state() != QAbstractSocket::ConnectedState) { + if (_socket == nullptr || _socket->state() != QAbstractSocket::ConnectedState) { qDebug("dataArrival called in bad state"); return; } @@ -390,7 +390,7 @@ void ServerConnection::sock_dataArrival() return; if (_fromServer.readComplete()) { // message is complete this->handleMsg(); - if (_socket == NULL) + if (_socket == nullptr) return; _fromServer.reset(); } diff --git a/src/client/net/serverconnection.h b/src/client/net/serverconnection.h index 9db9b02..f5f6264 100644 --- a/src/client/net/serverconnection.h +++ b/src/client/net/serverconnection.h @@ -38,7 +38,7 @@ public: ~ServerConnection(); inline bool isConnected() const { - return _socket != NULL && _socket->state() == QAbstractSocket::ConnectedState; + return _socket != nullptr && _socket->state() == QAbstractSocket::ConnectedState; } const inline QString getPeerAdress() const diff --git a/src/client/net/serverdiscovery.cpp b/src/client/net/serverdiscovery.cpp index 33ddbf5..799fcbe 100644 --- a/src/client/net/serverdiscovery.cpp +++ b/src/client/net/serverdiscovery.cpp @@ -145,12 +145,12 @@ void ServerDiscovery::onUdpReadyRead() while (_discoverySocket.hasPendingDatagrams()) { // Discard any packets if discovery is stopped if (!this->isActive()) { - _discoverySocket.readDatagram(NULL, 0); + _discoverySocket.readDatagram(nullptr, 0); continue; } const qint64 size = _discoverySocket.readDatagram(data, UDPBUFSIZ, &addr, &port); - if (size <= 0) //|| clientApp->connection() != NULL) // TODO CHECK + if (size <= 0) //|| clientApp->connection() != nullptr) // TODO CHECK continue; _packet.reset(); |