Merge branch 'master' into voidptr

Author: altendky

CHANGELOG.md

@@ -16,6 +16,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 * [#104](https://github.com/stlehmann/PyQt5-stubs/pull/104) `sip.voidptr` handles integer values and sequences and takes `self`
+* [#103](https://github.com/stlehmann/PyQt5-stubs/pull/103) `pyqtBoundSignal.disconnect()`'s `slot` parameter is optional
+* [#100](https://github.com/stlehmann/PyQt5-stubs/pull/100) fill generic parameter as `sip.array[int]` for QtDataVisualization textures
 * [#92](https://github.com/stlehmann/PyQt5-stubs/pull/92) remove self from `qDefaultSurfaceFormat()` and `qIdForNode()`
 * [#83](https://github.com/stlehmann/PyQt5-stubs/pull/83) fixes `sip.array` to be generic
 * [#79](https://github.com/stlehmann/PyQt5-stubs/pull/79) fixes extra class layer in several modules

PyQt5-stubs/QtCore.pyi

@@ -35,7 +35,10 @@ class pyqtBoundSignal:
 
     def emit(self, *args: typing.Any) -> None: ...
     def connect(self, slot: "PYQT_SLOT") -> "QMetaObject.Connection": ...
-    def disconnect(self, slot: typing.Union["PYQT_SLOT", "QMetaObject.Connection"]=None) -> None: ...
+    @typing.overload
+    def disconnect(self) -> None: ...
+    @typing.overload
+    def disconnect(self, slot: typing.Union["PYQT_SLOT", "QMetaObject.Connection"]) -> None: ...
 
 
 class pyqtSignal:
@@ -2289,12 +2292,12 @@ class QIODevice(QObject):
         def __invert__(self) -> 'QIODevice.OpenMode': ...
         def __index__(self) -> int: ...
         def __int__(self) -> int: ...
-        def __and__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ... #type: ignore[override]
-        def __iand__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ... #type: ignore[override]
-        def __or__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ... #type: ignore[override]
-        def __ior__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ... #type: ignore[override]
-        def __xor__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ... #type: ignore[override]
-        def __ixor__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ... #type: ignore[override]
+        def __and__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ...
+        def __iand__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ...
+        def __or__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ...
+        def __ior__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ...
+        def __xor__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ...
+        def __ixor__(self, other: typing.Union['QIODevice.OpenMode', 'QIODevice.OpenModeFlag']) -> 'QIODevice.OpenMode': ...
 
     @typing.overload
     def __init__(self) -> None: ...

PyQt5-stubs/QtDataVisualization.pyi

@@ -834,7 +834,7 @@ class QCustom3DVolume('QCustom3DItem'):
     @typing.overload
     def __init__(self, parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
     @typing.overload
-    def __init__(self, position: QtGui.QVector3D, scaling: QtGui.QVector3D, rotation: QtGui.QQuaternion, textureWidth: int, textureHeight: int, textureDepth: int, textureData: sip.array, textureFormat: QtGui.QImage.Format, colorTable: typing.Iterable[int], parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
+    def __init__(self, position: QtGui.QVector3D, scaling: QtGui.QVector3D, rotation: QtGui.QQuaternion, textureWidth: int, textureHeight: int, textureDepth: int, textureData: sip.array[int], textureFormat: QtGui.QImage.Format, colorTable: typing.Iterable[int], parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
 
     def sliceFrameThicknessesChanged(self, values: QtGui.QVector3D) -> None: ...
     def sliceFrameGapsChanged(self, values: QtGui.QVector3D) -> None: ...
@@ -846,7 +846,7 @@ class QCustom3DVolume('QCustom3DItem'):
     def preserveOpacityChanged(self, enabled: bool) -> None: ...
     def alphaMultiplierChanged(self, mult: float) -> None: ...
     def textureFormatChanged(self, format: QtGui.QImage.Format) -> None: ...
-    def textureDataChanged(self, data: sip.array) -> None: ...
+    def textureDataChanged(self, data: sip.array[int]) -> None: ...
     def colorTableChanged(self) -> None: ...
     def sliceIndexZChanged(self, value: int) -> None: ...
     def sliceIndexYChanged(self, value: int) -> None: ...
@@ -879,9 +879,9 @@ class QCustom3DVolume('QCustom3DItem'):
     def setSubTextureData(self, axis: QtCore.Qt.Axis, index: int, data: sip.voidptr) -> None: ...
     @typing.overload
     def setSubTextureData(self, axis: QtCore.Qt.Axis, index: int, image: QtGui.QImage) -> None: ...
-    def textureData(self) -> sip.array: ...
-    def createTextureData(self, images: typing.Iterable[QtGui.QImage]) -> sip.array: ...
-    def setTextureData(self, data: sip.array) -> None: ...
+    def textureData(self) -> sip.array[int]: ...
+    def createTextureData(self, images: typing.Iterable[QtGui.QImage]) -> sip.array[int]: ...
+    def setTextureData(self, data: sip.array[int]) -> None: ...
     def colorTable(self) -> typing.List[int]: ...
     def setColorTable(self, colors: typing.Iterable[int]) -> None: ...
     def setSliceIndices(self, x: int, y: int, z: int) -> None: ...