diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-07-07 09:08:39 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-07-07 09:08:39 +0000 |
| commit | 7df119586bbb595f8f00ca1cb54bc3beebfc14a5 (patch) | |
| tree | 2c30b72af484ce0821730b9c8f4955ea8b86aaf1 /src | |
| parent | 498881bcf60b59b945beed450e31592b1c8e96a3 (diff) | |
| download | qxmpp-7df119586bbb595f8f00ca1cb54bc3beebfc14a5.tar.gz | |
normalize Qt signal / slot signatures
Diffstat (limited to 'src')
| -rw-r--r-- | src/QXmppClient.cpp | 24 | ||||
| -rw-r--r-- | src/QXmppOutgoingClient.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppRosterManager.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppServer.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppTransferManager.cpp | 8 | ||||
| -rw-r--r-- | src/server/mod_proxy65.cpp | 4 |
6 files changed, 24 insertions, 24 deletions
diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp index 7f17fa7b..56f1688e 100644 --- a/src/QXmppClient.cpp +++ b/src/QXmppClient.cpp @@ -134,20 +134,20 @@ QXmppClient::QXmppClient(QObject *parent) d->stream = new QXmppOutgoingClient(this); d->addProperCapability(d->clientPresence); - bool check = connect(d->stream, SIGNAL(elementReceived(const QDomElement&, bool&)), - this, SLOT(_q_elementReceived(const QDomElement&, bool&))); + bool check = connect(d->stream, SIGNAL(elementReceived(QDomElement,bool)), + this, SLOT(_q_elementReceived(QDomElement,bool))); Q_ASSERT(check); - check = connect(d->stream, SIGNAL(messageReceived(const QXmppMessage&)), - this, SIGNAL(messageReceived(const QXmppMessage&))); + check = connect(d->stream, SIGNAL(messageReceived(QXmppMessage)), + this, SIGNAL(messageReceived(QXmppMessage))); Q_ASSERT(check); - check = connect(d->stream, SIGNAL(presenceReceived(const QXmppPresence&)), - this, SIGNAL(presenceReceived(const QXmppPresence&))); + check = connect(d->stream, SIGNAL(presenceReceived(QXmppPresence)), + this, SIGNAL(presenceReceived(QXmppPresence))); Q_ASSERT(check); - check = connect(d->stream, SIGNAL(iqReceived(const QXmppIq&)), - this, SIGNAL(iqReceived(const QXmppIq&))); + check = connect(d->stream, SIGNAL(iqReceived(QXmppIq)), + this, SIGNAL(iqReceived(QXmppIq))); Q_ASSERT(check); check = connect(d->stream->socket(), SIGNAL(stateChanged(QAbstractSocket::SocketState)), @@ -567,14 +567,14 @@ void QXmppClient::setLogger(QXmppLogger *logger) { if (logger != d->logger) { if (d->logger) { - disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)), - d->logger, SLOT(log(QXmppLogger::MessageType, QString))); + disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)), + d->logger, SLOT(log(QXmppLogger::MessageType,QString))); } d->logger = logger; if (d->logger) { - connect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)), - d->logger, SLOT(log(QXmppLogger::MessageType, QString))); + connect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)), + d->logger, SLOT(log(QXmppLogger::MessageType,QString))); } emit loggerChanged(d->logger); diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp index fd533565..ee4483b1 100644 --- a/src/QXmppOutgoingClient.cpp +++ b/src/QXmppOutgoingClient.cpp @@ -100,8 +100,8 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent) setSocket(socket); // initialise logger - bool check = connect(socket, SIGNAL(sslErrors(const QList<QSslError>&)), - this, SLOT(socketSslErrors(const QList<QSslError>&))); + bool check = connect(socket, SIGNAL(sslErrors(QList<QSslError>)), + this, SLOT(socketSslErrors(QList<QSslError>))); Q_ASSERT(check); check = connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), diff --git a/src/QXmppRosterManager.cpp b/src/QXmppRosterManager.cpp index 0dfda018..5322bd33 100644 --- a/src/QXmppRosterManager.cpp +++ b/src/QXmppRosterManager.cpp @@ -43,8 +43,8 @@ QXmppRosterManager::QXmppRosterManager(QXmppClient* client) this, SLOT(disconnected())); Q_ASSERT(check); - check = QObject::connect(client, SIGNAL(presenceReceived(const QXmppPresence&)), - this, SLOT(presenceReceived(const QXmppPresence&))); + check = QObject::connect(client, SIGNAL(presenceReceived(QXmppPresence)), + this, SLOT(presenceReceived(QXmppPresence))); Q_ASSERT(check); } diff --git a/src/QXmppServer.cpp b/src/QXmppServer.cpp index 6acac104..5fab41ea 100644 --- a/src/QXmppServer.cpp +++ b/src/QXmppServer.cpp @@ -455,8 +455,8 @@ QXmppLogger *QXmppServer::logger() void QXmppServer::setLogger(QXmppLogger *logger) { if (d->logger) - QObject::disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)), - d->logger, SLOT(log(QXmppLogger::MessageType, QString))); + QObject::disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)), + d->logger, SLOT(log(QXmppLogger::MessageType,QString))); d->logger = logger; d->logger = logger; if (d->logger) diff --git a/src/QXmppTransferManager.cpp b/src/QXmppTransferManager.cpp index baa5d4aa..b9ab0c41 100644 --- a/src/QXmppTransferManager.cpp +++ b/src/QXmppTransferManager.cpp @@ -479,8 +479,8 @@ QXmppTransferManager::QXmppTransferManager() m_socksServer = new QXmppSocksServer(this); if (m_socksServer->listen()) { - bool check = connect(m_socksServer, SIGNAL(newConnection(QTcpSocket*, const QString&, quint16)), - this, SLOT(socksServerConnected(QTcpSocket*, const QString&, quint16))); + bool check = connect(m_socksServer, SIGNAL(newConnection(QTcpSocket*,QString,quint16)), + this, SLOT(socksServerConnected(QTcpSocket*,QString,quint16))); Q_ASSERT(check); Q_UNUSED(check); } else { @@ -493,8 +493,8 @@ void QXmppTransferManager::setClient(QXmppClient *client) QXmppClientExtension::setClient(client); // XEP-0047: In-Band Bytestreams - bool check = QObject::connect(client, SIGNAL(iqReceived(const QXmppIq&)), - this, SLOT(iqReceived(const QXmppIq&))); + bool check = QObject::connect(client, SIGNAL(iqReceived(QXmppIq)), + this, SLOT(iqReceived(QXmppIq))); Q_ASSERT(check); Q_UNUSED(check); } diff --git a/src/server/mod_proxy65.cpp b/src/server/mod_proxy65.cpp index c5edbd4a..99b840f8 100644 --- a/src/server/mod_proxy65.cpp +++ b/src/server/mod_proxy65.cpp @@ -188,8 +188,8 @@ QXmppServerProxy65::QXmppServerProxy65() d->totalBytes = 0; d->totalTransfers = 0; - bool check = connect(d->server, SIGNAL(newConnection(QTcpSocket*, const QString&, quint16)), - this, SLOT(slotSocketConnected(QTcpSocket*, const QString &, quint16))); + bool check = connect(d->server, SIGNAL(newConnection(QTcpSocket*,QString,quint16)), + this, SLOT(slotSocketConnected(QTcpSocket*,QString,quint16))); Q_ASSERT(check); check = connect(d->statisticsTimer, SIGNAL(timeout()), |
