From 3d4c2e72e740a6fcb66ec337be194b6c356a96be Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 26 Aug 2010 08:36:22 +0000 Subject: rework elementReceived() arguments --- src/QXmppServer.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/QXmppServer.cpp') diff --git a/src/QXmppServer.cpp b/src/QXmppServer.cpp index 33ea7147..0630eea6 100644 --- a/src/QXmppServer.cpp +++ b/src/QXmppServer.cpp @@ -242,11 +242,6 @@ QXmppOutgoingServer* QXmppServer::connectToDomain(const QString &domain) stream->configuration().setDomain(domain); stream->configuration().setHost(domain); stream->configuration().setPort(5269); - bool check = connect(stream, SIGNAL(elementReceived(QDomElement, bool&)), - this, SLOT(slotElementReceived(QDomElement, bool&))); - Q_ASSERT(check); - Q_UNUSED(check); - d->outgoingServers.append(stream); // connect to remote server @@ -459,8 +454,8 @@ void QXmppServer::slotClientConnection(QSslSocket *socket) this, SLOT(slotClientDisconnected())); Q_ASSERT(check); - check = connect(stream, SIGNAL(elementReceived(QDomElement, bool&)), - this, SLOT(slotElementReceived(QDomElement, bool&))); + check = connect(stream, SIGNAL(elementReceived(QDomElement)), + this, SLOT(slotElementReceived(QDomElement))); Q_ASSERT(check); d->incomingClients.append(stream); @@ -544,10 +539,8 @@ void QXmppServer::slotDialbackRequestReceived(const QXmppDialback &dialback) /// Handle an incoming XML element. -void QXmppServer::slotElementReceived(const QDomElement &element, bool &handled) +void QXmppServer::slotElementReceived(const QDomElement &element) { - Q_UNUSED(handled); - QXmppStream *incoming = qobject_cast(sender()); if (!incoming) return; @@ -572,8 +565,8 @@ void QXmppServer::slotServerConnection(QSslSocket *socket) this, SLOT(slotDialbackRequestReceived(QXmppDialback))); Q_ASSERT(check); - check = connect(stream, SIGNAL(elementReceived(QDomElement, bool&)), - this, SLOT(slotElementReceived(QDomElement, bool&))); + check = connect(stream, SIGNAL(elementReceived(QDomElement)), + this, SLOT(slotElementReceived(QDomElement))); Q_ASSERT(check); } -- cgit v1.2.3