incorrect-emit: Also honour Q_SLOT and Q_SIGNAL keywords

CCBUG: 373947

2 files changed, 16 insertions, 5 deletions

diff --git a/tests/incorrect-emit/main.cpp b/tests/incorrect-emit/main.cpp
index 599b6089..0d1fdb12 100644
--- a/tests/incorrect-emit/main.cpp
+++ b/tests/incorrect-emit/main.cpp
@@ -30,6 +30,8 @@ private Q_SLOTS:
 
 protected:
     void prot();
+    Q_SIGNAL void singularSig();
+    Q_SLOT void singularSlot();
 };
 
 void MyObject::pub()
@@ -56,4 +58,11 @@ MyObject::MyObject()
     emit another->sig(); // OK;
     emit memberFunc()->sig(); // OK;
     [this]{ emit sig(); }; // OK
+    emit singularSig(); // Warning
+    singularSlot(); // OK
+}
+
+void MyObject::singularSlot()
+{
+    singularSig(); // Warning
 }
diff --git a/tests/incorrect-emit/main.cpp.expected b/tests/incorrect-emit/main.cpp.expected
index 7d6dbdc1..3db4cd2e 100644
--- a/tests/incorrect-emit/main.cpp.expected
+++ b/tests/incorrect-emit/main.cpp.expected
@@ -1,6 +1,8 @@
-incorrect-emit/main.cpp:37:11: warning: Emit keyword being used with non-signal MyObject::prot [-Wclazy-incorrect-emit]
-incorrect-emit/main.cpp:38:5: warning: Missing emit keyword on signal call MyObject::sig [-Wclazy-incorrect-emit]
-incorrect-emit/main.cpp:43:12: warning: Emit keyword being used with non-signal MyObject::privSlot [-Wclazy-incorrect-emit]
-incorrect-emit/main.cpp:45:5: warning: Missing emit keyword on signal call MyObject::sig [-Wclazy-incorrect-emit]
+incorrect-emit/main.cpp:39:11: warning: Emit keyword being used with non-signal MyObject::prot [-Wclazy-incorrect-emit]
+incorrect-emit/main.cpp:40:5: warning: Missing emit keyword on signal call MyObject::sig [-Wclazy-incorrect-emit]
+incorrect-emit/main.cpp:45:12: warning: Emit keyword being used with non-signal MyObject::privSlot [-Wclazy-incorrect-emit]
 incorrect-emit/main.cpp:47:5: warning: Missing emit keyword on signal call MyObject::sig [-Wclazy-incorrect-emit]
-incorrect-emit/main.cpp:55:10: warning: Emitting inside constructor has no effect [-Wclazy-incorrect-emit]
+incorrect-emit/main.cpp:49:5: warning: Missing emit keyword on signal call MyObject::sig [-Wclazy-incorrect-emit]
+incorrect-emit/main.cpp:57:10: warning: Emitting inside constructor has no effect [-Wclazy-incorrect-emit]
+incorrect-emit/main.cpp:61:10: warning: Emitting inside constructor has no effect [-Wclazy-incorrect-emit]
+incorrect-emit/main.cpp:67:5: warning: Missing emit keyword on signal call MyObject::singularSig [-Wclazy-incorrect-emit]