Skip to content

Commit

Permalink
Add missing classes
Browse files Browse the repository at this point in the history
(and in some cases document when classes were introduced)
  • Loading branch information
usiems authored and mrbean-bremen committed Dec 11, 2023
1 parent 2d72bc5 commit 467d3c0
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 8 deletions.
19 changes: 18 additions & 1 deletion generator/typesystem_core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,14 @@
<!--### Obsolete in 4.3-->
</value-type>

<value-type name="QCalendar" since-version="5.14">
<inject-code class="pywrap-h">
public:
const static int Unspecified = QCalendar::Unspecified;
</inject-code>
</value-type>
<value-type name="QCalendar::YearMonthDay" since-version="5.14"/>

<value-type name="QDateTime">
<modify-function signature="operator=(QDateTime)" remove="all"/>
</value-type>
Expand Down Expand Up @@ -1011,6 +1019,8 @@
</modify-argument>
</modify-function>
</object-type>
<value-type name="QModelRoleData" since-version="6"/>
<value-type name="QModelRoleDataSpan" since-version="6"/>

<object-type name="QAbstractListModel">
<extra-includes>
Expand Down Expand Up @@ -1316,7 +1326,7 @@
</object-type>
<object-type name="QLibraryInfo"/>
<object-type name="QMutex"/>
<object-type name="QRecursiveMutex"/>
<object-type name="QRecursiveMutex" since-version="5.14"/>
<!-- QMutexLocker is a template in Qt6, we need to figure out what to do with it... -->
<value-type name="QMutexLocker" before-version="6">
<!-- special handling for context handlers -->
Expand Down Expand Up @@ -1432,6 +1442,10 @@
<modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/>
<!--### Obsolete in 4.3-->
</object-type>
<!-- Only available on Linux:
<enum-type name="QProcess::UnixProcessFlag" flags="QProcess::UnixProcessFlags" since-version="6.6"/>
<value-type name="QProcess::UnixProcessParameters" since-version="6.6"/>
-->

<object-type name="QSignalMapper">
</object-type>
Expand Down Expand Up @@ -2006,6 +2020,7 @@
<enum-type name="QTimeZone::Initialization" since-version="6.5"/>
<enum-type name="QProcess::InputChannelMode"/>
<enum-type name="QByteArray::Base64Option" flags="QByteArray::Base64Options"/>
<enum-type name="QByteArray::Base64DecodingStatus"/>
<enum-type name="QMetaType::Type"/>
<enum-type name="QMetaType::TypeFlag" flags="QMetaType::TypeFlags"/>
<enum-type name="QAbstractItemModel::CheckIndexOption"/>
Expand Down Expand Up @@ -2047,4 +2062,6 @@
<enum-type name="QLocale::FloatingPointPrecisionOption"/>
<enum-type name="QUuid::StringFormat"/>
<enum-type name="Qt::ChecksumType"/>
<enum-type name="Qt::SplitBehaviorFlags" flag="Qt::SplitBehavior"/>
<enum-type name="Qt::HighDpiScaleFactorRoundingPolicy"/>
</typesystem>
20 changes: 18 additions & 2 deletions generator/typesystem_gui.xml
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@
<enum-type name="QTextDocument::FindFlag" flags="QTextDocument::FindFlags"/>
<enum-type name="QTextDocument::MetaInformation"/>
<enum-type name="QTextDocument::ResourceType"/>
<enum-type name="QTextDocument::MarkdownFeature" flags="QTextDocument::MarkdownFeatures"/>
<enum-type name="QTextEdit::AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/>
<enum-type name="QTextEdit::LineWrapMode"/>
<enum-type name="QTextFormat::ObjectTypes"/>
Expand Down Expand Up @@ -525,8 +526,8 @@
</enum-type>


<enum-type name="QMessageBox::StandardButton" flags="QMessageBox::StandardButtons">
</enum-type>
<enum-type name="QMessageBox::StandardButton" flags="QMessageBox::StandardButtons"/>
<enum-type name="QMessageBox::Option" flags="QMessageBox::Options"/>

<enum-type name="QPalette::ColorGroup">
</enum-type>
Expand Down Expand Up @@ -730,6 +731,7 @@
<modify-function signature="operator int()const" access="private"/>
<modify-function signature="operator[](uint)const" access="private"/>
</value-type>
<value-type name="QKeyCombination" since-version="6"/>

<value-type name="QPicture">
<modify-function signature="operator=(QPicture)" remove="all"/>
Expand Down Expand Up @@ -771,6 +773,7 @@
<modify-function signature="operator=(QTextBlock)" remove="all"/>
</value-type>
<value-type name="QTextBlockFormat"/>
<enum-type name="QTextBlockFormat::MarkerType"/>
<value-type name="QTextTableCellFormat"/>
<value-type name="QTextCharFormat">
<modify-function signature="isValid()const" access="non-final"/>
Expand Down Expand Up @@ -2525,6 +2528,7 @@ PyObject* constScanLine(QImage* image, int line) {
</modify-argument>
</modify-function>
</object-type>
<enum-type name="QTextLayout::GlyphRunRetrievalFlag" flags="QTextLayout::GlyphRunRetrievalFlags" since-version="6.5"/>

<object-type name="QTableWidget">

Expand Down Expand Up @@ -3092,6 +3096,7 @@ PyObject* constScanLine(QImage* image, int line) {
<interface-type name="QPagedPaintDevice" create-shell="no">
<modify-function signature="devicePageLayout()const" remove="all"/>
</interface-type>
<interface-type name="QPageRanges"/>

<interface-type name="QPlatformSurface"/>
<interface-type name="QSurface"/>
Expand All @@ -3112,6 +3117,9 @@ PyObject* constScanLine(QImage* image, int line) {
<value-type name="QRgba64">
<modify-function signature="operator quint64() const" remove="all"/>
</value-type>
<!-- template class
<value-type name="QRgbaFloat" since-version="6.2"/>
-->

<enum-type name="QScrollerProperties::ScrollMetric"/>
<enum-type name="QScrollerProperties::OvershootPolicy"/>
Expand Down Expand Up @@ -3171,6 +3179,14 @@ PyObject* constScanLine(QImage* image, int line) {

<object-type name="QOpenGLTextureBlitter"/>
<enum-type name="QOpenGLTextureBlitter::Origin"/>

<object-type name="QTransposeProxyModel" since-version="5.13"/>

<value-type name="QColorSpace" since-version="5.14"/>
<enum-type name="QColorSpace::NamedColorSpace" since-version="5.14"/>
<enum-type name="QColorSpace::Primaries" since-version="5.14"/>
<enum-type name="QColorSpace::TransferFunction" since-version="5.14"/>
<value-type name="QColorTransform" since-version="5.14"/>

<!-- Inefficient hash codes -->
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
Expand Down
6 changes: 3 additions & 3 deletions generator/typesystem_multimedia.xml
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,14 @@
<object-type name="QAudioSource"/>
<object-type name="QCameraDevice"/>
<object-type name="QCameraFormat"/>
<object-type name="QCapturableWindow"/>
<object-type name="QCapturableWindow" since-version="6.6"/>
<object-type name="QImageCapture"/>
<object-type name="QMediaCaptureSession"/>
<object-type name="QMediaDevices"/>
<object-type name="QMediaFormat"/>
<enum-type name="QMediaFormat::ResolveFlags"/>
<object-type name="QMediaTimeRange::Interval"/>
<object-type name="QScreenCapture"/>
<object-type name="QScreenCapture" since-version="6.5"/>
<object-type name="QVideoFrameFormat"/>
<enum-type name="QVideoFrameFormat::ColorSpace"/>
<enum-type name="QVideoFrameFormat::ColorRange"/>
Expand All @@ -209,7 +209,7 @@
<enum-type name="QVideoFrameFormat::PixelFormat"/>
<enum-type name="QVideoFrameFormat::ColorTransfer"/>
<object-type name="QVideoSink"/>
<object-type name="QWindowCapture"/>
<object-type name="QWindowCapture" since-version="6.6"/>
</group>

</typesystem>
12 changes: 12 additions & 0 deletions generator/typesystem_network.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,15 @@
<object-type name="QHttp">
<modify-function signature="closeConnection()" remove="all"/>
</object-type>

<object-type name="QTcpServer">
<modify-function signature="waitForNewConnection(int,bool*)">
<modify-argument index="2">
<remove-argument/>
</modify-argument>
</modify-function>
</object-type>
<object-type name="QSslServer" since-version="6.4"/>
<object-type name="QTcpSocket"/>
<object-type name="QUdpSocket">
<modify-function signature="writeDatagram(const char*,qint64,QHostAddress,unsigned short)" remove="all"/>
Expand Down Expand Up @@ -230,6 +232,16 @@
<object-type name="QHstsPolicy"/>
<enum-type name="QHstsPolicy::PolicyFlag"/>
<object-type name="QNetworkDatagram"/>

<object-type name="QDtls" since-version="5.12"/>
<enum-type name="QDtls::HandshakeState" since-version="5.12"/>
<object-type name="QDtlsClientVerifier" since-version="5.12"/>

<object-type name="QHttp1Configuration" since-version="6.5"/>
<object-type name="QHttp2Configuration" since-version="5.14"/>

<object-type name="QNetworkInformation" since-version="6.1"/>
<enum-type name="QNetworkInformation::Feature" flags="QNetworkInformation::Features" since-version="6.1"/>

<suppress-warning text="*unmatched parameter type 'sockaddr const*"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
Expand Down
13 changes: 12 additions & 1 deletion generator/typesystem_qml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,22 @@
<object-type name="QJSEngine">
<modify-function signature="newQMetaObject()" remove="all"/>
</object-type>
<object-type name="QJSValue"></object-type>
<object-type name="QJSValue"/>
<object-type name="QJSManagedValue" since-version="6.1"/>
<object-type name="QJSPrimitiveValue" since-version="6.1">
<modify-function signature="operator++(int)" remove="all"/>
<modify-function signature="operator--(int)" remove="all"/>
</object-type>
<object-type name="QJSPrimitiveUndefined" since-version="6.1"/>
<object-type name="QJSPrimitiveNull" since-version="6.1"/>

<enum-type name="QJSEngine::Extension"/>
<enum-type name="QJSEngine::ObjectOwnership"/>
<enum-type name="QJSValue::ErrorType"/>
<enum-type name="QJSValue::SpecialValue"/>
<enum-type name="QJSValue::ObjectConversionBehavior"/>
<enum-type name="QJSManagedValue::Type" since-version="6.1"/>
<enum-type name="QJSPrimitiveValue::Type" since-version="6.1"/>

<object-type name="QQmlAbstractUrlInterceptor"></object-type>
<object-type name="QQmlApplicationEngine"></object-type>
Expand Down
17 changes: 16 additions & 1 deletion generator/typesystem_webenginewidgets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<object-type name="QWebEngineFullScreenRequest"/>
<object-type name="QWebEngineHistory"/>
<object-type name="QWebEngineHistoryItem"/>
<object-type name="QWebEngineHistoryModel" since-version="6.2"/>
<interface-type name="QWebEngineHistoryModel" create-shell="no" create-promoter="no" since-version="6.2"/>
<enum-type name="QWebEngineHistoryModel::Roles" since-version="6.2"/>
<object-type name="QWebEngineProfile"/>
<object-type name="QWebEngineScript"/>
Expand All @@ -22,6 +22,21 @@
<object-type name="QWebEngineUrlRequestInterceptor"/>
<object-type name="QWebEngineUrlRequestJob"/>
<object-type name="QWebEngineUrlSchemeHandler"/>
<object-type name="QWebEngineNotification" since-version="5.13"/>
<object-type name="QWebEngineClientCertificateStore" since-version="5.13"/>
<object-type name="QWebEngineLoadingInfo" since-version="6.2"/>
<enum-type name="QWebEngineLoadingInfo::ErrorDomain" since-version="6.2"/>
<enum-type name="QWebEngineLoadingInfo::LoadStatus" since-version="6.2"/>
<object-type name="QWebEngineContextMenuRequest" since-version="6.2"/>
<enum-type name="QWebEngineContextMenuRequest::EditFlag" flags="QWebEngineContextMenuRequest::EditFlags" since-version="6.2"/>
<enum-type name="QWebEngineContextMenuRequest::MediaFlag" flags="QWebEngineContextMenuRequest::MediaFlags" since-version="6.2"/>
<enum-type name="QWebEngineContextMenuRequest::MediaType" since-version="6.2"/>
<object-type name="QWebEngineNavigationRequest" since-version="6.2"/>
<object-type name="QWebEngineNewWindowRequest" since-version="6.2"/>
<enum-type name="QWebEngineNewWindowRequest::DestinationType" since-version="6.2"/>
<object-type name="QWebEngineFileSystemAccessRequest" since-version="6.4"/>
<enum-type name="QWebEngineFileSystemAccessRequest::AccessFlag" flags="QWebEngineFileSystemAccessRequest::AccessFlags" since-version="6.4"/>
<enum-type name="QWebEngineFileSystemAccessRequest::HandleType" since-version="6.4"/>

<enum-type name="QWebEngineCertificateError::Error"/>
<enum-type name="QWebEngineDownloadItem::DownloadState"/>
Expand Down
1 change: 1 addition & 0 deletions generator/typesystem_xml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<modify-function signature="operator=(QDomDocument)" remove="all"/>
</value-type>
<enum-type name="QDomDocument::ParseOption" flags="QDomDocument::ParseOptions" since-version="6.5"/>
<value-type name="QDomDocument::ParseResult" since-version="6.5"/>

<value-type name="QDomDocumentFragment">
<modify-function signature="nodeType()const" remove="all"/>
Expand Down

0 comments on commit 467d3c0

Please sign in to comment.