From 46995fd3fd7da4d1b035f71a1279c041b2871ffd Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Mon, 26 Dec 2022 21:35:16 +0100 Subject: 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. --- src/base/QXmppLogger.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/base/QXmppLogger.h') 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: -- cgit v1.2.3