diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-09-07 08:00:32 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-09-07 08:00:32 +0000 |
| commit | d48769f744833e6dc3e0c3a25ab69a95087215f5 (patch) | |
| tree | 4853abdd32309cd86b6532855d2b4730ac6ca037 /src | |
| parent | c61694402a270e0c3c08cc9a90bf65b9bcfa7b00 (diff) | |
| download | qxmpp-d48769f744833e6dc3e0c3a25ab69a95087215f5.tar.gz | |
fix some compiler warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/QXmppCallManager.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppClient.cpp | 7 | ||||
| -rw-r--r-- | src/QXmppMucManager.cpp | 9 | ||||
| -rw-r--r-- | src/QXmppOutgoingClient.cpp | 7 | ||||
| -rw-r--r-- | src/QXmppOutgoingServer.cpp | 1 | ||||
| -rw-r--r-- | src/QXmppRosterManager.cpp | 15 | ||||
| -rw-r--r-- | src/QXmppServer.cpp | 23 | ||||
| -rw-r--r-- | src/QXmppSrvInfo.cpp | 6 | ||||
| -rw-r--r-- | src/QXmppStream.cpp | 5 | ||||
| -rw-r--r-- | src/QXmppStun.cpp | 13 |
10 files changed, 62 insertions, 28 deletions
diff --git a/src/QXmppCallManager.cpp b/src/QXmppCallManager.cpp index 2473fde4..363881af 100644 --- a/src/QXmppCallManager.cpp +++ b/src/QXmppCallManager.cpp @@ -298,6 +298,8 @@ void QXmppCallPrivate::handleRequest(const QXmppJingleIq &iq) QXmppCallPrivate::Stream *QXmppCallPrivate::createStream(const QString &media) { + bool check; + Q_UNUSED(check); Q_ASSERT(manager); Stream *stream = new Stream; @@ -331,7 +333,7 @@ QXmppCallPrivate::Stream *QXmppCallPrivate::createStream(const QString &media) stream->connection->bind(QXmppIceComponent::discoverAddresses()); // connect signals - bool check = QObject::connect(stream->connection, SIGNAL(localCandidatesChanged()), + check = QObject::connect(stream->connection, SIGNAL(localCandidatesChanged()), q, SLOT(localCandidatesChanged())); Q_ASSERT(check); diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp index c991a7a5..0bea7d6b 100644 --- a/src/QXmppClient.cpp +++ b/src/QXmppClient.cpp @@ -131,11 +131,14 @@ QXmppClient::QXmppClient(QObject *parent) : QXmppLoggable(parent), d(new QXmppClientPrivate(this)) { + bool check; + Q_UNUSED(check); + d->stream = new QXmppOutgoingClient(this); d->addProperCapability(d->clientPresence); - bool check = connect(d->stream, SIGNAL(elementReceived(QDomElement,bool&)), - this, SLOT(_q_elementReceived(QDomElement,bool&))); + check = connect(d->stream, SIGNAL(elementReceived(QDomElement,bool&)), + this, SLOT(_q_elementReceived(QDomElement,bool&))); Q_ASSERT(check); check = connect(d->stream, SIGNAL(messageReceived(QXmppMessage)), diff --git a/src/QXmppMucManager.cpp b/src/QXmppMucManager.cpp index b753250c..041e3f85 100644 --- a/src/QXmppMucManager.cpp +++ b/src/QXmppMucManager.cpp @@ -84,12 +84,14 @@ QXmppMucRoom *QXmppMucManager::addRoom(const QString &roomJid) void QXmppMucManager::setClient(QXmppClient* client) { + bool check; + Q_UNUSED(check); + QXmppClientExtension::setClient(client); - bool check = connect(client, SIGNAL(messageReceived(QXmppMessage)), - this, SLOT(_q_messageReceived(QXmppMessage))); + check = connect(client, SIGNAL(messageReceived(QXmppMessage)), + this, SLOT(_q_messageReceived(QXmppMessage))); Q_ASSERT(check); - Q_UNUSED(check); } QStringList QXmppMucManager::discoveryFeatures() const @@ -170,6 +172,7 @@ QXmppMucRoom::QXmppMucRoom(QXmppClient *client, const QString &jid, QObject *par : QObject(parent) { bool check; + Q_UNUSED(check); d = new QXmppMucRoomPrivate; d->allowedActions = NoAction; diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp index bfda1517..96c20292 100644 --- a/src/QXmppOutgoingClient.cpp +++ b/src/QXmppOutgoingClient.cpp @@ -96,12 +96,15 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent) : QXmppStream(parent), d(new QXmppOutgoingClientPrivate) { + bool check; + Q_UNUSED(check); + QSslSocket *socket = new QSslSocket(this); setSocket(socket); // initialise logger - bool check = connect(socket, SIGNAL(sslErrors(QList<QSslError>)), - this, SLOT(socketSslErrors(QList<QSslError>))); + 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/QXmppOutgoingServer.cpp b/src/QXmppOutgoingServer.cpp index 3dc0ce74..adcbd079 100644 --- a/src/QXmppOutgoingServer.cpp +++ b/src/QXmppOutgoingServer.cpp @@ -56,6 +56,7 @@ QXmppOutgoingServer::QXmppOutgoingServer(const QString &domain, QObject *parent) d(new QXmppOutgoingServerPrivate) { bool check; + Q_UNUSED(check); QSslSocket *socket = new QSslSocket(this); setSocket(socket); diff --git a/src/QXmppRosterManager.cpp b/src/QXmppRosterManager.cpp index 5322bd33..d57e2ddf 100644 --- a/src/QXmppRosterManager.cpp +++ b/src/QXmppRosterManager.cpp @@ -35,16 +35,19 @@ QXmppRosterManager::QXmppRosterManager(QXmppClient* client) : m_isRosterReceived(false) { - bool check = QObject::connect(client, SIGNAL(connected()), - this, SLOT(connected())); + bool check; + Q_UNUSED(check); + + check = connect(client, SIGNAL(connected()), + this, SLOT(connected())); Q_ASSERT(check); - check = QObject::connect(client, SIGNAL(disconnected()), - this, SLOT(disconnected())); + check = connect(client, SIGNAL(disconnected()), + this, SLOT(disconnected())); Q_ASSERT(check); - check = QObject::connect(client, SIGNAL(presenceReceived(QXmppPresence)), - this, SLOT(presenceReceived(QXmppPresence))); + check = connect(client, SIGNAL(presenceReceived(QXmppPresence)), + this, SLOT(presenceReceived(QXmppPresence))); Q_ASSERT(check); } diff --git a/src/QXmppServer.cpp b/src/QXmppServer.cpp index 507486a3..2be22877 100644 --- a/src/QXmppServer.cpp +++ b/src/QXmppServer.cpp @@ -377,10 +377,13 @@ void QXmppServerPrivate::stopExtensions() QXmppServer::QXmppServer(QObject *parent) : QXmppLoggable(parent) { + bool check; + Q_UNUSED(check); + d = new QXmppServerPrivate(this); d->serverForClients = new QXmppSslServer(this); - bool check = connect(d->serverForClients, SIGNAL(newConnection(QSslSocket*)), - this, SLOT(_q_clientConnection(QSslSocket*))); + check = connect(d->serverForClients, SIGNAL(newConnection(QSslSocket*)), + this, SLOT(_q_clientConnection(QSslSocket*))); Q_ASSERT(check); d->serverForServers = new QXmppSslServer(this); @@ -645,10 +648,13 @@ bool QXmppServer::sendPacket(const QXmppStanza &packet) void QXmppServer::addIncomingClient(QXmppIncomingClient *stream) { + bool check; + Q_UNUSED(check); + stream->setPasswordChecker(d->passwordChecker); - bool check = connect(stream, SIGNAL(connected()), - this, SLOT(_q_streamConnected())); + check = connect(stream, SIGNAL(connected()), + this, SLOT(_q_streamConnected())); Q_ASSERT(check); check = connect(stream, SIGNAL(disconnected()), @@ -725,6 +731,9 @@ void QXmppServer::_q_elementReceived(const QDomElement &element) void QXmppServer::_q_serverConnection(QSslSocket *socket) { + bool check; + Q_UNUSED(check); + // check the socket didn't die since the signal was emitted if (socket->state() != QAbstractSocket::ConnectedState) { delete socket; @@ -734,12 +743,12 @@ void QXmppServer::_q_serverConnection(QSslSocket *socket) QXmppIncomingServer *stream = new QXmppIncomingServer(socket, d->domain, this); socket->setParent(stream); - bool check = connect(stream, SIGNAL(connected()), - this, SLOT(_q_streamConnected())); + check = connect(stream, SIGNAL(connected()), + this, SLOT(_q_streamConnected())); Q_ASSERT(check); check = connect(stream, SIGNAL(disconnected()), - this, SLOT(_q_streamDisconnected())); + this, SLOT(_q_streamDisconnected())); Q_ASSERT(check); check = connect(stream, SIGNAL(dialbackRequestReceived(QXmppDialback)), diff --git a/src/QXmppSrvInfo.cpp b/src/QXmppSrvInfo.cpp index 4495ebbc..25ec2ad7 100644 --- a/src/QXmppSrvInfo.cpp +++ b/src/QXmppSrvInfo.cpp @@ -489,7 +489,7 @@ QXmppSrvInfo QXmppSrvInfo::fromName(const QString &dname) answerIndex = 0; while ((p < response + responseLength) && (answerIndex < answerCount)) { - int type, klass, ttl, size; + int type, size; status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); if (status < 0) { @@ -501,9 +501,9 @@ QXmppSrvInfo QXmppSrvInfo::fromName(const QString &dname) p += status; type = (p[0] << 8) | p[1]; p += 2; - klass = (p[0] << 8) | p[1]; + //klass = (p[0] << 8) | p[1]; p += 2; - ttl = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; + //ttl = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; p += 4; size = (p[0] << 8) | p[1]; p += 2; diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp index f87efcd0..009c35fc 100644 --- a/src/QXmppStream.cpp +++ b/src/QXmppStream.cpp @@ -170,12 +170,15 @@ QSslSocket *QXmppStream::socket() const void QXmppStream::setSocket(QSslSocket *socket) { + bool check; + Q_UNUSED(check); + d->socket = socket; if (!d->socket) return; // socket events - bool check = connect(socket, SIGNAL(connected()), + check = connect(socket, SIGNAL(connected()), this, SLOT(_q_socketConnected())); Q_ASSERT(check); diff --git a/src/QXmppStun.cpp b/src/QXmppStun.cpp index 45d55220..f189f223 100644 --- a/src/QXmppStun.cpp +++ b/src/QXmppStun.cpp @@ -1075,6 +1075,7 @@ QXmppStunTransaction::QXmppStunTransaction(const QXmppStunMessage &request, QObj m_tries(0) { bool check; + Q_UNUSED(check); check = connect(this, SIGNAL(writeStun(QXmppStunMessage)), receiver, SLOT(writeStun(QXmppStunMessage))); @@ -1147,6 +1148,7 @@ QXmppTurnAllocation::QXmppTurnAllocation(QObject *parent) m_state(UnconnectedState) { bool check; + Q_UNUSED(check); socket = new QUdpSocket(this); check = connect(socket, SIGNAL(readyRead()), @@ -1578,6 +1580,8 @@ QXmppIceComponent::QXmppIceComponent(QObject *parent) m_turnConfigured(false) { bool check; + Q_UNUSED(check); + m_localUser = generateStanzaHash(4); m_localPassword = generateStanzaHash(22); @@ -2330,6 +2334,9 @@ QXmppIceComponent *QXmppIceConnection::component(int component) void QXmppIceConnection::addComponent(int component) { + bool check; + Q_UNUSED(check); + if (m_components.contains(component)) { warning(QString("Already have component %1").arg(QString::number(component))); @@ -2346,12 +2353,12 @@ void QXmppIceConnection::addComponent(int component) socket->setTurnUser(m_turnUser); socket->setTurnPassword(m_turnPassword); - bool check = connect(socket, SIGNAL(localCandidatesChanged()), - this, SIGNAL(localCandidatesChanged())); + check = connect(socket, SIGNAL(localCandidatesChanged()), + this, SIGNAL(localCandidatesChanged())); Q_ASSERT(check); check = connect(socket, SIGNAL(connected()), - this, SLOT(slotConnected())); + this, SLOT(slotConnected())); Q_ASSERT(check); m_components[component] = socket; |
