Skip to content

Commit 9e27c6c

Browse files
usiemsusiems
committed
Extract primitive type definitions and general suppressions...
into a separate typesystem file. This way bindings for other non-Qt libraries can use these without inheriting wildcard rejections that may not be wanted.
1 parent 83a2edb commit 9e27c6c

File tree

4 files changed

+82
-75
lines changed

4 files changed

+82
-75
lines changed

‎generator/build_all.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<typesystem>
2+
<load-typesystem name="typesystem_general.xml" generate="no" />
23
<load-typesystem name="typesystem_core.xml" generate="yes" />
34
<load-typesystem name="typesystem_gui.xml" generate="yes" />
45
<load-typesystem name="typesystem_sql.xml" generate="yes" />

‎generator/generator.qrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<qresource prefix="/trolltech/generator/">
33
<file>qtscript_masterinclude.h</file>
44
<file>build_all.txt</file>
5+
<file alias="typesystem_general.txt">typesystem_general.xml</file>
56
<file alias="typesystem_core.txt">typesystem_core.xml</file>
67
<file alias="typesystem_gui.txt">typesystem_gui.xml</file>
78
<file alias="typesystem_sql.txt">typesystem_sql.xml</file>

‎generator/typesystem_core.xml‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -181,66 +181,6 @@
181181
<rejection class="SyncContinuation"/>
182182
<rejection class="UnwrapHandler"/>
183183

184-
<primitive-type name="qgl_GLsizeiptr"/>
185-
<primitive-type name="qgl_GLintptr"/>
186-
<primitive-type name="GLint"/>
187-
<primitive-type name="GLuint"/>
188-
<primitive-type name="GLenum"/>
189-
<primitive-type name="GLclampf"/>
190-
<primitive-type name="GLsizei"/>
191-
<primitive-type name="GLfloat"/>
192-
<primitive-type name="GLbitfield"/>
193-
<primitive-type name="GLbyte"/>
194-
<primitive-type name="GLshort"/>
195-
<primitive-type name="GLubyte"/>
196-
<primitive-type name="GLushort"/>
197-
<primitive-type name="GLdouble"/>
198-
<primitive-type name="GLclampd"/>
199-
<primitive-type name="GLvoid"/>
200-
<primitive-type name="GLboolean"/>
201-
<primitive-type name="GLuint64"/>
202-
203-
<primitive-type name="bool"/>
204-
<primitive-type name="double"/>
205-
<primitive-type name="qreal"/>
206-
<primitive-type name="float"/>
207-
<primitive-type name="qint64"/>
208-
<primitive-type name="quint64"/>
209-
<primitive-type name="__int64"/>
210-
<primitive-type name="unsigned __int64"/>
211-
<primitive-type name="unsigned long long"/>
212-
<primitive-type name="long long"/>
213-
<primitive-type name="qlonglong"/>
214-
<primitive-type name="qulonglong"/>
215-
<primitive-type name="short"/>
216-
<primitive-type name="signed short"/>
217-
<primitive-type name="ushort"/>
218-
<primitive-type name="unsigned short"/>
219-
<primitive-type name="char"/>
220-
<primitive-type name="signed char"/>
221-
<primitive-type name="uchar"/>
222-
<primitive-type name="unsigned char"/>
223-
<primitive-type name="int"/>
224-
<primitive-type name="signed int"/>
225-
<primitive-type name="uint"/>
226-
<primitive-type name="ulong"/>
227-
<primitive-type name="unsigned int"/>
228-
<primitive-type name="signed long"/>
229-
<primitive-type name="long"/>
230-
<primitive-type name="unsigned long"/>
231-
<primitive-type name="WId"/>
232-
<primitive-type name="Qt::HANDLE"/>
233-
<primitive-type name="QVariant::Type"/>
234-
<primitive-type name="QByteRef"/>
235-
<primitive-type name="QBitRef"/>
236-
<primitive-type name="QBool"/>
237-
<primitive-type name="jobject"/>
238-
<primitive-type name="quintptr"/>
239-
<primitive-type name="qintptr"/>
240-
<primitive-type name="qptrdiff"/>
241-
<primitive-type name="qsizetype"/>
242-
<primitive-type name="Qt::Disambiguated_t"/>
243-
244184
<rejection class="qfloat16"/> <!-- only used in QRgbaFloat template and QCborStreamReader/Writer so far -->
245185

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

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

257-
258197
<rejection class="" enum-name="QtValidLicenseForDBusModule"/>
259198
<rejection class="" enum-name="QtValidLicenseForSqlModule"/>
260199
<rejection class="" enum-name="QtValidLicenseForOpenGLModule"/>
@@ -2121,9 +2060,6 @@ public:
21212060
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTSMFI'"/>
21222061
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractFileEngine::ExtensionOption const\*'"/>
21232062
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractFileEngine::Iterator\*'"/>
2124-
<suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
2125-
<suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
2126-
<suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
21272063
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPointer&lt;*&gt;'"/>
21282064
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QVector&lt;*&gt;'"/>
21292065
<suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/>
@@ -2207,17 +2143,6 @@ public:
22072143
<suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: Qt::MatchWrap) in Qt::MatchFlag"/>
22082144
<suppress-warning text="WARNING(MetaJavaBuilder) :: unmatched enum Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap) when parsing default value of 'match' in class 'QAbstractItemModel'"/>
22092145
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QLatin1String(defaultConnection)' of argument in function '*', class '*'"/>
2210-
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class '*' has equals operators but no qHash() function"/>
2211-
<suppress-warning text="WARNING(MetaJavaBuilder) :: type '*' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
2212-
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' for enum '*' is not declared"/>
2213-
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched parameter type '*'"/>
2214-
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched return type '*'"/>
2215-
<!-- <suppress-warning text="WARNING(MetaJavaBuilder) :: signature '*' for function modification in '*' not found. Possible candidates: "/>
2216-
-->
2217-
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' does not have a type entry"/>
2218-
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '*' of argument in function '*', class '*'"/>
2219-
<suppress-warning text="WARNING(MetaJavaBuilder) :: Shadowing: * and *; Java code will not compile"/>
2220-
<suppress-warning text="WARNING(MetaJavaBuilder) :: enum '*' is specified in typesystem, but not declared"/>
22212146

22222147
<!-- Qt 5 new classes -->
22232148
<object-type name="QFileDevice"/>

‎generator/typesystem_general.xml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0"?>
2+
<typesystem package="com.trolltech.general">
3+
4+
<primitive-type name="qgl_GLsizeiptr"/>
5+
<primitive-type name="qgl_GLintptr"/>
6+
<primitive-type name="GLint"/>
7+
<primitive-type name="GLuint"/>
8+
<primitive-type name="GLenum"/>
9+
<primitive-type name="GLclampf"/>
10+
<primitive-type name="GLsizei"/>
11+
<primitive-type name="GLfloat"/>
12+
<primitive-type name="GLbitfield"/>
13+
<primitive-type name="GLbyte"/>
14+
<primitive-type name="GLshort"/>
15+
<primitive-type name="GLubyte"/>
16+
<primitive-type name="GLushort"/>
17+
<primitive-type name="GLdouble"/>
18+
<primitive-type name="GLclampd"/>
19+
<primitive-type name="GLvoid"/>
20+
<primitive-type name="GLboolean"/>
21+
<primitive-type name="GLuint64"/>
22+
23+
<primitive-type name="bool"/>
24+
<primitive-type name="double"/>
25+
<primitive-type name="qreal"/>
26+
<primitive-type name="float"/>
27+
<primitive-type name="qint64"/>
28+
<primitive-type name="quint64"/>
29+
<primitive-type name="__int64"/>
30+
<primitive-type name="unsigned __int64"/>
31+
<primitive-type name="unsigned long long"/>
32+
<primitive-type name="long long"/>
33+
<primitive-type name="qlonglong"/>
34+
<primitive-type name="qulonglong"/>
35+
<primitive-type name="short"/>
36+
<primitive-type name="signed short"/>
37+
<primitive-type name="ushort"/>
38+
<primitive-type name="unsigned short"/>
39+
<primitive-type name="char"/>
40+
<primitive-type name="signed char"/>
41+
<primitive-type name="uchar"/>
42+
<primitive-type name="unsigned char"/>
43+
<primitive-type name="int"/>
44+
<primitive-type name="signed int"/>
45+
<primitive-type name="uint"/>
46+
<primitive-type name="ulong"/>
47+
<primitive-type name="unsigned int"/>
48+
<primitive-type name="signed long"/>
49+
<primitive-type name="long"/>
50+
<primitive-type name="unsigned long"/>
51+
<primitive-type name="WId"/>
52+
<primitive-type name="Qt::HANDLE"/>
53+
<primitive-type name="QVariant::Type"/>
54+
<primitive-type name="QByteRef"/>
55+
<primitive-type name="QBitRef"/>
56+
<primitive-type name="QBool"/>
57+
<primitive-type name="jobject"/>
58+
<primitive-type name="quintptr"/>
59+
<primitive-type name="qintptr"/>
60+
<primitive-type name="qptrdiff"/>
61+
<primitive-type name="qsizetype"/>
62+
<primitive-type name="size_t"/>
63+
<primitive-type name="Qt::Disambiguated_t"/>
64+
65+
<suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
66+
<suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
67+
<suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
68+
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class '*' has equals operators but no qHash() function"/>
69+
<suppress-warning text="WARNING(MetaJavaBuilder) :: type '*' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
70+
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' for enum '*' is not declared"/>
71+
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched parameter type '*'"/>
72+
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched return type '*'"/>
73+
<!-- <suppress-warning text="WARNING(MetaJavaBuilder) :: signature '*' for function modification in '*' not found. Possible candidates: "/>
74+
-->
75+
<suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' does not have a type entry"/>
76+
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '*' of argument in function '*', class '*'"/>
77+
<suppress-warning text="WARNING(MetaJavaBuilder) :: Shadowing: * and *; Java code will not compile"/>
78+
<suppress-warning text="WARNING(MetaJavaBuilder) :: enum '*' is specified in typesystem, but not declared"/>
79+
80+
</typesystem>

0 commit comments

Comments
 (0)