Skip to content

Commit ba0de04

Browse files
florianlinkflorianlink
committed
further cleanup of typesystem, enabled some nested classes
1 parent 5c505f9 commit ba0de04

6 files changed

Lines changed: 47 additions & 50 deletions

File tree

‎generator/typesystem_core.xml‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
<rejection class="QSystemLocale"/>
1212
<rejection class="QFutureWatcherBase"/>
1313
<rejection class="QFutureSynchronizer"/>
14-
15-
<enum-type name="QXmlStreamReader::Error"/>
16-
<enum-type name="QXmlStreamReader::TokenType"/>
17-
14+
1815
<primitive-type name="qgl_GLsizeiptr"/>
1916
<primitive-type name="qgl_GLintptr"/>
2017
<primitive-type name="GLint"/>
@@ -1784,7 +1781,6 @@
17841781
<object-type name="QCollatorSortKey"/>
17851782
<object-type name="QCommandLineOption"/>
17861783
<object-type name="QCommandLineParser"/>
1787-
<object-type name="QFileSelector"/>
17881784
<object-type name="QIdentityProxyModel"/>
17891785
<object-type name="QJsonArray"/>
17901786
<object-type name="QJsonDocument"/>
@@ -1826,42 +1822,22 @@
18261822
<enum-type name="QTimeZone::TimeType"/>
18271823
<enum-type name="QTimeZone::NameType"/>
18281824
<enum-type name="QProcess::InputChannelMode"/>
1829-
<enum-type name="QWebFrame::ValueOwnership"/>
1830-
<enum-type name="QFileIconProvider::Option"/>
1831-
<enum-type name="QIconEngine::IconEngineHook"/>
1832-
<enum-type name="QPagedPaintDevice::PageSize"/>
1833-
<enum-type name="QStyleOptionFrame::FrameFeature"/>
1834-
<enum-type name="QWebSettings::ThirdPartyCookiePolicy"/>
18351825
<enum-type name="QByteArray::Base64Option"/>
1836-
<enum-type name="QAbstractScrollArea::SizeAdjustPolicy"/>
1837-
<enum-type name="QSslConfiguration::NextProtocolNegotiationStatus"/>
1838-
<enum-type name="QFontDatabase::SystemFont"/>
1839-
<enum-type name="QStyleOptionToolBox::SelectedPosition"/>
1840-
<enum-type name="QStyleOptionToolBox::TabPosition"/>
18411826
<enum-type name="QMetaType::TypeFlag"/>
1842-
<enum-type name="QLineEdit::ActionPosition"/>
18431827
<enum-type name="QAbstractItemModel::LayoutChangeHint"/>
1844-
<enum-type name="QWebPage::VisibilityState"/>
18451828
<enum-type name="QTextCharFormat::FontPropertiesInheritanceBehavior"/>
1846-
<enum-type name="QSqlDriver::NotificationSource"/>
1847-
<enum-type name="QTouchEvent::TouchPoint::InfoFlag" flags="QTouchEvent::TouchPoint::InfoFlags"/>
18481829
<enum-type name="QLocalServer::SocketOption" flags="QLocalServer::SocketOptions"/>
18491830
<enum-type name="QAbstractSocket::PauseMode"/>
18501831
<enum-type name="QAbstractSocket::BindFlag"/>
18511832
<enum-type name="QSound::Loop"/>
1852-
<enum-type name="QWebSecurityOrigin::SubdomainSetting"/>
18531833
<enum-type name="QState::RestorePolicy"/>
18541834
<enum-type name="QAccessible::TextBoundaryType"/>
18551835
<enum-type name="QAccessible::InterfaceType"/>
1856-
<enum-type name="QStyleOptionTab::TabFeature"/>
18571836
<enum-type name="QFileDevice::MemoryMapFlags"/>
18581837
<enum-type name="QFileDevice::Permission"/>
18591838
<enum-type name="QFileDevice::FileHandleFlag"/>
18601839
<enum-type name="QFileDevice::FileError"/>
18611840
<enum-type name="QColor::NameFormat"/>
1862-
<enum-type name="QStyleOptionViewItem::ViewItemFeature"/>
1863-
<enum-type name="QStyleOptionViewItem::ViewItemPosition"/>
1864-
<enum-type name="QSsl::AlternativeNameEntryType"/>
18651841
<enum-type name="Qt::ApplicationState"/>
18661842
<enum-type name="Qt::ScreenOrientation"/>
18671843
<enum-type name="Qt::MouseEventSource"/>

‎generator/typesystem_gui.xml‎

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
<?xml version="1.0"?>
2-
<typesystem package="com.trolltech.qt.gui"><rejection class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><rejection class="QIconEngineV2"/><rejection class="QInputMethodEvent"/><rejection class="QPainterPath::Element"/><rejection class="QTextBlock::iterator"/><rejection class="QTextEdit::ExtraSelection"/><rejection class="QTextFrame::iterator"/><rejection class="QTextLayout::FormatRange"/><rejection class="QTreeWidgetItemIterator"/><rejection class="QAccessibleFactoryInterface"/><rejection class="QIconEngineFactoryInterfaceV2"/><rejection class="QImageIOHandlerFactoryInterface"/><rejection class="QInputContextFactoryInterface"/><rejection class="QStyleFactoryInterface"/><rejection class="QPictureFormatInterface"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Cannot find enum constant for value 'DragMove' in 'QDragMoveEvent' or any of its super classes"/>
2+
<typesystem package="com.trolltech.qt.gui">
3+
<rejection class="QColormap"/>
4+
<rejection class="QIconEngineV2"/>
5+
<rejection class="QPainterPath::Element"/>
6+
<rejection class="QTextBlock::iterator"/>
7+
<rejection class="QTextEdit::ExtraSelection"/>
8+
<rejection class="QTextFrame::iterator"/>
9+
<rejection class="QTextLayout::FormatRange"/>
10+
<rejection class="QTreeWidgetItemIterator"/>
11+
<rejection class="QAccessibleFactoryInterface"/>
12+
<rejection class="QIconEngineFactoryInterfaceV2"/>
13+
<rejection class="QImageIOHandlerFactoryInterface"/>
14+
<rejection class="QInputContextFactoryInterface"/>
15+
<rejection class="QStyleFactoryInterface"/>
16+
<rejection class="QPictureFormatInterface"/>
317

418
<rejection class="*" function-name="d_func"/>
519

@@ -525,15 +539,17 @@
525539
<enum-type name="QGesture::GestureCancelPolicy"/>
526540
<enum-type name="QTextDocument::Stacks"/>
527541
<enum-type name="QPainter::PixmapFragmentHint"/>
542+
<enum-type name="QLineEdit::ActionPosition"/>
543+
<enum-type name="QTouchEvent::TouchPoint::InfoFlag" flags="QTouchEvent::TouchPoint::InfoFlags"/>
544+
<enum-type name="QStyleOptionViewItem::ViewItemPosition"/>
545+
<enum-type name="QAbstractScrollArea::SizeAdjustPolicy"/>
546+
<enum-type name="QFontDatabase::SystemFont"/>
547+
<enum-type name="QStyleOptionToolBox::SelectedPosition"/>
548+
<enum-type name="QStyleOptionToolBox::TabPosition"/>
549+
<enum-type name="QFileIconProvider::Option"/>
550+
<enum-type name="QIconEngine::IconEngineHook"/>
551+
<enum-type name="QPagedPaintDevice::PageSize"/>
528552

529-
<object-type name="QAbstractProxyModel"/>
530-
<object-type name="QDirModel"/>
531-
<object-type name="QFileSystemModel"/>
532-
<object-type name="QPrinterInfo"/>
533-
<object-type name="QSortFilterProxyModel"/>
534-
<object-type name="QProxyModel"/>
535-
<object-type name="QTextOption"/>
536-
<object-type name="QFontDatabase"/>
537553
<object-type name="QGestureRecognizer" force-abstract="yes"/>
538554

539555
<value-type name="QPixmapCache::Key"/>
@@ -1320,7 +1336,6 @@ PyObject* constScanLine(QImage* image, int line) {
13201336
<modify-function signature="open()" virtual-slot="yes"/>
13211337
<modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3-->
13221338
<modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3-->
1323-
<modify-function signature="setVisible(bool)" allow-as-slot="yes"/>
13241339
</object-type>
13251340
<object-type name="QDialogButtonBox">
13261341
</object-type>
@@ -2748,7 +2763,6 @@ PyObject* constScanLine(QImage* image, int line) {
27482763
<object-type name="QTouchEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::TouchBegin || %1-&gt;type() == QEvent::TouchUpdate || %1-&gt;type() == QEvent::TouchEnd"/>
27492764

27502765
<!-- Qt 5 additional classes -->
2751-
<object-type name="QInputMethodEvent"/>
27522766
<object-type name="QTextObjectInterface"/>
27532767
<object-type name="QRawFont"/>
27542768
<object-type name="QBackingStore"/>
@@ -2789,7 +2803,6 @@ PyObject* constScanLine(QImage* image, int line) {
27892803
<object-type name="QStyleHints"/>
27902804
<object-type name="QTouchDevice"/>
27912805
<object-type name="QWindow"/>
2792-
<object-type name="QAbstractTextDocumentLayout"/>
27932806

27942807
<object-type name="QGuiApplication">
27952808
<modify-function signature="QGuiApplication(int &amp;, char **, int)" remove="all"/>
@@ -2799,19 +2812,18 @@ PyObject* constScanLine(QImage* image, int line) {
27992812
<interface-type name="QPlatformSurface"/>
28002813
<interface-type name="QSurface"/>
28012814
<object-type name="QSurfaceFormat"/>
2802-
<!-- <object-type name="QOpenGLPaintDevice"/> -->
2815+
<value-type name="QPainter::PixmapFragment"/>
2816+
<!-- <object-type name="QOpenGLPaintDevice"/> -->
28032817
<enum-type name="QSurface::SurfaceType"/>
28042818
<enum-type name="QSurface::SurfaceClass"/>
28052819
<enum-type name="QPagedPaintDevice::Margins"/>
2806-
<enum-type name="QPainter::PixmapFragment"/>
2807-
<enum-type name="QTextLayout::FormatRange"/>
2808-
<enum-type name="QGlyphRun::GlyphRunFlag"/>
2820+
<enum-type name="QGlyphRun::GlyphRunFlag" flags="QGlyphRun::GlyphRunFlags"/>
28092821
<enum-type name="QInputMethod::Action"/>
28102822
<enum-type name="QPageSize::Unit"/>
28112823
<enum-type name="QPageSize::SizeMatchPolicy"/>
28122824
<enum-type name="QPageSize::PageSizeId"/>
28132825
<enum-type name="QRawFont::AntialiasingType"/>
2814-
<enum-type name="QRawFont::LayoutFlag"/>
2826+
<enum-type name="QRawFont::LayoutFlag" flags="QRawFont::LayoutFlags"/>
28152827
<enum-type name="QOpenGLContext::OpenGLModuleType"/>
28162828
<enum-type name="QOpenGLTexture::MipMapGeneration"/>
28172829
<enum-type name="QOpenGLTexture::TextureFormat"/>
@@ -2826,7 +2838,7 @@ PyObject* constScanLine(QImage* image, int line) {
28262838
<enum-type name="QOpenGLTexture::TextureUnitReset"/>
28272839
<enum-type name="QOpenGLTexture::BindingTarget"/>
28282840
<enum-type name="QOpenGLTexture::SwizzleComponent"/>
2829-
<enum-type name="QOpenGLTexture::Feature"/>
2841+
<enum-type name="QOpenGLTexture::Feature" flags="QOpenGLTexture::Features"/>
28302842
<enum-type name="QOpenGLTexture::Target"/>
28312843
<enum-type name="QOpenGLTexture::PixelType"/>
28322844
<enum-type name="QOpenGLBuffer::UsagePattern"/>
@@ -2839,11 +2851,10 @@ PyObject* constScanLine(QImage* image, int line) {
28392851
<enum-type name="QOpenGLShader::ShaderTypeBit"/>
28402852
<enum-type name="QWindow::Visibility"/>
28412853
<enum-type name="QWindow::AncestorMode"/>
2842-
<enum-type name="QOpenGLFunctions::OpenGLFeature"/>
2854+
<enum-type name="QOpenGLFunctions::OpenGLFeature" flags="QOpenGLFunctions::OpenGLFeatures"/>
28432855
<enum-type name="QScrollEvent::ScrollState"/>
2844-
<enum-type name="QScrollEvent::CapabilityFlag"/>
28452856
<enum-type name="QTouchDevice::DeviceType"/>
2846-
<enum-type name="QTouchDevice::CapabilityFlag"/>
2857+
<enum-type name="QTouchDevice::CapabilityFlag" flags="QTouchDevice::Capabilities"/>
28472858

28482859
<enum-type name="QSurfaceFormat::FormatOption"/>
28492860
<enum-type name="QSurfaceFormat::RenderableType"/>
@@ -2926,5 +2937,7 @@ PyObject* constScanLine(QImage* image, int line) {
29262937
<suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles"/>
29272938

29282939
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QtSharedPointer' does not have a type entry"/>
2940+
<suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles"/>
2941+
<suppress-warning text="WARNING(MetaJavaBuilder) :: Cannot find enum constant for value 'DragMove' in 'QDragMoveEvent' or any of its super classes"/>
29292942

29302943
</typesystem>

‎generator/typesystem_multimedia.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<enum-type name="QAudioFormat::SampleType"/>
66
<enum-type name="QSoundEffect::Status"/>
77
<enum-type name="QSoundEffect::Loop"/>
8-
<enum-type name="QAudioFormat::SampleType"/>
98
<enum-type name="QAbstractVideoBuffer::HandleType"/>
109
<enum-type name="QAbstractVideoBuffer::MapMode"/>
1110
<enum-type name="QCameraImageCapture::Error"/>
@@ -93,4 +92,8 @@
9392
<object-type name="QVideoProbe"/>
9493
<object-type name="QVideoSurfaceFormat"/>
9594

95+
<object-type name="QCameraViewfinder"/>
96+
<object-type name="QGraphicsVideoItem"/>
97+
<object-type name="QVideoWidget"/>
98+
9699
</typesystem>

‎generator/typesystem_network.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<include file-name="qssl.h" location="global"/>
55
</namespace-type>
66

7+
<enum-type name="QSsl::AlternativeNameEntryType"/>
8+
<enum-type name="QSslConfiguration::NextProtocolNegotiationStatus"/>
79
<enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/>
810
<enum-type name="QAbstractSocket::NetworkLayerProtocol"/>
911
<enum-type name="QAbstractSocket::SocketError"/>

‎generator/typesystem_sql.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<rejection class="QSqlDriverCreator"/>
44
<rejection class="QSqlDriverPlugin"/>
55
<rejection class="QSqlDriverFactoryInterface"/>
6+
<enum-type name="QSqlDriver::NotificationSource"/>
67

78
<namespace-type name="QSql">
89
<include file-name="qsql.h" location="global"/>

‎generator/typesystem_webkit.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@
1010
<enum-type name="QWebSettings::WebAttribute">
1111
<reject-enum-value name="LocalStorageEnabled"/>
1212
</enum-type>
13+
<enum-type name="QWebSettings::ThirdPartyCookiePolicy"/>
14+
<enum-type name="QWebPage::VisibilityState"/>
15+
<enum-type name="QWebFrame::ValueOwnership"/>
16+
<enum-type name="QWebSecurityOrigin::SubdomainSetting"/>
1317

14-
<enum-type name="QWebFrame::RenderLayer"/>
18+
<enum-type name="QWebFrame::RenderLayer"/>
1519

1620
<enum-type name="QWebPage::Feature"/>
1721
<enum-type name="QWebPage::PermissionPolicy"/>
@@ -28,8 +32,6 @@
2832
</enum-type>
2933
<enum-type name="QWebPage::ErrorDomain"/>
3034

31-
<object-type name="QWebHistory"/>
32-
<object-type name="QWebHistoryItem"/>
3335
<value-type name="QWebElementCollection"/>
3436

3537
<object-type name="QGraphicsWebView"/>

0 commit comments

Comments
 (0)