aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorJonah BrĂ¼chert <jbb.prv@gmx.de>2019-10-19 17:23:08 +0200
committerLNJ <lnj@kaidan.im>2019-10-22 15:32:25 +0200
commit876c924cde7b8fe129d0f3e1b76cf0a2de9fb856 (patch)
treec0a8816bf3fbff9fe1c6efd229dad5897cbdf61b /src/server
parent70dfa23900a3905285435a10fdaa97462a67016f (diff)
Use raw literals, range based loops and auto
Diffstat (limited to 'src/server')
-rw-r--r--src/server/QXmppIncomingClient.cpp4
-rw-r--r--src/server/QXmppIncomingServer.cpp4
-rw-r--r--src/server/QXmppOutgoingServer.cpp2
-rw-r--r--src/server/QXmppPasswordChecker.cpp4
-rw-r--r--src/server/QXmppServer.cpp24
5 files changed, 19 insertions, 19 deletions
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index e563ef1c..aadc6d9e 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -393,7 +393,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
void QXmppIncomingClient::onDigestReply()
{
- QXmppPasswordReply *reply = qobject_cast<QXmppPasswordReply*>(sender());
+ auto *reply = qobject_cast<QXmppPasswordReply*>(sender());
if (!reply)
return;
reply->deleteLater();
@@ -424,7 +424,7 @@ void QXmppIncomingClient::onDigestReply()
void QXmppIncomingClient::onPasswordReply()
{
- QXmppPasswordReply *reply = qobject_cast<QXmppPasswordReply*>(sender());
+ auto *reply = qobject_cast<QXmppPasswordReply*>(sender());
if (!reply)
return;
reply->deleteLater();
diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index e1223d86..1e413600 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -159,7 +159,7 @@ void QXmppIncomingServer::handleStanza(const QDomElement &stanza)
debug(QString("Received a dialback result from '%1' on %2").arg(domain, d->origin()));
// establish dialback connection
- QXmppOutgoingServer *stream = new QXmppOutgoingServer(d->domain, this);
+ auto *stream = new QXmppOutgoingServer(d->domain, this);
bool check = connect(stream, SIGNAL(dialbackResponseReceived(QXmppDialback)),
this, SLOT(slotDialbackResponseReceived(QXmppDialback)));
Q_ASSERT(check);
@@ -201,7 +201,7 @@ bool QXmppIncomingServer::isConnected() const
void QXmppIncomingServer::slotDialbackResponseReceived(const QXmppDialback &dialback)
{
- QXmppOutgoingServer *stream = qobject_cast<QXmppOutgoingServer*>(sender());
+ auto *stream = qobject_cast<QXmppOutgoingServer*>(sender());
if (!stream ||
dialback.command() != QXmppDialback::Verify ||
dialback.id() != d->localStreamId ||
diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index 5df14368..af5ed01b 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -61,7 +61,7 @@ QXmppOutgoingServer::QXmppOutgoingServer(const QString &domain, QObject *parent)
Q_UNUSED(check);
// socket initialisation
- QSslSocket *socket = new QSslSocket(this);
+ auto *socket = new QSslSocket(this);
setSocket(socket);
check = connect(socket, SIGNAL(disconnected()),
diff --git a/src/server/QXmppPasswordChecker.cpp b/src/server/QXmppPasswordChecker.cpp
index 758e604f..026d69cc 100644
--- a/src/server/QXmppPasswordChecker.cpp
+++ b/src/server/QXmppPasswordChecker.cpp
@@ -162,7 +162,7 @@ void QXmppPasswordReply::setPassword(const QString &password)
QXmppPasswordReply *QXmppPasswordChecker::checkPassword(const QXmppPasswordRequest &request)
{
- QXmppPasswordReply *reply = new QXmppPasswordReply;
+ auto *reply = new QXmppPasswordReply;
QString secret;
QXmppPasswordReply::Error error = getPassword(request, secret);
@@ -187,7 +187,7 @@ QXmppPasswordReply *QXmppPasswordChecker::checkPassword(const QXmppPasswordReque
QXmppPasswordReply *QXmppPasswordChecker::getDigest(const QXmppPasswordRequest &request)
{
- QXmppPasswordReply *reply = new QXmppPasswordReply;
+ auto *reply = new QXmppPasswordReply;
QString secret;
QXmppPasswordReply::Error error = getPassword(request, secret);
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 82bc5d37..283d3917 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -166,7 +166,7 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data)
// if we did not find an outgoing server,
// we need to establish the S2S connection
- QXmppOutgoingServer *conn = new QXmppOutgoingServer(domain, nullptr);
+ auto *conn = new QXmppOutgoingServer(domain, nullptr);
conn->setLocalStreamKey(QXmppUtils::generateStanzaHash().toLatin1());
conn->moveToThread(q->thread());
conn->setParent(q);
@@ -266,7 +266,7 @@ void QXmppServerPrivate::loadExtensions(QXmppServer *server)
if (!loaded) {
QObjectList plugins = QPluginLoader::staticInstances();
foreach (QObject *object, plugins) {
- QXmppServerPlugin *plugin = qobject_cast<QXmppServerPlugin*>(object);
+ auto *plugin = qobject_cast<QXmppServerPlugin*>(object);
if (!plugin)
continue;
@@ -547,7 +547,7 @@ bool QXmppServer::listenForClients(const QHostAddress &address, quint16 port)
}
// create new server
- QXmppSslServer *server = new QXmppSslServer(this);
+ auto *server = new QXmppSslServer(this);
server->addCaCertificates(d->caCertificates);
server->setLocalCertificate(d->localCertificate);
server->setPrivateKey(d->privateKey);
@@ -610,7 +610,7 @@ bool QXmppServer::listenForServers(const QHostAddress &address, quint16 port)
}
// create new server
- QXmppSslServer *server = new QXmppSslServer(this);
+ auto *server = new QXmppSslServer(this);
server->addCaCertificates(d->caCertificates);
server->setLocalCertificate(d->localCertificate);
server->setPrivateKey(d->privateKey);
@@ -704,7 +704,7 @@ void QXmppServer::_q_clientConnection(QSslSocket *socket)
return;
}
- QXmppIncomingClient *stream = new QXmppIncomingClient(socket, d->domain, this);
+ auto *stream = new QXmppIncomingClient(socket, d->domain, this);
stream->setInactivityTimeout(120);
socket->setParent(stream);
addIncomingClient(stream);
@@ -715,7 +715,7 @@ void QXmppServer::_q_clientConnection(QSslSocket *socket)
void QXmppServer::_q_clientConnected()
{
- QXmppIncomingClient *client = qobject_cast<QXmppIncomingClient*>(sender());
+ auto *client = qobject_cast<QXmppIncomingClient*>(sender());
if (!client)
return;
@@ -739,7 +739,7 @@ void QXmppServer::_q_clientConnected()
void QXmppServer::_q_clientDisconnected()
{
- QXmppIncomingClient *client = qobject_cast<QXmppIncomingClient *>(sender());
+ auto *client = qobject_cast<QXmppIncomingClient *>(sender());
if (!client)
return;
@@ -771,7 +771,7 @@ void QXmppServer::_q_clientDisconnected()
void QXmppServer::_q_dialbackRequestReceived(const QXmppDialback &dialback)
{
- QXmppIncomingServer *stream = qobject_cast<QXmppIncomingServer *>(sender());
+ auto *stream = qobject_cast<QXmppIncomingServer *>(sender());
if (!stream)
return;
@@ -806,7 +806,7 @@ void QXmppServer::handleElement(const QDomElement &element)
void QXmppServer::_q_outgoingServerDisconnected()
{
- QXmppOutgoingServer *outgoing = qobject_cast<QXmppOutgoingServer *>(sender());
+ auto *outgoing = qobject_cast<QXmppOutgoingServer *>(sender());
if (!outgoing)
return;
@@ -831,7 +831,7 @@ void QXmppServer::_q_serverConnection(QSslSocket *socket)
return;
}
- QXmppIncomingServer *stream = new QXmppIncomingServer(socket, d->domain, this);
+ auto *stream = new QXmppIncomingServer(socket, d->domain, this);
socket->setParent(stream);
check = connect(stream, SIGNAL(disconnected()),
@@ -855,7 +855,7 @@ void QXmppServer::_q_serverConnection(QSslSocket *socket)
void QXmppServer::_q_serverDisconnected()
{
- QXmppIncomingServer *incoming = qobject_cast<QXmppIncomingServer *>(sender());
+ auto *incoming = qobject_cast<QXmppIncomingServer *>(sender());
if (!incoming)
return;
@@ -893,7 +893,7 @@ QXmppSslServer::~QXmppSslServer()
void QXmppSslServer::incomingConnection(qintptr socketDescriptor)
{
- QSslSocket *socket = new QSslSocket;
+ auto *socket = new QSslSocket;
if (!socket->setSocketDescriptor(socketDescriptor)) {
delete socket;
return;