Skip to content

Commit 1cbf30f

Browse files
committed
More signal / slot argument fixing
1 parent fc1f392 commit 1cbf30f

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

PySide6-stubs/QtCore.pyi

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5262,7 +5262,7 @@ class QMetaObject(Shiboken.Object):
52625262
def checkConnectArgs(signal: PySide6.QtCore.QMetaMethod, method: PySide6.QtCore.QMetaMethod) -> bool: ...
52635263
@overload
52645264
@staticmethod
5265-
def checkConnectArgs(signal: Union[bytes, bytearray, memoryview], method: Union[bytes, bytearray, memoryview]) -> bool: ...
5265+
def checkConnectArgs(signal: str, method: str) -> bool: ...
52665266
def classInfo(self, index: int) -> PySide6.QtCore.QMetaClassInfo: ...
52675267
def classInfoCount(self) -> int: ...
52685268
def classInfoOffset(self) -> int: ...
@@ -5288,35 +5288,35 @@ class QMetaObject(Shiboken.Object):
52885288
def inherits(self, metaObject: PySide6.QtCore.QMetaObject) -> bool: ...
52895289
@overload
52905290
@staticmethod
5291-
def invokeMethod(obj: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview], arg__3: PySide6.QtCore.Qt.ConnectionType, ret: PySide6.QtCore.QGenericReturnArgument, val0: PySide6.QtCore.QGenericArgument = ..., val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> bool: ...
5291+
def invokeMethod(obj: PySide6.QtCore.QObject, member: str, arg__3: PySide6.QtCore.Qt.ConnectionType, ret: PySide6.QtCore.QGenericReturnArgument, val0: PySide6.QtCore.QGenericArgument = ..., val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> bool: ...
52925292
@overload
52935293
@staticmethod
5294-
def invokeMethod(obj: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview], ret: PySide6.QtCore.QGenericReturnArgument, val0: PySide6.QtCore.QGenericArgument = ..., val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> bool: ...
5294+
def invokeMethod(obj: PySide6.QtCore.QObject, member: str, ret: PySide6.QtCore.QGenericReturnArgument, val0: PySide6.QtCore.QGenericArgument = ..., val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> bool: ...
52955295
@overload
52965296
@staticmethod
5297-
def invokeMethod(obj: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview], type: PySide6.QtCore.Qt.ConnectionType, val0: PySide6.QtCore.QGenericArgument, val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> bool: ...
5297+
def invokeMethod(obj: PySide6.QtCore.QObject, member: str, type: PySide6.QtCore.Qt.ConnectionType, val0: PySide6.QtCore.QGenericArgument, val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> bool: ...
52985298
@overload
52995299
@staticmethod
5300-
def invokeMethod(obj: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview], val0: PySide6.QtCore.QGenericArgument, val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> bool: ...
5300+
def invokeMethod(obj: PySide6.QtCore.QObject, member: str, val0: PySide6.QtCore.QGenericArgument, val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> bool: ...
53015301
@overload
53025302
@staticmethod
5303-
def invokeMethod(object: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview], ret: PySide6.QtCore.QGenericReturnArgumentHolder, val0: PySide6.QtCore.QGenericArgumentHolder = ..., val1: PySide6.QtCore.QGenericArgumentHolder = ..., val2: PySide6.QtCore.QGenericArgumentHolder = ..., val3: PySide6.QtCore.QGenericArgumentHolder = ..., val4: PySide6.QtCore.QGenericArgumentHolder = ..., val5: PySide6.QtCore.QGenericArgumentHolder = ..., val6: PySide6.QtCore.QGenericArgumentHolder = ..., val7: PySide6.QtCore.QGenericArgumentHolder = ..., val8: PySide6.QtCore.QGenericArgumentHolder = ..., val9: PySide6.QtCore.QGenericArgumentHolder = ...) -> object: ...
5303+
def invokeMethod(object: PySide6.QtCore.QObject, member: str, ret: PySide6.QtCore.QGenericReturnArgumentHolder, val0: PySide6.QtCore.QGenericArgumentHolder = ..., val1: PySide6.QtCore.QGenericArgumentHolder = ..., val2: PySide6.QtCore.QGenericArgumentHolder = ..., val3: PySide6.QtCore.QGenericArgumentHolder = ..., val4: PySide6.QtCore.QGenericArgumentHolder = ..., val5: PySide6.QtCore.QGenericArgumentHolder = ..., val6: PySide6.QtCore.QGenericArgumentHolder = ..., val7: PySide6.QtCore.QGenericArgumentHolder = ..., val8: PySide6.QtCore.QGenericArgumentHolder = ..., val9: PySide6.QtCore.QGenericArgumentHolder = ...) -> object: ...
53045304
@overload
53055305
@staticmethod
5306-
def invokeMethod(object: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview], type: PySide6.QtCore.Qt.ConnectionType, ret: PySide6.QtCore.QGenericReturnArgumentHolder, val0: PySide6.QtCore.QGenericArgumentHolder = ..., val1: PySide6.QtCore.QGenericArgumentHolder = ..., val2: PySide6.QtCore.QGenericArgumentHolder = ..., val3: PySide6.QtCore.QGenericArgumentHolder = ..., val4: PySide6.QtCore.QGenericArgumentHolder = ..., val5: PySide6.QtCore.QGenericArgumentHolder = ..., val6: PySide6.QtCore.QGenericArgumentHolder = ..., val7: PySide6.QtCore.QGenericArgumentHolder = ..., val8: PySide6.QtCore.QGenericArgumentHolder = ..., val9: PySide6.QtCore.QGenericArgumentHolder = ...) -> object: ...
5306+
def invokeMethod(object: PySide6.QtCore.QObject, member: str, type: PySide6.QtCore.Qt.ConnectionType, ret: PySide6.QtCore.QGenericReturnArgumentHolder, val0: PySide6.QtCore.QGenericArgumentHolder = ..., val1: PySide6.QtCore.QGenericArgumentHolder = ..., val2: PySide6.QtCore.QGenericArgumentHolder = ..., val3: PySide6.QtCore.QGenericArgumentHolder = ..., val4: PySide6.QtCore.QGenericArgumentHolder = ..., val5: PySide6.QtCore.QGenericArgumentHolder = ..., val6: PySide6.QtCore.QGenericArgumentHolder = ..., val7: PySide6.QtCore.QGenericArgumentHolder = ..., val8: PySide6.QtCore.QGenericArgumentHolder = ..., val9: PySide6.QtCore.QGenericArgumentHolder = ...) -> object: ...
53075307
@overload
53085308
@staticmethod
5309-
def invokeMethod(object: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview], type: PySide6.QtCore.Qt.ConnectionType, val0: PySide6.QtCore.QGenericArgumentHolder = ..., val1: PySide6.QtCore.QGenericArgumentHolder = ..., val2: PySide6.QtCore.QGenericArgumentHolder = ..., val3: PySide6.QtCore.QGenericArgumentHolder = ..., val4: PySide6.QtCore.QGenericArgumentHolder = ..., val5: PySide6.QtCore.QGenericArgumentHolder = ..., val6: PySide6.QtCore.QGenericArgumentHolder = ..., val7: PySide6.QtCore.QGenericArgumentHolder = ..., val8: PySide6.QtCore.QGenericArgumentHolder = ..., val9: PySide6.QtCore.QGenericArgumentHolder = ...) -> bool: ...
5309+
def invokeMethod(object: PySide6.QtCore.QObject, member: str, type: PySide6.QtCore.Qt.ConnectionType, val0: PySide6.QtCore.QGenericArgumentHolder = ..., val1: PySide6.QtCore.QGenericArgumentHolder = ..., val2: PySide6.QtCore.QGenericArgumentHolder = ..., val3: PySide6.QtCore.QGenericArgumentHolder = ..., val4: PySide6.QtCore.QGenericArgumentHolder = ..., val5: PySide6.QtCore.QGenericArgumentHolder = ..., val6: PySide6.QtCore.QGenericArgumentHolder = ..., val7: PySide6.QtCore.QGenericArgumentHolder = ..., val8: PySide6.QtCore.QGenericArgumentHolder = ..., val9: PySide6.QtCore.QGenericArgumentHolder = ...) -> bool: ...
53105310
@overload
53115311
@staticmethod
5312-
def invokeMethod(object: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview], val0: PySide6.QtCore.QGenericArgumentHolder = ..., val1: PySide6.QtCore.QGenericArgumentHolder = ..., val2: PySide6.QtCore.QGenericArgumentHolder = ..., val3: PySide6.QtCore.QGenericArgumentHolder = ..., val4: PySide6.QtCore.QGenericArgumentHolder = ..., val5: PySide6.QtCore.QGenericArgumentHolder = ..., val6: PySide6.QtCore.QGenericArgumentHolder = ..., val7: PySide6.QtCore.QGenericArgumentHolder = ..., val8: PySide6.QtCore.QGenericArgumentHolder = ..., val9: PySide6.QtCore.QGenericArgumentHolder = ...) -> bool: ...
5312+
def invokeMethod(object: PySide6.QtCore.QObject, member: str, val0: PySide6.QtCore.QGenericArgumentHolder = ..., val1: PySide6.QtCore.QGenericArgumentHolder = ..., val2: PySide6.QtCore.QGenericArgumentHolder = ..., val3: PySide6.QtCore.QGenericArgumentHolder = ..., val4: PySide6.QtCore.QGenericArgumentHolder = ..., val5: PySide6.QtCore.QGenericArgumentHolder = ..., val6: PySide6.QtCore.QGenericArgumentHolder = ..., val7: PySide6.QtCore.QGenericArgumentHolder = ..., val8: PySide6.QtCore.QGenericArgumentHolder = ..., val9: PySide6.QtCore.QGenericArgumentHolder = ...) -> bool: ...
53135313
def metaType(self) -> PySide6.QtCore.QMetaType: ...
53145314
def method(self, index: int) -> PySide6.QtCore.QMetaMethod: ...
53155315
def methodCount(self) -> int: ...
53165316
def methodOffset(self) -> int: ...
53175317
def newInstance(self, val0: PySide6.QtCore.QGenericArgument, val1: PySide6.QtCore.QGenericArgument = ..., val2: PySide6.QtCore.QGenericArgument = ..., val3: PySide6.QtCore.QGenericArgument = ..., val4: PySide6.QtCore.QGenericArgument = ..., val5: PySide6.QtCore.QGenericArgument = ..., val6: PySide6.QtCore.QGenericArgument = ..., val7: PySide6.QtCore.QGenericArgument = ..., val8: PySide6.QtCore.QGenericArgument = ..., val9: PySide6.QtCore.QGenericArgument = ...) -> PySide6.QtCore.QObject: ...
53185318
@staticmethod
5319-
def normalizedSignature(method: Union[bytes, bytearray, memoryview]) -> PySide6.QtCore.QByteArray: ...
5319+
def normalizedSignature(method: str) -> PySide6.QtCore.QByteArray: ...
53205320
@staticmethod
53215321
def normalizedType(type: Union[bytes, bytearray, memoryview]) -> PySide6.QtCore.QByteArray: ...
53225322
def property(self, index: int) -> PySide6.QtCore.QMetaProperty: ...
@@ -5879,7 +5879,7 @@ class QObject(Shiboken.Object):
58795879
def objectName(self) -> str: ...
58805880
def parent(self) -> PySide6.QtCore.QObject: ...
58815881
def property(self, name: str) -> Any: ...
5882-
def receivers(self, signal: Union[bytes, bytearray, memoryview]) -> int: ...
5882+
def receivers(self, signal: str) -> int: ...
58835883
def removeEventFilter(self, obj: PySide6.QtCore.QObject) -> None: ...
58845884
def sender(self) -> PySide6.QtCore.QObject: ...
58855885
def senderSignalIndex(self) -> int: ...
@@ -8104,10 +8104,10 @@ class QTimer(PySide6.QtCore.QObject):
81048104
def singleShot(msec: int, context: PySide6.QtCore.QObject, functor: Callable) -> None: ...
81058105
@overload
81068106
@staticmethod
8107-
def singleShot(msec: int, receiver: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview]) -> None: ...
8107+
def singleShot(msec: int, receiver: PySide6.QtCore.QObject, member: str) -> None: ...
81088108
@overload
81098109
@staticmethod
8110-
def singleShot(msec: int, timerType: PySide6.QtCore.Qt.TimerType, receiver: PySide6.QtCore.QObject, member: Union[bytes, bytearray, memoryview]) -> None: ...
8110+
def singleShot(msec: int, timerType: PySide6.QtCore.Qt.TimerType, receiver: PySide6.QtCore.QObject, member: str) -> None: ...
81118111
@overload
81128112
def start(self) -> None: ...
81138113
@overload

tests/signal_slot.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,7 @@ def emitted(self) -> List[str]:
156156
b = SomeClassWithSignal.disconnect(instance, SIGNAL('signal_no_arg()'), instance, SLOT('my_slot_no_arg()'))
157157
assert type(b) is bool
158158

159+
connection = instance.signal_no_arg.connect(instance.my_slot_no_arg)
160+
r = 33
161+
r = instance.receivers(SIGNAL('signal_no_arg()'))
162+
assert type(r) is int

0 commit comments

Comments
 (0)