Disable Qt keywords completely

Previously we had the policy that no qt keywords were allowed in headers
that may be included by users. However since there was no automatic test
verifying that in some places keywords were still used.

This now disables qt keywords completely, also in tests and examples. Qt
keywords are in general no good or really good idea as they even
conflict with the standard library (`emit` at least).

In some cases in the examples I just removed the slot tag if the
functions didn't need to be slots (anymore).

Closes #503.

5 files changed, 28 insertions, 28 deletions

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