Tests: Port away from string based signal-slot connections

Change the occurrences that do not appear to test string-based
connections.

Change-Id: I4bc8916ea1326f6258f0ad643408cd2c42690e1e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

16 files changed, 38 insertions, 38 deletions

diff --git a/sources/pyside6/tests/QtCore/qobject_protected_methods_test.py b/sources/pyside6/tests/QtCore/qobject_protected_methods_test.py
index e9f935482..9b89abf9c 100644
--- a/sources/pyside6/tests/QtCore/qobject_protected_methods_test.py
+++ b/sources/pyside6/tests/QtCore/qobject_protected_methods_test.py
@@ -60,7 +60,7 @@ class QObjectReceivers(unittest.TestCase):
         obj = Dummy()
         self.assertEqual(obj.receivers(SIGNAL("destroyed()")), 0)
 
-        QObject.connect(obj, SIGNAL("destroyed()"), self.cb)
+        obj.destroyed.connect(self.cb)
         self.assertEqual(obj.receivers(SIGNAL("destroyed()")), 1)
 
     def testQThreadReceiversExtern(self):
@@ -68,7 +68,7 @@ class QObjectReceivers(unittest.TestCase):
 
         obj = QThread()
         self.assertEqual(obj.receivers(SIGNAL('destroyed()')), 0)
-        QObject.connect(obj, SIGNAL("destroyed()"), self.cb)
+        obj.destroyed.connect(self.cb)
         self.assertEqual(obj.receivers(SIGNAL("destroyed()")), 1)
 
 
diff --git a/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py b/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py
index 3d22f2f8c..27178361d 100644
--- a/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py
+++ b/sources/pyside6/tests/QtCore/qthread_prod_cons_test.py
@@ -130,8 +130,8 @@ class ProducerConsumer(unittest.TestCase):
         prod.start()
         cons.start()
 
-        QObject.connect(prod, SIGNAL('finished()'), self.finishCb)
-        QObject.connect(cons, SIGNAL('finished()'), self.finishCb)
+        prod.finished.connect(self.finishCb)
+        cons.finished.connect(self.finishCb)
 
         self.app.exec()
 
diff --git a/sources/pyside6/tests/QtCore/qthread_test.py b/sources/pyside6/tests/QtCore/qthread_test.py
index a08b0d777..13c92b6f7 100644
--- a/sources/pyside6/tests/QtCore/qthread_test.py
+++ b/sources/pyside6/tests/QtCore/qthread_test.py
@@ -90,7 +90,7 @@ class QThreadSimpleCase(UsesQCoreApplication):
     def testSignalFinished(self):
         # QThread.finished() (signal)
         obj = Dummy()
-        QObject.connect(obj, SIGNAL('finished()'), self.cb)
+        obj.finished.connect(self.cb)
         mutex.lock()
         obj.start()
         mutex.unlock()
@@ -104,7 +104,7 @@ class QThreadSimpleCase(UsesQCoreApplication):
     def testSignalStarted(self):
         # QThread.started() (signal)
         obj = Dummy()
-        QObject.connect(obj, SIGNAL('started()'), self.cb)
+        obj.started.connect(self.cb)
         obj.start()
 
         self._thread = obj
diff --git a/sources/pyside6/tests/QtCore/qtimer_timeout_test.py b/sources/pyside6/tests/QtCore/qtimer_timeout_test.py
index 38f4bb20e..ed2780c7a 100644
--- a/sources/pyside6/tests/QtCore/qtimer_timeout_test.py
+++ b/sources/pyside6/tests/QtCore/qtimer_timeout_test.py
@@ -79,7 +79,7 @@ class TestTimeoutSignal(UsesQCoreApplication):
     def testTimeoutSignal(self):
         # Test the QTimer timeout() signal
         refCount = sys.getrefcount(self.timer)
-        QObject.connect(self.timer, SIGNAL('timeout()'), self.callback)
+        self.timer.timeout.connect(self.callback)
         self.timer.start(4)
         self.watchdog.startTimer(10)
 
diff --git a/sources/pyside6/tests/QtNetwork/udpsocket_test.py b/sources/pyside6/tests/QtNetwork/udpsocket_test.py
index 8b806170e..630577ab6 100644
--- a/sources/pyside6/tests/QtNetwork/udpsocket_test.py
+++ b/sources/pyside6/tests/QtNetwork/udpsocket_test.py
@@ -76,7 +76,7 @@ class HttpSignalsCase(unittest.TestCase):
     def testDefaultArgs(self):
         # QUdpSocket.readDatagram pythonic return
         # @bug 124
-        QObject.connect(self.server, SIGNAL('readyRead()'), self.callback)
+        self.server.readyRead.connect(self.callback)
         self.sendPackage()
         self.app.exec()
 
diff --git a/sources/pyside6/tests/QtStateMachine/qstatemachine_test.py b/sources/pyside6/tests/QtStateMachine/qstatemachine_test.py
index 71cfb558f..537972779 100644
--- a/sources/pyside6/tests/QtStateMachine/qstatemachine_test.py
+++ b/sources/pyside6/tests/QtStateMachine/qstatemachine_test.py
@@ -55,7 +55,7 @@ class QStateMachineTest(UsesQCoreApplication):
         s2 = QState()
         s3 = QFinalState()
 
-        QObject.connect(self.machine, SIGNAL("started()"), self.cb)
+        self.machine.started.connect(self.cb)
 
         self.anim = QParallelAnimationGroup()
 
diff --git a/sources/pyside6/tests/pysidetest/signalemissionfrompython_test.py b/sources/pyside6/tests/pysidetest/signalemissionfrompython_test.py
index 8a3f64032..99c1a3e91 100644
--- a/sources/pyside6/tests/pysidetest/signalemissionfrompython_test.py
+++ b/sources/pyside6/tests/pysidetest/signalemissionfrompython_test.py
@@ -78,8 +78,8 @@ class SignalEmissionFromPython(unittest.TestCase):
 
         def callbackTwo():
             self.two_called += 1
-        QObject.connect(self.obj1, SIGNAL('signalWithDefaultValue()'), callbackOne)
-        QObject.connect(self.obj2, SIGNAL('signalWithDefaultValue()'), callbackTwo)
+        self.obj1.signalWithDefaultValue.connect(callbackOne)
+        self.obj2.signalWithDefaultValue.connect(callbackTwo)
         self.obj1.emitSignalWithDefaultValue_void()
         self.obj2.emitSignalWithDefaultValue_void()
         self.assertEqual(self.one_called, 1)
@@ -106,8 +106,8 @@ class SignalEmissionFromPython(unittest.TestCase):
 
         def callbackTwo():
             self.two_called += 1
-        QObject.connect(self.obj1, SIGNAL('signalWithDefaultValue()'), callbackOne)
-        QObject.connect(self.obj2, SIGNAL('signalWithDefaultValue()'), callbackTwo)
+        self.obj1.signalWithDefaultValue.connect(callbackOne)
+        self.obj2.signalWithDefaultValue.connect(callbackTwo)
         self.obj1.emitSignalWithDefaultValue_void()
         self.obj2.emitSignalWithDefaultValue_void()
         self.assertEqual(self.one_called, 1)
diff --git a/sources/pyside6/tests/pysidetest/signalwithdefaultvalue_test.py b/sources/pyside6/tests/pysidetest/signalwithdefaultvalue_test.py
index c44cca396..458a87528 100644
--- a/sources/pyside6/tests/pysidetest/signalwithdefaultvalue_test.py
+++ b/sources/pyside6/tests/pysidetest/signalwithdefaultvalue_test.py
@@ -85,8 +85,8 @@ class SignalWithDefaultValueTest(unittest.TestCase):
 
         def callbackBool(value):
             self.bool_called = True
-        QObject.connect(self.obj, SIGNAL('signalWithDefaultValue()'), callbackVoid)
-        QObject.connect(self.obj, SIGNAL('signalWithDefaultValue(bool)'), callbackBool)
+        self.obj.signalWithDefaultValue.connect(callbackVoid)
+        self.obj.signalWithDefaultValue.connect(callbackBool)
         self.obj.emitSignalWithDefaultValue_void()
         self.assertTrue(self.void_called)
         self.assertTrue(self.bool_called)
@@ -97,8 +97,8 @@ class SignalWithDefaultValueTest(unittest.TestCase):
 
         def callbackBool(value):
             self.bool_called = True
-        QObject.connect(self.obj, SIGNAL('signalWithDefaultValue()'), callbackVoid)
-        QObject.connect(self.obj, SIGNAL('signalWithDefaultValue(bool)'), callbackBool)
+        self.obj.signalWithDefaultValue.connect(callbackVoid)
+        self.obj.signalWithDefaultValue.connect(callbackBool)
         self.obj.emitSignalWithDefaultValue_bool()
         self.assertTrue(self.void_called)
         self.assertTrue(self.bool_called)
diff --git a/sources/pyside6/tests/signals/lambda_gui_test.py b/sources/pyside6/tests/signals/lambda_gui_test.py
index e7b88ab5f..70cbb4d66 100644
--- a/sources/pyside6/tests/signals/lambda_gui_test.py
+++ b/sources/pyside6/tests/signals/lambda_gui_test.py
@@ -59,7 +59,7 @@ if hasQtGui:
             obj = QPushButton('label')
             ctr = Control()
             func = lambda: setattr(ctr, 'arg', True)
-            QObject.connect(obj, SIGNAL('clicked()'), func)
+            obj.clicked.connect(func)
             obj.click()
             self.assertTrue(ctr.arg)
             QObject.disconnect(obj, SIGNAL('clicked()'), func)
@@ -70,7 +70,7 @@ if hasQtGui:
             ctr = Control()
             arg = 444
             func = lambda x: setattr(ctr, 'arg', 444)
-            QObject.connect(obj, SIGNAL('valueChanged(int)'), func)
+            obj.valueChanged.connect(func)
             obj.setValue(444)
             self.assertEqual(ctr.arg, arg)
             QObject.disconnect(obj, SIGNAL('valueChanged(int)'), func)
diff --git a/sources/pyside6/tests/signals/qobject_destroyed_test.py b/sources/pyside6/tests/signals/qobject_destroyed_test.py
index 6129b5c65..f722e4c2a 100644
--- a/sources/pyside6/tests/signals/qobject_destroyed_test.py
+++ b/sources/pyside6/tests/signals/qobject_destroyed_test.py
@@ -50,7 +50,7 @@ class QObjectDestroyed(unittest.TestCase):
     def testDestroyed(self):
         """Emission of QObject.destroyed() to a python slot"""
         obj = QObject()
-        QObject.connect(obj, SIGNAL('destroyed()'), self.destroyed_cb)
+        obj.destroyed.connect(self.destroyed_cb)
         del obj
         self.assertTrue(self.called)
 
diff --git a/sources/pyside6/tests/signals/qobject_receivers_test.py b/sources/pyside6/tests/signals/qobject_receivers_test.py
index 4e2388e29..e444413e3 100644
--- a/sources/pyside6/tests/signals/qobject_receivers_test.py
+++ b/sources/pyside6/tests/signals/qobject_receivers_test.py
@@ -54,9 +54,9 @@ class TestQObjectReceivers(unittest.TestCase):
         receiver1 = QObject()
         receiver2 = QObject()
         self.assertEqual(sender.receivers(SIGNAL("")), 0)
-        sender.connect(sender, SIGNAL("destroyed()"), receiver1, SLOT("deleteLater()"))
+        sender.destroyed.connect(receiver1.deleteLater)
         self.assertEqual(sender.receivers(SIGNAL("destroyed()")), 1)
-        sender.connect(sender, SIGNAL("destroyed()"), receiver2, SLOT("deleteLater()"))
+        sender.destroyed.connect(receiver2.deleteLater)
         self.assertEqual(sender.receivers(SIGNAL("destroyed()")), 2)
         sender.disconnect(sender, SIGNAL("destroyed()"), receiver2, SLOT("deleteLater()"))
         self.assertEqual(sender.receivers(SIGNAL("destroyed()")), 1)
@@ -67,9 +67,9 @@ class TestQObjectReceivers(unittest.TestCase):
     def testPySlots(self):
         sender = QObject()
         receiver = QObject()
-        sender.connect(sender, SIGNAL("destroyed()"), cute_slot)
+        sender.destroyed.connect(cute_slot)
         self.assertEqual(sender.receivers(SIGNAL("destroyed( )")), 1)
-        sender.connect(sender, SIGNAL("destroyed()"), receiver, SLOT("deleteLater()"))
+        sender.destroyed.connect(receiver.deleteLater)
         self.assertEqual(sender.receivers(SIGNAL("destroyed()")), 2)
         del sender
         del receiver
diff --git a/sources/pyside6/tests/signals/qobject_sender_test.py b/sources/pyside6/tests/signals/qobject_sender_test.py
index 3a817f727..60eedabc5 100644
--- a/sources/pyside6/tests/signals/qobject_sender_test.py
+++ b/sources/pyside6/tests/signals/qobject_sender_test.py
@@ -89,7 +89,7 @@ class ObjectSenderWithQAppTest(UsesQCoreApplication):
         sender = QTimer()
         sender.setObjectName('foo')
         recv = Receiver()
-        QObject.connect(sender, SIGNAL('timeout()'), recv.callback)
+        sender.timeout.connect(recv.callback)
         sender.start(10)
         self.app.exec()
         self.assertEqual(sender, recv.the_sender)
@@ -103,7 +103,7 @@ class ObjectSenderWithQAppTest(UsesQCoreApplication):
     def testSenderCppSignalWithPythonExtendedClass(self):
         sender = ExtQTimer()
         recv = Receiver()
-        QObject.connect(sender, SIGNAL('timeout()'), recv.callback)
+        sender.timeout.connect(recv.callback)
         sender.start(10)
         self.app.exec()
         self.assertEqual(sender, recv.the_sender)
@@ -116,7 +116,7 @@ class ObjectSenderWithQAppCheckOnReceiverTest(UsesQCoreApplication):
         sender = QTimer()
         sender.setObjectName('foo')
         recv = Receiver()
-        QObject.connect(sender, SIGNAL('timeout()'), recv.callback)
+        sender.timeout.connect(recv.callback)
         sender.start(10)
         self.app.exec()
         self.assertEqual(sender, recv.the_sender)
@@ -124,7 +124,7 @@ class ObjectSenderWithQAppCheckOnReceiverTest(UsesQCoreApplication):
     def testSenderCppSignalWithPythonExtendedClass(self):
         sender = ExtQTimer()
         recv = Receiver()
-        QObject.connect(sender, SIGNAL('timeout()'), recv.callback)
+        sender.timeout.connect(recv.callback)
         sender.start(10)
         self.app.exec()
         self.assertEqual(sender, recv.the_sender)
diff --git a/sources/pyside6/tests/signals/signal_emission_gui_test.py b/sources/pyside6/tests/signals/signal_emission_gui_test.py
index c13a74e94..cf9ddb543 100644
--- a/sources/pyside6/tests/signals/signal_emission_gui_test.py
+++ b/sources/pyside6/tests/signals/signal_emission_gui_test.py
@@ -57,7 +57,7 @@ if hasQtGui:
         def testButtonClicked(self):
             """Connection of a python slot to QPushButton.clicked()"""
             button = QPushButton('Mylabel')
-            QObject.connect(button, SIGNAL('clicked()'), self.cb)
+            button.clicked.connect(self.cb)
             self.args = tuple()
             button.emit(SIGNAL('clicked(bool)'), False)
             self.assertTrue(self.called)
@@ -65,7 +65,7 @@ if hasQtGui:
         def testButtonClick(self):
             """Indirect qt signal emission using the QPushButton.click() method """
             button = QPushButton('label')
-            QObject.connect(button, SIGNAL('clicked()'), self.cb)
+            button.clicked.connect(self.cb)
             self.args = tuple()
             button.click()
             self.assertTrue(self.called)
@@ -85,14 +85,14 @@ if hasQtGui:
 
         def testSpinBoxValueChanged(self):
             """Connection of a python slot to QSpinBox.valueChanged(int)"""
-            QObject.connect(self.spin, SIGNAL('valueChanged(int)'), self.cb)
+            self.spin.valueChanged.connect(self.cb)
             self.args = [3]
             self.spin.emit(SIGNAL('valueChanged(int)'), *self.args)
             self.assertTrue(self.called)
 
         def testSpinBoxValueChangedImplicit(self):
             """Indirect qt signal emission using QSpinBox.setValue(int)"""
-            QObject.connect(self.spin, SIGNAL('valueChanged(int)'), self.cb)
+            self.spin.valueChanged.connect(self.cb)
             self.args = [42]
             self.spin.setValue(self.args[0])
             self.assertTrue(self.called)
@@ -100,7 +100,7 @@ if hasQtGui:
         def atestSpinBoxValueChangedFewArgs(self):
             """Emission of signals with fewer arguments than needed"""
             # XXX: PyQt4 crashes on the assertRaises
-            QObject.connect(self.spin, SIGNAL('valueChanged(int)'), self.cb)
+            self.spin.valueChanged.connect(self.cb)
             self.args = (554,)
             self.assertRaises(TypeError, self.spin.emit, SIGNAL('valueChanged(int)'))
 
@@ -117,7 +117,7 @@ if hasQtGui:
 
             spinRec.setValue(5)
 
-            QObject.connect(spinSend, SIGNAL('valueChanged(int)'), spinRec, SLOT('setValue(int)'))
+            spinSend.valueChanged.connect(spinRec.setValue)
             self.assertEqual(spinRec.value(), 5)
             spinSend.setValue(3)
             self.assertEqual(spinRec.value(), 3)
@@ -131,7 +131,7 @@ if hasQtGui:
             spinRec.setValue(5)
             spinSend.setValue(42)
 
-            QObject.connect(spinSend, SIGNAL('valueChanged(int)'), spinRec, SLOT('setValue(int)'))
+            spinSend.valueChanged.connect(spinRec.setValue)
             self.assertEqual(spinRec.value(), 5)
             self.assertEqual(spinSend.value(), 42)
             spinSend.emit(SIGNAL('valueChanged(int)'), 3)
diff --git a/sources/pyside6/tests/signals/signal_manager_refcount_test.py b/sources/pyside6/tests/signals/signal_manager_refcount_test.py
index e304d01e3..c3170f7a2 100644
--- a/sources/pyside6/tests/signals/signal_manager_refcount_test.py
+++ b/sources/pyside6/tests/signals/signal_manager_refcount_test.py
@@ -51,7 +51,7 @@ class SignalManagerRefCount(unittest.TestCase):
             pass
         obj = QObject()
         refcount = getrefcount(obj)
-        QObject.connect(obj, SIGNAL('destroyed()'), callback)
+        obj.destroyed.connect(callback)
         self.assertEqual(refcount, getrefcount(obj))
         QObject.disconnect(obj, SIGNAL('destroyed()'), callback)
         self.assertEqual(refcount, getrefcount(obj))
diff --git a/sources/pyside6/tests/signals/signal_with_primitive_type_test.py b/sources/pyside6/tests/signals/signal_with_primitive_type_test.py
index e5abdaae3..77fec7131 100644
--- a/sources/pyside6/tests/signals/signal_with_primitive_type_test.py
+++ b/sources/pyside6/tests/signals/signal_with_primitive_type_test.py
@@ -49,7 +49,7 @@ class SignalPrimitiveTypeTest(unittest.TestCase):
     def createTimeLine(self):
         self.called = False
         tl = QTimeLine(10000)
-        QObject.connect(tl, SIGNAL("valueChanged(qreal)"), self.signalValueChanged)
+        tl.valueChanged.connect(self.signalValueChanged)
         return tl
 
     def testTimeLine(self):
diff --git a/sources/pyside6/tests/signals/slot_reference_count_test.py b/sources/pyside6/tests/signals/slot_reference_count_test.py
index 757cd20cb..54b904f42 100644
--- a/sources/pyside6/tests/signals/slot_reference_count_test.py
+++ b/sources/pyside6/tests/signals/slot_reference_count_test.py
@@ -81,7 +81,7 @@ class CppSignalRefCount(unittest.TestCase):
 
         self.assertEqual(getrefcount(cb), 2)
 
-        QObject.connect(self.emitter, SIGNAL('destroyed()'), cb)
+        self.emitter.destroyed.connect(cb)
         self.assertEqual(getrefcount(cb), 3)
 
         QObject.disconnect(self.emitter, SIGNAL('destroyed()'), cb)