diff options
Diffstat (limited to 'src')
32 files changed, 181 insertions, 183 deletions
diff --git a/src/base/QXmppLogger.cpp b/src/base/QXmppLogger.cpp index a9c7bcef..c0758765 100644 --- a/src/base/QXmppLogger.cpp +++ b/src/base/QXmppLogger.cpp @@ -183,7 +183,7 @@ void QXmppLogger::log(QXmppLogger::MessageType type, const QString &text) std::cout << qPrintable(formatted(type, text)) << std::endl; break; case QXmppLogger::SignalLogging: - emit message(type, text); + Q_EMIT message(type, text); break; default: break; diff --git a/src/base/QXmppLogger.h b/src/base/QXmppLogger.h index 04765d39..f851cbf6 100644 --- a/src/base/QXmppLogger.h +++ b/src/base/QXmppLogger.h @@ -119,7 +119,7 @@ protected: void debug(const QString &message) { - emit logMessage(QXmppLogger::DebugMessage, qxmpp_loggable_trace(message)); + Q_EMIT logMessage(QXmppLogger::DebugMessage, qxmpp_loggable_trace(message)); } /// Logs an informational message. @@ -128,7 +128,7 @@ protected: void info(const QString &message) { - emit logMessage(QXmppLogger::InformationMessage, qxmpp_loggable_trace(message)); + Q_EMIT logMessage(QXmppLogger::InformationMessage, qxmpp_loggable_trace(message)); } /// Logs a warning message. @@ -137,7 +137,7 @@ protected: void warning(const QString &message) { - emit logMessage(QXmppLogger::WarningMessage, qxmpp_loggable_trace(message)); + Q_EMIT logMessage(QXmppLogger::WarningMessage, qxmpp_loggable_trace(message)); } /// Logs a received packet. @@ -146,7 +146,7 @@ protected: void logReceived(const QString &message) { - emit logMessage(QXmppLogger::ReceivedMessage, qxmpp_loggable_trace(message)); + Q_EMIT logMessage(QXmppLogger::ReceivedMessage, qxmpp_loggable_trace(message)); } /// Logs a sent packet. @@ -155,7 +155,7 @@ protected: void logSent(const QString &message) { - emit logMessage(QXmppLogger::SentMessage, qxmpp_loggable_trace(message)); + Q_EMIT logMessage(QXmppLogger::SentMessage, qxmpp_loggable_trace(message)); } Q_SIGNALS: diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp index 5420f6b4..bff85456 100644 --- a/src/base/QXmppSocks.cpp +++ b/src/base/QXmppSocks.cpp @@ -167,7 +167,7 @@ void QXmppSocksClient::slotReadyRead() // notify of connection m_step = ReadyState; - emit ready(); + Q_EMIT ready(); } } @@ -295,7 +295,7 @@ void QXmppSocksServer::slotReadyRead() // notify of connection m_states.insert(socket, ReadyState); - emit newConnection(socket, hostName, hostPort); + Q_EMIT newConnection(socket, hostName, hostPort); // send response buffer.resize(3); diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp index 360135a4..8a7e61c3 100644 --- a/src/base/QXmppStun.cpp +++ b/src/base/QXmppStun.cpp @@ -1186,7 +1186,7 @@ void QXmppStunTransaction::readStun(const QXmppStunMessage &response) response.messageClass() == QXmppStunMessage::Response) { m_response = response; m_retryTimer->stop(); - emit finished(); + Q_EMIT finished(); } } @@ -1211,12 +1211,12 @@ void QXmppStunTransaction::retry() if (m_tries >= STUN_RTO_MAX) { m_response.setType(QXmppStunMessage::Error); m_response.errorPhrase = QLatin1String("Request timed out"); - emit finished(); + Q_EMIT finished(); return; } // resend request - emit writeStun(m_request); + Q_EMIT writeStun(m_request); m_retryTimer->start(m_tries ? 2 * m_retryTimer->interval() : STUN_RTO_INTERVAL); m_tries++; } @@ -1360,8 +1360,8 @@ void QXmppTurnAllocation::handleDatagram(const QByteArray &buffer, const QHostAd stream >> channel; stream >> length; if (m_state == ConnectedState && m_channels.contains(channel) && length <= buffer.size() - 4) { - emit datagramReceived(buffer.mid(4, length), m_channels[channel].first, - m_channels[channel].second); + Q_EMIT datagramReceived(buffer.mid(4, length), m_channels[channel].first, + m_channels[channel].second); } return; } @@ -1488,10 +1488,10 @@ void QXmppTurnAllocation::setState(AllocationState state) } m_state = state; if (m_state == ConnectedState) { - emit connected(); + Q_EMIT connected(); } else if (m_state == UnconnectedState) { m_timer->stop(); - emit disconnected(); + Q_EMIT disconnected(); } } @@ -1684,7 +1684,7 @@ void QXmppUdpTransport::readyRead() const qint64 size = m_socket->pendingDatagramSize(); buffer.resize(size); m_socket->readDatagram(buffer.data(), buffer.size(), &remoteHost, &remotePort); - emit datagramReceived(buffer, remoteHost, remotePort); + Q_EMIT datagramReceived(buffer, remoteHost, remotePort); } } @@ -2122,7 +2122,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr break; } } - emit datagramReceived(buffer); + Q_EMIT datagramReceived(buffer); return; } @@ -2282,7 +2282,7 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr const bool wasConnected = (d->activePair != nullptr); d->activePair = pair; if (!wasConnected) { - emit connected(); + Q_EMIT connected(); } } } @@ -2362,7 +2362,7 @@ void QXmppIceComponent::transactionFinished() d->localCandidates << candidate; - emit localCandidatesChanged(); + Q_EMIT localCandidatesChanged(); } else { debug(QStringLiteral("STUN test failed (error %1)").arg(transaction->response().errorPhrase)); } @@ -2380,7 +2380,7 @@ void QXmppIceComponent::turnConnected() debug(QStringLiteral("Adding relayed candidate %1 port %2").arg(candidate.host().toString(), QString::number(candidate.port()))); d->localCandidates << candidate; - emit localCandidatesChanged(); + Q_EMIT localCandidatesChanged(); updateGatheringState(); } @@ -2521,7 +2521,7 @@ void QXmppIceComponent::updateGatheringState() if (newGatheringState != d->gatheringState) { d->gatheringState = newGatheringState; - emit gatheringStateChanged(); + Q_EMIT gatheringStateChanged(); } } @@ -2862,7 +2862,7 @@ void QXmppIceConnection::slotConnected() } info(QStringLiteral("ICE negotiation completed")); d->connectTimer->stop(); - emit connected(); + Q_EMIT connected(); } void QXmppIceConnection::slotGatheringStateChanged() @@ -2889,7 +2889,7 @@ void QXmppIceConnection::slotGatheringStateChanged() if (newGatheringState != d->gatheringState) { info(QStringLiteral("ICE gathering state changed from '%1' to '%2'").arg(gathering_states[d->gatheringState], gathering_states[newGatheringState])); d->gatheringState = newGatheringState; - emit gatheringStateChanged(); + Q_EMIT gatheringStateChanged(); } } @@ -2899,7 +2899,7 @@ void QXmppIceConnection::slotTimeout() for (auto *socket : std::as_const(d->components)) { socket->close(); } - emit disconnected(); + Q_EMIT disconnected(); } /// \cond diff --git a/src/client/QXmppArchiveManager.cpp b/src/client/QXmppArchiveManager.cpp index 6cca75d3..6eee0d6c 100644 --- a/src/client/QXmppArchiveManager.cpp +++ b/src/client/QXmppArchiveManager.cpp @@ -27,12 +27,12 @@ bool QXmppArchiveManager::handleStanza(const QDomElement &element) if (QXmppArchiveChatIq::isArchiveChatIq(element)) { QXmppArchiveChatIq archiveIq; archiveIq.parse(element); - emit archiveChatReceived(archiveIq.chat(), archiveIq.resultSetReply()); + Q_EMIT archiveChatReceived(archiveIq.chat(), archiveIq.resultSetReply()); return true; } else if (QXmppArchiveListIq::isArchiveListIq(element)) { QXmppArchiveListIq archiveIq; archiveIq.parse(element); - emit archiveListReceived(archiveIq.chats(), archiveIq.resultSetReply()); + Q_EMIT archiveListReceived(archiveIq.chats(), archiveIq.resultSetReply()); return true; } else if (QXmppArchivePrefIq::isArchivePrefIq(element)) { // TODO: handle preference iq diff --git a/src/client/QXmppAtmManager.h b/src/client/QXmppAtmManager.h index 9fbd5a63..9a0ab446 100644 --- a/src/client/QXmppAtmManager.h +++ b/src/client/QXmppAtmManager.h @@ -24,11 +24,10 @@ protected: /// \cond void setClient(QXmppClient *client) override; -private slots: - void handleMessageReceived(const QXmppMessage &message); +private: + Q_SLOT void handleMessageReceived(const QXmppMessage &message); /// \endcond -private: QFuture<void> makeTrustDecisions(const QString &encryption, const QMultiHash<QString, QByteArray> &keyIdsForAuthentication, const QMultiHash<QString, QByteArray> &keyIdsForDistrusting); QFuture<void> handleMessage(const QXmppMessage &message); @@ -40,10 +39,12 @@ private: QFuture<QXmpp::SendResult> sendTrustMessage(const QString &encryption, const QList<QXmppTrustMessageKeyOwner> &keyOwners, const QString &recipientJid); + /// \cond inline QXmppAtmTrustStorage *trustStorage() const { return dynamic_cast<QXmppAtmTrustStorage *>(QXmppTrustManager::trustStorage()); } + /// \endcond friend class tst_QXmppAtmManager; }; diff --git a/src/client/QXmppAttentionManager.cpp b/src/client/QXmppAttentionManager.cpp index 661208e6..55bdc179 100644 --- a/src/client/QXmppAttentionManager.cpp +++ b/src/client/QXmppAttentionManager.cpp @@ -206,7 +206,7 @@ void QXmppAttentionManager::handleMessageReceived(const QXmppMessage &message) // check rate limit if (!d->checkRateLimit(bareJid)) { - emit attentionRequestRateLimited(message); + Q_EMIT attentionRequestRateLimited(message); return; } @@ -215,7 +215,7 @@ void QXmppAttentionManager::handleMessageReceived(const QXmppMessage &message) isTrusted = rosterManager->getRosterBareJids().contains(bareJid); } - emit attentionRequested(message, isTrusted); + Q_EMIT attentionRequested(message, isTrusted); } QXmppAttentionManagerPrivate::QXmppAttentionManagerPrivate(QXmppAttentionManager *parent, quint8 allowedAttempts, QTime timeFrame) diff --git a/src/client/QXmppBookmarkManager.cpp b/src/client/QXmppBookmarkManager.cpp index d1038382..45680e7e 100644 --- a/src/client/QXmppBookmarkManager.cpp +++ b/src/client/QXmppBookmarkManager.cpp @@ -144,7 +144,7 @@ bool QXmppBookmarkManager::handleStanza(const QDomElement &stanza) if (iq.type() == QXmppIq::Result) { d->bookmarks = iq.bookmarks(); d->bookmarksReceived = true; - emit bookmarksReceived(d->bookmarks); + Q_EMIT bookmarksReceived(d->bookmarks); } return true; } else if (!d->pendingId.isEmpty() && stanza.attribute("id") == d->pendingId) { @@ -152,7 +152,7 @@ bool QXmppBookmarkManager::handleStanza(const QDomElement &stanza) iq.parse(stanza); if (iq.type() == QXmppIq::Result) { d->bookmarks = d->pendingBookmarks; - emit bookmarksReceived(d->bookmarks); + Q_EMIT bookmarksReceived(d->bookmarks); } d->pendingId = QString(); return true; diff --git a/src/client/QXmppCall.h b/src/client/QXmppCall.h index f13a8cc3..a504ff29 100644 --- a/src/client/QXmppCall.h +++ b/src/client/QXmppCall.h @@ -55,39 +55,36 @@ public: QXmppCallStream *audioStream() const; QXmppCallStream *videoStream() const; -signals: /// \brief This signal is emitted when a call is connected. /// /// Once this signal is emitted, you can connect a QAudioOutput and /// QAudioInput to the call. You can determine the appropriate clockrate /// and the number of channels by calling payloadType(). - void connected(); + Q_SIGNAL void connected(); /// \brief This signal is emitted when a call is finished. /// /// Note: Do not delete the call in the slot connected to this signal, /// instead use deleteLater(). - void finished(); + Q_SIGNAL void finished(); /// \brief This signal is emitted when the remote party is ringing. - void ringing(); + Q_SIGNAL void ringing(); /// \brief This signal is emitted when the call state changes. - void stateChanged(QXmppCall::State state); + Q_SIGNAL void stateChanged(QXmppCall::State state); /// \brief This signal is emitted when a stream is created. - void streamCreated(QXmppCallStream *stream); + Q_SIGNAL void streamCreated(QXmppCallStream *stream); -public slots: - void accept(); - void hangup(); - void addVideo(); - -private slots: - void localCandidatesChanged(); - void terminated(); + Q_SLOT void accept(); + Q_SLOT void hangup(); + Q_SLOT void addVideo(); private: + Q_SLOT void localCandidatesChanged(); + Q_SLOT void terminated(); + QXmppCall(const QString &jid, QXmppCall::Direction direction, QXmppCallManager *parent); QXmppCallPrivate *d; diff --git a/src/client/QXmppCarbonManager.cpp b/src/client/QXmppCarbonManager.cpp index 61a19778..8727688a 100644 --- a/src/client/QXmppCarbonManager.cpp +++ b/src/client/QXmppCarbonManager.cpp @@ -98,9 +98,9 @@ bool QXmppCarbonManager::handleStanza(const QDomElement &element) message.setCarbonForwarded(true); if (sent) { - emit messageSent(message); + Q_EMIT messageSent(message); } else { - emit messageReceived(message); + Q_EMIT messageReceived(message); } return true; diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index f69bc29b..174c4219 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -863,7 +863,7 @@ bool QXmppClient::injectMessage(QXmppMessage &&message) auto handled = MessagePipeline::process(this, d->extensions, std::move(message)); if (!handled) { // no extension handled the message - emit messageReceived(message); + Q_EMIT messageReceived(message); } return handled; } @@ -890,7 +890,7 @@ void QXmppClient::_q_reconnect() void QXmppClient::_q_socketStateChanged(QAbstractSocket::SocketState socketState) { Q_UNUSED(socketState); - emit stateChanged(state()); + Q_EMIT stateChanged(state()); } /// At connection establishment, send initial presence. @@ -902,8 +902,8 @@ void QXmppClient::_q_streamConnected() d->isActive = true; // notify managers - emit connected(); - emit stateChanged(QXmppClient::ConnectedState); + Q_EMIT connected(); + Q_EMIT stateChanged(QXmppClient::ConnectedState); // send initial presence if (d->stream->isAuthenticated()) { @@ -914,8 +914,8 @@ void QXmppClient::_q_streamConnected() void QXmppClient::_q_streamDisconnected() { // notify managers - emit disconnected(); - emit stateChanged(QXmppClient::DisconnectedState); + Q_EMIT disconnected(); + Q_EMIT stateChanged(QXmppClient::DisconnectedState); } void QXmppClient::_q_streamError(QXmppClient::Error err) @@ -936,7 +936,7 @@ void QXmppClient::_q_streamError(QXmppClient::Error err) } // notify managers - emit error(err); + Q_EMIT error(err); } QXmppLogger *QXmppClient::logger() const @@ -968,6 +968,6 @@ void QXmppClient::setLogger(QXmppLogger *logger) d->logger, &QXmppLogger::updateCounter); } - emit loggerChanged(d->logger); + Q_EMIT loggerChanged(d->logger); } } diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp index fa0a19da..bdea6ede 100644 --- a/src/client/QXmppDiscoveryManager.cpp +++ b/src/client/QXmppDiscoveryManager.cpp @@ -322,9 +322,9 @@ bool QXmppDiscoveryManager::handleStanza(const QDomElement &element) case QXmppIq::Error: // handle all replies if (receivedIq.queryType() == QXmppDiscoveryIq::InfoQuery) { - emit infoReceived(receivedIq); + Q_EMIT infoReceived(receivedIq); } else if (receivedIq.queryType() == QXmppDiscoveryIq::ItemsQuery) { - emit itemsReceived(receivedIq); + Q_EMIT itemsReceived(receivedIq); } return true; diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp index 17daa844..eb88fc0f 100644 --- a/src/client/QXmppEntityTimeManager.cpp +++ b/src/client/QXmppEntityTimeManager.cpp @@ -79,7 +79,7 @@ bool QXmppEntityTimeManager::handleStanza(const QDomElement &element) if (element.tagName() == "iq" && QXmppEntityTimeIq::isEntityTimeIq(element)) { QXmppEntityTimeIq entityTime; entityTime.parse(element); - emit timeReceived(entityTime); + Q_EMIT timeReceived(entityTime); return true; } diff --git a/src/client/QXmppHttpUploadManager.cpp b/src/client/QXmppHttpUploadManager.cpp index 46242d5f..2fe2994e 100644 --- a/src/client/QXmppHttpUploadManager.cpp +++ b/src/client/QXmppHttpUploadManager.cpp @@ -47,7 +47,7 @@ struct QXmppHttpUploadPrivate { if (!finished) { finished = true; - emit q->finished(result()); + Q_EMIT q->finished(result()); } } void reportProgress(quint64 sent, quint64 total) @@ -61,7 +61,7 @@ struct QXmppHttpUploadPrivate if (bytesSent != sent || bytesTotal != total) { bytesSent = sent; bytesTotal = total; - emit q->progressChanged(); + Q_EMIT q->progressChanged(); } } [[nodiscard]] QXmppHttpUpload::Result result() const diff --git a/src/client/QXmppMamManager.cpp b/src/client/QXmppMamManager.cpp index 7bbbdd74..9050c02f 100644 --- a/src/client/QXmppMamManager.cpp +++ b/src/client/QXmppMamManager.cpp @@ -120,14 +120,14 @@ bool QXmppMamManager::handleStanza(const QDomElement &element) itr->second.messages.append(std::move(message)); } else { // signal-based API - emit archivedMessageReceived(queryId, message); + Q_EMIT archivedMessageReceived(queryId, message); } return true; } } else if (QXmppMamResultIq::isMamResultIq(element)) { QXmppMamResultIq result; result.parse(element); - emit resultsRecieved(result.id(), result.resultSetReply(), result.complete()); + Q_EMIT resultsRecieved(result.id(), result.resultSetReply(), result.complete()); return true; } diff --git a/src/client/QXmppMessageReceiptManager.cpp b/src/client/QXmppMessageReceiptManager.cpp index 660964e7..b464ed18 100644 --- a/src/client/QXmppMessageReceiptManager.cpp +++ b/src/client/QXmppMessageReceiptManager.cpp @@ -37,7 +37,7 @@ bool QXmppMessageReceiptManager::handleMessage(const QXmppMessage &message) // Buggy clients also mark carbon messages as received; to avoid this // we check whether sender and receiver have the same bare JID. if (QXmppUtils::jidToBareJid(message.from()) != QXmppUtils::jidToBareJid(message.to())) { - emit messageDelivered(message.from(), message.receiptId()); + Q_EMIT messageDelivered(message.from(), message.receiptId()); } return true; } diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp index 0076122b..7954734b 100644 --- a/src/client/QXmppMucManager.cpp +++ b/src/client/QXmppMucManager.cpp @@ -61,7 +61,7 @@ QXmppMucRoom *QXmppMucManager::addRoom(const QString &roomJid) this, &QXmppMucManager::_q_roomDestroyed); // emit signal - emit roomAdded(room); + Q_EMIT roomAdded(room); } return room; } @@ -100,7 +100,7 @@ bool QXmppMucManager::handleStanza(const QDomElement &element) } } if (room->d->permissionsQueue.isEmpty()) { - emit room->permissionsReceived(room->d->permissions.values()); + Q_EMIT room->permissionsReceived(room->d->permissions.values()); } return true; } @@ -110,7 +110,7 @@ bool QXmppMucManager::handleStanza(const QDomElement &element) QXmppMucRoom *room = d->rooms.value(iq.from()); if (room && iq.type() == QXmppIq::Result && !iq.form().isNull()) { - emit room->configurationReceived(iq.form()); + Q_EMIT room->configurationReceived(iq.form()); return true; } } @@ -136,7 +136,7 @@ void QXmppMucManager::_q_messageReceived(const QXmppMessage &msg) // process room invitations const QString roomJid = msg.mucInvitationJid(); if (!roomJid.isEmpty() && (!d->rooms.contains(roomJid) || !d->rooms.value(roomJid)->isJoined())) { - emit invitationReceived(roomJid, msg.from(), msg.mucInvitationReason()); + Q_EMIT invitationReceived(roomJid, msg.from(), msg.mucInvitationReason()); } } @@ -342,7 +342,7 @@ void QXmppMucRoom::setNickName(const QString &nickName) d->client->sendPacket(packet); } else { d->nickName = nickName; - emit nickNameChanged(nickName); + Q_EMIT nickNameChanged(nickName); } } @@ -520,19 +520,19 @@ void QXmppMucRoom::_q_disconnected() const QStringList removed = d->participants.keys(); d->participants.clear(); for (const auto &jid : removed) { - emit participantRemoved(jid); + Q_EMIT participantRemoved(jid); } - emit participantsChanged(); + Q_EMIT participantsChanged(); // update available actions if (d->allowedActions != NoAction) { d->allowedActions = NoAction; - emit allowedActionsChanged(d->allowedActions); + Q_EMIT allowedActionsChanged(d->allowedActions); } // emit "left" signal if we had joined the room if (wasJoined) { - emit left(); + Q_EMIT left(); } } @@ -550,7 +550,7 @@ void QXmppMucRoom::_q_discoveryInfoReceived(const QXmppDiscoveryIq &iq) if (name != d->name) { d->name = name; - emit nameChanged(name); + Q_EMIT nameChanged(name); } } } @@ -565,10 +565,10 @@ void QXmppMucRoom::_q_messageReceived(const QXmppMessage &message) const QString subject = message.subject(); if (!subject.isEmpty()) { d->subject = subject; - emit subjectChanged(subject); + Q_EMIT subjectChanged(subject); } - emit messageReceived(message); + Q_EMIT messageReceived(message); } void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence) @@ -610,38 +610,38 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence) if (newActions != d->allowedActions) { d->allowedActions = newActions; - emit allowedActionsChanged(d->allowedActions); + Q_EMIT allowedActionsChanged(d->allowedActions); } } if (added) { - emit participantAdded(jid); - emit participantsChanged(); + Q_EMIT participantAdded(jid); + Q_EMIT participantsChanged(); if (jid == d->ownJid()) { // request room information if (d->discoManager) { d->discoManager->requestInfo(d->jid); } - emit joined(); + Q_EMIT joined(); } } else { - emit participantChanged(jid); + Q_EMIT participantChanged(jid); } } else if (presence.type() == QXmppPresence::Unavailable) { if (d->participants.contains(jid)) { d->participants.insert(jid, presence); - emit participantRemoved(jid); + Q_EMIT participantRemoved(jid); d->participants.remove(jid); - emit participantsChanged(); + Q_EMIT participantsChanged(); // check whether this was our own presence if (jid == d->ownJid()) { const QString newNick = presence.mucItem().nick(); if (!newNick.isEmpty() && newNick != d->nickName) { d->nickName = newNick; - emit nickNameChanged(newNick); + Q_EMIT nickNameChanged(newNick); return; } @@ -649,34 +649,34 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence) if (presence.mucStatusCodes().contains(307)) { const QString actor = presence.mucItem().actor(); const QString reason = presence.mucItem().reason(); - emit kicked(actor, reason); + Q_EMIT kicked(actor, reason); } // clear chat room participants const QStringList removed = d->participants.keys(); d->participants.clear(); for (const auto &jid : removed) { - emit participantRemoved(jid); + Q_EMIT participantRemoved(jid); } - emit participantsChanged(); + Q_EMIT participantsChanged(); // update available actions if (d->allowedActions != NoAction) { d->allowedActions = NoAction; - emit allowedActionsChanged(d->allowedActions); + Q_EMIT allowedActionsChanged(d->allowedActions); } // notify user we left the room - emit left(); + Q_EMIT left(); } } } else if (presence.type() == QXmppPresence::Error) { if (presence.isMucSupported()) { // emit error - emit error(presence.error()); + Q_EMIT error(presence.error()); // notify the user we left the room - emit left(); + Q_EMIT left(); } } } diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index 271ec8b9..7d1ad6a3 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -325,7 +325,7 @@ void QXmppOutgoingClient::_q_socketDisconnected() d->redirectHost = QString(); d->redirectPort = 0; } else { - emit disconnected(); + Q_EMIT disconnected(); } } @@ -338,7 +338,7 @@ void QXmppOutgoingClient::socketSslErrors(const QList<QSslError> &errors) } // relay signal - emit sslErrors(errors); + Q_EMIT sslErrors(errors); // if configured, ignore the errors if (configuration().ignoreSslErrors()) { @@ -354,7 +354,7 @@ void QXmppOutgoingClient::socketError(QAbstractSocket::SocketError socketError) // some network error occurred during startup -> try next available SRV record server d->connectToNextDNSHost(); } else { - emit error(QXmppClient::SocketError); + Q_EMIT error(QXmppClient::SocketError); } } @@ -419,7 +419,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) // give client opportunity to handle stanza bool handled = false; - emit elementReceived(nodeRecv, handled); + Q_EMIT elementReceived(nodeRecv, handled); if (handled) { return; } @@ -535,7 +535,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) // otherwise we are done d->sessionStarted = true; - emit connected(); + Q_EMIT connected(); } else if (ns == ns_stream && nodeRecv.tagName() == "error") { // handle redirects const auto otherHost = nodeRecv.firstChildElement("see-other-host"); @@ -551,7 +551,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) } else { d->xmppStreamError = QXmppStanza::Error::UndefinedCondition; } - emit error(QXmppClient::XmppStreamError); + Q_EMIT error(QXmppClient::XmppStreamError); } else if (ns == ns_sasl) { if (!d->saslClient) { warning("SASL stanza received, but no mechanism selected"); @@ -584,7 +584,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) } else { d->xmppStreamError = QXmppStanza::Error::UndefinedCondition; } - emit error(QXmppClient::XmppStreamError); + Q_EMIT error(QXmppClient::XmppStreamError); warning("Authentication failure"); disconnectFromHost(); @@ -608,7 +608,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) d->sendStreamManagementEnable(); } else { // we are connected now - emit connected(); + Q_EMIT connected(); } } else if (QXmppBindIq::isBindIq(nodeRecv) && id == d->bindId) { QXmppBindIq bind; @@ -637,12 +637,12 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) d->sendStreamManagementEnable(); } else { // we are connected now - emit connected(); + Q_EMIT connected(); } } } else if (bind.type() == QXmppIq::Error) { d->xmppStreamError = bind.error().condition(); - emit error(QXmppClient::XmppStreamError); + Q_EMIT error(QXmppClient::XmppStreamError); warning("Resource binding error received: " + bind.error().text()); disconnectFromHost(); } @@ -657,7 +657,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) // xmpp connection made d->sessionStarted = true; - emit connected(); + Q_EMIT connected(); } else if (QXmppNonSASLAuthIq::isNonSASLAuthIq(nodeRecv)) { if (type == "result") { bool digest = !nodeRecv.firstChildElement("query").firstChildElement("digest").isNull(); @@ -707,7 +707,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) iq.setError(error); sendPacket(iq); } else { - emit iqReceived(iqPacket); + Q_EMIT iqReceived(iqPacket); } } } else if (nodeRecv.tagName() == "presence") { @@ -715,13 +715,13 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) presence.parse(nodeRecv); // emit presence - emit presenceReceived(presence); + Q_EMIT presenceReceived(presence); } else if (nodeRecv.tagName() == "message") { QXmppMessage message; message.parse(nodeRecv); // emit message - emit messageReceived(message); + Q_EMIT messageReceived(message); } } else if (QXmppStreamManagementEnabled::isStreamManagementEnabled(nodeRecv)) { QXmppStreamManagementEnabled streamManagementEnabled; @@ -735,7 +735,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) d->streamManagementEnabled = true; enableStreamManagement(true); // we are connected now - emit connected(); + Q_EMIT connected(); } else if (QXmppStreamManagementResumed::isStreamManagementResumed(nodeRecv)) { QXmppStreamManagementResumed streamManagementResumed; streamManagementResumed.parse(nodeRecv); @@ -747,7 +747,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) enableStreamManagement(false); // we are connected now // TODO: The stream was resumed. Therefore, we should not send presence information or request the roster. - emit connected(); + Q_EMIT connected(); } else if (QXmppStreamManagementFailed::isStreamManagementFailed(nodeRecv)) { if (d->isResuming) { // resuming failed. We can try to bind a resource now. @@ -767,10 +767,10 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) // otherwise we are done d->sessionStarted = true; - emit connected(); + Q_EMIT connected(); } else { // we are connected now, but stream management is disabled - emit connected(); + Q_EMIT connected(); } } } @@ -812,7 +812,7 @@ void QXmppOutgoingClient::pingTimeout() { warning("Ping timeout"); QXmppStream::disconnectFromHost(); - emit error(QXmppClient::KeepAliveError); + Q_EMIT error(QXmppClient::KeepAliveError); } bool QXmppOutgoingClient::setResumeAddress(const QString &address) diff --git a/src/client/QXmppRegistrationManager.cpp b/src/client/QXmppRegistrationManager.cpp index 71c2f39e..b4ae7510 100644 --- a/src/client/QXmppRegistrationManager.cpp +++ b/src/client/QXmppRegistrationManager.cpp @@ -183,9 +183,9 @@ bool QXmppRegistrationManager::handleStanza(const QDomElement &stanza) if (features.registerMode() == QXmppStreamFeatures::Disabled) { warning(QStringLiteral("Could not request the registration form, because the server does not advertise the register stream feature.")); client()->disconnectFromServer(); - emit registrationFailed({ QXmppStanza::Error::Cancel, - QXmppStanza::Error::FeatureNotImplemented, - QStringLiteral("The server does not advertise the register stream feature.") }); + Q_EMIT registrationFailed({ QXmppStanza::Error::Cancel, + QXmppStanza::Error::FeatureNotImplemented, + QStringLiteral("The server does not advertise the register stream feature.") }); return true; } @@ -210,11 +210,11 @@ bool QXmppRegistrationManager::handleStanza(const QDomElement &stanza) switch (iq.type()) { case QXmppIq::Result: info(QStringLiteral("Successfully registered with the service.")); - emit registrationSucceeded(); + Q_EMIT registrationSucceeded(); break; case QXmppIq::Error: warning(QStringLiteral("Registering with the service failed: ").append(iq.error().text())); - emit registrationFailed(iq.error()); + Q_EMIT registrationFailed(iq.error()); break; default: break; // should never occur @@ -230,11 +230,11 @@ bool QXmppRegistrationManager::handleStanza(const QDomElement &stanza) case QXmppIq::Result: info(QStringLiteral("Changed password successfully.")); client()->configuration().setPassword(d->newPassword); - emit passwordChanged(d->newPassword); + Q_EMIT passwordChanged(d->newPassword); break; case QXmppIq::Error: warning(QStringLiteral("Failed to change password: ").append(iq.error().text())); - emit passwordChangeFailed(iq.error()); + Q_EMIT passwordChangeFailed(iq.error()); break; default: break; // should never occur @@ -250,12 +250,12 @@ bool QXmppRegistrationManager::handleStanza(const QDomElement &stanza) switch (iq.type()) { case QXmppIq::Result: info(QStringLiteral("Account deleted successfully.")); - emit accountDeleted(); + Q_EMIT accountDeleted(); client()->disconnectFromServer(); break; case QXmppIq::Error: warning(QStringLiteral("Failed to delete account: ").append(iq.error().text())); - emit accountDeletionFailed(iq.error()); + Q_EMIT accountDeletionFailed(iq.error()); break; default: break; // should never occur @@ -267,7 +267,7 @@ bool QXmppRegistrationManager::handleStanza(const QDomElement &stanza) QXmppRegisterIq iq; iq.parse(stanza); - emit registrationFormReceived(iq); + Q_EMIT registrationFormReceived(iq); } } return false; @@ -302,6 +302,6 @@ void QXmppRegistrationManager::setSupportedByServer(bool registrationSupported) { if (d->supportedByServer != registrationSupported) { d->supportedByServer = registrationSupported; - emit supportedByServerChanged(); + Q_EMIT supportedByServerChanged(); } } diff --git a/src/client/QXmppRemoteMethod.cpp b/src/client/QXmppRemoteMethod.cpp index 71a48bdd..7a282647 100644 --- a/src/client/QXmppRemoteMethod.cpp +++ b/src/client/QXmppRemoteMethod.cpp @@ -39,7 +39,7 @@ void QXmppRemoteMethod::gotError(const QXmppRpcErrorIq &iq) m_result.hasError = true; m_result.errorMessage = iq.error().text(); m_result.code = iq.error().type(); - emit callDone(); + Q_EMIT callDone(); } } @@ -50,6 +50,6 @@ void QXmppRemoteMethod::gotResult(const QXmppRpcResponseIq &iq) // FIXME: we don't handle multiple responses const auto values = iq.values(); m_result.result = values.first(); - emit callDone(); + Q_EMIT callDone(); } } diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp index bb4eb435..810a4615 100644 --- a/src/client/QXmppRosterManager.cpp +++ b/src/client/QXmppRosterManager.cpp @@ -173,17 +173,17 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element) if (item.subscriptionType() == QXmppRosterIq::Item::Remove) { if (d->entries.remove(bareJid)) { // notify the user that the item was removed - emit itemRemoved(bareJid); + Q_EMIT itemRemoved(bareJid); } } else { const bool added = !d->entries.contains(bareJid); d->entries.insert(bareJid, item); if (added) { // notify the user that the item was added - emit itemAdded(bareJid); + Q_EMIT itemAdded(bareJid); } else { // notify the user that the item changed - emit itemChanged(bareJid); + Q_EMIT itemChanged(bareJid); } } } @@ -196,7 +196,7 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element) } if (isInitial) { d->isRosterReceived = true; - emit rosterReceived(); + Q_EMIT rosterReceived(); } break; } @@ -221,11 +221,11 @@ void QXmppRosterManager::_q_presenceReceived(const QXmppPresence &presence) switch (presence.type()) { case QXmppPresence::Available: d->presences[bareJid][resource] = presence; - emit presenceChanged(bareJid, resource); + Q_EMIT presenceChanged(bareJid, resource); break; case QXmppPresence::Unavailable: d->presences[bareJid].remove(resource); - emit presenceChanged(bareJid, resource); + Q_EMIT presenceChanged(bareJid, resource); break; case QXmppPresence::Subscribe: if (client()->configuration().autoAcceptSubscriptions()) { @@ -235,8 +235,8 @@ void QXmppRosterManager::_q_presenceReceived(const QXmppPresence &presence) // ask for reciprocal subscription subscribe(bareJid); } else { - emit subscriptionReceived(bareJid); - emit subscriptionRequestReceived(bareJid, presence); + Q_EMIT subscriptionReceived(bareJid); + Q_EMIT subscriptionRequestReceived(bareJid, presence); } break; default: diff --git a/src/client/QXmppRpcManager.cpp b/src/client/QXmppRpcManager.cpp index 2d92f314..c72a9563 100644 --- a/src/client/QXmppRpcManager.cpp +++ b/src/client/QXmppRpcManager.cpp @@ -162,12 +162,12 @@ bool QXmppRpcManager::handleStanza(const QDomElement &element) } else if (QXmppRpcResponseIq::isRpcResponseIq(element)) { QXmppRpcResponseIq rpcResponseIq; rpcResponseIq.parse(element); - emit rpcCallResponse(rpcResponseIq); + Q_EMIT rpcCallResponse(rpcResponseIq); return true; } else if (QXmppRpcErrorIq::isRpcErrorIq(element)) { QXmppRpcErrorIq rpcErrorIq; rpcErrorIq.parse(element); - emit rpcCallError(rpcErrorIq); + Q_EMIT rpcCallError(rpcErrorIq); return true; } return false; diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp index ac138986..c4936323 100644 --- a/src/client/QXmppTransferManager.cpp +++ b/src/client/QXmppTransferManager.cpp @@ -339,7 +339,7 @@ void QXmppTransferJob::setLocalFileUrl(const QUrl &localFileUrl) { if (localFileUrl != d->localFileUrl) { d->localFileUrl = localFileUrl; - emit localFileUrlChanged(localFileUrl); + Q_EMIT localFileUrlChanged(localFileUrl); } } @@ -412,17 +412,17 @@ void QXmppTransferJob::setState(QXmppTransferJob::State state) if (d->state == QXmppTransferJob::TransferState) { d->transferStart.start(); } - emit stateChanged(d->state); + Q_EMIT stateChanged(d->state); } } void QXmppTransferJob::_q_terminated() { - emit stateChanged(d->state); + Q_EMIT stateChanged(d->state); if (d->error != NoError) { - emit error(d->error); + Q_EMIT error(d->error); } - emit finished(); + Q_EMIT finished(); } void QXmppTransferJob::terminate(QXmppTransferJob::Error cause) @@ -528,7 +528,7 @@ bool QXmppTransferIncomingJob::writeData(const QByteArray &data) if (!d->fileInfo.hash().isEmpty()) { d->hash.addData(data); } - emit progress(d->done, d->fileInfo.size()); + Q_EMIT progress(d->done, d->fileInfo.size()); return true; } @@ -688,7 +688,7 @@ void QXmppTransferOutgoingJob::_q_sendData() d->socksSocket->write(buffer, length); delete[] buffer; d->done += length; - emit progress(d->done, fileSize()); + Q_EMIT progress(d->done, fileSize()); } } /// \endcond @@ -1073,7 +1073,7 @@ void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq) client()->sendPacket(dataIq); job->d->done += buffer.size(); - emit job->progress(job->d->done, job->fileSize()); + Q_EMIT job->progress(job->d->done, job->fileSize()); } else { // close the bytestream QXmppIbbCloseIq closeIq; @@ -1173,7 +1173,7 @@ void QXmppTransferManager::_q_jobFinished() return; } - emit jobFinished(job); + Q_EMIT jobFinished(job); } void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state) @@ -1232,7 +1232,7 @@ void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state) client()->sendPacket(response); // notify user - emit jobStarted(job); + Q_EMIT jobStarted(job); } /// @@ -1355,7 +1355,7 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice * client()->sendPacket(request); // notify user - emit jobStarted(job); + Q_EMIT jobStarted(job); return job; } @@ -1559,7 +1559,7 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati connect(job, &QXmppTransferJob::stateChanged, this, &QXmppTransferManager::_q_jobStateChanged); // allow user to accept or decline the job - emit fileReceived(job); + Q_EMIT fileReceived(job); } QString QXmppTransferManager::proxy() const diff --git a/src/client/QXmppTrustManager.cpp b/src/client/QXmppTrustManager.cpp index 2a5a591b..a5031a52 100644 --- a/src/client/QXmppTrustManager.cpp +++ b/src/client/QXmppTrustManager.cpp @@ -212,7 +212,7 @@ QFuture<void> QXmppTrustManager::setTrustLevel(const QString &encryption, const auto future = m_trustStorage->setTrustLevel(encryption, keyIds, trustLevel); await(future, this, [=](QHash<QString, QMultiHash<QString, QByteArray>> modifiedKeys) mutable { - emit trustLevelsChanged(modifiedKeys); + Q_EMIT trustLevelsChanged(modifiedKeys); interface.reportFinished(); }); @@ -233,7 +233,7 @@ QFuture<void> QXmppTrustManager::setTrustLevel(const QString &encryption, const auto future = m_trustStorage->setTrustLevel(encryption, keyOwnerJids, oldTrustLevel, newTrustLevel); await(future, this, [=](QHash<QString, QMultiHash<QString, QByteArray>> modifiedKeys) mutable { - emit trustLevelsChanged(modifiedKeys); + Q_EMIT trustLevelsChanged(modifiedKeys); interface.reportFinished(); }); diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp index e40233ae..17a58893 100644 --- a/src/client/QXmppUploadRequestManager.cpp +++ b/src/client/QXmppUploadRequestManager.cpp @@ -275,13 +275,13 @@ bool QXmppUploadRequestManager::handleStanza(const QDomElement &element) QXmppHttpUploadSlotIq slot; slot.parse(element); - emit slotReceived(slot); + Q_EMIT slotReceived(slot); return true; } else if (QXmppHttpUploadRequestIq::isHttpUploadRequestIq(element)) { QXmppHttpUploadRequestIq requestError; requestError.parse(element); - emit requestFailed(requestError); + Q_EMIT requestFailed(requestError); return true; } return false; @@ -312,7 +312,7 @@ void QXmppUploadRequestManager::handleDiscoInfo(const QXmppDiscoveryIq &iq) } d->uploadServices.append(service); - emit serviceFoundChanged(); + Q_EMIT serviceFoundChanged(); } } return; @@ -331,7 +331,7 @@ void QXmppUploadRequestManager::setClient(QXmppClient *client) // on client disconnect remove all upload services connect(client, &QXmppClient::disconnected, this, [this]() { d->uploadServices.clear(); - emit serviceFoundChanged(); + Q_EMIT serviceFoundChanged(); }); } } diff --git a/src/client/QXmppVCardManager.cpp b/src/client/QXmppVCardManager.cpp index fa5a5f02..78d23d7d 100644 --- a/src/client/QXmppVCardManager.cpp +++ b/src/client/QXmppVCardManager.cpp @@ -95,10 +95,10 @@ bool QXmppVCardManager::handleStanza(const QDomElement &element) if (vCardIq.from().isEmpty() || vCardIq.from() == client()->configuration().jidBare()) { d->clientVCard = vCardIq; d->isClientVCardReceived = true; - emit clientVCardReceived(); + Q_EMIT clientVCardReceived(); } - emit vCardReceived(vCardIq); + Q_EMIT vCardReceived(vCardIq); return true; } diff --git a/src/client/QXmppVersionManager.cpp b/src/client/QXmppVersionManager.cpp index f4cabbdc..4d12db5d 100644 --- a/src/client/QXmppVersionManager.cpp +++ b/src/client/QXmppVersionManager.cpp @@ -132,7 +132,7 @@ bool QXmppVersionManager::handleStanza(const QDomElement &element) if (versionIq.type() == QXmppIq::Result) { // emit response - emit versionReceived(versionIq); + Q_EMIT versionReceived(versionIq); } return true; diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp index e86a309a..c8e1ada7 100644 --- a/src/server/QXmppIncomingClient.cpp +++ b/src/server/QXmppIncomingClient.cpp @@ -280,7 +280,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv) // authentication succeeded d->jid = QString("%1@%2").arg(d->saslServer->username(), d->domain); info(QString("Authentication succeeded for '%1' from %2").arg(d->jid, d->origin())); - emit updateCounter("incoming-client.auth.success"); + Q_EMIT updateCounter("incoming-client.auth.success"); sendPacket(QXmppSaslSuccess()); handleStart(); } else { @@ -308,7 +308,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv) sendPacket(bindResult); // bound - emit connected(); + Q_EMIT connected(); return; } else if (QXmppSessionIq::isSessionIq(nodeRecv) && type == QLatin1String("set")) { QXmppSessionIq sessionSet; @@ -353,7 +353,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv) } // emit stanza for processing by server - emit elementReceived(nodeFull); + Q_EMIT elementReceived(nodeFull); } } } @@ -369,7 +369,7 @@ void QXmppIncomingClient::onDigestReply() if (reply->error() == QXmppPasswordReply::TemporaryError) { warning(QString("Temporary authentication failure for '%1' from %2").arg(d->saslServer->username(), d->origin())); - emit updateCounter("incoming-client.auth.temporary-auth-failure"); + Q_EMIT updateCounter("incoming-client.auth.temporary-auth-failure"); sendPacket(QXmppSaslFailure("temporary-auth-failure")); disconnectFromHost(); return; @@ -381,7 +381,7 @@ void QXmppIncomingClient::onDigestReply() QXmppSaslServer::Response result = d->saslServer->respond(reply->property("__sasl_raw").toByteArray(), challenge); if (result != QXmppSaslServer::Challenge) { warning(QString("Authentication failed for '%1' from %2").arg(d->saslServer->username(), d->origin())); - emit updateCounter("incoming-client.auth.not-authorized"); + Q_EMIT updateCounter("incoming-client.auth.not-authorized"); sendPacket(QXmppSaslFailure("not-authorized")); disconnectFromHost(); return; @@ -404,19 +404,19 @@ void QXmppIncomingClient::onPasswordReply() case QXmppPasswordReply::NoError: d->jid = jid; info(QString("Authentication succeeded for '%1' from %2").arg(d->jid, d->origin())); - emit updateCounter("incoming-client.auth.success"); + Q_EMIT updateCounter("incoming-client.auth.success"); sendPacket(QXmppSaslSuccess()); handleStart(); break; case QXmppPasswordReply::AuthorizationError: warning(QString("Authentication failed for '%1' from %2").arg(jid, d->origin())); - emit updateCounter("incoming-client.auth.not-authorized"); + Q_EMIT updateCounter("incoming-client.auth.not-authorized"); sendPacket(QXmppSaslFailure("not-authorized")); disconnectFromHost(); break; case QXmppPasswordReply::TemporaryError: warning(QString("Temporary authentication failure for '%1' from %2").arg(jid, d->origin())); - emit updateCounter("incoming-client.auth.temporary-auth-failure"); + Q_EMIT updateCounter("incoming-client.auth.temporary-auth-failure"); sendPacket(QXmppSaslFailure("temporary-auth-failure")); disconnectFromHost(); break; @@ -426,7 +426,7 @@ void QXmppIncomingClient::onPasswordReply() void QXmppIncomingClient::onSocketDisconnected() { info(QString("Socket disconnected for '%1' from %2").arg(d->jid, d->origin())); - emit disconnected(); + Q_EMIT disconnected(); } void QXmppIncomingClient::onTimeout() diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp index 962c087d..648868bf 100644 --- a/src/server/QXmppIncomingServer.cpp +++ b/src/server/QXmppIncomingServer.cpp @@ -143,12 +143,12 @@ void QXmppIncomingServer::handleStanza(const QDomElement &stanza) stream->connectToHost(domain); } else if (request.command() == QXmppDialback::Verify) { debug(QString("Received a dialback verify from '%1' on %2").arg(domain, d->origin())); - emit dialbackRequestReceived(request); + Q_EMIT dialbackRequestReceived(request); } } else if (d->authenticated.contains(QXmppUtils::jidToDomain(stanza.attribute("from")))) { // relay stanza if the remote party is authenticated - emit elementReceived(stanza); + Q_EMIT elementReceived(stanza); } else { warning(QString("Received an element from unverified domain '%1' on %2").arg(QXmppUtils::jidToDomain(stanza.attribute("from")), d->origin())); disconnectFromHost(); @@ -194,7 +194,7 @@ void QXmppIncomingServer::slotDialbackResponseReceived(const QXmppDialback &dial const bool wasConnected = !d->authenticated.isEmpty(); d->authenticated.insert(dialback.from()); if (!wasConnected) { - emit connected(); + Q_EMIT connected(); } } else { warning(QString("Failed to verify incoming domain '%1' on %2").arg(dialback.from(), d->origin())); @@ -209,5 +209,5 @@ void QXmppIncomingServer::slotDialbackResponseReceived(const QXmppDialback &dial void QXmppIncomingServer::slotSocketDisconnected() { info(QString("Socket disconnected from %1").arg(d->origin())); - emit disconnected(); + Q_EMIT disconnected(); } diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp index 49e6f4b2..83075ac7 100644 --- a/src/server/QXmppOutgoingServer.cpp +++ b/src/server/QXmppOutgoingServer.cpp @@ -119,7 +119,7 @@ void QXmppOutgoingServer::_q_dnsLookupFinished() void QXmppOutgoingServer::_q_socketDisconnected() { debug("Socket disconnected"); - emit disconnected(); + Q_EMIT disconnected(); } /// \cond @@ -202,10 +202,10 @@ void QXmppOutgoingServer::handleStanza(const QDomElement &stanza) d->dataQueue.clear(); // emit signal - emit connected(); + Q_EMIT connected(); } } else if (response.command() == QXmppDialback::Verify) { - emit dialbackResponseReceived(response); + Q_EMIT dialbackResponseReceived(response); } } } @@ -302,5 +302,5 @@ void QXmppOutgoingServer::slotSslErrors(const QList<QSslError> &errors) void QXmppOutgoingServer::socketError(QAbstractSocket::SocketError error) { Q_UNUSED(error); - emit disconnected(); + Q_EMIT disconnected(); } diff --git a/src/server/QXmppPasswordChecker.cpp b/src/server/QXmppPasswordChecker.cpp index 4a3dd3a5..33326b7f 100644 --- a/src/server/QXmppPasswordChecker.cpp +++ b/src/server/QXmppPasswordChecker.cpp @@ -102,7 +102,7 @@ void QXmppPasswordReply::setError(QXmppPasswordReply::Error error) void QXmppPasswordReply::finish() { m_isFinished = true; - emit finished(); + Q_EMIT finished(); } /// Delay marking reply as finished. diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp index 6409788e..ae6c364a 100644 --- a/src/server/QXmppServer.cpp +++ b/src/server/QXmppServer.cpp @@ -158,7 +158,7 @@ bool QXmppServerPrivate::routeData(const QString &to, const QByteArray &data) // add stream outgoingServers.insert(conn); - emit q->setGauge("outgoing-server.count", outgoingServers.size()); + Q_EMIT q->setGauge("outgoing-server.count", outgoingServers.size()); // queue data and connect to remote server QMetaObject::invokeMethod(conn, "queueData", Q_ARG(QByteArray, data)); @@ -392,7 +392,7 @@ void QXmppServer::setLogger(QXmppLogger *logger) d->logger, &QXmppLogger::updateCounter); } - emit loggerChanged(d->logger); + Q_EMIT loggerChanged(d->logger); } } @@ -706,7 +706,7 @@ void QXmppServer::addIncomingClient(QXmppIncomingClient *stream) // add stream d->incomingClients.insert(stream); - emit setGauge("incoming-client.count", d->incomingClients.size()); + Q_EMIT setGauge("incoming-client.count", d->incomingClients.size()); } /// Handle a new incoming TCP connection from a client. @@ -750,7 +750,7 @@ void QXmppServer::_q_clientConnected() d->incomingClientsByBareJid[QXmppUtils::jidToBareJid(jid)].insert(client); // emit signal - emit clientConnected(jid); + Q_EMIT clientConnected(jid); } /// Handle a stream disconnection for a client. @@ -783,11 +783,11 @@ void QXmppServer::_q_clientDisconnected() // emit signal if (!jid.isEmpty()) { - emit clientDisconnected(jid); + Q_EMIT clientDisconnected(jid); } // update counter - emit setGauge("incoming-client.count", d->incomingClients.size()); + Q_EMIT setGauge("incoming-client.count", d->incomingClients.size()); } } @@ -836,7 +836,7 @@ void QXmppServer::_q_outgoingServerDisconnected() if (d->outgoingServers.remove(outgoing)) { outgoing->deleteLater(); - emit setGauge("outgoing-server.count", d->outgoingServers.size()); + Q_EMIT setGauge("outgoing-server.count", d->outgoingServers.size()); } } @@ -867,7 +867,7 @@ void QXmppServer::_q_serverConnection(QSslSocket *socket) // add stream d->incomingServers.insert(stream); - emit setGauge("incoming-server.count", d->incomingServers.size()); + Q_EMIT setGauge("incoming-server.count", d->incomingServers.size()); } /// Handle a stream disconnection for an incoming server. @@ -881,7 +881,7 @@ void QXmppServer::_q_serverDisconnected() if (d->incomingServers.remove(incoming)) { incoming->deleteLater(); - emit setGauge("incoming-server.count", d->incomingServers.size()); + Q_EMIT setGauge("incoming-server.count", d->incomingServers.size()); } } @@ -928,7 +928,7 @@ void QXmppSslServer::incomingConnection(qintptr socketDescriptor) socket->setLocalCertificate(d->localCertificate); socket->setPrivateKey(d->privateKey); } - emit newConnection(socket); + Q_EMIT newConnection(socket); } /// Adds the given certificates to the CA certificate database to be used |