Skip to content

Extract primitive type definitions into separate typesystem file #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2025
Merged

Extract primitive type definitions into separate typesystem file #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions generator/build_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<typesystem>
<load-typesystem name="typesystem_general.xml" generate="no" />
<load-typesystem name="typesystem_core.xml" generate="yes" />
<load-typesystem name="typesystem_gui.xml" generate="yes" />
<load-typesystem name="typesystem_sql.xml" generate="yes" />
Expand Down
1 change: 1 addition & 0 deletions generator/generator.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<qresource prefix="/trolltech/generator/">
<file>qtscript_masterinclude.h</file>
<file>build_all.txt</file>
<file alias="typesystem_general.txt">typesystem_general.xml</file>
<file alias="typesystem_core.txt">typesystem_core.xml</file>
<file alias="typesystem_gui.txt">typesystem_gui.xml</file>
<file alias="typesystem_sql.txt">typesystem_sql.xml</file>
Expand Down
75 changes: 0 additions & 75 deletions generator/typesystem_core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,66 +181,6 @@
<rejection class="SyncContinuation"/>
<rejection class="UnwrapHandler"/>

<primitive-type name="qgl_GLsizeiptr"/>
<primitive-type name="qgl_GLintptr"/>
<primitive-type name="GLint"/>
<primitive-type name="GLuint"/>
<primitive-type name="GLenum"/>
<primitive-type name="GLclampf"/>
<primitive-type name="GLsizei"/>
<primitive-type name="GLfloat"/>
<primitive-type name="GLbitfield"/>
<primitive-type name="GLbyte"/>
<primitive-type name="GLshort"/>
<primitive-type name="GLubyte"/>
<primitive-type name="GLushort"/>
<primitive-type name="GLdouble"/>
<primitive-type name="GLclampd"/>
<primitive-type name="GLvoid"/>
<primitive-type name="GLboolean"/>
<primitive-type name="GLuint64"/>

<primitive-type name="bool"/>
<primitive-type name="double"/>
<primitive-type name="qreal"/>
<primitive-type name="float"/>
<primitive-type name="qint64"/>
<primitive-type name="quint64"/>
<primitive-type name="__int64"/>
<primitive-type name="unsigned __int64"/>
<primitive-type name="unsigned long long"/>
<primitive-type name="long long"/>
<primitive-type name="qlonglong"/>
<primitive-type name="qulonglong"/>
<primitive-type name="short"/>
<primitive-type name="signed short"/>
<primitive-type name="ushort"/>
<primitive-type name="unsigned short"/>
<primitive-type name="char"/>
<primitive-type name="signed char"/>
<primitive-type name="uchar"/>
<primitive-type name="unsigned char"/>
<primitive-type name="int"/>
<primitive-type name="signed int"/>
<primitive-type name="uint"/>
<primitive-type name="ulong"/>
<primitive-type name="unsigned int"/>
<primitive-type name="signed long"/>
<primitive-type name="long"/>
<primitive-type name="unsigned long"/>
<primitive-type name="WId"/>
<primitive-type name="Qt::HANDLE"/>
<primitive-type name="QVariant::Type"/>
<primitive-type name="QByteRef"/>
<primitive-type name="QBitRef"/>
<primitive-type name="QBool"/>
<primitive-type name="jobject"/>
<primitive-type name="quintptr"/>
<primitive-type name="qintptr"/>
<primitive-type name="qptrdiff"/>
<primitive-type name="qsizetype"/>
<primitive-type name="Qt::Disambiguated_t"/>

<rejection class="qfloat16"/> <!-- only used in QRgbaFloat template and QCborStreamReader/Writer so far -->

<value-type name="QModelIndex"/>
Expand All @@ -254,7 +194,6 @@

<rejection class="" enum-name="QtValidLicenseForTestModule"/>


<rejection class="" enum-name="QtValidLicenseForDBusModule"/>
<rejection class="" enum-name="QtValidLicenseForSqlModule"/>
<rejection class="" enum-name="QtValidLicenseForOpenGLModule"/>
Expand Down Expand Up @@ -2121,9 +2060,6 @@ public:
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTSMFI'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractFileEngine::ExtensionOption const\*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractFileEngine::Iterator\*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
<suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPointer&lt;*&gt;'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QVector&lt;*&gt;'"/>
<suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/>
Expand Down Expand Up @@ -2207,17 +2143,6 @@ public:
<suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: Qt::MatchWrap) in Qt::MatchFlag"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: unmatched enum Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap) when parsing default value of 'match' in class 'QAbstractItemModel'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QLatin1String(defaultConnection)' of argument in function '*', class '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class '*' has equals operators but no qHash() function"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: type '*' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' for enum '*' is not declared"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched parameter type '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched return type '*'"/>
<!-- <suppress-warning text="WARNING(MetaJavaBuilder) :: signature '*' for function modification in '*' not found. Possible candidates: "/>
-->
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' does not have a type entry"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '*' of argument in function '*', class '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: Shadowing: * and *; Java code will not compile"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: enum '*' is specified in typesystem, but not declared"/>

<!-- Qt 5 new classes -->
<object-type name="QFileDevice"/>
Expand Down
80 changes: 80 additions & 0 deletions generator/typesystem_general.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0"?>
<typesystem package="com.trolltech.general">

<primitive-type name="qgl_GLsizeiptr"/>
<primitive-type name="qgl_GLintptr"/>
<primitive-type name="GLint"/>
<primitive-type name="GLuint"/>
<primitive-type name="GLenum"/>
<primitive-type name="GLclampf"/>
<primitive-type name="GLsizei"/>
<primitive-type name="GLfloat"/>
<primitive-type name="GLbitfield"/>
<primitive-type name="GLbyte"/>
<primitive-type name="GLshort"/>
<primitive-type name="GLubyte"/>
<primitive-type name="GLushort"/>
<primitive-type name="GLdouble"/>
<primitive-type name="GLclampd"/>
<primitive-type name="GLvoid"/>
<primitive-type name="GLboolean"/>
<primitive-type name="GLuint64"/>

<primitive-type name="bool"/>
<primitive-type name="double"/>
<primitive-type name="qreal"/>
<primitive-type name="float"/>
<primitive-type name="qint64"/>
<primitive-type name="quint64"/>
<primitive-type name="__int64"/>
<primitive-type name="unsigned __int64"/>
<primitive-type name="unsigned long long"/>
<primitive-type name="long long"/>
<primitive-type name="qlonglong"/>
<primitive-type name="qulonglong"/>
<primitive-type name="short"/>
<primitive-type name="signed short"/>
<primitive-type name="ushort"/>
<primitive-type name="unsigned short"/>
<primitive-type name="char"/>
<primitive-type name="signed char"/>
<primitive-type name="uchar"/>
<primitive-type name="unsigned char"/>
<primitive-type name="int"/>
<primitive-type name="signed int"/>
<primitive-type name="uint"/>
<primitive-type name="ulong"/>
<primitive-type name="unsigned int"/>
<primitive-type name="signed long"/>
<primitive-type name="long"/>
<primitive-type name="unsigned long"/>
<primitive-type name="WId"/>
<primitive-type name="Qt::HANDLE"/>
<primitive-type name="QVariant::Type"/>
<primitive-type name="QByteRef"/>
<primitive-type name="QBitRef"/>
<primitive-type name="QBool"/>
<primitive-type name="jobject"/>
<primitive-type name="quintptr"/>
<primitive-type name="qintptr"/>
<primitive-type name="qptrdiff"/>
<primitive-type name="qsizetype"/>
<primitive-type name="size_t"/>
<primitive-type name="Qt::Disambiguated_t"/>

<suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
<suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class '*' has equals operators but no qHash() function"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: type '*' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' for enum '*' is not declared"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched parameter type '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched return type '*'"/>
<!-- <suppress-warning text="WARNING(MetaJavaBuilder) :: signature '*' for function modification in '*' not found. Possible candidates: "/>
-->
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' does not have a type entry"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '*' of argument in function '*', class '*'"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: Shadowing: * and *; Java code will not compile"/>
<suppress-warning text="WARNING(MetaJavaBuilder) :: enum '*' is specified in typesystem, but not declared"/>

</typesystem>
Loading