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. --- tests/qxmpputils/tst_qxmpputils.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tests/qxmpputils/tst_qxmpputils.cpp') diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp index 032e9957..47cf65c1 100644 --- a/tests/qxmpputils/tst_qxmpputils.cpp +++ b/tests/qxmpputils/tst_qxmpputils.cpp @@ -20,15 +20,13 @@ class tst_QXmppUtils : public QObject { Q_OBJECT -private slots: - void testCrc32(); - void testHmac(); - void testJid(); - void testMime(); - void testTimezoneOffset(); - void testStanzaHash(); - private: + Q_SLOT void testCrc32(); + Q_SLOT void testHmac(); + Q_SLOT void testJid(); + Q_SLOT void testMime(); + Q_SLOT void testTimezoneOffset(); + Q_SLOT void testStanzaHash(); Q_SLOT void testCalculateHashes_data(); Q_SLOT void testCalculateHashes(); }; -- cgit v1.2.3