From 876c924cde7b8fe129d0f3e1b76cf0a2de9fb856 Mon Sep 17 00:00:00 2001 From: Jonah Brüchert Date: Sat, 19 Oct 2019 17:23:08 +0200 Subject: Use raw literals, range based loops and auto --- src/client/QXmppCallManager.cpp | 10 +++++----- src/client/QXmppClient.cpp | 2 +- src/client/QXmppClient.h | 6 +++--- src/client/QXmppOutgoingClient.cpp | 2 +- src/client/QXmppTransferManager.cpp | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/client') diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp index 0a1d490f..e5e1b901 100644 --- a/src/client/QXmppCallManager.cpp +++ b/src/client/QXmppCallManager.cpp @@ -293,17 +293,17 @@ QXmppCallPrivate::Stream *QXmppCallPrivate::createStream(const QString &media) Q_UNUSED(check); Q_ASSERT(manager); - Stream *stream = new Stream; + auto *stream = new Stream; stream->media = media; // RTP channel QObject *channelObject = nullptr; if (media == AUDIO_MEDIA) { - QXmppRtpAudioChannel *audioChannel = new QXmppRtpAudioChannel(q); + auto *audioChannel = new QXmppRtpAudioChannel(q); stream->channel = audioChannel; channelObject = audioChannel; } else if (media == VIDEO_MEDIA) { - QXmppRtpVideoChannel *videoChannel = new QXmppRtpVideoChannel(q); + auto *videoChannel = new QXmppRtpVideoChannel(q); stream->channel = videoChannel; channelObject = videoChannel; } else { @@ -573,7 +573,7 @@ void QXmppCall::hangup() void QXmppCall::localCandidatesChanged() { // find the stream - QXmppIceConnection *conn = qobject_cast(sender()); + auto *conn = qobject_cast(sender()); QXmppCallPrivate::Stream *stream = nullptr; foreach (QXmppCallPrivate::Stream *ptr, d->streams) { if (ptr->connection == conn) { @@ -799,7 +799,7 @@ QXmppCall *QXmppCallManager::call(const QString &jid) return nullptr; } - QXmppCall *call = new QXmppCall(jid, QXmppCall::OutgoingDirection, this); + auto *call = new QXmppCall(jid, QXmppCall::OutgoingDirection, this); call->d->sid = QXmppUtils::generateStanzaHash(); // register call diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index e5bd5473..deef3dbc 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -78,7 +78,7 @@ QXmppClientPrivate::QXmppClientPrivate(QXmppClient *qq) void QXmppClientPrivate::addProperCapability(QXmppPresence& presence) { - QXmppDiscoveryManager* ext = q->findExtension(); + auto* ext = q->findExtension(); if(ext) { presence.setCapabilityHash("sha-1"); presence.setCapabilityNode(ext->clientCapabilitiesNode()); diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h index de4bb3d5..5f765602 100644 --- a/src/client/QXmppClient.h +++ b/src/client/QXmppClient.h @@ -127,10 +127,10 @@ public: template T* findExtension() { - QList list = extensions(); - for (int i = 0; i < list.size(); ++i) + const QList list = extensions(); + for (auto ext : list) { - T* extension = qobject_cast(list.at(i)); + T* extension = qobject_cast(ext); if(extension) return extension; } diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index 3e8b4034..3a454e79 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -187,7 +187,7 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent) Q_UNUSED(check); // initialise socket - QSslSocket *socket = new QSslSocket(this); + auto *socket = new QSslSocket(this); setSocket(socket); check = connect(socket, SIGNAL(disconnected()), diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp index e69d1941..57e19fdd 100644 --- a/src/client/QXmppTransferManager.cpp +++ b/src/client/QXmppTransferManager.cpp @@ -263,7 +263,7 @@ void QXmppTransferJob::accept(const QString &filePath) { if (d->direction == IncomingDirection && d->state == OfferState && !d->iodevice) { - QFile *file = new QFile(filePath, this); + auto *file = new QFile(filePath, this); if (!file->open(QIODevice::WriteOnly)) { warning(QString("Could not write to %1").arg(filePath)); @@ -1143,7 +1143,7 @@ void QXmppTransferManager::_q_iqReceived(const QXmppIq &iq) // handle IQ from proxy if (ptr->direction() == QXmppTransferJob::OutgoingDirection && ptr->d->socksProxy.jid() == iq.from() && ptr->d->requestId == iq.id()) { - QXmppTransferOutgoingJob *job = static_cast(ptr); + auto *job = static_cast(ptr); if (job->d->socksSocket) { // proxy connection activation result @@ -1198,7 +1198,7 @@ void QXmppTransferManager::_q_jobDestroyed(QObject *object) void QXmppTransferManager::_q_jobError(QXmppTransferJob::Error error) { - QXmppTransferJob *job = qobject_cast(sender()); + auto *job = qobject_cast(sender()); if (!job || !d->jobs.contains(job)) return; @@ -1217,7 +1217,7 @@ void QXmppTransferManager::_q_jobError(QXmppTransferJob::Error error) void QXmppTransferManager::_q_jobFinished() { - QXmppTransferJob *job = qobject_cast(sender()); + auto *job = qobject_cast(sender()); if (!job || !d->jobs.contains(job)) return; @@ -1229,7 +1229,7 @@ void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state) bool check; Q_UNUSED(check); - QXmppTransferJob *job = qobject_cast(sender()); + auto *job = qobject_cast(sender()); if (!job || !d->jobs.contains(job)) return; @@ -1360,7 +1360,7 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice * return nullptr; } - QXmppTransferOutgoingJob *job = new QXmppTransferOutgoingJob(jid, client(), this); + auto *job = new QXmppTransferOutgoingJob(jid, client(), this); if (sid.isEmpty()) job->d->sid = QXmppUtils::generateStanzaHash(); else -- cgit v1.2.3