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/qxmpprpciq/tst_qxmpprpciq.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'tests/qxmpprpciq/tst_qxmpprpciq.cpp') diff --git a/tests/qxmpprpciq/tst_qxmpprpciq.cpp b/tests/qxmpprpciq/tst_qxmpprpciq.cpp index be651243..9c2bc5c0 100644 --- a/tests/qxmpprpciq/tst_qxmpprpciq.cpp +++ b/tests/qxmpprpciq/tst_qxmpprpciq.cpp @@ -35,21 +35,21 @@ class tst_QXmppRpcIq : public QObject { Q_OBJECT -private slots: - void testBase64(); - void testBool(); - void testDateTime(); - void testDouble(); - void testInt(); - void testNil(); - void testString(); - - void testArray(); - void testStruct(); - - void testInvoke(); - void testResponse(); - void testResponseFault(); +private: + Q_SLOT void testBase64(); + Q_SLOT void testBool(); + Q_SLOT void testDateTime(); + Q_SLOT void testDouble(); + Q_SLOT void testInt(); + Q_SLOT void testNil(); + Q_SLOT void testString(); + + Q_SLOT void testArray(); + Q_SLOT void testStruct(); + + Q_SLOT void testInvoke(); + Q_SLOT void testResponse(); + Q_SLOT void testResponseFault(); }; void tst_QXmppRpcIq::testBase64() { -- cgit v1.2.3