diff options
92 files changed, 675 insertions, 699 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 48f380d8..4e6449f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,7 @@ add_definitions( -DQURL_NO_CAST_FROM_STRING -DQT_NO_CAST_TO_ASCII -DQT_NO_FOREACH + -DQT_NO_KEYWORDS ) if(BUILD_OMEMO) diff --git a/examples/example_1_echoClient/example_1_echoClient.h b/examples/example_1_echoClient/example_1_echoClient.h index af94f091..4205ab70 100644 --- a/examples/example_1_echoClient/example_1_echoClient.h +++ b/examples/example_1_echoClient/example_1_echoClient.h @@ -15,7 +15,6 @@ public: echoClient(QObject *parent = nullptr); ~echoClient() override; -public slots: void messageReceived(const QXmppMessage &); }; diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.h b/examples/example_2_rosterHandling/example_2_rosterHandling.h index fc195cae..a8ec502e 100644 --- a/examples/example_2_rosterHandling/example_2_rosterHandling.h +++ b/examples/example_2_rosterHandling/example_2_rosterHandling.h @@ -17,7 +17,6 @@ public: xmppClient(QObject *parent = nullptr); ~xmppClient() override; -public slots: void clientConnected(); void rosterReceived(); void presenceChanged(const QString &bareJid, const QString &resource); diff --git a/examples/example_3_transferHandling/example_3_transferHandling.h b/examples/example_3_transferHandling/example_3_transferHandling.h index b8a6cf8b..f2eec6a7 100644 --- a/examples/example_3_transferHandling/example_3_transferHandling.h +++ b/examples/example_3_transferHandling/example_3_transferHandling.h @@ -16,14 +16,13 @@ public: xmppClient(QObject *parent = nullptr); void setRecipient(const QString &recipient); -private slots: - void slotError(QXmppTransferJob::Error error); - void slotFileReceived(QXmppTransferJob *job); - void slotFinished(); - void slotPresenceReceived(const QXmppPresence &presence); - void slotProgress(qint64 done, qint64 total); - private: + Q_SLOT void slotError(QXmppTransferJob::Error error); + Q_SLOT void slotFileReceived(QXmppTransferJob *job); + Q_SLOT void slotFinished(); + Q_SLOT void slotPresenceReceived(const QXmppPresence &presence); + Q_SLOT void slotProgress(qint64 done, qint64 total); + QString m_recipient; QXmppTransferManager *transferManager; }; diff --git a/examples/example_5_rpcInterface/remoteinterface.h b/examples/example_5_rpcInterface/remoteinterface.h index 04bb4393..a83903f8 100644 --- a/examples/example_5_rpcInterface/remoteinterface.h +++ b/examples/example_5_rpcInterface/remoteinterface.h @@ -16,8 +16,8 @@ public: bool isAuthorized(const QString &jid) const override; // RPC Interface -public slots: - QString echoString(const QString &message); +public: + Q_SLOT QString echoString(const QString &message); }; #endif // REMOTEINTERFACE_H diff --git a/examples/example_6_rpcClient/rpcClient.h b/examples/example_6_rpcClient/rpcClient.h index 9e075441..b4d4c393 100644 --- a/examples/example_6_rpcClient/rpcClient.h +++ b/examples/example_6_rpcClient/rpcClient.h @@ -18,11 +18,10 @@ public: rpcClient(QObject *parent = nullptr); ~rpcClient() override; -private slots: - void slotInvokeRemoteMethod(); - void slotPresenceReceived(const QXmppPresence &presence); - private: + Q_SLOT void slotInvokeRemoteMethod(); + Q_SLOT void slotPresenceReceived(const QXmppPresence &presence); + QString m_remoteJid; QXmppRpcManager *m_rpcManager; }; diff --git a/examples/example_7_archiveHandling/example_7_archiveHandling.h b/examples/example_7_archiveHandling/example_7_archiveHandling.h index aa46619e..9f65be7e 100644 --- a/examples/example_7_archiveHandling/example_7_archiveHandling.h +++ b/examples/example_7_archiveHandling/example_7_archiveHandling.h @@ -29,7 +29,6 @@ public: void setPageDirection(PageDirection direction); void setPageSize(int size); -public slots: void clientConnected(); void archiveListReceived(const QList<QXmppArchiveChat> &chats, const QXmppResultSetReply &rsmReply); void archiveChatReceived(const QXmppArchiveChat &chat, const QXmppResultSetReply &rsmReply); diff --git a/examples/example_9_vCard/example_9_vCard.h b/examples/example_9_vCard/example_9_vCard.h index f0f4a8a3..dbaac65c 100644 --- a/examples/example_9_vCard/example_9_vCard.h +++ b/examples/example_9_vCard/example_9_vCard.h @@ -19,7 +19,6 @@ public: xmppClient(QObject *parent = nullptr); ~xmppClient() override; -public slots: void clientConnected(); void rosterReceived(); void vCardReceived(const QXmppVCardIq &); 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 diff --git a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp index 69e4f5c8..1190ab51 100644 --- a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp +++ b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp @@ -11,14 +11,14 @@ class tst_QXmppArchiveIq : public QObject { Q_OBJECT -private slots: - void testArchiveList_data(); - void testArchiveList(); - void testArchiveChat_data(); - void testArchiveChat(); - void testArchiveRemove(); - void testArchiveRetrieve_data(); - void testArchiveRetrieve(); +private: + Q_SLOT void testArchiveList_data(); + Q_SLOT void testArchiveList(); + Q_SLOT void testArchiveChat_data(); + Q_SLOT void testArchiveChat(); + Q_SLOT void testArchiveRemove(); + Q_SLOT void testArchiveRetrieve_data(); + Q_SLOT void testArchiveRetrieve(); }; void tst_QXmppArchiveIq::testArchiveList_data() diff --git a/tests/qxmppatmmanager/tst_qxmppatmmanager.cpp b/tests/qxmppatmmanager/tst_qxmppatmmanager.cpp index c31190e0..40ec02ec 100644 --- a/tests/qxmppatmmanager/tst_qxmppatmmanager.cpp +++ b/tests/qxmppatmmanager/tst_qxmppatmmanager.cpp @@ -31,32 +31,31 @@ class tst_QXmppAtmManager : public QObject { Q_OBJECT -signals: - void unexpectedTrustMessageSent(); - -private slots: - void initTestCase(); - void testSendTrustMessage(); - void testMakePostponedTrustDecisions(); - void testDistrustAutomaticallyTrustedKeys(); - void testDistrust(); - void testAuthenticate_data(); - void testAuthenticate(); - void testMakeTrustDecisions(); - void testHandleMessage_data(); - void testHandleMessage(); - void testMakeTrustDecisionsNoKeys(); - void testMakeTrustDecisionsOwnKeys(); - void testMakeTrustDecisionsOwnKeysNoOwnEndpoints(); - void testMakeTrustDecisionsOwnKeysNoOwnEndpointsWithAuthenticatedKeys(); - void testMakeTrustDecisionsOwnKeysNoContactsWithAuthenticatedKeys(); - void testMakeTrustDecisionsSoleOwnKeyDistrusted(); - void testMakeTrustDecisionsContactKeys(); - void testMakeTrustDecisionsContactKeysNoOwnEndpoints(); - void testMakeTrustDecisionsContactKeysNoOwnEndpointsWithAuthenticatedKeys(); - void testMakeTrustDecisionsSoleContactKeyDistrusted(); +public: + Q_SIGNAL void unexpectedTrustMessageSent(); private: + Q_SLOT void initTestCase(); + Q_SLOT void testSendTrustMessage(); + Q_SLOT void testMakePostponedTrustDecisions(); + Q_SLOT void testDistrustAutomaticallyTrustedKeys(); + Q_SLOT void testDistrust(); + Q_SLOT void testAuthenticate_data(); + Q_SLOT void testAuthenticate(); + Q_SLOT void testMakeTrustDecisions(); + Q_SLOT void testHandleMessage_data(); + Q_SLOT void testHandleMessage(); + Q_SLOT void testMakeTrustDecisionsNoKeys(); + Q_SLOT void testMakeTrustDecisionsOwnKeys(); + Q_SLOT void testMakeTrustDecisionsOwnKeysNoOwnEndpoints(); + Q_SLOT void testMakeTrustDecisionsOwnKeysNoOwnEndpointsWithAuthenticatedKeys(); + Q_SLOT void testMakeTrustDecisionsOwnKeysNoContactsWithAuthenticatedKeys(); + Q_SLOT void testMakeTrustDecisionsSoleOwnKeyDistrusted(); + Q_SLOT void testMakeTrustDecisionsContactKeys(); + Q_SLOT void testMakeTrustDecisionsContactKeysNoOwnEndpoints(); + Q_SLOT void testMakeTrustDecisionsContactKeysNoOwnEndpointsWithAuthenticatedKeys(); + Q_SLOT void testMakeTrustDecisionsSoleContactKeyDistrusted(); + void testMakeTrustDecisionsOwnKeysDone(); void testMakeTrustDecisionsContactKeysDone(); void clearTrustStorage(); @@ -1023,7 +1022,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsNoKeys() // unexpected trust message connect(&m_logger, &QXmppLogger::message, &context, [=](QXmppLogger::MessageType type, const QString &) { if (type == QXmppLogger::SentMessage) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } }); @@ -1669,7 +1668,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsSoleOwnKeyDistrusted() parsePacket(message, text.toUtf8()); if (message.to() == QStringLiteral("alice@example.org")) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } } }); @@ -1800,7 +1799,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsContactKeys() parsePacket(message, text.toUtf8()); if (message.to() == QStringLiteral("carol@example.net")) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } } }); @@ -1850,7 +1849,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsContactKeysNoOwnEndpoints() QXmppMessage message; parsePacket(message, text.toUtf8()); - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } }); @@ -1929,7 +1928,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsContactKeysNoOwnEndpointsWithAut parsePacket(message, text.toUtf8()); if (message.to() != QStringLiteral("bob@example.com")) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } } }); @@ -2013,7 +2012,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsSoleContactKeyDistrusted() parsePacket(message, text.toUtf8()); if (message.to() != QStringLiteral("alice@example.org")) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } } }); diff --git a/tests/qxmppattentionmanager/tst_qxmppattentionmanager.cpp b/tests/qxmppattentionmanager/tst_qxmppattentionmanager.cpp index dce277a2..81ff522f 100644 --- a/tests/qxmppattentionmanager/tst_qxmppattentionmanager.cpp +++ b/tests/qxmppattentionmanager/tst_qxmppattentionmanager.cpp @@ -15,16 +15,15 @@ class tst_QXmppAttentionManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testDiscoFeatures(); - void testReceived_data(); - void testReceived(); - void testRateLimiting(); - void testSendRequest(); + Q_SLOT void testDiscoFeatures(); + Q_SLOT void testReceived_data(); + Q_SLOT void testReceived(); + Q_SLOT void testRateLimiting(); + Q_SLOT void testSendRequest(); -private: void setOwnJid(const QString &jid); void addToRoster(const QString &jid); @@ -100,7 +99,7 @@ void tst_QXmppAttentionManager::testReceived() limitedCalled = true; }); - emit client.messageReceived(msg); + Q_EMIT client.messageReceived(msg); QCOMPARE(signalCalled, accepted); QVERIFY(!limitedCalled); @@ -133,7 +132,7 @@ void tst_QXmppAttentionManager::testRateLimiting() msg.setAttentionRequested(true); for (int i = 0; i < count; i++) { - emit client.messageReceived(msg); + Q_EMIT client.messageReceived(msg); } QCOMPARE(signalCalled, allowed); @@ -144,7 +143,7 @@ void tst_QXmppAttentionManager::testRateLimiting() QCoreApplication::processEvents(); for (int i = 0; i < count; i++) { - emit client.messageReceived(msg); + Q_EMIT client.messageReceived(msg); } QCOMPARE(signalCalled, allowed * 2); diff --git a/tests/qxmppbindiq/tst_qxmppbindiq.cpp b/tests/qxmppbindiq/tst_qxmppbindiq.cpp index e0af1e63..66b4b018 100644 --- a/tests/qxmppbindiq/tst_qxmppbindiq.cpp +++ b/tests/qxmppbindiq/tst_qxmppbindiq.cpp @@ -12,10 +12,10 @@ class tst_QXmppBindIq : public QObject { Q_OBJECT -private slots: - void testNoResource(); - void testResource(); - void testResult(); +private: + Q_SLOT void testNoResource(); + Q_SLOT void testResource(); + Q_SLOT void testResult(); }; void tst_QXmppBindIq::testNoResource() diff --git a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp index 361253ff..f5aaa44c 100644 --- a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp +++ b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp @@ -13,24 +13,24 @@ class tst_QXmppBitsOfBinaryContentId : public QObject { Q_OBJECT -private slots: - void testBasic(); +private: + Q_SLOT void testBasic(); - void testFromContentId_data(); - void testFromContentId(); + Q_SLOT void testFromContentId_data(); + Q_SLOT void testFromContentId(); - void testFromCidUrl_data(); - void testFromCidUrl(); + Q_SLOT void testFromCidUrl_data(); + Q_SLOT void testFromCidUrl(); - void testEmpty(); + Q_SLOT void testEmpty(); - void testIsValid_data(); - void testIsValid(); + Q_SLOT void testIsValid_data(); + Q_SLOT void testIsValid(); - void testIsBobContentId_data(); - void testIsBobContentId(); + Q_SLOT void testIsBobContentId_data(); + Q_SLOT void testIsBobContentId(); - void testUnsupportedAlgorithm(); + Q_SLOT void testUnsupportedAlgorithm(); }; void tst_QXmppBitsOfBinaryContentId::testBasic() diff --git a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp index 1fa2896f..34020edf 100644 --- a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp +++ b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp @@ -13,11 +13,11 @@ class tst_QXmppBitsOfBinaryIq : public QObject { Q_OBJECT -private slots: - void testBasic(); - void testResult(); - void testOtherSubelement(); - void testIsBobIq(); +private: + Q_SLOT void testBasic(); + Q_SLOT void testResult(); + Q_SLOT void testOtherSubelement(); + Q_SLOT void testIsBobIq(); Q_SLOT void fromByteArray(); }; diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp index c167586a..29b9da15 100644 --- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp +++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp @@ -35,15 +35,15 @@ class QXmppCarbonTestHelper : public QObject { Q_OBJECT -public slots: - void messageSent(const QXmppMessage &msg) +public: + Q_SLOT void messageSent(const QXmppMessage &msg) { m_signalTriggered = true; QCOMPARE(m_expectSent, true); compareMessages(m_expectedMessage, msg); } - void messageReceived(const QXmppMessage &msg) + Q_SLOT void messageReceived(const QXmppMessage &msg) { m_signalTriggered = true; QCOMPARE(m_expectSent, false); @@ -51,7 +51,6 @@ public slots: compareMessages(m_expectedMessage, msg); } -public: QXmppMessage m_expectedMessage; bool m_expectSent; bool m_signalTriggered; @@ -73,13 +72,12 @@ class tst_QXmppCarbonManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testHandleStanza_data(); - void testHandleStanza(); + Q_SLOT void testHandleStanza_data(); + Q_SLOT void testHandleStanza(); -private: QXmppCarbonTestHelper m_helper; MessageHandler *m_messageHandler; QXmppCarbonManager *m_managerV1; diff --git a/tests/qxmppclient/tst_qxmppclient.cpp b/tests/qxmppclient/tst_qxmppclient.cpp index 841e9ed4..dc34dc71 100644 --- a/tests/qxmppclient/tst_qxmppclient.cpp +++ b/tests/qxmppclient/tst_qxmppclient.cpp @@ -21,17 +21,16 @@ class tst_QXmppClient : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void handleMessageSent(QXmppLogger::MessageType type, const QString &text) const; - void testSendMessage(); + Q_SLOT void handleMessageSent(QXmppLogger::MessageType type, const QString &text) const; + Q_SLOT void testSendMessage(); - void testIndexOfExtension(); + Q_SLOT void testIndexOfExtension(); - void testE2eeExtension(); + Q_SLOT void testE2eeExtension(); -private: QXmppClient *client; }; diff --git a/tests/qxmppdataform/tst_qxmppdataform.cpp b/tests/qxmppdataform/tst_qxmppdataform.cpp index 2cc7f068..fa35f49b 100644 --- a/tests/qxmppdataform/tst_qxmppdataform.cpp +++ b/tests/qxmppdataform/tst_qxmppdataform.cpp @@ -19,12 +19,12 @@ class tst_QXmppDataForm : public QObject { Q_OBJECT -private slots: - void testSimple(); - void testSubmit(); - void testMedia(); - void testMediaSource(); - void testFormType(); +private: + Q_SLOT void testSimple(); + Q_SLOT void testSubmit(); + Q_SLOT void testMedia(); + Q_SLOT void testMediaSource(); + Q_SLOT void testFormType(); }; void tst_QXmppDataForm::testSimple() diff --git a/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp b/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp index 58d49e3c..9c86a888 100644 --- a/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp +++ b/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp @@ -12,9 +12,9 @@ class tst_QXmppDiscoveryIq : public QObject { Q_OBJECT -private slots: - void testDiscovery(); - void testDiscoveryWithForm(); +private: + Q_SLOT void testDiscovery(); + Q_SLOT void testDiscoveryWithForm(); }; void tst_QXmppDiscoveryIq::testDiscovery() diff --git a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp index 960d3519..546bfb82 100644 --- a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp +++ b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp @@ -12,9 +12,9 @@ class tst_QXmppEntityTimeIq : public QObject { Q_OBJECT -private slots: - void testEntityTimeGet(); - void testEntityTimeResult(); +private: + Q_SLOT void testEntityTimeGet(); + Q_SLOT void testEntityTimeResult(); }; void tst_QXmppEntityTimeIq::testEntityTimeGet() diff --git a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp index 6c44b94e..3d1932c9 100644 --- a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp +++ b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp @@ -11,13 +11,13 @@ class tst_QXmppHttpUploadIq : public QObject { Q_OBJECT -private slots: - void testRequest(); - void testIsRequest_data(); - void testIsRequest(); - void testSlot(); - void testIsSlot_data(); - void testIsSlot(); +private: + Q_SLOT void testRequest(); + Q_SLOT void testIsRequest_data(); + Q_SLOT void testIsRequest(); + Q_SLOT void testSlot(); + Q_SLOT void testIsSlot_data(); + Q_SLOT void testIsSlot(); }; void tst_QXmppHttpUploadIq::testRequest() diff --git a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp index 1c8c5775..502c28ff 100644 --- a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp +++ b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp @@ -11,10 +11,10 @@ class tst_QXmppIceConnection : public QObject { Q_OBJECT -private slots: - void testBind(); - void testBindStun(); - void testConnect(); +private: + Q_SLOT void testBind(); + Q_SLOT void testBindStun(); + Q_SLOT void testConnect(); }; void tst_QXmppIceConnection::testBind() diff --git a/tests/qxmppiq/tst_qxmppiq.cpp b/tests/qxmppiq/tst_qxmppiq.cpp index a96ee318..8337779a 100644 --- a/tests/qxmppiq/tst_qxmppiq.cpp +++ b/tests/qxmppiq/tst_qxmppiq.cpp @@ -11,9 +11,9 @@ class tst_QXmppIq : public QObject { Q_OBJECT -private slots: - void testBasic_data(); - void testBasic(); +private: + Q_SLOT void testBasic_data(); + Q_SLOT void testBasic(); }; void tst_QXmppIq::testBasic_data() diff --git a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp index 3deb49fb..b27d7454 100644 --- a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp +++ b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp @@ -12,49 +12,49 @@ class tst_QXmppJingleIq : public QObject { Q_OBJECT -private slots: - void testIsSdpParameter_data(); - void testIsSdpParameter(); - void testSdpParameter(); - void testSdpParameterWithoutValue(); - void testIsRtpCryptoElement_data(); - void testIsRtpCryptoElement(); - void testRtpCryptoElement_data(); - void testRtpCryptoElement(); - void testIsRtpEncryption_data(); - void testIsRtpEncryption(); - void testRtpEncryption_data(); - void testRtpEncryption(); - void testIsRtpFeedbackProperty_data(); - void testIsRtpFeedbackProperty(); - void testRtpFeedbackProperty(); - void testRtpFeedbackPropertyWithParameters(); - void testIsRtpFeedbackInterval_data(); - void testIsRtpFeedbackInterval(); - void testRtpFeedbackInterval(); - void testIsRtpHeaderExtensionProperty_data(); - void testIsRtpHeaderExtensionProperty(); - void testRtpHeaderExtensionProperty(); - void testRtpHeaderExtensionPropertyWithSenders(); - void testRtpHeaderExtensionPropertyWithParameters(); - void testCandidate(); - void testContent(); - void testContentFingerprint(); - void testContentSdp(); - void testContentSdpReflexive(); - void testContentSdpFingerprint(); - void testContentSdpParameters(); - void testContentRtpFeedbackNegotiation(); - void testContentRtpHeaderExtensionsNegotiation(); - void testSession(); - void testTerminate(); - void testRtpSessionState_data(); - void testRtpSessionState(); - void testAudioPayloadType(); - void testVideoPayloadType(); - void testPayloadTypeRtpFeedbackNegotiation(); - void testRtpErrorCondition_data(); - void testRtpErrorCondition(); +private: + Q_SLOT void testIsSdpParameter_data(); + Q_SLOT void testIsSdpParameter(); + Q_SLOT void testSdpParameter(); + Q_SLOT void testSdpParameterWithoutValue(); + Q_SLOT void testIsRtpCryptoElement_data(); + Q_SLOT void testIsRtpCryptoElement(); + Q_SLOT void testRtpCryptoElement_data(); + Q_SLOT void testRtpCryptoElement(); + Q_SLOT void testIsRtpEncryption_data(); + Q_SLOT void testIsRtpEncryption(); + Q_SLOT void testRtpEncryption_data(); + Q_SLOT void testRtpEncryption(); + Q_SLOT void testIsRtpFeedbackProperty_data(); + Q_SLOT void testIsRtpFeedbackProperty(); + Q_SLOT void testRtpFeedbackProperty(); + Q_SLOT void testRtpFeedbackPropertyWithParameters(); + Q_SLOT void testIsRtpFeedbackInterval_data(); + Q_SLOT void testIsRtpFeedbackInterval(); + Q_SLOT void testRtpFeedbackInterval(); + Q_SLOT void testIsRtpHeaderExtensionProperty_data(); + Q_SLOT void testIsRtpHeaderExtensionProperty(); + Q_SLOT void testRtpHeaderExtensionProperty(); + Q_SLOT void testRtpHeaderExtensionPropertyWithSenders(); + Q_SLOT void testRtpHeaderExtensionPropertyWithParameters(); + Q_SLOT void testCandidate(); + Q_SLOT void testContent(); + Q_SLOT void testContentFingerprint(); + Q_SLOT void testContentSdp(); + Q_SLOT void testContentSdpReflexive(); + Q_SLOT void testContentSdpFingerprint(); + Q_SLOT void testContentSdpParameters(); + Q_SLOT void testContentRtpFeedbackNegotiation(); + Q_SLOT void testContentRtpHeaderExtensionsNegotiation(); + Q_SLOT void testSession(); + Q_SLOT void testTerminate(); + Q_SLOT void testRtpSessionState_data(); + Q_SLOT void testRtpSessionState(); + Q_SLOT void testAudioPayloadType(); + Q_SLOT void testVideoPayloadType(); + Q_SLOT void testPayloadTypeRtpFeedbackNegotiation(); + Q_SLOT void testRtpErrorCondition_data(); + Q_SLOT void testRtpErrorCondition(); }; void tst_QXmppJingleIq::testIsSdpParameter_data() diff --git a/tests/qxmppmammanager/tst_qxmppmammanager.cpp b/tests/qxmppmammanager/tst_qxmppmammanager.cpp index 828a2cb6..b00748b7 100644 --- a/tests/qxmppmammanager/tst_qxmppmammanager.cpp +++ b/tests/qxmppmammanager/tst_qxmppmammanager.cpp @@ -12,11 +12,10 @@ class QXmppMamTestHelper : public QObject { Q_OBJECT -public slots: - void archivedMessageReceived(const QString &queryId, const QXmppMessage &message); - void resultsRecieved(const QString &queryId, const QXmppResultSetReply &resultSetReply, bool complete); - public: + Q_SLOT void archivedMessageReceived(const QString &queryId, const QXmppMessage &message); + Q_SLOT void resultsRecieved(const QString &queryId, const QXmppResultSetReply &resultSetReply, bool complete); + QXmppMessage m_expectedMessage; QXmppResultSetReply m_expectedResultSetReply; QString m_expectedQueryId; @@ -31,16 +30,15 @@ class tst_QXmppMamManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testHandleStanza_data(); - void testHandleStanza(); + Q_SLOT void testHandleStanza_data(); + Q_SLOT void testHandleStanza(); - void testHandleResultIq_data(); - void testHandleResultIq(); + Q_SLOT void testHandleResultIq_data(); + Q_SLOT void testHandleResultIq(); -private: QXmppMamTestHelper m_helper; QXmppMamManager m_manager; }; diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index ee964a4c..deca437e 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -22,42 +22,42 @@ class tst_QXmppMessage : public QObject { Q_OBJECT -private slots: - void testBasic_data(); - void testBasic(); - void testIsXmppStanza(); - void testUnknownXExtension(); - void testMessageAttention(); - void testMessageReceipt(); - void testDelay_data(); - void testDelay(); - void testDelayWithMultipleStamp(); - void testExtendedAddresses(); - void testMucInvitation(); - void testState_data(); - void testState(); - void testXhtml(); - void testSubextensions(); - void testChatMarkers(); - void testPrivateMessage(); - void testOutOfBandUrl(); - void testMessageCorrect(); - void testMessageAttaching(); - void testMix(); - void testEme(); - void testSpoiler(); - void testProcessingHints(); - void testBobData(); - void testFallbackIndication(); - void testStanzaIds(); - void testSlashMe_data(); - void testSlashMe(); - void testMixInvitation(); - void testTrustMessageElement(); - void testReaction(); - void testE2eeFallbackBody(); - void testFileSharing(); - void testEncryptedFileSource(); +private: + Q_SLOT void testBasic_data(); + Q_SLOT void testBasic(); + Q_SLOT void testIsXmppStanza(); + Q_SLOT void testUnknownXExtension(); + Q_SLOT void testMessageAttention(); + Q_SLOT void testMessageReceipt(); + Q_SLOT void testDelay_data(); + Q_SLOT void testDelay(); + Q_SLOT void testDelayWithMultipleStamp(); + Q_SLOT void testExtendedAddresses(); + Q_SLOT void testMucInvitation(); + Q_SLOT void testState_data(); + Q_SLOT void testState(); + Q_SLOT void testXhtml(); + Q_SLOT void testSubextensions(); + Q_SLOT void testChatMarkers(); + Q_SLOT void testPrivateMessage(); + Q_SLOT void testOutOfBandUrl(); + Q_SLOT void testMessageCorrect(); + Q_SLOT void testMessageAttaching(); + Q_SLOT void testMix(); + Q_SLOT void testEme(); + Q_SLOT void testSpoiler(); + Q_SLOT void testProcessingHints(); + Q_SLOT void testBobData(); + Q_SLOT void testFallbackIndication(); + Q_SLOT void testStanzaIds(); + Q_SLOT void testSlashMe_data(); + Q_SLOT void testSlashMe(); + Q_SLOT void testMixInvitation(); + Q_SLOT void testTrustMessageElement(); + Q_SLOT void testReaction(); + Q_SLOT void testE2eeFallbackBody(); + Q_SLOT void testFileSharing(); + Q_SLOT void testEncryptedFileSource(); }; void tst_QXmppMessage::testBasic_data() diff --git a/tests/qxmppmessagereaction/tst_qxmppmessagereaction.cpp b/tests/qxmppmessagereaction/tst_qxmppmessagereaction.cpp index 8acbe6c9..25f7d3ed 100644 --- a/tests/qxmppmessagereaction/tst_qxmppmessagereaction.cpp +++ b/tests/qxmppmessagereaction/tst_qxmppmessagereaction.cpp @@ -11,12 +11,12 @@ class tst_QXmppMessageReaction : public QObject { Q_OBJECT -private slots: - void testIsMessageReaction_data(); - void testIsMessageReaction(); - void testMessageReaction(); - void testMessageReactionWithDuplicateEmojis(); - void testMessageReactionRemoval(); +private: + Q_SLOT void testIsMessageReaction_data(); + Q_SLOT void testIsMessageReaction(); + Q_SLOT void testMessageReaction(); + Q_SLOT void testMessageReactionWithDuplicateEmojis(); + Q_SLOT void testMessageReactionRemoval(); }; void tst_QXmppMessageReaction::testIsMessageReaction_data() diff --git a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp index 71c114b5..33ce3de5 100644 --- a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp +++ b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp @@ -12,11 +12,11 @@ class tst_QXmppMessageReceiptManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testReceipt_data(); - void testReceipt(); + Q_SLOT void testReceipt_data(); + Q_SLOT void testReceipt(); void handleMessageDelivered(const QString &, const QString &) { @@ -27,7 +27,6 @@ private slots: m_receiptSent = true; } -private: QXmppMessageReceiptManager *m_manager; QXmppClient m_client; QXmppLogger m_logger; diff --git a/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp b/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp index a455903a..d235a992 100644 --- a/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp +++ b/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp @@ -12,9 +12,9 @@ class tst_QXmppMixInvitation : public QObject { Q_OBJECT -private slots: - void testInvitation(); - void testIsInvitation(); +private: + Q_SLOT void testInvitation(); + Q_SLOT void testIsInvitation(); }; void tst_QXmppMixInvitation::testInvitation() diff --git a/tests/qxmppmixiq/tst_qxmppmixiq.cpp b/tests/qxmppmixiq/tst_qxmppmixiq.cpp index 70c20dcb..0983a314 100644 --- a/tests/qxmppmixiq/tst_qxmppmixiq.cpp +++ b/tests/qxmppmixiq/tst_qxmppmixiq.cpp @@ -14,13 +14,13 @@ class tst_QXmppMixIq : public QObject { Q_OBJECT -private slots: - void testBase_data(); - void testBase(); - void testDefaults(); - void testSetters(); - void testInvalidActionType(); - void testIsMixIq(); +private: + Q_SLOT void testBase_data(); + Q_SLOT void testBase(); + Q_SLOT void testDefaults(); + Q_SLOT void testSetters(); + Q_SLOT void testInvalidActionType(); + Q_SLOT void testIsMixIq(); }; void tst_QXmppMixIq::testBase_data() diff --git a/tests/qxmppmixitems/tst_qxmppmixitems.cpp b/tests/qxmppmixitems/tst_qxmppmixitems.cpp index 9eedee9a..529dfedc 100644 --- a/tests/qxmppmixitems/tst_qxmppmixitems.cpp +++ b/tests/qxmppmixitems/tst_qxmppmixitems.cpp @@ -11,11 +11,11 @@ class tst_QXmppMixItem : public QObject { Q_OBJECT -private slots: - void testInfo(); - void testIsInfoItem(); - void testParticipant(); - void testIsParticipantItem(); +private: + Q_SLOT void testInfo(); + Q_SLOT void testIsInfoItem(); + Q_SLOT void testParticipant(); + Q_SLOT void testIsParticipantItem(); }; void tst_QXmppMixItem::testInfo() diff --git a/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp b/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp index d6dbc04e..3e3284d8 100644 --- a/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp +++ b/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp @@ -11,10 +11,10 @@ class tst_QXmppNonSASLAuthIq : public QObject { Q_OBJECT -private slots: - void testGet(); - void testSetPlain(); - void testSetDigest(); +private: + Q_SLOT void testGet(); + Q_SLOT void testSetPlain(); + Q_SLOT void testSetDigest(); }; void tst_QXmppNonSASLAuthIq::testGet() diff --git a/tests/qxmppomemodata/tst_qxmppomemodata.cpp b/tests/qxmppomemodata/tst_qxmppomemodata.cpp index 2048cfcf..23912579 100644 --- a/tests/qxmppomemodata/tst_qxmppomemodata.cpp +++ b/tests/qxmppomemodata/tst_qxmppomemodata.cpp @@ -44,26 +44,26 @@ class tst_QXmppOmemoData : public QObject { Q_OBJECT -private slots: - void testIsOmemoDeviceElement_data(); - void testIsOmemoDeviceElement(); - void testOmemoDeviceElement_data(); - void testOmemoDeviceElement(); - void testIsOmemoDeviceList_data(); - void testIsOmemoDeviceList(); - void testOmemoDeviceList(); - void testIsOmemoDeviceBundle_data(); - void testIsOmemoDeviceBundle(); - void testOmemoDeviceBundle(); - void testIsOmemoEnvelope_data(); - void testIsOmemoEnvelope(); - void testOmemoEnvelope_data(); - void testOmemoEnvelope(); - void testIsOmemoElement_data(); - void testIsOmemoElement(); - void testOmemoElement(); - void testMessageOmemoElement(); - void testOmemoIq(); +private: + Q_SLOT void testIsOmemoDeviceElement_data(); + Q_SLOT void testIsOmemoDeviceElement(); + Q_SLOT void testOmemoDeviceElement_data(); + Q_SLOT void testOmemoDeviceElement(); + Q_SLOT void testIsOmemoDeviceList_data(); + Q_SLOT void testIsOmemoDeviceList(); + Q_SLOT void testOmemoDeviceList(); + Q_SLOT void testIsOmemoDeviceBundle_data(); + Q_SLOT void testIsOmemoDeviceBundle(); + Q_SLOT void testOmemoDeviceBundle(); + Q_SLOT void testIsOmemoEnvelope_data(); + Q_SLOT void testIsOmemoEnvelope(); + Q_SLOT void testOmemoEnvelope_data(); + Q_SLOT void testOmemoEnvelope(); + Q_SLOT void testIsOmemoElement_data(); + Q_SLOT void testIsOmemoElement(); + Q_SLOT void testOmemoElement(); + Q_SLOT void testMessageOmemoElement(); + Q_SLOT void testOmemoIq(); }; void tst_QXmppOmemoData::testIsOmemoDeviceElement_data() diff --git a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp index f0cf2447..2d600a5d 100644 --- a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp +++ b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp @@ -76,17 +76,17 @@ class tst_QXmppOmemoManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); - void testSecurityPolicies(); - void testTrustLevels(); - void initOmemoUser(OmemoUser &omemoUser); - void testInit(); - void testSetUp(); - void testLoad(); - void testSendMessage(); - void testSendIq(); - void finish(OmemoUser &omemoUser); +private: + Q_SLOT void initTestCase(); + Q_SLOT void testSecurityPolicies(); + Q_SLOT void testTrustLevels(); + Q_SLOT void initOmemoUser(OmemoUser &omemoUser); + Q_SLOT void testInit(); + Q_SLOT void testSetUp(); + Q_SLOT void testLoad(); + Q_SLOT void testSendMessage(); + Q_SLOT void testSendIq(); + Q_SLOT void finish(OmemoUser &omemoUser); private: OmemoUser m_alice1; diff --git a/tests/qxmppomemomemorystorage/tst_qxmppomemomemorystorage.cpp b/tests/qxmppomemomemorystorage/tst_qxmppomemomemorystorage.cpp index cb751ae5..b8bc54ca 100644 --- a/tests/qxmppomemomemorystorage/tst_qxmppomemomemorystorage.cpp +++ b/tests/qxmppomemomemorystorage/tst_qxmppomemomemorystorage.cpp @@ -10,14 +10,13 @@ class tst_QXmppOmemoMemoryStorage : public QObject { Q_OBJECT -private slots: - void testOwnDevice(); - void testSignedPreKeyPairs(); - void testPreKeyPairs(); - void testDevices(); - void testResetAll(); - private: + Q_SLOT void testOwnDevice(); + Q_SLOT void testSignedPreKeyPairs(); + Q_SLOT void testPreKeyPairs(); + Q_SLOT void testDevices(); + Q_SLOT void testResetAll(); + QXmppOmemoMemoryStorage m_omemoStorage; }; diff --git a/tests/qxmpppresence/tst_qxmpppresence.cpp b/tests/qxmpppresence/tst_qxmpppresence.cpp index 95d7ee92..012939b8 100644 --- a/tests/qxmpppresence/tst_qxmpppresence.cpp +++ b/tests/qxmpppresence/tst_qxmpppresence.cpp @@ -14,18 +14,18 @@ class tst_QXmppPresence : public QObject { Q_OBJECT -private slots: - void testPresence(); - void testPresence_data(); - void testPresenceWithCapability(); - void testPresenceWithExtendedAddresses(); - void testPresenceWithMucItem(); - void testPresenceWithMucPassword(); - void testPresenceWithMucSupport(); - void testPresenceWithMuji(); - void testPresenceWithLastUserInteraction(); - void testPresenceWithMix(); - void testPresenceWithVCard(); +private: + Q_SLOT void testPresence(); + Q_SLOT void testPresence_data(); + Q_SLOT void testPresenceWithCapability(); + Q_SLOT void testPresenceWithExtendedAddresses(); + Q_SLOT void testPresenceWithMucItem(); + Q_SLOT void testPresenceWithMucPassword(); + Q_SLOT void testPresenceWithMucSupport(); + Q_SLOT void testPresenceWithMuji(); + Q_SLOT void testPresenceWithLastUserInteraction(); + Q_SLOT void testPresenceWithMix(); + Q_SLOT void testPresenceWithVCard(); }; void tst_QXmppPresence::testPresence_data() diff --git a/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp b/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp index 5a76dcb0..cbf90ee5 100644 --- a/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp +++ b/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp @@ -17,10 +17,10 @@ class tst_QXmppPubSubEvent : public QObject { Q_OBJECT -private slots: - void testBasic_data(); - void testBasic(); - void testCustomItem(); +private: + Q_SLOT void testBasic_data(); + Q_SLOT void testBasic(); + Q_SLOT void testCustomItem(); }; void tst_QXmppPubSubEvent::testBasic_data() diff --git a/tests/qxmpppubsubforms/tst_qxmpppubsubforms.cpp b/tests/qxmpppubsubforms/tst_qxmpppubsubforms.cpp index 0691733c..4f605d2c 100644 --- a/tests/qxmpppubsubforms/tst_qxmpppubsubforms.cpp +++ b/tests/qxmpppubsubforms/tst_qxmpppubsubforms.cpp @@ -12,10 +12,8 @@ class tst_QXmppPubSubForms : public QObject { Q_OBJECT -private slots: - void subAuthorization(); - private: + Q_SLOT void subAuthorization(); }; void tst_QXmppPubSubForms::subAuthorization() diff --git a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp index 809711a9..2d59124f 100644 --- a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp +++ b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp @@ -18,20 +18,20 @@ class tst_QXmppPubSubIq : public QObject { Q_OBJECT -private slots: - void testItems(); - void testItemsResponse(); - void testCreateNode(); - void testDeleteNode(); - void testPublish(); - void testRetractItem(); - void testSubscribe(); - void testSubscription(); - void testSubscriptions(); - void testIsPubSubIq_data(); - void testIsPubSubIq(); - - void testCustomItem(); +private: + Q_SLOT void testItems(); + Q_SLOT void testItemsResponse(); + Q_SLOT void testCreateNode(); + Q_SLOT void testDeleteNode(); + Q_SLOT void testPublish(); + Q_SLOT void testRetractItem(); + Q_SLOT void testSubscribe(); + Q_SLOT void testSubscription(); + Q_SLOT void testSubscriptions(); + Q_SLOT void testIsPubSubIq_data(); + Q_SLOT void testIsPubSubIq(); + + Q_SLOT void testCustomItem(); }; void tst_QXmppPubSubIq::testItems() diff --git a/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp b/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp index 8cef930c..cf210dd4 100644 --- a/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp +++ b/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp @@ -12,12 +12,12 @@ class tst_QXmppPushEnableIq : public QObject { Q_OBJECT -private slots: - void testPushEnable(); - void testPushDisable(); - void testXmlNs(); - void testDataForm(); - void testIsEnableIq(); +private: + Q_SLOT void testPushEnable(); + Q_SLOT void testPushDisable(); + Q_SLOT void testXmlNs(); + Q_SLOT void testDataForm(); + Q_SLOT void testIsEnableIq(); }; void tst_QXmppPushEnableIq::testPushEnable() diff --git a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp index 909fedac..b07d4d1b 100644 --- a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp +++ b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp @@ -15,19 +15,19 @@ class tst_QXmppRegisterIq : public QObject { Q_OBJECT -private slots: - void testGet(); - void testResult(); - void testResultWithForm(); - void testResultWithRedirection(); - void testResultWithFormAndRedirection(); - void testSet(); - void testSetWithForm(); - void testBobData(); - void testRegistered(); - void testRemove(); - void testChangePassword(); - void testUnregistration(); +private: + Q_SLOT void testGet(); + Q_SLOT void testResult(); + Q_SLOT void testResultWithForm(); + Q_SLOT void testResultWithRedirection(); + Q_SLOT void testResultWithFormAndRedirection(); + Q_SLOT void testSet(); + Q_SLOT void testSetWithForm(); + Q_SLOT void testBobData(); + Q_SLOT void testRegistered(); + Q_SLOT void testRemove(); + Q_SLOT void testChangePassword(); + Q_SLOT void testUnregistration(); }; void tst_QXmppRegisterIq::testGet() diff --git a/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp b/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp index 0cd2b005..80dabe65 100644 --- a/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp +++ b/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp @@ -13,34 +13,33 @@ class tst_QXmppRegistrationManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); - - void testDiscoFeatures(); - - void testChangePassword_data(); - void testChangePassword(); - void testDeleteAccount(); - void testRequestRegistrationForm_data(); - void testRequestRegistrationForm(); - void testRegisterOnConnectGetSet(); - void testServiceDiscovery(); - void testSendCachedRegistrationForm_data(); - void testSendCachedRegistrationForm(); - void testStreamFeaturesCheck_data(); - void testStreamFeaturesCheck(); - void testRegistrationResult_data(); - void testRegistrationResult(); - void testChangePasswordResult_data(); - void testChangePasswordResult(); - void testDeleteAccountResult_data(); - void testDeleteAccountResult(); - void testRegistrationFormReceived(); - - void sendStreamFeaturesToManager(bool registrationEnabled = true); - void setManagerConfig(const QString &username, const QString &server = QStringLiteral("example.org"), const QString &password = {}); - private: + Q_SLOT void initTestCase(); + + Q_SLOT void testDiscoFeatures(); + + Q_SLOT void testChangePassword_data(); + Q_SLOT void testChangePassword(); + Q_SLOT void testDeleteAccount(); + Q_SLOT void testRequestRegistrationForm_data(); + Q_SLOT void testRequestRegistrationForm(); + Q_SLOT void testRegisterOnConnectGetSet(); + Q_SLOT void testServiceDiscovery(); + Q_SLOT void testSendCachedRegistrationForm_data(); + Q_SLOT void testSendCachedRegistrationForm(); + Q_SLOT void testStreamFeaturesCheck_data(); + Q_SLOT void testStreamFeaturesCheck(); + Q_SLOT void testRegistrationResult_data(); + Q_SLOT void testRegistrationResult(); + Q_SLOT void testChangePasswordResult_data(); + Q_SLOT void testChangePasswordResult(); + Q_SLOT void testDeleteAccountResult_data(); + Q_SLOT void testDeleteAccountResult(); + Q_SLOT void testRegistrationFormReceived(); + + Q_SLOT void sendStreamFeaturesToManager(bool registrationEnabled = true); + Q_SLOT void setManagerConfig(const QString &username, const QString &server = QStringLiteral("example.org"), const QString &password = {}); + QXmppClient client; QXmppLogger logger; QXmppRegistrationManager *manager; @@ -206,7 +205,7 @@ void tst_QXmppRegistrationManager::testServiceDiscovery() delete context; // on disconnect, supportedByServer needs to be reset - emit client.disconnected(); + Q_EMIT client.disconnected(); QVERIFY(!manager->supportedByServer()); } diff --git a/tests/qxmppresultset/tst_qxmppresultset.cpp b/tests/qxmppresultset/tst_qxmppresultset.cpp index 67b00466..8238b5e6 100644 --- a/tests/qxmppresultset/tst_qxmppresultset.cpp +++ b/tests/qxmppresultset/tst_qxmppresultset.cpp @@ -12,11 +12,11 @@ class tst_QXmppResultSet : public QObject { Q_OBJECT -private slots: - void testQuery_data(); - void testQuery(); - void testReply_data(); - void testReply(); +private: + Q_SLOT void testQuery_data(); + Q_SLOT void testQuery(); + Q_SLOT void testReply_data(); + Q_SLOT void testReply(); }; void tst_QXmppResultSet::testQuery_data() diff --git a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp index 728bd9ee..7cb5d332 100644 --- a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp +++ b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp @@ -11,15 +11,15 @@ class tst_QXmppRosterIq : public QObject { Q_OBJECT -private slots: - void testItem_data(); - void testItem(); - void testApproved_data(); - void testApproved(); - void testVersion_data(); - void testVersion(); - void testMixAnnotate(); - void testMixChannel(); +private: + Q_SLOT void testItem_data(); + Q_SLOT void testItem(); + Q_SLOT void testApproved_data(); + Q_SLOT void testApproved(); + Q_SLOT void testVersion_data(); + Q_SLOT void testVersion(); + Q_SLOT void testMixAnnotate(); + Q_SLOT void testMixChannel(); }; void tst_QXmppRosterIq::testItem_data() diff --git a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp index 261610d4..11c7fb3d 100644 --- a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp +++ b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp @@ -13,12 +13,12 @@ class tst_QXmppRosterManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testDiscoFeatures(); - void testRenameItem(); - void subscriptionRequestReceived(); + Q_SLOT void testDiscoFeatures(); + Q_SLOT void testRenameItem(); + Q_SLOT void subscriptionRequestReceived(); Q_SLOT void testAddItem(); Q_SLOT void testRemoveItem(); @@ -106,7 +106,7 @@ void tst_QXmppRosterManager::subscriptionRequestReceived() QCOMPARE(presence.statusText(), QStringLiteral("Hi, I'm Alice.")); }); - emit client.presenceReceived(presence); + Q_EMIT client.presenceReceived(presence); QVERIFY(subscriptionRequestReceived); } diff --git a/tests/qxmpprpciq/tst_qxmpprpciq.cpp b/tests/qxmpprpciq/tst_qxmpprpciq.cpp index be651243..9c2bc5c0 100644 --- a/tests/qxmpprpciq/tst_qxmpprpciq.cpp +++ b/tests/qxmpprpciq/tst_qxmpprpciq.cpp @@ -35,21 +35,21 @@ class tst_QXmppRpcIq : public QObject { Q_OBJECT -private slots: - void testBase64(); - void testBool(); - void testDateTime(); - void testDouble(); - void testInt(); - void testNil(); - void testString(); - - void testArray(); - void testStruct(); - - void testInvoke(); - void testResponse(); - void testResponseFault(); +private: + Q_SLOT void testBase64(); + Q_SLOT void testBool(); + Q_SLOT void testDateTime(); + Q_SLOT void testDouble(); + Q_SLOT void testInt(); + Q_SLOT void testNil(); + Q_SLOT void testString(); + + Q_SLOT void testArray(); + Q_SLOT void testStruct(); + + Q_SLOT void testInvoke(); + Q_SLOT void testResponse(); + Q_SLOT void testResponseFault(); }; void tst_QXmppRpcIq::testBase64() { diff --git a/tests/qxmppsasl/tst_qxmppsasl.cpp b/tests/qxmppsasl/tst_qxmppsasl.cpp index 88709dd4..951af0b4 100644 --- a/tests/qxmppsasl/tst_qxmppsasl.cpp +++ b/tests/qxmppsasl/tst_qxmppsasl.cpp @@ -11,37 +11,37 @@ class tst_QXmppSasl : public QObject { Q_OBJECT -private slots: - void testParsing(); - void testAuth_data(); - void testAuth(); - void testChallenge_data(); - void testChallenge(); - void testFailure(); - void testResponse_data(); - void testResponse(); - void testSuccess(); +private: + Q_SLOT void testParsing(); + Q_SLOT void testAuth_data(); + Q_SLOT void testAuth(); + Q_SLOT void testChallenge_data(); + Q_SLOT void testChallenge(); + Q_SLOT void testFailure(); + Q_SLOT void testResponse_data(); + Q_SLOT void testResponse(); + Q_SLOT void testSuccess(); // client - void testClientAvailableMechanisms(); - void testClientBadMechanism(); - void testClientAnonymous(); - void testClientDigestMd5(); - void testClientDigestMd5_data(); - void testClientFacebook(); - void testClientGoogle(); - void testClientPlain(); - void testClientScramSha1(); - void testClientScramSha1_bad(); - void testClientScramSha256(); - void testClientWindowsLive(); + Q_SLOT void testClientAvailableMechanisms(); + Q_SLOT void testClientBadMechanism(); + Q_SLOT void testClientAnonymous(); + Q_SLOT void testClientDigestMd5(); + Q_SLOT void testClientDigestMd5_data(); + Q_SLOT void testClientFacebook(); + Q_SLOT void testClientGoogle(); + Q_SLOT void testClientPlain(); + Q_SLOT void testClientScramSha1(); + Q_SLOT void testClientScramSha1_bad(); + Q_SLOT void testClientScramSha256(); + Q_SLOT void testClientWindowsLive(); // server - void testServerBadMechanism(); - void testServerAnonymous(); - void testServerDigestMd5(); - void testServerPlain(); - void testServerPlainChallenge(); + Q_SLOT void testServerBadMechanism(); + Q_SLOT void testServerAnonymous(); + Q_SLOT void testServerDigestMd5(); + Q_SLOT void testServerPlain(); + Q_SLOT void testServerPlainChallenge(); }; void tst_QXmppSasl::testParsing() diff --git a/tests/qxmppserver/tst_qxmppserver.cpp b/tests/qxmppserver/tst_qxmppserver.cpp index 8715d205..28e5c96f 100644 --- a/tests/qxmppserver/tst_qxmppserver.cpp +++ b/tests/qxmppserver/tst_qxmppserver.cpp @@ -11,9 +11,9 @@ class tst_QXmppServer : public QObject { Q_OBJECT -private slots: - void testConnect_data(); - void testConnect(); +private: + Q_SLOT void testConnect_data(); + Q_SLOT void testConnect(); }; void tst_QXmppServer::testConnect_data() diff --git a/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp b/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp index 837ef4c7..91b1bb8f 100644 --- a/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp +++ b/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp @@ -11,8 +11,8 @@ class TestPackets : public QObject { Q_OBJECT -private slots: - void testSession(); +private: + Q_SLOT void testSession(); }; void TestPackets::testSession() diff --git a/tests/qxmppsocks/tst_qxmppsocks.cpp b/tests/qxmppsocks/tst_qxmppsocks.cpp index eea55649..a58755ac 100644 --- a/tests/qxmppsocks/tst_qxmppsocks.cpp +++ b/tests/qxmppsocks/tst_qxmppsocks.cpp @@ -12,17 +12,16 @@ class tst_QXmppSocks : public QObject { Q_OBJECT -private slots: - void init(); - void newConnectionSlot(QTcpSocket *socket, QString hostName, quint16 port); +private: + Q_SLOT void init(); + Q_SLOT void newConnectionSlot(QTcpSocket *socket, QString hostName, quint16 port); - void testClient_data(); - void testClient(); - void testClientAndServer(); - void testServer_data(); - void testServer(); + Q_SLOT void testClient_data(); + Q_SLOT void testClient(); + Q_SLOT void testClientAndServer(); + Q_SLOT void testServer_data(); + Q_SLOT void testServer(); -private: QTcpSocket *m_connectionSocket; QString m_connectionHostName; quint16 m_connectionPort; diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp index 8f331e45..5439262c 100644 --- a/tests/qxmppstanza/tst_qxmppstanza.cpp +++ b/tests/qxmppstanza/tst_qxmppstanza.cpp @@ -20,19 +20,19 @@ class tst_QXmppStanza : public QObject { Q_OBJECT -private slots: - void testExtendedAddress_data(); - void testExtendedAddress(); - - void testErrorCases_data(); - void testErrorCases(); - void testErrorFileTooLarge(); - void testErrorRetry(); - void testErrorEnums(); - - void testEncryption(); - void testSenderKey(); - void testSceTimestamp(); +private: + Q_SLOT void testExtendedAddress_data(); + Q_SLOT void testExtendedAddress(); + + Q_SLOT void testErrorCases_data(); + Q_SLOT void testErrorCases(); + Q_SLOT void testErrorFileTooLarge(); + Q_SLOT void testErrorRetry(); + Q_SLOT void testErrorEnums(); + + Q_SLOT void testEncryption(); + Q_SLOT void testSenderKey(); + Q_SLOT void testSceTimestamp(); }; void tst_QXmppStanza::testExtendedAddress_data() diff --git a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp index 238c9164..cdccd04d 100644 --- a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp +++ b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp @@ -11,9 +11,9 @@ class tst_QXmppStartTlsPacket : public QObject { Q_OBJECT -private slots: - void testBasic_data(); - void testBasic(); +private: + Q_SLOT void testBasic_data(); + Q_SLOT void testBasic(); }; void tst_QXmppStartTlsPacket::testBasic_data() diff --git a/tests/qxmppstream/tst_qxmppstream.cpp b/tests/qxmppstream/tst_qxmppstream.cpp index d462c7df..45f78654 100644 --- a/tests/qxmppstream/tst_qxmppstream.cpp +++ b/tests/qxmppstream/tst_qxmppstream.cpp @@ -21,17 +21,17 @@ public: void handleStart() override { QXmppStream::handleStart(); - emit started(); + Q_EMIT started(); } void handleStream(const QDomElement &element) override { - emit streamReceived(element); + Q_EMIT streamReceived(element); } void handleStanza(const QDomElement &element) override { - emit stanzaReceived(element); + Q_EMIT stanzaReceived(element); } Q_SIGNAL void started(); diff --git a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp index 94e59eeb..c1e95149 100644 --- a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp +++ b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp @@ -28,11 +28,11 @@ class tst_QXmppStreamFeatures : public QObject { Q_OBJECT -private slots: - void testEmpty(); - void testRequired(); - void testFull(); - void testSetters(); +private: + Q_SLOT void testEmpty(); + Q_SLOT void testRequired(); + Q_SLOT void testFull(); + Q_SLOT void testSetters(); }; void tst_QXmppStreamFeatures::testEmpty() diff --git a/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp index f80722e1..b07e8fae 100644 --- a/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp +++ b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp @@ -11,13 +11,13 @@ class tst_QXmppStunMessage : public QObject { Q_OBJECT -private slots: - void testFingerprint(); - void testIntegrity(); - void testIPv4Address(); - void testIPv6Address(); - void testXorIPv4Address(); - void testXorIPv6Address(); +private: + Q_SLOT void testFingerprint(); + Q_SLOT void testIntegrity(); + Q_SLOT void testIPv4Address(); + Q_SLOT void testIPv6Address(); + Q_SLOT void testXorIPv4Address(); + Q_SLOT void testXorIPv6Address(); }; void tst_QXmppStunMessage::testFingerprint() diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp index 4440b1ae..f40b2e7e 100644 --- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp +++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp @@ -14,14 +14,13 @@ class tst_QXmppTransferManager : public QObject { Q_OBJECT -private slots: - void init(); - void testSendFile_data(); - void testSendFile(); +private: + Q_SLOT void init(); + Q_SLOT void testSendFile_data(); + Q_SLOT void testSendFile(); - void acceptFile(QXmppTransferJob *job); + Q_SLOT void acceptFile(QXmppTransferJob *job); -private: QBuffer receiverBuffer; QXmppTransferJob *receiverJob; }; diff --git a/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp b/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp index 6696081d..0c679aa5 100644 --- a/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp +++ b/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp @@ -17,19 +17,18 @@ class tst_QXmppTrustMemoryStorage : public QObject { Q_OBJECT -private slots: +private: // QXmppTrustMemoryStorage - void testSecurityPolicy(); - void testOwnKeys(); - void testKeys(); - void testTrustLevels(); - void testResetAll(); + Q_SLOT void testSecurityPolicy(); + Q_SLOT void testOwnKeys(); + Q_SLOT void testKeys(); + Q_SLOT void testTrustLevels(); + Q_SLOT void testResetAll(); // QXmppAtmTrustMemoryStorage - void atmTestKeysForPostponedTrustDecisions(); - void atmTestResetAll(); + Q_SLOT void atmTestKeysForPostponedTrustDecisions(); + Q_SLOT void atmTestResetAll(); -private: QXmppTrustMemoryStorage m_trustStorage; QXmppAtmTrustMemoryStorage m_atmTrustStorage; }; diff --git a/tests/qxmpptrustmessages/tst_qxmpptrustmessages.cpp b/tests/qxmpptrustmessages/tst_qxmpptrustmessages.cpp index aee889fd..a6b9c618 100644 --- a/tests/qxmpptrustmessages/tst_qxmpptrustmessages.cpp +++ b/tests/qxmpptrustmessages/tst_qxmpptrustmessages.cpp @@ -12,14 +12,14 @@ class tst_QXmppTrustMessages : public QObject { Q_OBJECT -private slots: - void testIsTrustMessageKeyOwner_data(); - void testIsTrustMessageKeyOwner(); - void testTrustMessageKeyOwner_data(); - void testTrustMessageKeyOwner(); - void testIsTrustMessageElement_data(); - void testIsTrustMessageElement(); - void testTrustMessageElement(); +private: + Q_SLOT void testIsTrustMessageKeyOwner_data(); + Q_SLOT void testIsTrustMessageKeyOwner(); + Q_SLOT void testTrustMessageKeyOwner_data(); + Q_SLOT void testTrustMessageKeyOwner(); + Q_SLOT void testIsTrustMessageElement_data(); + Q_SLOT void testIsTrustMessageElement(); + Q_SLOT void testTrustMessageElement(); }; void tst_QXmppTrustMessages::testIsTrustMessageKeyOwner_data() diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp index 032e9957..47cf65c1 100644 --- a/tests/qxmpputils/tst_qxmpputils.cpp +++ b/tests/qxmpputils/tst_qxmpputils.cpp @@ -20,15 +20,13 @@ class tst_QXmppUtils : public QObject { Q_OBJECT -private slots: - void testCrc32(); - void testHmac(); - void testJid(); - void testMime(); - void testTimezoneOffset(); - void testStanzaHash(); - private: + Q_SLOT void testCrc32(); + Q_SLOT void testHmac(); + Q_SLOT void testJid(); + Q_SLOT void testMime(); + Q_SLOT void testTimezoneOffset(); + Q_SLOT void testStanzaHash(); Q_SLOT void testCalculateHashes_data(); Q_SLOT void testCalculateHashes(); }; diff --git a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp index bfa26a9c..5e104c76 100644 --- a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp +++ b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp @@ -11,14 +11,14 @@ class tst_QXmppVCardIq : public QObject { Q_OBJECT -private slots: - void testAddress_data(); - void testAddress(); - void testEmail_data(); - void testEmail(); - void testPhone_data(); - void testPhone(); - void testVCard(); +private: + Q_SLOT void testAddress_data(); + Q_SLOT void testAddress(); + Q_SLOT void testEmail_data(); + Q_SLOT void testEmail(); + Q_SLOT void testPhone_data(); + Q_SLOT void testPhone(); + Q_SLOT void testVCard(); }; void tst_QXmppVCardIq::testAddress_data() diff --git a/tests/qxmppversioniq/tst_qxmppversioniq.cpp b/tests/qxmppversioniq/tst_qxmppversioniq.cpp index 7c3bd15d..849a9958 100644 --- a/tests/qxmppversioniq/tst_qxmppversioniq.cpp +++ b/tests/qxmppversioniq/tst_qxmppversioniq.cpp @@ -12,9 +12,9 @@ class tst_QXmppVersionIq : public QObject { Q_OBJECT -private slots: - void testVersionGet(); - void testVersionResult(); +private: + Q_SLOT void testVersionGet(); + Q_SLOT void testVersionResult(); }; void tst_QXmppVersionIq::testVersionGet() |