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/client/QXmppTrustManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client/QXmppTrustManager.cpp') diff --git a/src/client/QXmppTrustManager.cpp b/src/client/QXmppTrustManager.cpp index 2a5a591b..a5031a52 100644 --- a/src/client/QXmppTrustManager.cpp +++ b/src/client/QXmppTrustManager.cpp @@ -212,7 +212,7 @@ QFuture QXmppTrustManager::setTrustLevel(const QString &encryption, const auto future = m_trustStorage->setTrustLevel(encryption, keyIds, trustLevel); await(future, this, [=](QHash> modifiedKeys) mutable { - emit trustLevelsChanged(modifiedKeys); + Q_EMIT trustLevelsChanged(modifiedKeys); interface.reportFinished(); }); @@ -233,7 +233,7 @@ QFuture QXmppTrustManager::setTrustLevel(const QString &encryption, const auto future = m_trustStorage->setTrustLevel(encryption, keyOwnerJids, oldTrustLevel, newTrustLevel); await(future, this, [=](QHash> modifiedKeys) mutable { - emit trustLevelsChanged(modifiedKeys); + Q_EMIT trustLevelsChanged(modifiedKeys); interface.reportFinished(); }); -- cgit v1.2.3