@@ -0,0 +1,11 | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | xsltproc -o typesystem_core.xml --stringparam source 'typesystem_core-qtscript.xml' merge.xsl typesystem_core-common.xml | |||
|
4 | xsltproc -o typesystem_gui.xml --stringparam source 'typesystem_gui-qtscript.xml' merge.xsl typesystem_gui-common.xml | |||
|
5 | xsltproc -o typesystem_opengl.xml --stringparam source 'typesystem_opengl-qtscript.xml' merge.xsl typesystem_opengl-common.xml | |||
|
6 | xsltproc -o typesystem_network.xml --stringparam source 'typesystem_network-qtscript.xml' merge.xsl typesystem_network-common.xml | |||
|
7 | xsltproc -o typesystem_xml.xml --stringparam source 'typesystem_xml-qtscript.xml' merge.xsl typesystem_xml-common.xml | |||
|
8 | xsltproc -o typesystem_webkit.xml --stringparam source 'typesystem_webkit-qtscript.xml' merge.xsl typesystem_webkit-common.xml | |||
|
9 | xsltproc -o typesystem_sql.xml --stringparam source 'typesystem_sql-qtscript.xml' merge.xsl typesystem_sql-common.xml | |||
|
10 | xsltproc -o typesystem_svg.xml --stringparam source 'typesystem_svg-qtscript.xml' merge.xsl typesystem_svg-common.xml | |||
|
11 | xsltproc -o typesystem_xmlpatterns.xml --stringparam source 'typesystem_xmlpatterns-qtscript.xml' merge.xsl typesystem_xmlpatterns-common.xml No newline at end of file |
@@ -383,6 +383,7 template <typename _InputIterator, typename _OutputIterator> | |||||
383 | _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __first, _InputIterator __last, |
|
383 | _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __first, _InputIterator __last, | |
384 | _OutputIterator __result) |
|
384 | _OutputIterator __result) | |
385 | { |
|
385 | { | |
|
386 | std::cout << env.current_file << std::endl; | |||
386 | if (pp_isalpha (*__first) || *__first == '_') |
|
387 | if (pp_isalpha (*__first) || *__first == '_') | |
387 | { |
|
388 | { | |
388 | pp_macro_expander expand_include (env); |
|
389 | pp_macro_expander expand_include (env); | |
@@ -390,7 +391,8 _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __fi | |||||
390 | name.reserve (255); |
|
391 | name.reserve (255); | |
391 | expand_include (__first, __last, std::back_inserter (name)); |
|
392 | expand_include (__first, __last, std::back_inserter (name)); | |
392 | std::string::iterator it = skip_blanks (name.begin (), name.end ()); |
|
393 | std::string::iterator it = skip_blanks (name.begin (), name.end ()); | |
393 | assert (it != name.end () && (*it == '<' || *it == '"')); |
|
394 | printf("%s", name.c_str()); | |
|
395 | assert((it != name.end () && (*it == '<' || *it == '"'))); | |||
394 | handle_include (__skip_current_path, it, name.end (), __result); |
|
396 | handle_include (__skip_current_path, it, name.end (), __result); | |
395 | return __first; |
|
397 | return __first; | |
396 | } |
|
398 | } | |
@@ -416,7 +418,7 _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __fi | |||||
416 |
|
418 | |||
417 | std::string filepath; |
|
419 | std::string filepath; | |
418 | FILE *fp = find_include_file (filename, &filepath, quote == '>' ? INCLUDE_GLOBAL : INCLUDE_LOCAL, __skip_current_path); |
|
420 | FILE *fp = find_include_file (filename, &filepath, quote == '>' ? INCLUDE_GLOBAL : INCLUDE_LOCAL, __skip_current_path); | |
419 |
|
421 | |||
420 | #if defined (PP_HOOK_ON_FILE_INCLUDED) |
|
422 | #if defined (PP_HOOK_ON_FILE_INCLUDED) | |
421 | PP_HOOK_ON_FILE_INCLUDED (env.current_file, fp ? filepath : filename, fp); |
|
423 | PP_HOOK_ON_FILE_INCLUDED (env.current_file, fp ? filepath : filename, fp); | |
422 | #endif |
|
424 | #endif |
@@ -123,7 +123,7 void SetupGenerator::generate() | |||||
123 | } |
|
123 | } | |
124 |
|
124 | |||
125 | // declare individual class creation functions |
|
125 | // declare individual class creation functions | |
126 | s << "void PythonQt_init_" << shortPackName << "() {" << endl; |
|
126 | s << "void PythonQt_init_" << shortPackName << "(PyObject* module) {" << endl; | |
127 |
|
127 | |||
128 | if (shortPackName.endsWith("Builtin")) { |
|
128 | if (shortPackName.endsWith("Builtin")) { | |
129 | shortPackName = shortPackName.mid(0, shortPackName.length()-strlen("builtin")); |
|
129 | shortPackName = shortPackName.mid(0, shortPackName.length()-strlen("builtin")); | |
@@ -135,12 +135,14 void SetupGenerator::generate() | |||||
135 | QString shellCreator; |
|
135 | QString shellCreator; | |
136 | if (cls->generateShellClass()) { |
|
136 | if (cls->generateShellClass()) { | |
137 | shellCreator = ", PythonQtSetInstanceWrapperOnShell<" + ShellGenerator::shellClassName(cls) + ">"; |
|
137 | shellCreator = ", PythonQtSetInstanceWrapperOnShell<" + ShellGenerator::shellClassName(cls) + ">"; | |
|
138 | } else { | |||
|
139 | shellCreator = ", NULL"; | |||
138 | } |
|
140 | } | |
139 | if (cls->isQObject()) { |
|
141 | if (cls->isQObject()) { | |
140 |
s << "PythonQt:: |
|
142 | s << "PythonQt::priv()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module);" << endl; | |
141 | } else { |
|
143 | } else { | |
142 | QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():""; |
|
144 | QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():""; | |
143 |
s << "PythonQt:: |
|
145 | s << "PythonQt::priv()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module);" << endl; | |
144 | } |
|
146 | } | |
145 | foreach(AbstractMetaClass* interface, cls->interfaces()) { |
|
147 | foreach(AbstractMetaClass* interface, cls->interfaces()) { | |
146 | // the interface might be our own class... (e.g. QPaintDevice) |
|
148 | // the interface might be our own class... (e.g. QPaintDevice) |
@@ -52,8 +52,7 bool ShellGenerator::shouldGenerate(const AbstractMetaClass *meta_class) const | |||||
52 | if (meta_class->name().startsWith("Global")) return false; |
|
52 | if (meta_class->name().startsWith("Global")) return false; | |
53 | if (meta_class->name().startsWith("QStyleOptionComplex")) return false; |
|
53 | if (meta_class->name().startsWith("QStyleOptionComplex")) return false; | |
54 | if (meta_class->name().startsWith("QTextLayout")) return false; |
|
54 | if (meta_class->name().startsWith("QTextLayout")) return false; | |
55 |
|
|
55 | if (meta_class->name().startsWith("QPersistentModelIndex")) return false; | |
56 | //if (meta_class->name().startsWith("QDataStream")) return false; // " |
|
|||
57 | return ((cg & TypeEntry::GenerateCode) != 0); |
|
56 | return ((cg & TypeEntry::GenerateCode) != 0); | |
58 | } |
|
57 | } | |
59 |
|
58 |
@@ -42,6 +42,7 | |||||
42 | #include "shellimplgenerator.h" |
|
42 | #include "shellimplgenerator.h" | |
43 | #include "reporthandler.h" |
|
43 | #include "reporthandler.h" | |
44 | #include "fileout.h" |
|
44 | #include "fileout.h" | |
|
45 | #include <iostream> | |||
45 |
|
46 | |||
46 | extern void declareFunctionMetaTypes(QTextStream &stream, |
|
47 | extern void declareFunctionMetaTypes(QTextStream &stream, | |
47 | const AbstractMetaFunctionList &functions, |
|
48 | const AbstractMetaFunctionList &functions, | |
@@ -61,12 +62,18 static void writeHelperCode(QTextStream &s, const AbstractMetaClass *) | |||||
61 | { |
|
62 | { | |
62 | } |
|
63 | } | |
63 |
|
64 | |||
|
65 | ||||
|
66 | ||||
64 | void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class) |
|
67 | void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class) | |
65 | { |
|
68 | { | |
66 | QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":""; |
|
69 | QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":""; | |
67 | QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri"; |
|
70 | QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri"; | |
68 | priGenerator->addSource(pro_file_name, fileNameForClass(meta_class)); |
|
71 | priGenerator->addSource(pro_file_name, fileNameForClass(meta_class)); | |
69 |
|
72 | |||
|
73 | foreach (AbstractMetaField* field, meta_class->fields()) { | |||
|
74 | std::cout << "Not yet generated fields: " << meta_class->qualifiedCppName().toLatin1().data() << "::" << field->name().toLatin1().data() << std::endl; | |||
|
75 | } | |||
|
76 | ||||
70 |
|
|
77 | s << "#include \"PythonQtWrapper_" << meta_class->name() << ".h\"" << endl << endl; | |
71 |
|
78 | |||
72 | s << "#include <PythonQtSignalReceiver.h>" << endl; |
|
79 | s << "#include <PythonQtSignalReceiver.h>" << endl; |
This diff has been collapsed as it changes many lines, (932 lines changed) Show them Hide them | |||||
@@ -1,6 +1,7 | |||||
1 | <?xml version="1.0"?> |
|
1 | <?xml version="1.0"?> | |
2 | <typesystem> |
|
2 | <typesystem> | |
3 |
|
3 | |||
|
4 | <value-type name="QModelIndex"/> | |||
4 | <rejection class="*" function-name="d_func"/> |
|
5 | <rejection class="*" function-name="d_func"/> | |
5 | <rejection class="*" function-name="data_ptr"/> |
|
6 | <rejection class="*" function-name="data_ptr"/> | |
6 | <rejection class="*" function-name="detach"/> |
|
7 | <rejection class="*" function-name="detach"/> | |
@@ -9,7 +10,8 | |||||
9 | <rejection class="*" field-name="d_ptr"/> |
|
10 | <rejection class="*" field-name="d_ptr"/> | |
10 | <rejection class="*" field-name="d"/> |
|
11 | <rejection class="*" field-name="d"/> | |
11 |
|
12 | |||
12 |
<rejection class="" enum-name="QtValidLicenseForTestModule"/> |
|
13 | <rejection class="" enum-name="QtValidLicenseForTestModule"/> | |
|
14 | ||||
13 |
|
15 | |||
14 | <rejection class="" enum-name="QtValidLicenseForDBusModule"/> |
|
16 | <rejection class="" enum-name="QtValidLicenseForDBusModule"/> | |
15 | <rejection class="" enum-name="QtValidLicenseForSqlModule"/> |
|
17 | <rejection class="" enum-name="QtValidLicenseForSqlModule"/> | |
@@ -26,8 +28,17 | |||||
26 | <rejection class="" enum-name="QtValidLicenseForGuiModule"/> |
|
28 | <rejection class="" enum-name="QtValidLicenseForGuiModule"/> | |
27 | <rejection class="" enum-name="QtValidLicenseForScriptModule"/> |
|
29 | <rejection class="" enum-name="QtValidLicenseForScriptModule"/> | |
28 | <rejection class="" enum-name="QtValidLicenseForHelpModule"/> |
|
30 | <rejection class="" enum-name="QtValidLicenseForHelpModule"/> | |
|
31 | <rejection class="" enum-name="QtValidLicenseForScriptToolsModule" /> | |||
|
32 | <rejection class="" enum-name="QtValidLicenseForMultimediaModule" /> | |||
|
33 | <rejection class="" enum-name="QtValidLicenseForOpenVGModule" /> | |||
|
34 | ||||
29 | <rejection class="QtConcurrent" enum-name="enum_1" /> |
|
35 | <rejection class="QtConcurrent" enum-name="enum_1" /> | |
|
36 | <rejection class="QtConcurrent" function-name="operator|" /> | |||
|
37 | ||||
|
38 | <rejection class="Qt" enum-name="Modifier" /> | |||
30 |
|
39 | |||
|
40 | <rejection class="QSharedPointer" /> | |||
|
41 | <rejection class="QWeakPointer" /> | |||
31 | <rejection class="QFuture::const_iterator" /> |
|
42 | <rejection class="QFuture::const_iterator" /> | |
32 | <rejection class="QFutureInterface" /> |
|
43 | <rejection class="QFutureInterface" /> | |
33 | <rejection class="QFutureInterfaceBase" /> |
|
44 | <rejection class="QFutureInterfaceBase" /> | |
@@ -48,6 +59,7 | |||||
48 | <rejection class="QtConcurrent::Median"/> |
|
59 | <rejection class="QtConcurrent::Median"/> | |
49 | <rejection class="QtConcurrent::MemberFunctionWrapper"/> |
|
60 | <rejection class="QtConcurrent::MemberFunctionWrapper"/> | |
50 | <rejection class="QtConcurrent::MemberFunctionWrapper1"/> |
|
61 | <rejection class="QtConcurrent::MemberFunctionWrapper1"/> | |
|
62 | <rejection class="QtConcurrent::qValueType" /> | |||
51 | <rejection class="QtConcurrent::ReduceKernel"/> |
|
63 | <rejection class="QtConcurrent::ReduceKernel"/> | |
52 | <rejection class="QtConcurrent::ResultItem"/> |
|
64 | <rejection class="QtConcurrent::ResultItem"/> | |
53 | <rejection class="QtConcurrent::ResultIterator"/> |
|
65 | <rejection class="QtConcurrent::ResultIterator"/> | |
@@ -176,7 +188,7 | |||||
176 | <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall5"/> |
|
188 | <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall5"/> | |
177 |
|
189 | |||
178 | <rejection class="QMdi" /> |
|
190 | <rejection class="QMdi" /> | |
179 |
<rejection class="stdext" /> |
|
191 | <rejection class="stdext" /> | |
180 | <rejection class="QAlgorithmsPrivate"/> |
|
192 | <rejection class="QAlgorithmsPrivate"/> | |
181 | <rejection class="QAtomic"/> |
|
193 | <rejection class="QAtomic"/> | |
182 | <rejection class="QAtomicPointer"/> |
|
194 | <rejection class="QAtomicPointer"/> | |
@@ -184,11 +196,26 | |||||
184 | <rejection class="QBasicAtomicInt" /> |
|
196 | <rejection class="QBasicAtomicInt" /> | |
185 | <rejection class="QBasicAtomic"/> |
|
197 | <rejection class="QBasicAtomic"/> | |
186 | <rejection class="QBasicAtomicPointer"/> |
|
198 | <rejection class="QBasicAtomicPointer"/> | |
|
199 | <rejection class="QScopedPointer"/> | |||
|
200 | <rejection class="QScopedArrayPointer" /> | |||
|
201 | <rejection class="QScopedPointer" /> | |||
|
202 | <rejection class="QScopedPointerArrayDeleter" /> | |||
|
203 | <rejection class="QScopedPointerDeleter" /> | |||
|
204 | <rejection class="QScopedPointerPodDeleter" /> | |||
|
205 | <rejection class="QScopedPointerSharedDeleter" /> | |||
|
206 | <rejection class="QScopedSharedPointer" /> | |||
|
207 | <rejection class="QCustomScopedPointer" /> | |||
|
208 | <rejection class="QStringBuilder" /> | |||
|
209 | ||||
187 | <rejection class="QBitRef"/> |
|
210 | <rejection class="QBitRef"/> | |
188 | <rejection class="QCache"/> |
|
211 | <rejection class="QCache"/> | |
|
212 | <rejection class="QContiguousCache"/> | |||
|
213 | <rejection class="QContiguousCacheData"/> | |||
|
214 | <rejection class="QContiguousCacheTypedData"/> | |||
189 | <rejection class="QCharRef"/> |
|
215 | <rejection class="QCharRef"/> | |
190 | <rejection class="QDebug"/> |
|
216 | <rejection class="QDebug"/> | |
191 | <rejection class="QExplicitlySharedDataPointer"/> |
|
217 | <rejection class="QNoDebug" /> | |
|
218 | <rejection class="QExplicitlySharedDataPointer"/> | |||
192 | <rejection class="QFlag"/> |
|
219 | <rejection class="QFlag"/> | |
193 | <rejection class="QFlags"/> |
|
220 | <rejection class="QFlags"/> | |
194 | <rejection class="QForeachContainer"/> |
|
221 | <rejection class="QForeachContainer"/> | |
@@ -209,6 +236,7 | |||||
209 | <rejection class="QHashNode"/> |
|
236 | <rejection class="QHashNode"/> | |
210 | <rejection class="QHashNode"/> |
|
237 | <rejection class="QHashNode"/> | |
211 | <rejection class="QInternal"/> |
|
238 | <rejection class="QInternal"/> | |
|
239 | <rejection class="QIncompatibleFlag" /> | |||
212 | <rejection class="QLibrary"/> |
|
240 | <rejection class="QLibrary"/> | |
213 | <rejection class="QLinkedList"/> |
|
241 | <rejection class="QLinkedList"/> | |
214 | <rejection class="QLinkedListData"/> |
|
242 | <rejection class="QLinkedListData"/> | |
@@ -217,6 +245,8 | |||||
217 | <rejection class="QListData"/> |
|
245 | <rejection class="QListData"/> | |
218 | <rejection class="QListIterator"/> |
|
246 | <rejection class="QListIterator"/> | |
219 | <rejection class="QMap"/> |
|
247 | <rejection class="QMap"/> | |
|
248 | <rejection class="QMapNode" /> | |||
|
249 | <rejection class="QMapPayloadNode" /> | |||
220 | <rejection class="QMapData"/> |
|
250 | <rejection class="QMapData"/> | |
221 | <rejection class="QMapIterator"/> |
|
251 | <rejection class="QMapIterator"/> | |
222 | <rejection class="QMetaType"/> |
|
252 | <rejection class="QMetaType"/> | |
@@ -248,7 +278,7 | |||||
248 | <rejection class="QSharedDataPointer"/> |
|
278 | <rejection class="QSharedDataPointer"/> | |
249 | <rejection class="QStack"/> |
|
279 | <rejection class="QStack"/> | |
250 | <rejection class="QSysInfo"/> |
|
280 | <rejection class="QSysInfo"/> | |
251 |
<rejection class="QTextStreamManipulator"/> |
|
281 | <rejection class="QTextStreamManipulator"/> | |
252 | <rejection class="QThreadStorage"/> |
|
282 | <rejection class="QThreadStorage"/> | |
253 | <rejection class="QThreadStorageData"/> |
|
283 | <rejection class="QThreadStorageData"/> | |
254 | <rejection class="QTypeInfo"/> |
|
284 | <rejection class="QTypeInfo"/> | |
@@ -256,7 +286,7 | |||||
256 | <rejection class="QVFbKeyData"/> |
|
286 | <rejection class="QVFbKeyData"/> | |
257 | <rejection class="QVariantComparisonHelper"/> |
|
287 | <rejection class="QVariantComparisonHelper"/> | |
258 | <rejection class="QVectorData"/> |
|
288 | <rejection class="QVectorData"/> | |
259 |
<rejection class="QVectorIterator"/> |
|
289 | <rejection class="QVectorIterator"/> | |
260 | <rejection class="QVectorTypedData"/> |
|
290 | <rejection class="QVectorTypedData"/> | |
261 | <rejection class="QWriteLocker"/> |
|
291 | <rejection class="QWriteLocker"/> | |
262 | <rejection class="QtPrivate"/> |
|
292 | <rejection class="QtPrivate"/> | |
@@ -275,12 +305,20 | |||||
275 | <rejection class="QSubString"/> |
|
305 | <rejection class="QSubString"/> | |
276 | <rejection class="QUintForType"/> |
|
306 | <rejection class="QUintForType"/> | |
277 | <rejection class="QtConcurrent::internal" /> |
|
307 | <rejection class="QtConcurrent::internal" /> | |
|
308 | <rejection class="QByteArrayMatcher::Data" /> | |||
|
309 | <rejection class="QStringMatcher::Data" /> | |||
|
310 | ||||
|
311 | <rejection class="StringBuilder" /> | |||
|
312 | <rejection class="QConcatenable" /> | |||
|
313 | <rejection class="QLatin1Literal" /> | |||
|
314 | <rejection class="QIntegerForSizeof" /> | |||
|
315 | ||||
278 |
|
316 | |||
279 |
<rejection class="QLocale::Data" /> |
|
317 | <rejection class="QLocale::Data" /> | |
280 | <rejection class="QGlobalStaticDeleter" /> |
|
318 | <rejection class="QGlobalStaticDeleter" /> | |
281 | <rejection class="QSharedMemory" /> <!-- Temporarily until we know how to implement it in Java --> |
|
319 | <rejection class="QSharedMemory" /> <!-- Temporarily until we know how to implement it in Java --> | |
282 | <rejection class="QVarLengthArray" /> |
|
320 | <rejection class="QVarLengthArray" /> | |
283 |
|
321 | |||
284 | <!-- DBus --> |
|
322 | <!-- DBus --> | |
285 | <rejection class="QDBusAbstractAdaptor" /> |
|
323 | <rejection class="QDBusAbstractAdaptor" /> | |
286 | <rejection class="QDBusAbstractInterface" /> |
|
324 | <rejection class="QDBusAbstractInterface" /> | |
@@ -297,7 +335,7 | |||||
297 | <rejection class="QDBusServer" /> |
|
335 | <rejection class="QDBusServer" /> | |
298 | <rejection class="QDBusSignature" /> |
|
336 | <rejection class="QDBusSignature" /> | |
299 | <rejection class="QDBusVariant" /> |
|
337 | <rejection class="QDBusVariant" /> | |
300 |
|
338 | |||
301 | <rejection class="_Revbidit" /> |
|
339 | <rejection class="_Revbidit" /> | |
302 | <rejection class="_complex" /> |
|
340 | <rejection class="_complex" /> | |
303 | <rejection class="_exception" /> |
|
341 | <rejection class="_exception" /> | |
@@ -312,10 +350,11 | |||||
312 | <rejection class="stat" /> |
|
350 | <rejection class="stat" /> | |
313 | <rejection class="tm" /> |
|
351 | <rejection class="tm" /> | |
314 |
|
352 | |||
|
353 | <rejection class="Qt" enum-name="Initialization" /> | |||
|
354 | ||||
315 | <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/> |
|
355 | <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/> | |
316 | <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/> |
|
356 | <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/> | |
317 | <rejection class="QAbstractFileEngine" function-name="beginEntryList"/> |
|
357 | ||
318 | <rejection class="QAbstractFileEngine" function-name="endEntryList"/> |
|
|||
319 | <rejection class="QAbstractFileEngine" function-name="extension"/> |
|
358 | <rejection class="QAbstractFileEngine" function-name="extension"/> | |
320 | <rejection class="QCoreApplication" function-name="compressEvent"/> |
|
359 | <rejection class="QCoreApplication" function-name="compressEvent"/> | |
321 | <rejection class="QCoreApplication" function-name="eventFilter"/> |
|
360 | <rejection class="QCoreApplication" function-name="eventFilter"/> | |
@@ -340,7 +379,7 | |||||
340 | <rejection class="QList" function-name="node_destruct"/> |
|
379 | <rejection class="QList" function-name="node_destruct"/> | |
341 | <rejection class="QList" function-name="toSet"/> |
|
380 | <rejection class="QList" function-name="toSet"/> | |
342 | <rejection class="QObject" function-name="receivers"/> |
|
381 | <rejection class="QObject" function-name="receivers"/> | |
343 |
<rejection class="QObject" function-name="findChild"/> |
|
382 | <rejection class="QObject" function-name="findChild"/> | |
344 | <rejection class="QObject" function-name="findChildren"/> |
|
383 | <rejection class="QObject" function-name="findChildren"/> | |
345 | <rejection class="QObject" function-name="setUserData"/> |
|
384 | <rejection class="QObject" function-name="setUserData"/> | |
346 | <rejection class="QObject" function-name="userData"/> |
|
385 | <rejection class="QObject" function-name="userData"/> | |
@@ -350,6 +389,8 | |||||
350 | <rejection class="QObject" function-name="disconnect"/> |
|
389 | <rejection class="QObject" function-name="disconnect"/> | |
351 | <rejection class="QObject" function-name="disconnectNotify"/> |
|
390 | <rejection class="QObject" function-name="disconnectNotify"/> | |
352 | <rejection class="QObject" function-name="registerUserData"/> |
|
391 | <rejection class="QObject" function-name="registerUserData"/> | |
|
392 | <rejection class="QObject" function-name="sender"/> | |||
|
393 | <rejection class="QTimer" function-name="singleShot"/> | |||
353 | <rejection class="QProcess" function-name="pid"/> |
|
394 | <rejection class="QProcess" function-name="pid"/> | |
354 | <rejection class="QRegion" function-name="cleanUp"/> |
|
395 | <rejection class="QRegion" function-name="cleanUp"/> | |
355 | <rejection class="QSettings" function-name="registerFormat"/> |
|
396 | <rejection class="QSettings" function-name="registerFormat"/> | |
@@ -366,23 +407,45 | |||||
366 | <rejection class="QVector" function-name="alloc"/> |
|
407 | <rejection class="QVector" function-name="alloc"/> | |
367 | <rejection class="QVector" function-name="operator+="/> |
|
408 | <rejection class="QVector" function-name="operator+="/> | |
368 | <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/> |
|
409 | <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/> | |
369 |
|
410 | <rejection class="QtConcurrent::ThreadEngineBarrier" /> | ||
|
411 | ||||
370 | <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/> |
|
412 | <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/> | |
371 | <rejection class="QDataStream" enum-name="ByteOrder"/> |
|
413 | <rejection class="QDataStream" enum-name="ByteOrder"/> | |
372 |
|
414 | |||
373 |
|
415 | |||
374 | <namespace-type name="Qt"> |
|
416 | <namespace-type name="Qt"> | |
375 | </namespace-type> |
|
417 | </namespace-type> | |
376 |
|
418 | |||
|
419 | <enum-type name="QDate::MonthNameType" /> | |||
|
420 | <enum-type name="QAbstractAnimation::DeletionPolicy" /> | |||
|
421 | <enum-type name="QAbstractAnimation::Direction" /> | |||
|
422 | <enum-type name="QAbstractAnimation::State" /> | |||
|
423 | <enum-type name="QDataStream::FloatingPointPrecision" /> | |||
|
424 | <enum-type name="QEasingCurve::Type" /> | |||
|
425 | <enum-type name="QHistoryState::HistoryType" /> | |||
|
426 | <enum-type name="QState::ChildMode" /> | |||
|
427 | <enum-type name="QStateMachine::Error" /> | |||
|
428 | <enum-type name="QStateMachine::EventPriority" /> | |||
|
429 | <enum-type name="QStateMachine::RestorePolicy" /> | |||
|
430 | <enum-type name="Qt::AnchorPoint" /> | |||
|
431 | <enum-type name="Qt::CoordinateSystem" /> | |||
|
432 | <enum-type name="Qt::GestureState" /> | |||
|
433 | <enum-type name="Qt::InputMethodHint" flags="Qt::InputMethodHints" /> | |||
|
434 | <enum-type name="Qt::NavigationMode" /> | |||
|
435 | <enum-type name="Qt::RenderHint" /> | |||
|
436 | <enum-type name="Qt::TileRule" /> | |||
|
437 | <enum-type name="Qt::TouchPointState" flags="Qt::TouchPointStates" /> | |||
377 |
|
438 | |||
378 | <enum-type name="QtMsgType"> |
|
439 | <enum-type name="QtMsgType"> | |
379 | <reject-enum-value name="QtSystemMsg" /> |
|
440 | <reject-enum-value name="QtSystemMsg" /> | |
380 | </enum-type> |
|
441 | </enum-type> | |
381 |
|
442 | |||
|
443 | ||||
|
444 | <enum-type name="QReadWriteLock::RecursionMode" /> | |||
382 | <enum-type name="QSystemSemaphore::AccessMode" /> |
|
445 | <enum-type name="QSystemSemaphore::AccessMode" /> | |
383 | <enum-type name="QSystemSemaphore::SystemSemaphoreError" /> |
|
446 | <enum-type name="QSystemSemaphore::SystemSemaphoreError" /> | |
384 | <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons" /> |
|
447 | <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons" /> | |
385 |
<enum-type name="QTextBoundaryFinder::BoundaryType" /> |
|
448 | <enum-type name="QTextBoundaryFinder::BoundaryType" /> | |
386 | <enum-type name="QAbstractFileEngine::Extension" extensible="yes"/> |
|
449 | <enum-type name="QAbstractFileEngine::Extension" extensible="yes"/> | |
387 | <enum-type name="QAbstractFileEngine::FileFlag" flags="QAbstractFileEngine::FileFlags"/> |
|
450 | <enum-type name="QAbstractFileEngine::FileFlag" flags="QAbstractFileEngine::FileFlags"/> | |
388 | <enum-type name="QAbstractFileEngine::FileName"/> |
|
451 | <enum-type name="QAbstractFileEngine::FileName"/> | |
@@ -458,7 +521,6 | |||||
458 | <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/> |
|
521 | <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/> | |
459 | <enum-type name="Qt::LayoutDirection"/> |
|
522 | <enum-type name="Qt::LayoutDirection"/> | |
460 | <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/> |
|
523 | <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/> | |
461 | <enum-type name="Qt::Modifier"/> |
|
|||
462 | <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/> |
|
524 | <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/> | |
463 | <enum-type name="Qt::Orientation" flags="Qt::Orientations"/> |
|
525 | <enum-type name="Qt::Orientation" flags="Qt::Orientations"/> | |
464 | <enum-type name="Qt::PenCapStyle"/> |
|
526 | <enum-type name="Qt::PenCapStyle"/> | |
@@ -484,12 +546,13 | |||||
484 | <enum-type name="Qt::EventPriority"/> |
|
546 | <enum-type name="Qt::EventPriority"/> | |
485 | <enum-type name="Qt::MaskMode"/> |
|
547 | <enum-type name="Qt::MaskMode"/> | |
486 | <enum-type name="QCryptographicHash::Algorithm"/> |
|
548 | <enum-type name="QCryptographicHash::Algorithm"/> | |
487 |
|
549 | |||
488 | <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions" /> |
|
550 | <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions" /> | |
489 | <enum-type name="QtConcurrent::ThreadFunctionResult" /> |
|
551 | <enum-type name="QtConcurrent::ThreadFunctionResult" /> | |
|
552 | ||||
490 |
|
553 | |||
491 | <enum-type name="QCoreApplication::Encoding"> |
|
554 | <enum-type name="QCoreApplication::Encoding"> | |
492 |
<reject-enum-value name="DefaultCodec"/> |
|
555 | <reject-enum-value name="DefaultCodec"/> | |
493 | </enum-type> |
|
556 | </enum-type> | |
494 |
|
557 | |||
495 | <enum-type name="Qt::AlignmentFlag" flags="Qt::Alignment"> |
|
558 | <enum-type name="Qt::AlignmentFlag" flags="Qt::Alignment"> | |
@@ -512,9 +575,8 | |||||
512 | </enum-type> |
|
575 | </enum-type> | |
513 |
|
576 | |||
514 |
|
577 | |||
515 |
<enum-type name="QDataStream::Version"> |
|
578 | <enum-type name="QDataStream::Version"> | |
516 | <reject-enum-value name="Qt_4_1"/> |
|
579 | <reject-enum-value name="Qt_4_1"/> | |
517 | <reject-enum-value name="Qt_4_5"/> |
|
|||
518 | </enum-type> |
|
580 | </enum-type> | |
519 |
|
581 | |||
520 | <enum-type name="QDir::SortFlag" flags="QDir::SortFlags"> |
|
582 | <enum-type name="QDir::SortFlag" flags="QDir::SortFlags"> | |
@@ -550,92 +612,149 | |||||
550 | <enum-type name="Qt::ToolBarArea" flags="Qt::ToolBarAreas"> |
|
612 | <enum-type name="Qt::ToolBarArea" flags="Qt::ToolBarAreas"> | |
551 | <reject-enum-value name="AllToolBarAreas"/> |
|
613 | <reject-enum-value name="AllToolBarAreas"/> | |
552 | </enum-type> |
|
614 | </enum-type> | |
553 |
|
615 | |||
554 | <enum-type name="Qt::WidgetAttribute"> |
|
616 | <enum-type name="Qt::WidgetAttribute"> | |
555 | <reject-enum-value name="WA_ForceAcceptDrops"/> |
|
617 | <reject-enum-value name="WA_ForceAcceptDrops"/> | |
556 | <reject-enum-value name="WA_NoBackground"/> |
|
618 | <reject-enum-value name="WA_NoBackground"/> | |
557 | <reject-enum-value name="WA_MacMetalStyle"/> |
|
619 | <reject-enum-value name="WA_MacMetalStyle"/> | |
558 | </enum-type> |
|
620 | </enum-type> | |
559 |
|
621 | |||
560 |
<value-type name="Q |
|
622 | <value-type name="QProcessEnvironment" /> | |
|
623 | <value-type name="QBasicTimer"/> | |||
561 | <value-type name="QByteArrayMatcher"> |
|
624 | <value-type name="QByteArrayMatcher"> | |
562 | <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/> |
|
625 | <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/> | |
563 | </value-type> |
|
626 | </value-type> | |
564 |
|
627 | |||
565 |
<value-type name="QDate"> |
|
628 | <value-type name="QDate"> | |
566 | <modify-function signature="julianToGregorian(uint,int&,int&,int&)"> |
|
629 | <modify-function signature="julianToGregorian(uint,int&,int&,int&)"> | |
567 |
|
|
630 | <remove/> | |
568 |
</modify-function> |
|
631 | </modify-function> | |
569 |
|
632 | |||
570 |
<modify-function signature="setYMD(int, int, int)" remove="all"/> |
|
633 | <modify-function signature="setYMD(int, int, int)" remove="all"/> | |
|
634 | <!--### Obsolete in 4.3--> | |||
571 | </value-type> |
|
635 | </value-type> | |
572 |
|
636 | |||
573 | <value-type name="QDateTime"> |
|
637 | <value-type name="QDateTime"> | |
574 | <modify-function signature="operator=(QDateTime)" remove="all"/> |
|
638 | <modify-function signature="operator=(QDateTime)" remove="all"/> | |
575 | </value-type> |
|
639 | </value-type> | |
576 |
|
640 | |||
577 | <value-type name="QDir"> |
|
641 | <value-type name="QDir"> | |
578 | <modify-function signature="QDir(QString,QString,QFlags<QDir::SortFlag>,QFlags<QDir::Filter>)"> |
|
642 | <modify-function signature="QDir(QString,QString,QFlags<QDir::SortFlag>,QFlags<QDir::Filter>)"> | |
579 |
|
|
643 | <modify-argument index="3"> | |
580 |
|
|
644 | <replace-default-expression with="SortFlag.Name, SortFlag.IgnoreCase"/> | |
581 |
|
|
645 | </modify-argument> | |
582 |
</modify-function> |
|
646 | </modify-function> | |
583 | <modify-function signature="operator=(QDir)" remove="all"/> |
|
647 | <modify-function signature="operator=(QDir)" remove="all"/> | |
584 | <modify-function signature="operator=(QString)" remove="all"/> |
|
648 | <modify-function signature="operator=(QString)" remove="all"/> | |
585 |
<modify-function signature="addResourceSearchPath(QString)" remove="all"/> |
|
649 | <modify-function signature="addResourceSearchPath(QString)" remove="all"/> | |
|
650 | <!--### Obsolete in 4.3--> | |||
586 | </value-type> |
|
651 | </value-type> | |
587 |
|
652 | |||
588 | <value-type name="QPoint"/> |
|
653 | <value-type name="QPoint"/> | |
589 | <value-type name="QPointF"/> |
|
654 | <value-type name="QPointF"/> | |
590 |
|
655 | |||
591 | <value-type name="QRect"> |
|
656 | <value-type name="QRect"> | |
592 |
<modify-function signature="getCoords(int*,int*,int*,int*)const"> |
|
657 | <modify-function signature="getCoords(int*,int*,int*,int*)const"> | |
593 | <modify-function signature="getRect(int*,int*,int*,int*)const"> <remove/> </modify-function> |
|
658 | <remove/> | |
594 | <modify-function signature="operator&=(QRect)"> <remove/> </modify-function> |
|
659 | </modify-function> | |
595 | <modify-function signature="operator|=(QRect)"> <remove/> </modify-function> |
|
660 | <modify-function signature="getRect(int*,int*,int*,int*)const"> | |
596 | <modify-function signature="operator&(QRect)const"> <remove/> </modify-function> |
|
661 | <remove/> | |
597 | <modify-function signature="operator|(QRect)const"> <remove/> </modify-function> |
|
662 | </modify-function> | |
598 |
|
663 | <modify-function signature="operator&=(QRect)"> | ||
599 | <modify-function signature="intersect(const QRect&)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
664 | <remove/> | |
600 | <modify-function signature="unite(const QRect&)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
665 | </modify-function> | |
|
666 | <modify-function signature="operator|=(QRect)"> | |||
|
667 | <remove/> | |||
|
668 | </modify-function> | |||
|
669 | <modify-function signature="operator&(QRect)const"> | |||
|
670 | <remove/> | |||
|
671 | </modify-function> | |||
|
672 | <modify-function signature="operator|(QRect)const"> | |||
|
673 | <remove/> | |||
|
674 | </modify-function> | |||
|
675 | ||||
|
676 | <modify-function signature="intersect(const QRect&)const" remove="all"/> | |||
|
677 | <!--### Obsolete in 4.3--> | |||
|
678 | <modify-function signature="unite(const QRect&)const" remove="all"/> | |||
|
679 | <!--### Obsolete in 4.3--> | |||
601 | </value-type> |
|
680 | </value-type> | |
602 |
|
681 | |||
603 | <value-type name="QRectF"> |
|
682 | <value-type name="QRectF"> | |
604 |
<modify-function signature="getCoords( |
|
683 | <modify-function signature="getCoords(double*,double*,double*,double*)const"> | |
605 | <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function> |
|
684 | <remove/> | |
606 | <modify-function signature="operator&=(QRectF)"> <remove/> </modify-function> |
|
685 | </modify-function> | |
607 | <modify-function signature="operator|=(QRectF)"> <remove/> </modify-function> |
|
686 | <modify-function signature="getRect(double*,double*,double*,double*)const"> | |
608 | <modify-function signature="operator&(QRectF)const"> <remove/> </modify-function> |
|
687 | <remove/> | |
609 | <modify-function signature="operator|(QRectF)const"> <remove/> </modify-function> |
|
688 | </modify-function> | |
610 |
|
689 | <modify-function signature="operator&=(QRectF)"> | ||
611 | <modify-function signature="intersect(const QRectF&)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
690 | <remove/> | |
612 | <modify-function signature="unite(const QRectF&)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
691 | </modify-function> | |
|
692 | <modify-function signature="operator|=(QRectF)"> | |||
|
693 | <remove/> | |||
|
694 | </modify-function> | |||
|
695 | <modify-function signature="operator&(QRectF)const"> | |||
|
696 | <remove/> | |||
|
697 | </modify-function> | |||
|
698 | <modify-function signature="operator|(QRectF)const"> | |||
|
699 | <remove/> | |||
|
700 | </modify-function> | |||
|
701 | ||||
|
702 | <modify-function signature="intersect(const QRectF&)const" remove="all"/> | |||
|
703 | <!--### Obsolete in 4.3--> | |||
|
704 | <modify-function signature="unite(const QRectF&)const" remove="all"/> | |||
|
705 | <!--### Obsolete in 4.3--> | |||
613 | </value-type> |
|
706 | </value-type> | |
614 |
|
707 | |||
615 |
|
708 | |||
616 | <value-type name="QSize"> |
|
709 | <value-type name="QSize"> | |
617 |
<modify-function signature="operator*=( |
|
710 | <modify-function signature="operator*=(double)"> | |
618 | <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function> |
|
711 | <access modifier="private"/> | |
619 | <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function> |
|
712 | </modify-function> | |
620 |
<modify-function signature="operator |
|
713 | <modify-function signature="operator/=(double)"> | |
621 | <modify-function signature="rheight()"> <remove/> </modify-function> |
|
714 | <access modifier="private"/> | |
622 | <modify-function signature="rwidth()"> <remove/> </modify-function> |
|
715 | </modify-function> | |
|
716 | <modify-function signature="operator+=(QSize)"> | |||
|
717 | <access modifier="private"/> | |||
|
718 | </modify-function> | |||
|
719 | <modify-function signature="operator-=(QSize)"> | |||
|
720 | <access modifier="private"/> | |||
|
721 | </modify-function> | |||
|
722 | <modify-function signature="rheight()"> | |||
|
723 | <remove/> | |||
|
724 | </modify-function> | |||
|
725 | <modify-function signature="rwidth()"> | |||
|
726 | <remove/> | |||
|
727 | </modify-function> | |||
623 | </value-type> |
|
728 | </value-type> | |
624 |
|
729 | |||
625 | <value-type name="QSizeF"> |
|
730 | <value-type name="QSizeF"> | |
626 |
<modify-function signature="operator*=( |
|
731 | <modify-function signature="operator*=(double)"> | |
627 | <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function> |
|
732 | <access modifier="private"/> | |
628 | <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function> |
|
733 | </modify-function> | |
629 |
<modify-function signature="operator |
|
734 | <modify-function signature="operator/=(double)"> | |
630 | <modify-function signature="rheight()"> <remove/> </modify-function> |
|
735 | <access modifier="private"/> | |
631 | <modify-function signature="rwidth()"> <remove/> </modify-function> |
|
736 | </modify-function> | |
|
737 | <modify-function signature="operator+=(QSizeF)"> | |||
|
738 | <access modifier="private"/> | |||
|
739 | </modify-function> | |||
|
740 | <modify-function signature="operator-=(QSizeF)"> | |||
|
741 | <access modifier="private"/> | |||
|
742 | </modify-function> | |||
|
743 | <modify-function signature="rheight()"> | |||
|
744 | <remove/> | |||
|
745 | </modify-function> | |||
|
746 | <modify-function signature="rwidth()"> | |||
|
747 | <remove/> | |||
|
748 | </modify-function> | |||
632 | </value-type> |
|
749 | </value-type> | |
633 |
|
750 | |||
634 | <value-type name="QStringMatcher"> |
|
751 | <value-type name="QStringMatcher"> | |
635 | <modify-function signature="operator=(QStringMatcher)" remove="all"/> |
|
752 | <modify-function signature="operator=(QStringMatcher)" remove="all"/> | |
|
753 | <modify-function signature="QStringMatcher(const QChar*,int,Qt::CaseSensitivity)" remove="all" /> | |||
|
754 | <modify-function signature="indexIn(const QChar*,int,int)const" remove="all" /> | |||
636 | </value-type> |
|
755 | </value-type> | |
637 |
|
756 | |||
638 |
<value-type name="QTime"/> |
|
757 | <value-type name="QTime"/> | |
639 |
|
758 | |||
640 | <value-type name="QPersistentModelIndex"> |
|
759 | <value-type name="QPersistentModelIndex"> | |
641 | <modify-function signature="operator=(QPersistentModelIndex)" remove="all"/> |
|
760 | <modify-function signature="operator=(QPersistentModelIndex)" remove="all"/> | |
@@ -645,21 +764,20 | |||||
645 |
|
764 | |||
646 | <value-type name="QUuid"> |
|
765 | <value-type name="QUuid"> | |
647 | <modify-function signature="QUuid(const char*)"> |
|
766 | <modify-function signature="QUuid(const char*)"> | |
648 |
|
|
767 | <remove/> | |
649 | </modify-function> |
|
768 | </modify-function> | |
650 | </value-type> |
|
769 | </value-type> | |
651 |
|
770 | |||
652 |
<value-type name="QLocale"> |
|
771 | <value-type name="QLocale"> | |
653 |
<modify-function signature="toString( |
|
772 | <modify-function signature="toString(unsigned long long) const" remove="all"/> | |
654 | <modify-function signature="toString(ushort) const" remove="all"/> |
|
773 | <modify-function signature="toString(unsigned short) const" remove="all"/> | |
655 | <modify-function signature="toString(unsigned int) const" remove="all"/> |
|
774 | <modify-function signature="toString(unsigned int) const" remove="all"/> | |
656 | <modify-function signature="toUInt(QString,bool*,int)const" remove="all"/> |
|
775 | <modify-function signature="toUInt(QString,bool*,int)const" remove="all"/> | |
657 | <modify-function signature="toULongLong(QString,bool*,int)const" remove="all"/> |
|
776 | <modify-function signature="toULongLong(QString,bool*,int)const" remove="all"/> | |
658 | <modify-function signature="operator=(QLocale)" remove="all"/> |
|
777 | <modify-function signature="operator=(QLocale)" remove="all"/> | |
659 |
|
||||
660 | </value-type> |
|
778 | </value-type> | |
661 |
|
779 | |||
662 |
|
780 | |||
663 | <value-type name="QBitArray"> |
|
781 | <value-type name="QBitArray"> | |
664 | <modify-function signature="operator[](int)" remove="all"/> |
|
782 | <modify-function signature="operator[](int)" remove="all"/> | |
665 | <modify-function signature="operator[](int)const" remove="all"/> |
|
783 | <modify-function signature="operator[](int)const" remove="all"/> | |
@@ -671,67 +789,91 | |||||
671 | <modify-function signature="operator^=(QBitArray)" access="private"/> |
|
789 | <modify-function signature="operator^=(QBitArray)" access="private"/> | |
672 | <modify-function signature="operator|=(QBitArray)" access="private"/> |
|
790 | <modify-function signature="operator|=(QBitArray)" access="private"/> | |
673 | <modify-function signature="operator~()const" access="private"/> |
|
791 | <modify-function signature="operator~()const" access="private"/> | |
674 |
</value-type> |
|
792 | </value-type> | |
675 |
|
793 | |||
|
794 | <object-type name="QReadWriteLock"/> | |||
676 | <object-type name="QDirIterator"/> |
|
795 | <object-type name="QDirIterator"/> | |
677 | <object-type name="QAbstractFileEngineIterator"/> |
|
796 | <object-type name="QAbstractFileEngineIterator"/> | |
678 |
<object-type name="QAbstractItemModel" |
|
797 | <object-type name="QAbstractItemModel"> | |
679 |
|
798 | <modify-function signature="rowsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/> | ||
|
799 | <modify-function signature="rowsInserted(QModelIndex,int,int)" private-signal="yes"/> | |||
|
800 | ||||
|
801 | <modify-function signature="rowsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/> | |||
|
802 | <modify-function signature="rowsRemoved(QModelIndex,int,int)" private-signal="yes"/> | |||
|
803 | ||||
|
804 | <modify-function signature="columnsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/> | |||
|
805 | <modify-function signature="columnsInserted(QModelIndex,int,int)" private-signal="yes"/> | |||
|
806 | ||||
|
807 | <modify-function signature="columnsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/> | |||
|
808 | <modify-function signature="columnsRemoved(QModelIndex,int,int)" private-signal="yes"/> | |||
|
809 | ||||
|
810 | <modify-function signature="modelAboutToBeReset()" private-signal="yes"/> | |||
|
811 | <modify-function signature="modelReset()" private-signal="yes"/> | |||
|
812 | </object-type> | |||
|
813 | ||||
680 | <object-type name="QAbstractListModel"> |
|
814 | <object-type name="QAbstractListModel"> | |
681 | <extra-includes> |
|
815 | <extra-includes> | |
682 |
|
|
816 | <include file-name="QStringList" location="global"/> | |
683 |
|
|
817 | <include file-name="QSize" location="global"/> | |
684 | </extra-includes> |
|
818 | </extra-includes> | |
685 | </object-type> |
|
819 | </object-type> | |
686 |
|
820 | |||
687 | <object-type name="QAbstractTableModel"> |
|
|||
688 | <extra-includes> |
|
|||
689 | <include file-name="QStringList" location="global"/> |
|
|||
690 | <include file-name="QSize" location="global"/> |
|
|||
691 | </extra-includes> |
|
|||
692 | </object-type> |
|
|||
693 |
|
||||
694 | <value-type name="QUrl"> |
|
821 | <value-type name="QUrl"> | |
695 | <extra-includes> |
|
822 | <extra-includes> | |
696 |
|
|
823 | <include file-name="QStringList" location="global"/> | |
697 | </extra-includes> |
|
824 | </extra-includes> | |
698 | <modify-function signature="operator=(QUrl)" remove="all"/> |
|
825 | <modify-function signature="operator=(QUrl)" remove="all"/> | |
699 | <modify-function signature="operator=(QString)" remove="all"/> |
|
826 | <modify-function signature="operator=(QString)" remove="all"/> | |
700 |
|
827 | |||
701 |
<modify-function signature="fromPunycode(const QByteArray&)" remove="all"/> |
|
828 | <modify-function signature="fromPunycode(const QByteArray&)" remove="all"/> | |
702 | <modify-function signature="toPunycode(const QString&)" remove="all"/> <!--### Obsolete in 4.3--> |
|
829 | <!--### Obsolete in 4.3--> | |
|
830 | <modify-function signature="toPunycode(const QString&)" remove="all"/> | |||
|
831 | <!--### Obsolete in 4.3--> | |||
703 | </value-type> |
|
832 | </value-type> | |
704 |
|
833 | |||
705 | <value-type name="QRegExp"> |
|
834 | <value-type name="QRegExp"> | |
706 | <extra-includes> |
|
835 | <extra-includes> | |
707 |
|
|
836 | <include file-name="QStringList" location="global"/> | |
708 | </extra-includes> |
|
837 | </extra-includes> | |
709 | <modify-function signature="operator=(QRegExp)" remove="all"/> |
|
838 | <modify-function signature="operator=(QRegExp)" remove="all"/> | |
|
839 | <modify-function signature="pos(int)const"> | |||
|
840 | <remove /> | |||
|
841 | </modify-function> | |||
|
842 | <modify-function signature="cap(int)const"> | |||
|
843 | <remove /> | |||
|
844 | </modify-function> | |||
|
845 | <modify-function signature="capturedTexts()const"> | |||
|
846 | <remove /> | |||
|
847 | </modify-function> | |||
|
848 | <modify-function signature="errorString()const"> | |||
|
849 | <remove /> | |||
|
850 | </modify-function> | |||
710 | </value-type> |
|
851 | </value-type> | |
711 |
|
852 | |||
712 | <value-type name="QFileInfo"> |
|
853 | <value-type name="QFileInfo"> | |
713 | <extra-includes> |
|
854 | <extra-includes> | |
714 |
|
|
855 | <include file-name="QDateTime" location="global"/> | |
715 |
|
|
856 | <include file-name="QDir" location="global"/> | |
716 | </extra-includes> |
|
857 | </extra-includes> | |
717 | <modify-function signature="operator!=(const QFileInfo &)const" remove="all"/> |
|
858 | <modify-function signature="operator!=(const QFileInfo &)const" remove="all"/> | |
718 | <modify-function signature="operator==(const QFileInfo &)const" remove="all"/> |
|
859 | <modify-function signature="operator==(const QFileInfo &)const" remove="all"/> | |
719 | <modify-function signature="operator=(QFileInfo)" remove="all"/> |
|
860 | <modify-function signature="operator=(QFileInfo)" remove="all"/> | |
720 | <modify-function signature="setFile(QFile)"> |
|
861 | <modify-function signature="setFile(QFile)"> | |
721 |
|
|
862 | <modify-argument index="1"> | |
722 |
|
|
863 | <reference-count action="ignore"/> | |
723 |
|
|
864 | </modify-argument> | |
724 | </modify-function> |
|
865 | </modify-function> | |
725 |
|
866 | |||
726 |
<modify-function signature="readLink()const" remove="all"/> |
|
867 | <modify-function signature="readLink()const" remove="all"/> | |
|
868 | <!--### Obsolete in 4.3--> | |||
727 | </value-type> |
|
869 | </value-type> | |
728 |
|
870 | |||
729 |
|
|
871 | <interface-type name="QFactoryInterface" /> | |
730 |
|
872 | |||
731 | <value-type name="QByteArray"> |
|
873 | <value-type name="QByteArray"> | |
732 |
|
874 | |||
733 | <extra-includes> |
|
875 | <extra-includes> | |
734 |
|
|
876 | <include file-name="QNoImplicitBoolCast" location="global"/> | |
735 | </extra-includes> |
|
877 | </extra-includes> | |
736 |
|
878 | |||
737 | <!-- removed functions --> |
|
879 | <!-- removed functions --> | |
@@ -745,7 +887,7 | |||||
745 | <modify-function signature="end()" remove="all"/> |
|
887 | <modify-function signature="end()" remove="all"/> | |
746 | <modify-function signature="end()const" remove="all"/> |
|
888 | <modify-function signature="end()const" remove="all"/> | |
747 | <modify-function signature="number(uint,int)" remove="all"/> |
|
889 | <modify-function signature="number(uint,int)" remove="all"/> | |
748 |
<modify-function signature="number( |
|
890 | <modify-function signature="number(unsigned long long,int)" remove="all"/> | |
749 | <modify-function signature="operator const char *()const" remove="all"/> |
|
891 | <modify-function signature="operator const char *()const" remove="all"/> | |
750 | <modify-function signature="operator const void *()const" remove="all"/> |
|
892 | <modify-function signature="operator const void *()const" remove="all"/> | |
751 | <modify-function signature="operator+=(const char*)" remove="all"/> |
|
893 | <modify-function signature="operator+=(const char*)" remove="all"/> | |
@@ -761,8 +903,8 | |||||
761 | <modify-function signature="push_front(const QByteArray&)" remove="all"/> |
|
903 | <modify-function signature="push_front(const QByteArray&)" remove="all"/> | |
762 | <modify-function signature="push_front(const char*)" remove="all"/> |
|
904 | <modify-function signature="push_front(const char*)" remove="all"/> | |
763 | <modify-function signature="setNum(uint,int)" remove="all"/> |
|
905 | <modify-function signature="setNum(uint,int)" remove="all"/> | |
764 |
<modify-function signature="setNum( |
|
906 | <modify-function signature="setNum(unsigned long long,int)" remove="all"/> | |
765 | <modify-function signature="setNum(ushort,int)" remove="all"/> |
|
907 | <modify-function signature="setNum(unsigned short,int)" remove="all"/> | |
766 | <modify-function signature="toLong(bool*, int) const" remove="all"/> |
|
908 | <modify-function signature="toLong(bool*, int) const" remove="all"/> | |
767 | <modify-function signature="toLongLong(bool*, int) const" remove="all"/> |
|
909 | <modify-function signature="toLongLong(bool*, int) const" remove="all"/> | |
768 | <modify-function signature="toShort(bool*, int) const" remove="all"/> |
|
910 | <modify-function signature="toShort(bool*, int) const" remove="all"/> | |
@@ -776,27 +918,55 | |||||
776 | <modify-function signature="operator+=(QString)" remove="all"/> |
|
918 | <modify-function signature="operator+=(QString)" remove="all"/> | |
777 | <modify-function signature="operator+=(char)" remove="all"/> |
|
919 | <modify-function signature="operator+=(char)" remove="all"/> | |
778 | </value-type> |
|
920 | </value-type> | |
779 |
|
921 | |||
780 | <value-type name="QTextBoundaryFinder"> |
|
922 | <value-type name="QTextBoundaryFinder"> | |
781 | <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all" /> |
|
923 | <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all" /> | |
782 | <modify-function signature="operator=(QTextBoundaryFinder)" remove="all" /> |
|
924 | <modify-function signature="operator=(QTextBoundaryFinder)" remove="all" /> | |
783 | </value-type> |
|
925 | </value-type> | |
784 |
|
926 | |||
|
927 | <value-type name="QEasingCurve"> | |||
|
928 | <modify-function signature="customType()const" remove="all" /> | |||
|
929 | <modify-function signature="setCustomType(double)" remove="all" /> | |||
|
930 | </value-type> | |||
|
931 | ||||
|
932 | <object-type name="QAbstractAnimation" /> | |||
|
933 | <object-type name="QVariantAnimation" /> | |||
|
934 | <object-type name="QAnimationGroup" /> | |||
|
935 | <object-type name="QPauseAnimation" /> | |||
|
936 | <object-type name="QParallelAnimationGroup" /> | |||
|
937 | <object-type name="QSequentialAnimationGroup" /> | |||
|
938 | <object-type name="QPropertyAnimation" /> | |||
|
939 | ||||
|
940 | <object-type name="QAbstractState" /> | |||
|
941 | <object-type name="QAbstractTransition" /> | |||
|
942 | <object-type name="QState" /> | |||
|
943 | <object-type name="QStateMachine" /> | |||
|
944 | <object-type name="QHistoryState" /> | |||
|
945 | <object-type name="QSignalTransition" /> | |||
|
946 | <object-type name="QEventTransition" /> | |||
|
947 | <object-type name="QFinalState" /> | |||
|
948 | ||||
785 | <object-type name="QXmlStreamEntityResolver" /> |
|
949 | <object-type name="QXmlStreamEntityResolver" /> | |
786 |
<object-type name="QAbstractEventDispatcher"/> |
|
950 | <object-type name="QAbstractEventDispatcher"/> | |
787 | <object-type name="QEventLoop"/> |
|
951 | <object-type name="QEventLoop"/> | |
788 |
<object-type name="QFile"> |
|
952 | <object-type name="QFile"> | |
789 |
<modify-function signature="readLink()const" remove="all"/> |
|
953 | <modify-function signature="readLink()const" remove="all"/> | |
790 | <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3--> |
|
954 | <!--### Obsolete in 4.3--> | |
791 | <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all" /> <!-- Can't provide same API and performance --> |
|
955 | <modify-function signature="readLink(QString)" remove="all"/> | |
792 | <modify-function signature="unmap(uchar*)" remove="all" /> <!-- Can't provide same API and performance --> |
|
956 | <!--### Obsolete in 4.3--> | |
|
957 | <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all" /> | |||
|
958 | <!-- Can't provide same API and performance --> | |||
|
959 | <modify-function signature="unmap(unsigned char*)" remove="all" /> | |||
|
960 | <!-- Can't provide same API and performance --> | |||
793 | </object-type> |
|
961 | </object-type> | |
794 |
|
962 | |||
795 | <object-type name="QIODevice"/> |
|
963 | <object-type name="QIODevice"/> | |
|
964 | <object-type name="QStateMachine::SignalEvent" polymorphic-id-expression="%1->type() == QEvent::StateMachineSignal" /> | |||
|
965 | <object-type name="QStateMachine::WrappedEvent" polymorphic-id-expression="%1->type() == QEvent::StateMachineWrapped" /> | |||
796 |
|
966 | |||
797 | <object-type name="QCryptographicHash"/> |
|
967 | <object-type name="QCryptographicHash"/> | |
798 | <object-type name="QLibraryInfo"/> |
|
968 | <object-type name="QLibraryInfo"/> | |
799 |
<object-type name="QMutex"/> |
|
969 | <object-type name="QMutex"/> | |
800 | <object-type name="QSemaphore"/> |
|
970 | <object-type name="QSemaphore"/> | |
801 | <object-type name="QSocketNotifier"/> |
|
971 | <object-type name="QSocketNotifier"/> | |
802 | <object-type name="QSystemLocale"/> |
|
972 | <object-type name="QSystemLocale"/> | |
@@ -805,74 +975,71 | |||||
805 | </object-type> |
|
975 | </object-type> | |
806 | <object-type name="QMimeData"> |
|
976 | <object-type name="QMimeData"> | |
807 | <extra-includes> |
|
977 | <extra-includes> | |
808 |
|
|
978 | <include file-name="QStringList" location="global"/> | |
809 |
|
|
979 | <include file-name="QUrl" location="global"/> | |
810 | </extra-includes> |
|
980 | </extra-includes> | |
811 |
</object-type> |
|
981 | </object-type> | |
812 |
<object-type name="QTextCodec"> |
|
982 | <object-type name="QTextCodec"> | |
813 |
|
983 | |||
814 | <modify-function signature="setCodecForTr(QTextCodec*)"> |
|
984 | <modify-function signature="setCodecForTr(QTextCodec*)"> | |
815 |
|
|
985 | <access modifier="private"/> | |
816 |
|
|
986 | <modify-argument index="1"> | |
817 |
|
|
987 | <reference-count action="set" variable-name="__rcCodecForTr"/> | |
818 |
|
|
988 | </modify-argument> | |
819 | </modify-function> |
|
989 | </modify-function> | |
820 | <modify-function signature="setCodecForCStrings(QTextCodec*)"> |
|
990 | <modify-function signature="setCodecForCStrings(QTextCodec*)"> | |
821 |
|
|
991 | <modify-argument index="1"> | |
822 |
|
|
992 | <reference-count action="set" variable-name="__rcCodecForCStrings"/> | |
823 |
|
|
993 | </modify-argument> | |
824 | </modify-function> |
|
994 | </modify-function> | |
825 | <modify-function signature="setCodecForLocale(QTextCodec*)"> |
|
995 | <modify-function signature="setCodecForLocale(QTextCodec*)"> | |
826 |
|
|
996 | <modify-argument index="1"> | |
827 |
|
|
997 | <reference-count action="set" variable-name="__rcCodecForLocale"/> | |
828 |
|
|
998 | </modify-argument> | |
829 | </modify-function> |
|
999 | </modify-function> | |
830 |
|
1000 | |||
831 |
|
1001 | |||
832 | <modify-function signature="codecForTr()"> |
|
1002 | <modify-function signature="codecForTr()"> | |
833 |
|
|
1003 | <remove/> | |
834 | </modify-function> |
|
1004 | </modify-function> | |
835 |
|
1005 | |||
836 | <modify-function signature="QTextCodec()"> |
|
1006 | <modify-function signature="QTextCodec()"> | |
837 |
|
|
1007 | <modify-argument index="-1"> | |
838 |
|
|
1008 | <define-ownership class="java" owner="c++"/> | |
839 |
|
|
1009 | </modify-argument> | |
840 | </modify-function> |
|
1010 | </modify-function> | |
841 |
|
1011 | |||
842 | <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const"> |
|
1012 | <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const"> | |
843 |
|
|
1013 | <remove/> | |
844 | </modify-function> |
|
1014 | </modify-function> | |
845 |
|
1015 | |||
846 | <modify-function signature="toUnicode(const char*,int,QTextCodec::ConverterState*)const"> |
|
1016 | <modify-function signature="toUnicode(const char*,int,QTextCodec::ConverterState*)const"> | |
847 |
|
|
1017 | <remove/> | |
848 | </modify-function> |
|
1018 | </modify-function> | |
849 |
|
1019 | |||
850 | <modify-function signature="toUnicode(const char*)const"> |
|
1020 | <modify-function signature="toUnicode(const char*)const"> | |
851 |
|
|
1021 | <remove/> | |
852 | </modify-function> |
|
1022 | </modify-function> | |
853 | </object-type> |
|
1023 | </object-type> | |
854 |
|
1024 | |||
855 | <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory" /> |
|
|||
856 | <object-type name="QTextCodecPlugin" /> |
|
|||
857 |
|
||||
858 | <object-type name="QTextDecoder"> |
|
1025 | <object-type name="QTextDecoder"> | |
859 | <modify-function signature="toUnicode(const char*,int)"> |
|
1026 | <modify-function signature="toUnicode(const char*,int)"> | |
860 |
|
|
1027 | <remove/> | |
861 |
</modify-function> |
|
1028 | </modify-function> | |
862 | <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/> |
|
1029 | <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/> | |
863 | </object-type> |
|
1030 | </object-type> | |
864 | <object-type name="QTextEncoder"> |
|
1031 | <object-type name="QTextEncoder"> | |
865 | <modify-function signature="fromUnicode(const QChar*,int)"> |
|
1032 | <modify-function signature="fromUnicode(const QChar*,int)"> | |
866 |
|
|
1033 | <remove/> | |
867 |
</modify-function> |
|
1034 | </modify-function> | |
868 | </object-type> |
|
1035 | </object-type> | |
869 |
<object-type name="QTimeLine"/> |
|
1036 | <object-type name="QTimeLine"/> | |
870 | <object-type name="QTranslator"> |
|
1037 | <object-type name="QTranslator"> | |
871 | <modify-function signature="translate(const char*,const char*,const char*,int)const"> |
|
1038 | <modify-function signature="translate(const char*,const char*,const char*,int)const"> | |
872 |
|
|
1039 | <remove/> | |
873 | </modify-function> |
|
1040 | </modify-function> | |
874 | </object-type> |
|
1041 | </object-type> | |
875 |
|
1042 | |||
876 | <object-type name="QWaitCondition"/> |
|
1043 | <object-type name="QWaitCondition"/> | |
877 |
|
1044 | |||
878 | <object-type name="QFileSystemWatcher"> |
|
1045 | <object-type name="QFileSystemWatcher"> | |
@@ -880,170 +1047,184 | |||||
880 | <include file-name="QStringList" location="global"/> |
|
1047 | <include file-name="QStringList" location="global"/> | |
881 | </extra-includes> |
|
1048 | </extra-includes> | |
882 | </object-type> |
|
1049 | </object-type> | |
883 |
|
1050 | |||
884 | <object-type name="QTextCodec::ConverterState"> |
|
1051 | <object-type name="QTextCodec::ConverterState"> | |
885 | <include file-name="QTextCodec" location="global"/> |
|
1052 | <include file-name="QTextCodec" location="global"/> | |
886 | </object-type> |
|
1053 | </object-type> | |
887 |
|
1054 | |||
888 |
<object-type name="QBuffer"> |
|
1055 | <object-type name="QBuffer"> | |
889 | <modify-function signature="buffer()"> |
|
1056 | <modify-function signature="buffer()"> | |
890 |
|
|
1057 | <remove/> | |
891 | </modify-function> |
|
1058 | </modify-function> | |
|
1059 | <modify-function signature="connectNotify(const char *)" remove="all" /> | |||
|
1060 | <modify-function signature="disconnectNotify(const char *)" remove="all" /> | |||
892 | </object-type> |
|
1061 | </object-type> | |
893 |
|
1062 | |||
894 | <object-type name="QTimer"/> |
|
1063 | <object-type name="QTimer"/> | |
895 |
|
1064 | |||
896 | <object-type name="QAbstractFileEngineHandler"> |
|
1065 | <object-type name="QAbstractFileEngineHandler"> | |
897 | <modify-function signature="create(const QString &) const"> |
|
1066 | <modify-function signature="create(const QString &) const"> | |
898 |
|
|
1067 | <modify-argument index="return"> | |
899 |
|
|
1068 | <define-ownership owner="c++" class="shell"/> | |
900 |
|
|
1069 | </modify-argument> | |
901 | </modify-function> |
|
1070 | </modify-function> | |
902 | </object-type> |
|
1071 | </object-type> | |
903 |
|
1072 | |||
904 |
|
|
1073 | <object-type name="QAbstractFileEngine::MapExtensionOption" /> | |
905 |
|
|
1074 | <object-type name="QAbstractFileEngine::MapExtensionReturn" /> | |
906 |
|
|
1075 | <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> | |
907 | <object-type name="QAbstractFileEngine"> |
|
1076 | <object-type name="QAbstractFileEngine"> | |
908 | <extra-includes> |
|
1077 | <extra-includes> | |
909 |
|
|
1078 | <include file-name="QDateTime" location="global"/> | |
910 | </extra-includes> |
|
1079 | </extra-includes> | |
911 |
<modify-function signature="map( |
|
1080 | <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all" /> | |
912 | <modify-function signature="unmap(unsigned char*)" remove="all" /> |
|
1081 | <modify-function signature="unmap(unsigned char*)" remove="all" /> | |
913 | </object-type> |
|
1082 | </object-type> | |
914 |
|
1083 | |||
915 | <object-type name="QProcess"> |
|
1084 | <object-type name="QProcess"> | |
916 |
<modify-function signature="readChannelMode()const" remove="all"/> |
|
1085 | <modify-function signature="readChannelMode()const" remove="all"/> | |
917 | <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1086 | <!--### Obsolete in 4.3--> | |
|
1087 | <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> | |||
|
1088 | <!--### Obsolete in 4.3--> | |||
918 | </object-type> |
|
1089 | </object-type> | |
919 |
|
1090 | |||
920 | <object-type name="QSignalMapper"> |
|
1091 | <object-type name="QSignalMapper"> | |
921 | <modify-function signature="mapped(const QString &)"> |
|
1092 | <modify-function signature="mapped(const QString &)"> | |
922 |
|
|
1093 | <rename to="mappedString"/> | |
923 | </modify-function> |
|
1094 | </modify-function> | |
924 | <modify-function signature="mapped(int)"> |
|
1095 | <modify-function signature="mapped(int)"> | |
925 |
|
|
1096 | <rename to="mappedInteger"/> | |
926 |
</modify-function> |
|
1097 | </modify-function> | |
927 | <modify-function signature="mapped(QObject *)"> |
|
1098 | <modify-function signature="mapped(QObject *)"> | |
928 |
|
|
1099 | <rename to="mappedQObject"/> | |
929 |
</modify-function> |
|
1100 | </modify-function> | |
930 | <modify-function signature="mapped(QWidget *)" remove="all"/> |
|
1101 | <modify-function signature="mapped(QWidget *)" remove="all"/> | |
931 |
|
1102 | |||
932 | <modify-function signature="mapping(QWidget*)const" remove="all"/> |
|
1103 | <modify-function signature="mapping(QWidget*)const" remove="all"/> | |
933 |
|
1104 | |||
934 | <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/> |
|
1105 | <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/> | |
935 |
</object-type> |
|
1106 | </object-type> | |
936 |
|
1107 | |||
937 | <object-type name="QObject"> |
|
1108 | <object-type name="QObject"> | |
938 | <modify-function signature="childEvent(QChildEvent*)"> |
|
1109 | <modify-function signature="childEvent(QChildEvent*)"> | |
939 |
|
|
1110 | <modify-argument index="1" invalidate-after-use="yes" /> | |
940 | </modify-function> |
|
1111 | </modify-function> | |
941 | <modify-function signature="customEvent(QEvent*)"> |
|
1112 | <modify-function signature="customEvent(QEvent*)"> | |
942 |
|
|
1113 | <modify-argument index="1" invalidate-after-use="yes" /> | |
943 | </modify-function> |
|
1114 | </modify-function> | |
944 | <modify-function signature="event(QEvent*)"> |
|
1115 | <modify-function signature="event(QEvent*)"> | |
945 |
|
|
1116 | <modify-argument index="1" invalidate-after-use="yes" /> | |
946 | </modify-function> |
|
1117 | </modify-function> | |
947 | <modify-function signature="eventFilter(QObject*,QEvent*)"> |
|
1118 | <modify-function signature="eventFilter(QObject*,QEvent*)"> | |
948 |
|
|
1119 | <modify-argument index="2" invalidate-after-use="yes" /> | |
949 | </modify-function> |
|
1120 | </modify-function> | |
950 | <modify-function signature="timerEvent(QTimerEvent*)"> |
|
1121 | <modify-function signature="timerEvent(QTimerEvent*)"> | |
951 |
|
|
1122 | <modify-argument index="1" invalidate-after-use="yes" /> | |
952 | </modify-function> |
|
1123 | </modify-function> | |
953 |
|
1124 | |||
954 | <modify-function signature="installEventFilter(QObject*)"> |
|
1125 | <modify-function signature="installEventFilter(QObject*)"> | |
955 |
|
|
1126 | <modify-argument index="1"> | |
956 |
|
|
1127 | <reference-count action="add" variable-name="__rcEventFilters"/> | |
957 |
|
|
1128 | </modify-argument> | |
958 | </modify-function> |
|
1129 | </modify-function> | |
959 | <modify-function signature="removeEventFilter(QObject*)"> |
|
1130 | <modify-function signature="removeEventFilter(QObject*)"> | |
960 |
|
|
1131 | <modify-argument index="1"> | |
961 |
|
|
1132 | <reference-count action="remove" variable-name="__rcEventFilters"/> | |
962 |
|
|
1133 | </modify-argument> | |
963 | </modify-function> |
|
1134 | </modify-function> | |
964 | <modify-function signature="setParent(QObject*)"> |
|
1135 | <modify-function signature="setParent(QObject*)"> | |
965 |
|
|
1136 | <modify-argument index="1"> | |
966 |
|
|
1137 | <reference-count action="ignore"/> | |
967 |
|
|
1138 | </modify-argument> | |
968 | </modify-function> |
|
1139 | </modify-function> | |
969 |
|
1140 | |||
970 | <modify-function signature="deleteLater()"> |
|
1141 | <modify-function signature="deleteLater()"> | |
971 |
|
|
1142 | <rename to="disposeLater"/> | |
972 | </modify-function> |
|
1143 | </modify-function> | |
973 | <!-- |
|
1144 | ||
974 | <modify-function signature="inherits(const char*)const"> |
|
1145 | <modify-function signature="inherits(const char*)const"> | |
975 |
|
|
1146 | <remove/> | |
976 | </modify-function> |
|
1147 | </modify-function> | |
977 | --> |
|
1148 | ||
978 | <modify-function signature="property(const char*)const"> |
|
1149 | <modify-function signature="property(const char*)const"> | |
979 |
|
|
1150 | <access modifier="private"/> | |
980 | </modify-function> |
|
1151 | </modify-function> | |
981 |
|
1152 | |||
982 | <modify-function signature="setProperty(const char*,QVariant)"> |
|
1153 | <modify-function signature="setProperty(const char*,QVariant)"> | |
983 |
|
|
1154 | <access modifier="private"/> | |
984 | </modify-function> |
|
1155 | </modify-function> | |
985 |
|
1156 | |||
986 |
|
1157 | |||
987 | <extra-includes> |
|
1158 | <extra-includes> | |
988 |
|
|
1159 | <include file-name="QVarLengthArray" location="global"/> | |
989 | </extra-includes> |
|
1160 | </extra-includes> | |
990 |
|
1161 | |||
991 | </object-type> |
|
1162 | </object-type> | |
992 |
|
1163 | |||
993 | <object-type name="QCoreApplication"> |
|
1164 | <object-type name="QCoreApplication"> | |
994 | <extra-includes> |
|
1165 | <extra-includes> | |
995 |
|
|
1166 | <include file-name="QStringList" location="global"/> | |
996 | </extra-includes> |
|
1167 | </extra-includes> | |
997 |
|
1168 | |||
998 |
<modify-function signature="argv()" remove="all" /> |
|
1169 | <modify-function signature="argv()" remove="all" /> | |
999 | <modify-function signature="argc()" remove="all" /> <!-- Obsolete --> |
|
1170 | <!-- Obsolete --> | |
1000 |
|
1171 | <modify-function signature="argc()" remove="all" /> | ||
|
1172 | <!-- Obsolete --> | |||
|
1173 | ||||
1001 | <modify-function signature="notify(QObject*,QEvent*)"> |
|
1174 | <modify-function signature="notify(QObject*,QEvent*)"> | |
1002 |
|
|
1175 | <modify-argument index="2" invalidate-after-use="yes" /> | |
1003 | </modify-function> |
|
1176 | </modify-function> | |
1004 |
|
1177 | |||
1005 |
|
1178 | |||
1006 | <modify-function signature="QCoreApplication(int &, char **)"> |
|
1179 | <modify-function signature="QCoreApplication(int &, char **)"> | |
1007 | <access modifier="private"/> |
|
1180 | <access modifier="private"/> | |
1008 |
</modify-function> |
|
1181 | </modify-function> | |
1009 | <modify-function signature="removePostedEvents(QObject*)"> |
|
1182 | <modify-function signature="removePostedEvents(QObject*)"> | |
1010 |
|
|
1183 | <modify-argument index="1"> | |
1011 |
|
|
1184 | <reference-count action="ignore"/> | |
1012 |
|
|
1185 | </modify-argument> | |
1013 | </modify-function> |
|
1186 | </modify-function> | |
1014 | <modify-function signature="removePostedEvents(QObject*,int)"> |
|
1187 | <modify-function signature="removePostedEvents(QObject*,int)"> | |
1015 |
|
|
1188 | <modify-argument index="1"> | |
1016 |
|
|
1189 | <reference-count action="ignore"/> | |
1017 |
|
|
1190 | </modify-argument> | |
1018 | </modify-function> |
|
1191 | </modify-function> | |
1019 |
|
1192 | |||
1020 | <modify-function signature="installTranslator(QTranslator *)"> |
|
1193 | <modify-function signature="installTranslator(QTranslator *)"> | |
1021 |
|
|
1194 | <modify-argument index="1"> | |
1022 |
|
|
1195 | <reference-count action="add" variable-name="__rcTranslators"/> | |
1023 |
|
|
1196 | </modify-argument> | |
1024 | </modify-function> |
|
1197 | </modify-function> | |
1025 |
|
1198 | |||
1026 | <modify-function signature="removeTranslator(QTranslator *)"> |
|
1199 | <modify-function signature="removeTranslator(QTranslator *)"> | |
1027 |
|
|
1200 | <modify-argument index="1"> | |
1028 |
|
|
1201 | <reference-count action="remove" variable-name="__rcTranslators"/> | |
1029 |
|
|
1202 | </modify-argument> | |
1030 |
</modify-function> |
|
1203 | </modify-function> | |
1031 |
|
1204 | |||
1032 |
|
1205 | |||
1033 | <modify-function signature="postEvent(QObject*,QEvent*)"> |
|
1206 | <modify-function signature="postEvent(QObject*,QEvent*)"> | |
1034 |
|
|
1207 | <modify-argument index="2"> | |
1035 |
|
|
1208 | <define-ownership class="java" owner="c++"/> | |
1036 |
|
|
1209 | </modify-argument> | |
1037 |
</modify-function> |
|
1210 | </modify-function> | |
1038 | </object-type> |
|
1211 | </object-type> | |
1039 |
|
1212 | |||
1040 | <object-type name="QSettings"> |
|
1213 | <object-type name="QSettings"> | |
1041 | <extra-includes> |
|
1214 | <extra-includes> | |
1042 |
|
|
1215 | <include file-name="QStringList" location="global"/> | |
1043 | </extra-includes> |
|
1216 | </extra-includes> | |
1044 |
|
1217 | |||
1045 | <modify-function signature="setSystemIniPath(const QString&)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1218 | <modify-function signature="setIniCodec(QTextCodec*)"> | |
1046 | <modify-function signature="setUserIniPath(const QString&)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1219 | <modify-argument index="1"> | |
|
1220 | <reference-count action="set" variable-name="__rcIniCodec" /> | |||
|
1221 | </modify-argument> | |||
|
1222 | </modify-function> | |||
|
1223 | ||||
|
1224 | <modify-function signature="setSystemIniPath(const QString&)" remove="all"/> | |||
|
1225 | <!--### Obsolete in 4.3--> | |||
|
1226 | <modify-function signature="setUserIniPath(const QString&)" remove="all"/> | |||
|
1227 | <!--### Obsolete in 4.3--> | |||
1047 | </object-type> |
|
1228 | </object-type> | |
1048 |
|
1229 | |||
1049 | <object-type name="QEvent" polymorphic-base="yes" polymorphic-id-expression="%1->type() == QEvent::None"/> |
|
1230 | <object-type name="QEvent" polymorphic-base="yes" polymorphic-id-expression="%1->type() == QEvent::None"/> | |
@@ -1051,129 +1232,209 | |||||
1051 | <modify-field name="c" read="false" write="false"/> |
|
1232 | <modify-field name="c" read="false" write="false"/> | |
1052 | </object-type> |
|
1233 | </object-type> | |
1053 | <object-type name="QTimerEvent" polymorphic-id-expression="%1->type() == QEvent::Timer"/> |
|
1234 | <object-type name="QTimerEvent" polymorphic-id-expression="%1->type() == QEvent::Timer"/> | |
1054 |
<object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1->type() == QEvent::DynamicPropertyChange"/> |
|
1235 | <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1->type() == QEvent::DynamicPropertyChange"/> | |
1055 |
|
1236 | |||
1056 |
<object-type name="QDataStream"> |
|
1237 | <object-type name="QDataStream"> | |
1057 | <modify-function signature="setDevice(QIODevice*)"> |
|
1238 | <modify-function signature="setDevice(QIODevice*)"> | |
1058 |
|
|
1239 | <modify-argument index="1"> | |
1059 |
|
|
1240 | <reference-count action="set" variable-name="__rcDevice"/> | |
1060 |
|
|
1241 | </modify-argument> | |
1061 | </modify-function> |
|
1242 | </modify-function> | |
1062 | <!-- |
|
|||
1063 | <modify-function signature="unsetDevice()"> |
|
1243 | <modify-function signature="unsetDevice()"> | |
1064 |
|
|
1244 | <inject-code position="end"> | |
1065 |
|
|
1245 | __rcDevice = null; | |
1066 |
|
|
1246 | </inject-code> | |
1067 | </modify-function> |
|
1247 | </modify-function> | |
1068 | --> |
|
|||
1069 |
|
1248 | |||
1070 |
|
1249 | |||
1071 |
<modify-function signature="operator<<(const char*)"> |
|
1250 | <modify-function signature="operator<<(const char*)"> | |
1072 | <modify-function signature="operator<<(unsigned int)"> <remove/> </modify-function> |
|
1251 | <remove/> | |
1073 | <modify-function signature="operator<<(unsigned long long)"> <remove/> </modify-function> |
|
1252 | </modify-function> | |
1074 |
<modify-function signature="operator<<(unsigned |
|
1253 | <modify-function signature="operator<<(unsigned char)"> | |
|
1254 | <remove/> | |||
|
1255 | </modify-function> | |||
|
1256 | <modify-function signature="operator<<(unsigned int)"> | |||
|
1257 | <remove/> | |||
|
1258 | </modify-function> | |||
|
1259 | <modify-function signature="operator<<(unsigned long long)"> | |||
|
1260 | <remove/> | |||
|
1261 | </modify-function> | |||
|
1262 | <modify-function signature="operator<<(unsigned short)"> | |||
|
1263 | <remove/> | |||
|
1264 | </modify-function> | |||
1075 |
|
1265 | |||
1076 |
<modify-function signature="operator>>(char &*)"> |
|
1266 | <modify-function signature="operator>>(char &*)"> | |
|
1267 | <remove/> | |||
|
1268 | </modify-function> | |||
|
1269 | <modify-function signature="operator>>(uint&)"> | |||
|
1270 | <remove/> | |||
|
1271 | </modify-function> | |||
|
1272 | <modify-function signature="operator>>(unsigned char&)"> | |||
|
1273 | <remove/> | |||
|
1274 | </modify-function> | |||
|
1275 | <modify-function signature="operator>>(unsigned long long&)"> | |||
|
1276 | <remove/> | |||
|
1277 | </modify-function> | |||
1077 |
|
1278 | |||
1078 |
<modify-function signature="readRawData(char*,int)"> |
|
1279 | <modify-function signature="readRawData(char*,int)"> | |
1079 | <modify-function signature="readBytes(char&*,uint&)"> <remove/> </modify-function> |
|
1280 | <remove/> | |
1080 | <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function> |
|
1281 | </modify-function> | |
1081 |
<modify-function signature=" |
|
1282 | <modify-function signature="readBytes(char&*,uint&)"> | |
|
1283 | <remove/> | |||
|
1284 | </modify-function> | |||
|
1285 | <modify-function signature="writeRawData(const char*,int)"> | |||
|
1286 | <remove/> | |||
|
1287 | </modify-function> | |||
|
1288 | <modify-function signature="writeBytes(const char*,uint)"> | |||
|
1289 | <remove/> | |||
|
1290 | </modify-function> | |||
1082 | </object-type> |
|
1291 | </object-type> | |
1083 |
|
1292 | |||
1084 | <object-type name="QFSFileEngine"> |
|
1293 | <object-type name="QFSFileEngine"> | |
1085 | <extra-includes> |
|
1294 | <extra-includes> | |
1086 |
|
|
1295 | <include file-name="QDateTime" location="global"/> | |
1087 |
|
|
1296 | </extra-includes> | |
1088 | </object-type> |
|
1297 | </object-type> | |
1089 |
|
1298 | |||
1090 | <object-type name="QTextStream"> |
|
1299 | <object-type name="QTextStream"> | |
1091 |
<modify-function signature="QTextStream(QByteArray *, QFlags<QIODevice::OpenModeFlag>)"> |
|
1300 | <modify-function signature="QTextStream(QByteArray *, QFlags<QIODevice::OpenModeFlag>)"> | |
1092 | <modify-function signature="QTextStream(QString*,QFlags<QIODevice::OpenModeFlag>)"> <remove/> </modify-function> |
|
1301 | <remove/> | |
1093 | <modify-function signature="operator>>(QChar&)"> <remove/> </modify-function> |
|
1302 | </modify-function> | |
1094 | <modify-function signature="operator<<(const void*)"> <remove/> </modify-function> |
|
1303 | <modify-function signature="QTextStream(QString*,QFlags<QIODevice::OpenModeFlag>)"> | |
1095 | <modify-function signature="operator<<(unsigned int)"> <remove/> </modify-function> |
|
1304 | <remove/> | |
1096 | <modify-function signature="operator<<(qlonglong)"> <remove/> </modify-function> |
|
1305 | </modify-function> | |
1097 |
<modify-function signature="operator& |
|
1306 | <modify-function signature="operator>>(QChar&)"> | |
1098 | <modify-function signature="operator<<(unsigned long)"> <remove/> </modify-function> |
|
1307 | <remove/> | |
1099 | <modify-function signature="operator<<(signed long)"> <remove/> </modify-function> |
|
1308 | </modify-function> | |
1100 |
<modify-function signature="operator<<(const |
|
1309 | <modify-function signature="operator<<(const void*)"> | |
1101 | <modify-function signature="operator<<(unsigned short)"> <remove/> </modify-function> |
|
1310 | <remove/> | |
1102 | <modify-function signature="operator>>(qulonglong&)"> <remove/> </modify-function> |
|
1311 | </modify-function> | |
1103 |
<modify-function signature="operator& |
|
1312 | <modify-function signature="operator<<(unsigned int)"> | |
1104 | <modify-function signature="setString(QString*,QFlags<QIODevice::OpenModeFlag>)"> <remove/> </modify-function> |
|
1313 | <remove/> | |
1105 | <modify-function signature="string()const"> <remove/> </modify-function> |
|
1314 | </modify-function> | |
1106 |
<modify-function signature="operator& |
|
1315 | <modify-function signature="operator<<(unsigned long long)"> | |
1107 | <modify-function signature="operator>>(char*)"> <remove/> </modify-function> |
|
1316 | <remove/> | |
1108 | <modify-function signature="operator>>(QByteArray&)"> <remove/> </modify-function> |
|
1317 | </modify-function> | |
1109 |
<modify-function signature="operator& |
|
1318 | <modify-function signature="operator<<(const QChar &)"> | |
1110 |
|
1319 | <remove/> | ||
1111 |
|
1320 | </modify-function> | ||
|
1321 | <modify-function signature="operator<<(unsigned long)"> | |||
|
1322 | <remove/> | |||
|
1323 | </modify-function> | |||
|
1324 | <modify-function signature="operator<<(signed long)"> | |||
|
1325 | <remove/> | |||
|
1326 | </modify-function> | |||
|
1327 | <modify-function signature="operator<<(const char*)"> | |||
|
1328 | <remove/> | |||
|
1329 | </modify-function> | |||
|
1330 | <modify-function signature="operator<<(unsigned short)"> | |||
|
1331 | <remove/> | |||
|
1332 | </modify-function> | |||
|
1333 | <modify-function signature="operator<<(const QByteArray&)"> | |||
|
1334 | <remove/> | |||
|
1335 | </modify-function> | |||
|
1336 | <modify-function signature="operator>>(unsigned long long&)"> | |||
|
1337 | <remove/> | |||
|
1338 | </modify-function> | |||
|
1339 | <modify-function signature="operator>>(uint&)"> | |||
|
1340 | <remove/> | |||
|
1341 | </modify-function> | |||
|
1342 | <modify-function signature="operator>>(ulong&)"> | |||
|
1343 | <remove/> | |||
|
1344 | </modify-function> | |||
|
1345 | <modify-function signature="setString(QString*,QFlags<QIODevice::OpenModeFlag>)"> | |||
|
1346 | <remove /> | |||
|
1347 | </modify-function> | |||
|
1348 | <modify-function signature="string()const"> | |||
|
1349 | <remove /> | |||
|
1350 | </modify-function> | |||
|
1351 | <modify-function signature="operator>>(signed long&)"> | |||
|
1352 | <remove/> | |||
|
1353 | </modify-function> | |||
|
1354 | <modify-function signature="operator>>(char*)"> | |||
|
1355 | <remove/> | |||
|
1356 | </modify-function> | |||
|
1357 | <modify-function signature="operator>>(QByteArray&)"> | |||
|
1358 | <remove/> | |||
|
1359 | </modify-function> | |||
|
1360 | <modify-function signature="operator>>(QString&)"> | |||
|
1361 | <remove/> | |||
|
1362 | </modify-function> | |||
|
1363 | <modify-function signature="operator>>(unsigned short&)"> | |||
|
1364 | <remove/> | |||
|
1365 | </modify-function> | |||
|
1366 | <modify-function signature="operator<<(const QString&)"> | |||
|
1367 | <remove/> | |||
|
1368 | </modify-function> | |||
|
1369 | ||||
|
1370 | ||||
1112 | <modify-function signature="setCodec(QTextCodec *)"> |
|
1371 | <modify-function signature="setCodec(QTextCodec *)"> | |
1113 |
|
|
1372 | <modify-argument index="1"> | |
1114 |
|
|
1373 | <reference-count action="set" variable-name="__rcCodec"/> | |
1115 |
|
|
1374 | </modify-argument> | |
1116 | </modify-function> |
|
1375 | </modify-function> | |
1117 |
|
1376 | |||
1118 | <modify-function signature="QTextStream(QIODevice *)"> |
|
1377 | <modify-function signature="QTextStream(QIODevice *)"> | |
1119 |
|
|
1378 | <modify-argument index="1"> | |
1120 |
|
|
1379 | <reference-count action="set" variable-name="__rcDevice"/> | |
1121 |
|
|
1380 | </modify-argument> | |
1122 |
</modify-function> |
|
1381 | </modify-function> | |
1123 | <modify-function signature="setDevice(QIODevice *)"> |
|
1382 | <modify-function signature="setDevice(QIODevice *)"> | |
1124 |
|
|
1383 | <modify-argument index="1"> | |
1125 |
|
|
1384 | <reference-count action="set" variable-name="__rcDevice"/> | |
1126 |
|
|
1385 | </modify-argument> | |
1127 |
</modify-function> |
|
1386 | </modify-function> | |
1128 | </object-type> |
|
1387 | </object-type> | |
1129 |
|
1388 | |||
1130 | <object-type name="QSystemSemaphore" /> |
|
1389 | <object-type name="QSystemSemaphore" /> | |
1131 |
|
1390 | |||
1132 | <namespace-type name="QtConcurrent" target-type="class" /> |
|
1391 | <namespace-type name="QtConcurrent" target-type="class" /> | |
1133 |
|
1392 | |||
1134 | <value-type name="QFuture" generate="no"> |
|
1393 | <value-type name="QFuture" generate="no"> | |
1135 | <modify-function signature="operator T() const" remove="all" /> |
|
1394 | <modify-function signature="operator T() const" remove="all" /> | |
1136 | <modify-function signature="operator=(const QFuture &)" remove="all" /> |
|
1395 | <modify-function signature="operator=(const QFuture &)" remove="all" /> | |
1137 | </value-type> |
|
1396 | </value-type> | |
1138 |
<value-type name="Qt |
|
1397 | <value-type name="QtJambiVoidFuture" java-name="QFutureVoid"> | |
1139 | <modify-function signature="resultCount()const" remove="all" /> |
|
1398 | <modify-function signature="resultCount()const" remove="all" /> | |
1140 | <modify-function signature="isResultReadyAt(int)const" remove="all" /> |
|
1399 | <modify-function signature="isResultReadyAt(int)const" remove="all" /> | |
1141 | </value-type> |
|
1400 | </value-type> | |
1142 |
<value-type name="Qt |
|
1401 | <value-type name="QtJambiFuture" java-name="QFuture" generic-class="yes" /> | |
1143 |
|
1402 | |||
1144 | <object-type name="QFutureWatcherBase"> |
|
1403 | <object-type name="QFutureWatcherBase"> | |
1145 | <modify-function signature="connectNotify(const char *)" remove="all" /> |
|
1404 | <modify-function signature="connectNotify(const char *)" remove="all" /> | |
1146 | <modify-function signature="disconnectNotify(const char *)" remove="all" /> |
|
1405 | <modify-function signature="disconnectNotify(const char *)" remove="all" /> | |
1147 |
</object-type> |
|
1406 | </object-type> | |
1148 |
<object-type name="Qt |
|
1407 | <object-type name="QtJambiVoidFutureWatcher" java-name="QFutureWatcherVoid" /> | |
1149 |
|
1408 | |||
1150 | <object-type name="QFutureWatcher" generate="no"> |
|
1409 | <object-type name="QFutureWatcher" generate="no"> | |
1151 | <modify-function signature="future()const" remove="all" /> |
|
1410 | <modify-function signature="future()const" remove="all" /> | |
1152 | </object-type> |
|
1411 | </object-type> | |
1153 |
<object-type name="Qt |
|
1412 | <object-type name="QtJambiFutureWatcher" java-name="QFutureWatcher" generic-class="yes" /> | |
1154 |
|
1413 | |||
1155 | <object-type name="QFutureSynchronizer" generate="no" /> |
|
1414 | <object-type name="QFutureSynchronizer" generate="no" /> | |
1156 |
<object-type name="Qt |
|
1415 | <object-type name="QtJambiFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer" /> | |
1157 |
<object-type name="Qt |
|
1416 | <object-type name="QtJambiVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid" /> | |
1158 | <object-type name="QThreadPool" /> |
|
1417 | <object-type name="QThreadPool" /> | |
1159 |
|
1418 | |||
1160 | <object-type name="QFutureIterator" generate="no"> |
|
1419 | <object-type name="QFutureIterator" generate="no"> | |
1161 |
|
|
1420 | <modify-function signature="operator=(const QFuture&)" remove="all" /> | |
1162 | </object-type> |
|
1421 | </object-type> | |
1163 |
<object-type name="Qt |
|
1422 | <object-type name="QtJambiFutureIterator" generic-class="yes" java-name="QFutureIterator" /> | |
1164 | <object-type name="QRunnable" /> |
|
1423 | <object-type name="QRunnable" /> | |
1165 |
|
1424 | |||
1166 |
|
1425 | <!-- Inefficient hash codes --> | ||
1167 | <value-type name="QXmlStreamAttribute"/> |
|
1426 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
1168 | <value-type name="QXmlStreamAttributes"/> |
|
1427 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
1169 | <value-type name="QXmlStreamNamespaceDeclaration"/> |
|
1428 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
1170 | <value-type name="QXmlStreamNotationDeclaration"/> |
|
1429 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
1171 | <value-type name="QXmlStreamEntityDeclaration"/> |
|
1430 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
1172 | <object-type name="QXmlStreamReader"/> |
|
1431 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
1173 | <object-type name="QXmlStreamWriter"/> |
|
1432 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QProcessEnvironment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
1174 |
|
1433 | |||
1175 | <value-type name="QModelIndex"/> |
|
1434 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::selectIteration', unmatched parameter type 'T'" /> | |
|
1435 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QVariantAnimation::registerInterpolator', unmatched parameter type 'QVariantAnimation::Interpolator'" /> | |||
1176 |
|
1436 | |||
|
1437 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'Qt::Initialization'"/> | |||
1177 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'std::*'"/> |
|
1438 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'std::*'"/> | |
1178 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/> |
|
1439 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/> | |
1179 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/> |
|
1440 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/> | |
@@ -1190,40 +1451,23 | |||||
1190 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> |
|
1451 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> | |
1191 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPointer<*>'"/> |
|
1452 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPointer<*>'"/> | |
1192 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QVector<*>'"/> |
|
1453 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QVector<*>'"/> | |
1193 |
<suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/> |
|
1454 | <suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/> | |
1194 |
<suppress-warning text="* private virtual function '*' in 'QAbstractTableModel'"/> |
|
1455 | <suppress-warning text="* private virtual function '*' in 'QAbstractTableModel'"/> | |
1195 |
<suppress-warning text="* private virtual function '*' in 'QListWidget'"/> |
|
1456 | <suppress-warning text="* private virtual function '*' in 'QListWidget'"/> | |
1196 |
<suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/> |
|
1457 | <suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/> | |
1197 |
<suppress-warning text="* private virtual function '*' in 'QFontDialog'"/> |
|
1458 | <suppress-warning text="* private virtual function '*' in 'QFontDialog'"/> | |
1198 |
<suppress-warning text="* private virtual function '*' in 'QTableWidget'"/> |
|
1459 | <suppress-warning text="* private virtual function '*' in 'QTableWidget'"/> | |
1199 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDateTime' has equals operators but no qHash() function"/> |
|
|||
1200 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPersistentModelIndex' has equals operators but no qHash() function"/> |
|
|||
1201 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function"/> |
|
|||
1202 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRect' has equals operators but no qHash() function"/> |
|
|||
1203 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTime' has equals operators but no qHash() function"/> |
|
|||
1204 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function"/> |
|
|||
1205 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDir' has equals operators but no qHash() function"/> |
|
|||
1206 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPointF' has equals operators but no qHash() function"/> |
|
|||
1207 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSize' has equals operators but no qHash() function"/> |
|
|||
1208 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFileInfo' has equals operators but no qHash() function"/> |
|
|||
1209 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizeF' has equals operators but no qHash() function"/> |
|
|||
1210 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function"/> |
|
|||
1211 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRectF' has equals operators but no qHash() function"/> |
|
|||
1212 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDate' has equals operators but no qHash() function"/> |
|
|||
1213 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPoint' has equals operators but no qHash() function"/> |
|
|||
1214 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function"/> |
|
|||
1215 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase&'" /> |
|
1460 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase&'" /> | |
1216 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase const&'" /> |
|
1461 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase const&'" /> | |
1217 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase&'" /> |
|
1462 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase&'" /> | |
1218 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase const&'" /> |
|
1463 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase const&'" /> | |
1219 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function" /> |
|
|||
1220 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown operator 'T'" /> |
|
1464 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown operator 'T'" /> | |
1221 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function" /> |
|
|||
1222 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constBegin', unmatched return type 'const_iterator'" /> |
|
1465 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constBegin', unmatched return type 'const_iterator'" /> | |
1223 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::end', unmatched return type 'const_iterator'" /> |
|
1466 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::end', unmatched return type 'const_iterator'" /> | |
1224 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd', unmatched return type 'const_iterator'" /> |
|
1467 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd', unmatched return type 'const_iterator'" /> | |
1225 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface<T>*'" /> |
|
1468 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface<T>*'" /> | |
1226 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::begin', unmatched return type 'const_iterator'" /> |
|
1469 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::begin', unmatched return type 'const_iterator'" /> | |
|
1470 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::advance', unmatched parameter type 'It&'" /> | |||
1227 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'" /> |
|
1471 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'" /> | |
1228 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList<U>'" /> |
|
1472 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList<U>'" /> | |
1229 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList<MapFunctor::result_type>'" /> |
|
1473 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList<MapFunctor::result_type>'" /> | |
@@ -1231,6 +1475,7 | |||||
1231 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Iterator'" /> |
|
1475 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Iterator'" /> | |
1232 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Sequence const&'" /> |
|
1476 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Sequence const&'" /> | |
1233 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filter', unmatched parameter type 'Sequence&'" /> |
|
1477 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filter', unmatched parameter type 'Sequence&'" /> | |
|
1478 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<qValueType<Iterator>::value_type>" /> | |||
1234 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<Sequence::value_type>'" /> |
|
1479 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<Sequence::value_type>'" /> | |
1235 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<Iterator::value_type>'" /> |
|
1480 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<Iterator::value_type>'" /> | |
1236 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMappedReduced', unmatched return type 'V'" /> |
|
1481 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMappedReduced', unmatched return type 'V'" /> | |
@@ -1269,4 +1514,9 | |||||
1269 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingFilter', unmatched parameter type 'Sequence&'" /> |
|
1514 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingFilter', unmatched parameter type 'Sequence&'" /> | |
1270 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::createFunctor', unmatched return type 'QtConcurrent::SelectMemberFunctor0<T,Class>::type'" /> |
|
1515 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::createFunctor', unmatched return type 'QtConcurrent::SelectMemberFunctor0<T,Class>::type'" /> | |
1271 |
|
1516 | |||
|
1517 | <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFuture<void>::operator= - definition *ignored*" /> | |||
|
1518 | <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureInterface<void>::future - definition *ignored*" /> | |||
|
1519 | <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureWatcher<void>::setFuture - definition *ignored*" /> | |||
|
1520 | ||||
|
1521 | ||||
1272 | </typesystem> |
|
1522 | </typesystem> |
This diff has been collapsed as it changes many lines, (1307 lines changed) Show them Hide them | |||||
@@ -33,6 +33,7 | |||||
33 | QString %out% = %in%.toString(); |
|
33 | QString %out% = %in%.toString(); | |
34 | </template><rejection class="QTextCodec::ConverterState"/><rejection class="QTextCodecFactoryInterface"/><rejection class="QAbstractEventDispatcher"/><rejection class="QAbstractFileEngine"/><rejection class="QAbstractFileEngineHandler"/><rejection class="QAbstractFileEngineIterator"/><rejection class="QFSFileEngine"/><rejection class="QSystemLocale"/><rejection class="QFutureWatcherBase"/><rejection class="QFutureSynchronizer"/><enum-type name="QXmlStreamReader::Error"/><enum-type name="QXmlStreamReader::TokenType"/><primitive-type name="bool"/><primitive-type name="double"/><primitive-type name="qreal"/><primitive-type name="float"/><primitive-type name="qint64"/><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="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"/><suppress-warning text="WARNING(MetaJavaBuilder) :: signal 'finished' in class 'QProcess' is overloaded."/><suppress-warning text="WARNING(MetaJavaBuilder) :: missing required class for enums: QRegExp"/><suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'QtValidLicenseForScriptToolsModule' does not have a type entry or is not an enum"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QDataStream::Qt_4_5"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: Qt::MatchFlags(Qt::MatchStartsWith in Qt::MatchFlag"/><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"/> |
|
34 | </template><rejection class="QTextCodec::ConverterState"/><rejection class="QTextCodecFactoryInterface"/><rejection class="QAbstractEventDispatcher"/><rejection class="QAbstractFileEngine"/><rejection class="QAbstractFileEngineHandler"/><rejection class="QAbstractFileEngineIterator"/><rejection class="QFSFileEngine"/><rejection class="QSystemLocale"/><rejection class="QFutureWatcherBase"/><rejection class="QFutureSynchronizer"/><enum-type name="QXmlStreamReader::Error"/><enum-type name="QXmlStreamReader::TokenType"/><primitive-type name="bool"/><primitive-type name="double"/><primitive-type name="qreal"/><primitive-type name="float"/><primitive-type name="qint64"/><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="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"/><suppress-warning text="WARNING(MetaJavaBuilder) :: signal 'finished' in class 'QProcess' is overloaded."/><suppress-warning text="WARNING(MetaJavaBuilder) :: missing required class for enums: QRegExp"/><suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'QtValidLicenseForScriptToolsModule' does not have a type entry or is not an enum"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QDataStream::Qt_4_5"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: Qt::MatchFlags(Qt::MatchStartsWith in Qt::MatchFlag"/><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"/> | |
35 |
|
35 | |||
|
36 | <value-type name="QModelIndex"/> | |||
36 | <rejection class="*" function-name="d_func"/> |
|
37 | <rejection class="*" function-name="d_func"/> | |
37 | <rejection class="*" function-name="data_ptr"/> |
|
38 | <rejection class="*" function-name="data_ptr"/> | |
38 | <rejection class="*" function-name="detach"/> |
|
39 | <rejection class="*" function-name="detach"/> | |
@@ -41,7 +42,8 | |||||
41 | <rejection class="*" field-name="d_ptr"/> |
|
42 | <rejection class="*" field-name="d_ptr"/> | |
42 | <rejection class="*" field-name="d"/> |
|
43 | <rejection class="*" field-name="d"/> | |
43 |
|
44 | |||
44 |
<rejection class="" enum-name="QtValidLicenseForTestModule"/> |
|
45 | <rejection class="" enum-name="QtValidLicenseForTestModule"/> | |
|
46 | ||||
45 |
|
47 | |||
46 | <rejection class="" enum-name="QtValidLicenseForDBusModule"/> |
|
48 | <rejection class="" enum-name="QtValidLicenseForDBusModule"/> | |
47 | <rejection class="" enum-name="QtValidLicenseForSqlModule"/> |
|
49 | <rejection class="" enum-name="QtValidLicenseForSqlModule"/> | |
@@ -58,8 +60,17 | |||||
58 | <rejection class="" enum-name="QtValidLicenseForGuiModule"/> |
|
60 | <rejection class="" enum-name="QtValidLicenseForGuiModule"/> | |
59 | <rejection class="" enum-name="QtValidLicenseForScriptModule"/> |
|
61 | <rejection class="" enum-name="QtValidLicenseForScriptModule"/> | |
60 | <rejection class="" enum-name="QtValidLicenseForHelpModule"/> |
|
62 | <rejection class="" enum-name="QtValidLicenseForHelpModule"/> | |
|
63 | <rejection class="" enum-name="QtValidLicenseForScriptToolsModule"/> | |||
|
64 | <rejection class="" enum-name="QtValidLicenseForMultimediaModule"/> | |||
|
65 | <rejection class="" enum-name="QtValidLicenseForOpenVGModule"/> | |||
|
66 | ||||
61 | <rejection class="QtConcurrent" enum-name="enum_1"/> |
|
67 | <rejection class="QtConcurrent" enum-name="enum_1"/> | |
|
68 | <rejection class="QtConcurrent" function-name="operator|"/> | |||
62 |
|
69 | |||
|
70 | <rejection class="Qt" enum-name="Modifier"/> | |||
|
71 | ||||
|
72 | <rejection class="QSharedPointer"/> | |||
|
73 | <rejection class="QWeakPointer"/> | |||
63 | <rejection class="QFuture::const_iterator"/> |
|
74 | <rejection class="QFuture::const_iterator"/> | |
64 | <rejection class="QFutureInterface"/> |
|
75 | <rejection class="QFutureInterface"/> | |
65 | <rejection class="QFutureInterfaceBase"/> |
|
76 | <rejection class="QFutureInterfaceBase"/> | |
@@ -80,6 +91,7 | |||||
80 | <rejection class="QtConcurrent::Median"/> |
|
91 | <rejection class="QtConcurrent::Median"/> | |
81 | <rejection class="QtConcurrent::MemberFunctionWrapper"/> |
|
92 | <rejection class="QtConcurrent::MemberFunctionWrapper"/> | |
82 | <rejection class="QtConcurrent::MemberFunctionWrapper1"/> |
|
93 | <rejection class="QtConcurrent::MemberFunctionWrapper1"/> | |
|
94 | <rejection class="QtConcurrent::qValueType"/> | |||
83 | <rejection class="QtConcurrent::ReduceKernel"/> |
|
95 | <rejection class="QtConcurrent::ReduceKernel"/> | |
84 | <rejection class="QtConcurrent::ResultItem"/> |
|
96 | <rejection class="QtConcurrent::ResultItem"/> | |
85 | <rejection class="QtConcurrent::ResultIterator"/> |
|
97 | <rejection class="QtConcurrent::ResultIterator"/> | |
@@ -208,7 +220,7 | |||||
208 | <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall5"/> |
|
220 | <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall5"/> | |
209 |
|
221 | |||
210 | <rejection class="QMdi"/> |
|
222 | <rejection class="QMdi"/> | |
211 |
<rejection class="stdext"/> |
|
223 | <rejection class="stdext"/> | |
212 | <rejection class="QAlgorithmsPrivate"/> |
|
224 | <rejection class="QAlgorithmsPrivate"/> | |
213 | <rejection class="QAtomic"/> |
|
225 | <rejection class="QAtomic"/> | |
214 | <rejection class="QAtomicPointer"/> |
|
226 | <rejection class="QAtomicPointer"/> | |
@@ -216,11 +228,26 | |||||
216 | <rejection class="QBasicAtomicInt"/> |
|
228 | <rejection class="QBasicAtomicInt"/> | |
217 | <rejection class="QBasicAtomic"/> |
|
229 | <rejection class="QBasicAtomic"/> | |
218 | <rejection class="QBasicAtomicPointer"/> |
|
230 | <rejection class="QBasicAtomicPointer"/> | |
|
231 | <rejection class="QScopedPointer"/> | |||
|
232 | <rejection class="QScopedArrayPointer"/> | |||
|
233 | <rejection class="QScopedPointer"/> | |||
|
234 | <rejection class="QScopedPointerArrayDeleter"/> | |||
|
235 | <rejection class="QScopedPointerDeleter"/> | |||
|
236 | <rejection class="QScopedPointerPodDeleter"/> | |||
|
237 | <rejection class="QScopedPointerSharedDeleter"/> | |||
|
238 | <rejection class="QScopedSharedPointer"/> | |||
|
239 | <rejection class="QCustomScopedPointer"/> | |||
|
240 | <rejection class="QStringBuilder"/> | |||
|
241 | ||||
219 | <rejection class="QBitRef"/> |
|
242 | <rejection class="QBitRef"/> | |
220 | <rejection class="QCache"/> |
|
243 | <rejection class="QCache"/> | |
|
244 | <rejection class="QContiguousCache"/> | |||
|
245 | <rejection class="QContiguousCacheData"/> | |||
|
246 | <rejection class="QContiguousCacheTypedData"/> | |||
221 | <rejection class="QCharRef"/> |
|
247 | <rejection class="QCharRef"/> | |
222 | <rejection class="QDebug"/> |
|
248 | <rejection class="QDebug"/> | |
223 | <rejection class="QExplicitlySharedDataPointer"/> |
|
249 | <rejection class="QNoDebug"/> | |
|
250 | <rejection class="QExplicitlySharedDataPointer"/> | |||
224 | <rejection class="QFlag"/> |
|
251 | <rejection class="QFlag"/> | |
225 | <rejection class="QFlags"/> |
|
252 | <rejection class="QFlags"/> | |
226 | <rejection class="QForeachContainer"/> |
|
253 | <rejection class="QForeachContainer"/> | |
@@ -241,6 +268,7 | |||||
241 | <rejection class="QHashNode"/> |
|
268 | <rejection class="QHashNode"/> | |
242 | <rejection class="QHashNode"/> |
|
269 | <rejection class="QHashNode"/> | |
243 | <rejection class="QInternal"/> |
|
270 | <rejection class="QInternal"/> | |
|
271 | <rejection class="QIncompatibleFlag"/> | |||
244 | <rejection class="QLibrary"/> |
|
272 | <rejection class="QLibrary"/> | |
245 | <rejection class="QLinkedList"/> |
|
273 | <rejection class="QLinkedList"/> | |
246 | <rejection class="QLinkedListData"/> |
|
274 | <rejection class="QLinkedListData"/> | |
@@ -249,6 +277,8 | |||||
249 | <rejection class="QListData"/> |
|
277 | <rejection class="QListData"/> | |
250 | <rejection class="QListIterator"/> |
|
278 | <rejection class="QListIterator"/> | |
251 | <rejection class="QMap"/> |
|
279 | <rejection class="QMap"/> | |
|
280 | <rejection class="QMapNode"/> | |||
|
281 | <rejection class="QMapPayloadNode"/> | |||
252 | <rejection class="QMapData"/> |
|
282 | <rejection class="QMapData"/> | |
253 | <rejection class="QMapIterator"/> |
|
283 | <rejection class="QMapIterator"/> | |
254 | <rejection class="QMetaType"/> |
|
284 | <rejection class="QMetaType"/> | |
@@ -280,7 +310,7 | |||||
280 | <rejection class="QSharedDataPointer"/> |
|
310 | <rejection class="QSharedDataPointer"/> | |
281 | <rejection class="QStack"/> |
|
311 | <rejection class="QStack"/> | |
282 | <rejection class="QSysInfo"/> |
|
312 | <rejection class="QSysInfo"/> | |
283 |
<rejection class="QTextStreamManipulator"/> |
|
313 | <rejection class="QTextStreamManipulator"/> | |
284 | <rejection class="QThreadStorage"/> |
|
314 | <rejection class="QThreadStorage"/> | |
285 | <rejection class="QThreadStorageData"/> |
|
315 | <rejection class="QThreadStorageData"/> | |
286 | <rejection class="QTypeInfo"/> |
|
316 | <rejection class="QTypeInfo"/> | |
@@ -288,7 +318,7 | |||||
288 | <rejection class="QVFbKeyData"/> |
|
318 | <rejection class="QVFbKeyData"/> | |
289 | <rejection class="QVariantComparisonHelper"/> |
|
319 | <rejection class="QVariantComparisonHelper"/> | |
290 | <rejection class="QVectorData"/> |
|
320 | <rejection class="QVectorData"/> | |
291 |
<rejection class="QVectorIterator"/> |
|
321 | <rejection class="QVectorIterator"/> | |
292 | <rejection class="QVectorTypedData"/> |
|
322 | <rejection class="QVectorTypedData"/> | |
293 | <rejection class="QWriteLocker"/> |
|
323 | <rejection class="QWriteLocker"/> | |
294 | <rejection class="QtPrivate"/> |
|
324 | <rejection class="QtPrivate"/> | |
@@ -307,12 +337,20 | |||||
307 | <rejection class="QSubString"/> |
|
337 | <rejection class="QSubString"/> | |
308 | <rejection class="QUintForType"/> |
|
338 | <rejection class="QUintForType"/> | |
309 | <rejection class="QtConcurrent::internal"/> |
|
339 | <rejection class="QtConcurrent::internal"/> | |
|
340 | <rejection class="QByteArrayMatcher::Data"/> | |||
|
341 | <rejection class="QStringMatcher::Data"/> | |||
310 |
|
342 | |||
311 |
<rejection class=" |
|
343 | <rejection class="StringBuilder"/> | |
|
344 | <rejection class="QConcatenable"/> | |||
|
345 | <rejection class="QLatin1Literal"/> | |||
|
346 | <rejection class="QIntegerForSizeof"/> | |||
|
347 | ||||
|
348 | ||||
|
349 | <rejection class="QLocale::Data"/> | |||
312 | <rejection class="QGlobalStaticDeleter"/> |
|
350 | <rejection class="QGlobalStaticDeleter"/> | |
313 | <rejection class="QSharedMemory"/> <!-- Temporarily until we know how to implement it in Java --> |
|
351 | <rejection class="QSharedMemory"/> <!-- Temporarily until we know how to implement it in Java --> | |
314 | <rejection class="QVarLengthArray"/> |
|
352 | <rejection class="QVarLengthArray"/> | |
315 |
|
353 | |||
316 | <!-- DBus --> |
|
354 | <!-- DBus --> | |
317 | <rejection class="QDBusAbstractAdaptor"/> |
|
355 | <rejection class="QDBusAbstractAdaptor"/> | |
318 | <rejection class="QDBusAbstractInterface"/> |
|
356 | <rejection class="QDBusAbstractInterface"/> | |
@@ -329,7 +367,7 | |||||
329 | <rejection class="QDBusServer"/> |
|
367 | <rejection class="QDBusServer"/> | |
330 | <rejection class="QDBusSignature"/> |
|
368 | <rejection class="QDBusSignature"/> | |
331 | <rejection class="QDBusVariant"/> |
|
369 | <rejection class="QDBusVariant"/> | |
332 |
|
370 | |||
333 | <rejection class="_Revbidit"/> |
|
371 | <rejection class="_Revbidit"/> | |
334 | <rejection class="_complex"/> |
|
372 | <rejection class="_complex"/> | |
335 | <rejection class="_exception"/> |
|
373 | <rejection class="_exception"/> | |
@@ -344,10 +382,11 | |||||
344 | <rejection class="stat"/> |
|
382 | <rejection class="stat"/> | |
345 | <rejection class="tm"/> |
|
383 | <rejection class="tm"/> | |
346 |
|
384 | |||
|
385 | <rejection class="Qt" enum-name="Initialization"/> | |||
|
386 | ||||
347 | <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/> |
|
387 | <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/> | |
348 | <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/> |
|
388 | <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/> | |
349 | <rejection class="QAbstractFileEngine" function-name="beginEntryList"/> |
|
389 | ||
350 | <rejection class="QAbstractFileEngine" function-name="endEntryList"/> |
|
|||
351 | <rejection class="QAbstractFileEngine" function-name="extension"/> |
|
390 | <rejection class="QAbstractFileEngine" function-name="extension"/> | |
352 | <rejection class="QCoreApplication" function-name="compressEvent"/> |
|
391 | <rejection class="QCoreApplication" function-name="compressEvent"/> | |
353 | <rejection class="QCoreApplication" function-name="eventFilter"/> |
|
392 | <rejection class="QCoreApplication" function-name="eventFilter"/> | |
@@ -372,7 +411,7 | |||||
372 | <rejection class="QList" function-name="node_destruct"/> |
|
411 | <rejection class="QList" function-name="node_destruct"/> | |
373 | <rejection class="QList" function-name="toSet"/> |
|
412 | <rejection class="QList" function-name="toSet"/> | |
374 | <rejection class="QObject" function-name="receivers"/> |
|
413 | <rejection class="QObject" function-name="receivers"/> | |
375 |
<rejection class="QObject" function-name="findChild"/> |
|
414 | <rejection class="QObject" function-name="findChild"/> | |
376 | <rejection class="QObject" function-name="findChildren"/> |
|
415 | <rejection class="QObject" function-name="findChildren"/> | |
377 | <rejection class="QObject" function-name="setUserData"/> |
|
416 | <rejection class="QObject" function-name="setUserData"/> | |
378 | <rejection class="QObject" function-name="userData"/> |
|
417 | <rejection class="QObject" function-name="userData"/> | |
@@ -382,6 +421,8 | |||||
382 | <rejection class="QObject" function-name="disconnect"/> |
|
421 | <rejection class="QObject" function-name="disconnect"/> | |
383 | <rejection class="QObject" function-name="disconnectNotify"/> |
|
422 | <rejection class="QObject" function-name="disconnectNotify"/> | |
384 | <rejection class="QObject" function-name="registerUserData"/> |
|
423 | <rejection class="QObject" function-name="registerUserData"/> | |
|
424 | <rejection class="QObject" function-name="sender"/> | |||
|
425 | <rejection class="QTimer" function-name="singleShot"/> | |||
385 | <rejection class="QProcess" function-name="pid"/> |
|
426 | <rejection class="QProcess" function-name="pid"/> | |
386 | <rejection class="QRegion" function-name="cleanUp"/> |
|
427 | <rejection class="QRegion" function-name="cleanUp"/> | |
387 | <rejection class="QSettings" function-name="registerFormat"/> |
|
428 | <rejection class="QSettings" function-name="registerFormat"/> | |
@@ -398,10 +439,11 | |||||
398 | <rejection class="QVector" function-name="alloc"/> |
|
439 | <rejection class="QVector" function-name="alloc"/> | |
399 | <rejection class="QVector" function-name="operator+="/> |
|
440 | <rejection class="QVector" function-name="operator+="/> | |
400 | <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/> |
|
441 | <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/> | |
401 |
|
442 | <rejection class="QtConcurrent::ThreadEngineBarrier"/> | ||
|
443 | ||||
402 | <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/> |
|
444 | <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/> | |
403 | <rejection class="QDataStream" enum-name="ByteOrder"/> |
|
445 | <rejection class="QDataStream" enum-name="ByteOrder"/> | |
404 |
|
446 | |||
405 |
|
447 | |||
406 | <namespace-type name="Qt"> |
|
448 | <namespace-type name="Qt"> | |
407 |
|
449 | |||
@@ -410,15 +452,36 | |||||
410 | </extra-includes> |
|
452 | </extra-includes> | |
411 | </namespace-type> |
|
453 | </namespace-type> | |
412 |
|
454 | |||
|
455 | <enum-type name="QDate::MonthNameType"/> | |||
|
456 | <enum-type name="QAbstractAnimation::DeletionPolicy"/> | |||
|
457 | <enum-type name="QAbstractAnimation::Direction"/> | |||
|
458 | <enum-type name="QAbstractAnimation::State"/> | |||
|
459 | <enum-type name="QDataStream::FloatingPointPrecision"/> | |||
|
460 | <enum-type name="QEasingCurve::Type"/> | |||
|
461 | <enum-type name="QHistoryState::HistoryType"/> | |||
|
462 | <enum-type name="QState::ChildMode"/> | |||
|
463 | <enum-type name="QStateMachine::Error"/> | |||
|
464 | <enum-type name="QStateMachine::EventPriority"/> | |||
|
465 | <enum-type name="QStateMachine::RestorePolicy"/> | |||
|
466 | <enum-type name="Qt::AnchorPoint"/> | |||
|
467 | <enum-type name="Qt::CoordinateSystem"/> | |||
|
468 | <enum-type name="Qt::GestureState"/> | |||
|
469 | <enum-type name="Qt::InputMethodHint" flags="Qt::InputMethodHints"/> | |||
|
470 | <enum-type name="Qt::NavigationMode"/> | |||
|
471 | <enum-type name="Qt::RenderHint"/> | |||
|
472 | <enum-type name="Qt::TileRule"/> | |||
|
473 | <enum-type name="Qt::TouchPointState" flags="Qt::TouchPointStates"/> | |||
413 |
|
474 | |||
414 | <enum-type name="QtMsgType"> |
|
475 | <enum-type name="QtMsgType"> | |
415 | <reject-enum-value name="QtSystemMsg"/> |
|
476 | <reject-enum-value name="QtSystemMsg"/> | |
416 | </enum-type> |
|
477 | </enum-type> | |
417 |
|
478 | |||
|
479 | ||||
|
480 | <enum-type name="QReadWriteLock::RecursionMode"/> | |||
418 | <enum-type name="QSystemSemaphore::AccessMode"/> |
|
481 | <enum-type name="QSystemSemaphore::AccessMode"/> | |
419 | <enum-type name="QSystemSemaphore::SystemSemaphoreError"/> |
|
482 | <enum-type name="QSystemSemaphore::SystemSemaphoreError"/> | |
420 | <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons"/> |
|
483 | <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons"/> | |
421 |
<enum-type name="QTextBoundaryFinder::BoundaryType"/> |
|
484 | <enum-type name="QTextBoundaryFinder::BoundaryType"/> | |
422 | <enum-type name="QAbstractFileEngine::Extension" extensible="yes"/> |
|
485 | <enum-type name="QAbstractFileEngine::Extension" extensible="yes"/> | |
423 | <enum-type name="QAbstractFileEngine::FileFlag" flags="QAbstractFileEngine::FileFlags"/> |
|
486 | <enum-type name="QAbstractFileEngine::FileFlag" flags="QAbstractFileEngine::FileFlags"/> | |
424 | <enum-type name="QAbstractFileEngine::FileName"/> |
|
487 | <enum-type name="QAbstractFileEngine::FileName"/> | |
@@ -494,7 +557,6 | |||||
494 | <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/> |
|
557 | <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/> | |
495 | <enum-type name="Qt::LayoutDirection"/> |
|
558 | <enum-type name="Qt::LayoutDirection"/> | |
496 | <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/> |
|
559 | <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/> | |
497 | <enum-type name="Qt::Modifier"/> |
|
|||
498 | <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/> |
|
560 | <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/> | |
499 | <enum-type name="Qt::Orientation" flags="Qt::Orientations"/> |
|
561 | <enum-type name="Qt::Orientation" flags="Qt::Orientations"/> | |
500 | <enum-type name="Qt::PenCapStyle"/> |
|
562 | <enum-type name="Qt::PenCapStyle"/> | |
@@ -520,12 +582,13 | |||||
520 | <enum-type name="Qt::EventPriority"/> |
|
582 | <enum-type name="Qt::EventPriority"/> | |
521 | <enum-type name="Qt::MaskMode"/> |
|
583 | <enum-type name="Qt::MaskMode"/> | |
522 | <enum-type name="QCryptographicHash::Algorithm"/> |
|
584 | <enum-type name="QCryptographicHash::Algorithm"/> | |
523 |
|
585 | |||
524 | <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions"/> |
|
586 | <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions"/> | |
525 | <enum-type name="QtConcurrent::ThreadFunctionResult"/> |
|
587 | <enum-type name="QtConcurrent::ThreadFunctionResult"/> | |
|
588 | ||||
526 |
|
589 | |||
527 | <enum-type name="QCoreApplication::Encoding"> |
|
590 | <enum-type name="QCoreApplication::Encoding"> | |
528 |
<reject-enum-value name="DefaultCodec"/> |
|
591 | <reject-enum-value name="DefaultCodec"/> | |
529 | </enum-type> |
|
592 | </enum-type> | |
530 |
|
593 | |||
531 | <enum-type name="Qt::AlignmentFlag" flags="Qt::Alignment"> |
|
594 | <enum-type name="Qt::AlignmentFlag" flags="Qt::Alignment"> | |
@@ -548,9 +611,8 | |||||
548 | </enum-type> |
|
611 | </enum-type> | |
549 |
|
612 | |||
550 |
|
613 | |||
551 |
<enum-type name="QDataStream::Version"> |
|
614 | <enum-type name="QDataStream::Version"> | |
552 | <reject-enum-value name="Qt_4_1"/> |
|
615 | <reject-enum-value name="Qt_4_1"/> | |
553 | <reject-enum-value name="Qt_4_5"/> |
|
|||
554 | </enum-type> |
|
616 | </enum-type> | |
555 |
|
617 | |||
556 | <enum-type name="QDir::SortFlag" flags="QDir::SortFlags"> |
|
618 | <enum-type name="QDir::SortFlag" flags="QDir::SortFlags"> | |
@@ -586,41 +648,44 | |||||
586 | <enum-type name="Qt::ToolBarArea" flags="Qt::ToolBarAreas"> |
|
648 | <enum-type name="Qt::ToolBarArea" flags="Qt::ToolBarAreas"> | |
587 | <reject-enum-value name="AllToolBarAreas"/> |
|
649 | <reject-enum-value name="AllToolBarAreas"/> | |
588 | </enum-type> |
|
650 | </enum-type> | |
589 |
|
651 | |||
590 | <enum-type name="Qt::WidgetAttribute"> |
|
652 | <enum-type name="Qt::WidgetAttribute"> | |
591 | <reject-enum-value name="WA_ForceAcceptDrops"/> |
|
653 | <reject-enum-value name="WA_ForceAcceptDrops"/> | |
592 | <reject-enum-value name="WA_NoBackground"/> |
|
654 | <reject-enum-value name="WA_NoBackground"/> | |
593 | <reject-enum-value name="WA_MacMetalStyle"/> |
|
655 | <reject-enum-value name="WA_MacMetalStyle"/> | |
594 | </enum-type> |
|
656 | </enum-type> | |
595 |
|
657 | |||
596 |
<value-type name="Q |
|
658 | <value-type name="QProcessEnvironment"/> | |
|
659 | <value-type name="QBasicTimer"/> | |||
597 | <value-type name="QByteArrayMatcher"> |
|
660 | <value-type name="QByteArrayMatcher"> | |
598 | <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/> |
|
661 | <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/> | |
599 | </value-type> |
|
662 | </value-type> | |
600 |
|
663 | |||
601 |
<value-type name="QDate"> |
|
664 | <value-type name="QDate"> | |
602 | <modify-function signature="julianToGregorian(uint,int&,int&,int&)"> |
|
665 | <modify-function signature="julianToGregorian(uint,int&,int&,int&)"> | |
603 |
|
|
666 | <remove/> | |
604 |
</modify-function> |
|
667 | </modify-function> | |
605 |
|
668 | |||
606 |
<modify-function signature="setYMD(int, int, int)" remove="all"/> |
|
669 | <modify-function signature="setYMD(int, int, int)" remove="all"/> | |
|
670 | <!--### Obsolete in 4.3--> | |||
607 | </value-type> |
|
671 | </value-type> | |
608 |
|
672 | |||
609 | <value-type name="QDateTime"> |
|
673 | <value-type name="QDateTime"> | |
610 | <modify-function signature="operator=(QDateTime)" remove="all"/> |
|
674 | <modify-function signature="operator=(QDateTime)" remove="all"/> | |
611 | </value-type> |
|
675 | </value-type> | |
612 |
|
676 | |||
613 | <value-type name="QDir"> |
|
677 | <value-type name="QDir"> | |
614 | <modify-function signature="QDir(QString,QString,QFlags<QDir::SortFlag>,QFlags<QDir::Filter>)"> |
|
678 | <modify-function signature="QDir(QString,QString,QFlags<QDir::SortFlag>,QFlags<QDir::Filter>)"> | |
615 |
|
|
679 | <modify-argument index="3"> | |
616 |
|
|
680 | <replace-default-expression with="SortFlag.Name, SortFlag.IgnoreCase"/> | |
617 |
|
|
681 | </modify-argument> | |
618 |
</modify-function> |
|
682 | </modify-function> | |
619 | <modify-function signature="operator=(QDir)" remove="all"/> |
|
683 | <modify-function signature="operator=(QDir)" remove="all"/> | |
620 | <modify-function signature="operator=(QString)" remove="all"/> |
|
684 | <modify-function signature="operator=(QString)" remove="all"/> | |
621 |
<modify-function signature="addResourceSearchPath(QString)" remove="all"/> |
|
685 | <modify-function signature="addResourceSearchPath(QString)" remove="all"/> | |
|
686 | <!--### Obsolete in 4.3--> | |||
622 | </value-type> |
|
687 | </value-type> | |
623 |
|
688 | |||
624 | <value-type name="QPoint"> |
|
689 | <value-type name="QPoint"> | |
625 | <modify-function signature="rx()" remove="all"/> |
|
690 | <modify-function signature="rx()" remove="all"/> | |
626 | <modify-function signature="ry()" remove="all"/> |
|
691 | <modify-function signature="ry()" remove="all"/> | |
@@ -630,59 +695,108 | |||||
630 | <modify-function signature="ry()" remove="all"/> |
|
695 | <modify-function signature="ry()" remove="all"/> | |
631 | </value-type> |
|
696 | </value-type> | |
632 |
|
697 | |||
633 | <value-type name="QLine"> |
|
|||
634 | </value-type> |
|
|||
635 | <value-type name="QLineF"> |
|
|||
636 | </value-type> |
|
|||
637 |
|
||||
638 | <value-type name="QRect"> |
|
698 | <value-type name="QRect"> | |
639 |
<modify-function signature="getCoords(int*,int*,int*,int*)const"> |
|
699 | <modify-function signature="getCoords(int*,int*,int*,int*)const"> | |
640 | <modify-function signature="getRect(int*,int*,int*,int*)const"> <remove/> </modify-function> |
|
700 | <remove/> | |
641 | <modify-function signature="operator&=(QRect)"> <remove/> </modify-function> |
|
701 | </modify-function> | |
642 | <modify-function signature="operator|=(QRect)"> <remove/> </modify-function> |
|
702 | <modify-function signature="getRect(int*,int*,int*,int*)const"> | |
643 | <modify-function signature="operator&(QRect)const"> <remove/> </modify-function> |
|
703 | <remove/> | |
644 | <modify-function signature="operator|(QRect)const"> <remove/> </modify-function> |
|
704 | </modify-function> | |
645 |
|
705 | <modify-function signature="operator&=(QRect)"> | ||
646 | <modify-function signature="intersect(const QRect&)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
706 | <remove/> | |
647 | <modify-function signature="unite(const QRect&)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
707 | </modify-function> | |
|
708 | <modify-function signature="operator|=(QRect)"> | |||
|
709 | <remove/> | |||
|
710 | </modify-function> | |||
|
711 | <modify-function signature="operator&(QRect)const"> | |||
|
712 | <remove/> | |||
|
713 | </modify-function> | |||
|
714 | <modify-function signature="operator|(QRect)const"> | |||
|
715 | <remove/> | |||
|
716 | </modify-function> | |||
|
717 | ||||
|
718 | <modify-function signature="intersect(const QRect&)const" remove="all"/> | |||
|
719 | <!--### Obsolete in 4.3--> | |||
|
720 | <modify-function signature="unite(const QRect&)const" remove="all"/> | |||
|
721 | <!--### Obsolete in 4.3--> | |||
648 | </value-type> |
|
722 | </value-type> | |
649 |
|
723 | |||
650 | <value-type name="QRectF"> |
|
724 | <value-type name="QRectF"> | |
651 |
<modify-function signature="getCoords( |
|
725 | <modify-function signature="getCoords(double*,double*,double*,double*)const"> | |
652 | <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function> |
|
726 | <remove/> | |
653 | <modify-function signature="operator&=(QRectF)"> <remove/> </modify-function> |
|
727 | </modify-function> | |
654 | <modify-function signature="operator|=(QRectF)"> <remove/> </modify-function> |
|
728 | <modify-function signature="getRect(double*,double*,double*,double*)const"> | |
655 | <modify-function signature="operator&(QRectF)const"> <remove/> </modify-function> |
|
729 | <remove/> | |
656 | <modify-function signature="operator|(QRectF)const"> <remove/> </modify-function> |
|
730 | </modify-function> | |
657 |
|
731 | <modify-function signature="operator&=(QRectF)"> | ||
658 | <modify-function signature="intersect(const QRectF&)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
732 | <remove/> | |
659 | <modify-function signature="unite(const QRectF&)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
733 | </modify-function> | |
|
734 | <modify-function signature="operator|=(QRectF)"> | |||
|
735 | <remove/> | |||
|
736 | </modify-function> | |||
|
737 | <modify-function signature="operator&(QRectF)const"> | |||
|
738 | <remove/> | |||
|
739 | </modify-function> | |||
|
740 | <modify-function signature="operator|(QRectF)const"> | |||
|
741 | <remove/> | |||
|
742 | </modify-function> | |||
|
743 | ||||
|
744 | <modify-function signature="intersect(const QRectF&)const" remove="all"/> | |||
|
745 | <!--### Obsolete in 4.3--> | |||
|
746 | <modify-function signature="unite(const QRectF&)const" remove="all"/> | |||
|
747 | <!--### Obsolete in 4.3--> | |||
660 | </value-type> |
|
748 | </value-type> | |
661 |
|
749 | |||
662 |
|
750 | |||
663 | <value-type name="QSize"> |
|
751 | <value-type name="QSize"> | |
664 |
<modify-function signature="operator*=( |
|
752 | <modify-function signature="operator*=(double)"> | |
665 | <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function> |
|
753 | <access modifier="private"/> | |
666 | <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function> |
|
754 | </modify-function> | |
667 |
<modify-function signature="operator |
|
755 | <modify-function signature="operator/=(double)"> | |
668 | <modify-function signature="rheight()"> <remove/> </modify-function> |
|
756 | <access modifier="private"/> | |
669 | <modify-function signature="rwidth()"> <remove/> </modify-function> |
|
757 | </modify-function> | |
|
758 | <modify-function signature="operator+=(QSize)"> | |||
|
759 | <access modifier="private"/> | |||
|
760 | </modify-function> | |||
|
761 | <modify-function signature="operator-=(QSize)"> | |||
|
762 | <access modifier="private"/> | |||
|
763 | </modify-function> | |||
|
764 | <modify-function signature="rheight()"> | |||
|
765 | <remove/> | |||
|
766 | </modify-function> | |||
|
767 | <modify-function signature="rwidth()"> | |||
|
768 | <remove/> | |||
|
769 | </modify-function> | |||
670 | </value-type> |
|
770 | </value-type> | |
671 |
|
771 | |||
672 | <value-type name="QSizeF"> |
|
772 | <value-type name="QSizeF"> | |
673 |
<modify-function signature="operator*=( |
|
773 | <modify-function signature="operator*=(double)"> | |
674 | <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function> |
|
774 | <access modifier="private"/> | |
675 | <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function> |
|
775 | </modify-function> | |
676 |
<modify-function signature="operator |
|
776 | <modify-function signature="operator/=(double)"> | |
677 | <modify-function signature="rheight()"> <remove/> </modify-function> |
|
777 | <access modifier="private"/> | |
678 | <modify-function signature="rwidth()"> <remove/> </modify-function> |
|
778 | </modify-function> | |
|
779 | <modify-function signature="operator+=(QSizeF)"> | |||
|
780 | <access modifier="private"/> | |||
|
781 | </modify-function> | |||
|
782 | <modify-function signature="operator-=(QSizeF)"> | |||
|
783 | <access modifier="private"/> | |||
|
784 | </modify-function> | |||
|
785 | <modify-function signature="rheight()"> | |||
|
786 | <remove/> | |||
|
787 | </modify-function> | |||
|
788 | <modify-function signature="rwidth()"> | |||
|
789 | <remove/> | |||
|
790 | </modify-function> | |||
679 | </value-type> |
|
791 | </value-type> | |
680 |
|
792 | |||
681 | <value-type name="QStringMatcher"> |
|
793 | <value-type name="QStringMatcher"> | |
682 | <modify-function signature="operator=(QStringMatcher)" remove="all"/> |
|
794 | <modify-function signature="operator=(QStringMatcher)" remove="all"/> | |
|
795 | <modify-function signature="QStringMatcher(const QChar*,int,Qt::CaseSensitivity)" remove="all"/> | |||
|
796 | <modify-function signature="indexIn(const QChar*,int,int)const" remove="all"/> | |||
683 | </value-type> |
|
797 | </value-type> | |
684 |
|
798 | |||
685 |
<value-type name="QTime"/> |
|
799 | <value-type name="QTime"/> | |
686 |
|
800 | |||
687 | <value-type name="QPersistentModelIndex"> |
|
801 | <value-type name="QPersistentModelIndex"> | |
688 | <modify-function signature="operator=(QPersistentModelIndex)" remove="all"/> |
|
802 | <modify-function signature="operator=(QPersistentModelIndex)" remove="all"/> | |
@@ -692,18 +806,17 | |||||
692 |
|
806 | |||
693 | <value-type name="QUuid"> |
|
807 | <value-type name="QUuid"> | |
694 | <modify-function signature="QUuid(const char*)"> |
|
808 | <modify-function signature="QUuid(const char*)"> | |
695 |
|
|
809 | <remove/> | |
696 | </modify-function> |
|
810 | </modify-function> | |
697 | </value-type> |
|
811 | </value-type> | |
698 |
|
812 | |||
699 |
<value-type name="QLocale"> |
|
813 | <value-type name="QLocale"> | |
700 |
<modify-function signature="toString( |
|
814 | <modify-function signature="toString(unsigned long long) const" remove="all"/> | |
701 | <modify-function signature="toString(ushort) const" remove="all"/> |
|
815 | <modify-function signature="toString(unsigned short) const" remove="all"/> | |
702 | <modify-function signature="toString(unsigned int) const" remove="all"/> |
|
816 | <modify-function signature="toString(unsigned int) const" remove="all"/> | |
703 | <modify-function signature="toUInt(QString,bool*,int)const" remove="all"/> |
|
817 | <modify-function signature="toUInt(QString,bool*,int)const" remove="all"/> | |
704 | <modify-function signature="toULongLong(QString,bool*,int)const" remove="all"/> |
|
818 | <modify-function signature="toULongLong(QString,bool*,int)const" remove="all"/> | |
705 | <modify-function signature="operator=(QLocale)" remove="all"/> |
|
819 | <modify-function signature="operator=(QLocale)" remove="all"/> | |
706 |
|
||||
707 |
|
820 | |||
708 | <extra-includes> |
|
821 | <extra-includes> | |
709 | <include file-name="QDate" location="global"/> |
|
822 | <include file-name="QDate" location="global"/> | |
@@ -807,8 +920,8 | |||||
807 | </modify-argument> |
|
920 | </modify-argument> | |
808 | </modify-function> |
|
921 | </modify-function> | |
809 | </value-type> |
|
922 | </value-type> | |
810 |
|
923 | |||
811 |
|
924 | |||
812 | <value-type name="QBitArray"> |
|
925 | <value-type name="QBitArray"> | |
813 | <modify-function signature="operator[](int)" remove="all"/> |
|
926 | <modify-function signature="operator[](int)" remove="all"/> | |
814 | <modify-function signature="operator[](int)const" remove="all"/> |
|
927 | <modify-function signature="operator[](int)const" remove="all"/> | |
@@ -899,59 +1012,83 | |||||
899 | <modify-function signature="operator|=(QBitArray)"> |
|
1012 | <modify-function signature="operator|=(QBitArray)"> | |
900 | <modify-argument index="0" replace-value="this"/> |
|
1013 | <modify-argument index="0" replace-value="this"/> | |
901 | </modify-function> |
|
1014 | </modify-function> | |
902 |
</value-type> |
|
1015 | </value-type> | |
903 |
|
1016 | |||
|
1017 | <object-type name="QReadWriteLock"/> | |||
904 | <object-type name="QDirIterator"/> |
|
1018 | <object-type name="QDirIterator"/> | |
905 | <object-type name="QAbstractFileEngineIterator"/> |
|
1019 | <object-type name="QAbstractFileEngineIterator"/> | |
906 |
<object-type name="QAbstractItemModel" |
|
1020 | <object-type name="QAbstractItemModel"> | |
907 |
|
1021 | <modify-function signature="rowsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/> | ||
|
1022 | <modify-function signature="rowsInserted(QModelIndex,int,int)" private-signal="yes"/> | |||
|
1023 | ||||
|
1024 | <modify-function signature="rowsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/> | |||
|
1025 | <modify-function signature="rowsRemoved(QModelIndex,int,int)" private-signal="yes"/> | |||
|
1026 | ||||
|
1027 | <modify-function signature="columnsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/> | |||
|
1028 | <modify-function signature="columnsInserted(QModelIndex,int,int)" private-signal="yes"/> | |||
|
1029 | ||||
|
1030 | <modify-function signature="columnsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/> | |||
|
1031 | <modify-function signature="columnsRemoved(QModelIndex,int,int)" private-signal="yes"/> | |||
|
1032 | ||||
|
1033 | <modify-function signature="modelAboutToBeReset()" private-signal="yes"/> | |||
|
1034 | <modify-function signature="modelReset()" private-signal="yes"/> | |||
|
1035 | </object-type> | |||
|
1036 | ||||
908 | <object-type name="QAbstractListModel"> |
|
1037 | <object-type name="QAbstractListModel"> | |
909 | <extra-includes> |
|
1038 | <extra-includes> | |
910 |
|
|
1039 | <include file-name="QStringList" location="global"/> | |
911 |
|
|
1040 | <include file-name="QSize" location="global"/> | |
912 | </extra-includes> |
|
1041 | </extra-includes> | |
913 | </object-type> |
|
1042 | </object-type> | |
914 |
|
1043 | |||
915 | <object-type name="QAbstractTableModel"> |
|
|||
916 | <extra-includes> |
|
|||
917 | <include file-name="QStringList" location="global"/> |
|
|||
918 | <include file-name="QSize" location="global"/> |
|
|||
919 | </extra-includes> |
|
|||
920 | </object-type> |
|
|||
921 |
|
||||
922 | <value-type name="QUrl"> |
|
1044 | <value-type name="QUrl"> | |
923 | <extra-includes> |
|
1045 | <extra-includes> | |
924 |
|
|
1046 | <include file-name="QStringList" location="global"/> | |
925 | </extra-includes> |
|
1047 | </extra-includes> | |
926 | <modify-function signature="operator=(QUrl)" remove="all"/> |
|
1048 | <modify-function signature="operator=(QUrl)" remove="all"/> | |
927 | <modify-function signature="operator=(QString)" remove="all"/> |
|
1049 | <modify-function signature="operator=(QString)" remove="all"/> | |
928 |
|
1050 | |||
929 |
<modify-function signature="fromPunycode(const QByteArray&)" remove="all"/> |
|
1051 | <modify-function signature="fromPunycode(const QByteArray&)" remove="all"/> | |
930 | <modify-function signature="toPunycode(const QString&)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1052 | <!--### Obsolete in 4.3--> | |
|
1053 | <modify-function signature="toPunycode(const QString&)" remove="all"/> | |||
|
1054 | <!--### Obsolete in 4.3--> | |||
931 | </value-type> |
|
1055 | </value-type> | |
932 |
|
1056 | |||
933 | <value-type name="QRegExp"> |
|
1057 | <value-type name="QRegExp"> | |
934 | <extra-includes> |
|
1058 | <extra-includes> | |
935 |
|
|
1059 | <include file-name="QStringList" location="global"/> | |
936 | </extra-includes> |
|
1060 | </extra-includes> | |
937 | <modify-function signature="operator=(QRegExp)" remove="all"/> |
|
1061 | <modify-function signature="operator=(QRegExp)" remove="all"/> | |
|
1062 | <modify-function signature="pos(int)const"> | |||
|
1063 | <remove/> | |||
|
1064 | </modify-function> | |||
|
1065 | <modify-function signature="cap(int)const"> | |||
|
1066 | <remove/> | |||
|
1067 | </modify-function> | |||
|
1068 | <modify-function signature="capturedTexts()const"> | |||
|
1069 | <remove/> | |||
|
1070 | </modify-function> | |||
|
1071 | <modify-function signature="errorString()const"> | |||
|
1072 | <remove/> | |||
|
1073 | </modify-function> | |||
938 | </value-type> |
|
1074 | </value-type> | |
939 |
|
1075 | |||
940 | <value-type name="QFileInfo"> |
|
1076 | <value-type name="QFileInfo"> | |
941 | <extra-includes> |
|
1077 | <extra-includes> | |
942 |
|
|
1078 | <include file-name="QDateTime" location="global"/> | |
943 |
|
|
1079 | <include file-name="QDir" location="global"/> | |
944 | </extra-includes> |
|
1080 | </extra-includes> | |
945 | <modify-function signature="operator!=(const QFileInfo &)const" remove="all"/> |
|
1081 | <modify-function signature="operator!=(const QFileInfo &)const" remove="all"/> | |
946 | <modify-function signature="operator==(const QFileInfo &)const" remove="all"/> |
|
1082 | <modify-function signature="operator==(const QFileInfo &)const" remove="all"/> | |
947 | <modify-function signature="operator=(QFileInfo)" remove="all"/> |
|
1083 | <modify-function signature="operator=(QFileInfo)" remove="all"/> | |
948 | <modify-function signature="setFile(QFile)"> |
|
1084 | <modify-function signature="setFile(QFile)"> | |
949 |
|
|
1085 | <modify-argument index="1"> | |
950 |
|
|
1086 | <reference-count action="ignore"/> | |
951 |
|
|
1087 | </modify-argument> | |
952 | </modify-function> |
|
1088 | </modify-function> | |
953 |
|
1089 | |||
954 |
<modify-function signature="readLink()const" remove="all"/> |
|
1090 | <modify-function signature="readLink()const" remove="all"/> | |
|
1091 | <!--### Obsolete in 4.3--> | |||
955 |
|
1092 | |||
956 | <modify-function signature="QFileInfo(QFile)"> |
|
1093 | <modify-function signature="QFileInfo(QFile)"> | |
957 | <modify-argument index="1"> |
|
1094 | <modify-argument index="1"> | |
@@ -971,12 +1108,12 | |||||
971 | </modify-function> |
|
1108 | </modify-function> | |
972 | </value-type> |
|
1109 | </value-type> | |
973 |
|
1110 | |||
974 |
|
|
1111 | <interface-type name="QFactoryInterface"/> | |
975 |
|
1112 | |||
976 | <value-type name="QByteArray"> |
|
1113 | <value-type name="QByteArray"> | |
977 |
|
1114 | |||
978 | <extra-includes> |
|
1115 | <extra-includes> | |
979 |
|
|
1116 | <include file-name="QNoImplicitBoolCast" location="global"/> | |
980 | </extra-includes> |
|
1117 | </extra-includes> | |
981 |
|
1118 | |||
982 | <!-- removed functions --> |
|
1119 | <!-- removed functions --> | |
@@ -990,7 +1127,7 | |||||
990 | <modify-function signature="end()" remove="all"/> |
|
1127 | <modify-function signature="end()" remove="all"/> | |
991 | <modify-function signature="end()const" remove="all"/> |
|
1128 | <modify-function signature="end()const" remove="all"/> | |
992 | <modify-function signature="number(uint,int)" remove="all"/> |
|
1129 | <modify-function signature="number(uint,int)" remove="all"/> | |
993 |
<modify-function signature="number( |
|
1130 | <modify-function signature="number(unsigned long long,int)" remove="all"/> | |
994 | <modify-function signature="operator const char *()const" remove="all"/> |
|
1131 | <modify-function signature="operator const char *()const" remove="all"/> | |
995 | <modify-function signature="operator const void *()const" remove="all"/> |
|
1132 | <modify-function signature="operator const void *()const" remove="all"/> | |
996 | <modify-function signature="operator+=(const char*)" remove="all"/> |
|
1133 | <modify-function signature="operator+=(const char*)" remove="all"/> | |
@@ -1006,8 +1143,8 | |||||
1006 | <modify-function signature="push_front(const QByteArray&)" remove="all"/> |
|
1143 | <modify-function signature="push_front(const QByteArray&)" remove="all"/> | |
1007 | <modify-function signature="push_front(const char*)" remove="all"/> |
|
1144 | <modify-function signature="push_front(const char*)" remove="all"/> | |
1008 | <modify-function signature="setNum(uint,int)" remove="all"/> |
|
1145 | <modify-function signature="setNum(uint,int)" remove="all"/> | |
1009 |
<modify-function signature="setNum( |
|
1146 | <modify-function signature="setNum(unsigned long long,int)" remove="all"/> | |
1010 | <modify-function signature="setNum(ushort,int)" remove="all"/> |
|
1147 | <modify-function signature="setNum(unsigned short,int)" remove="all"/> | |
1011 | <modify-function signature="toLong(bool*, int) const" remove="all"/> |
|
1148 | <modify-function signature="toLong(bool*, int) const" remove="all"/> | |
1012 | <modify-function signature="toLongLong(bool*, int) const" remove="all"/> |
|
1149 | <modify-function signature="toLongLong(bool*, int) const" remove="all"/> | |
1013 | <modify-function signature="toShort(bool*, int) const" remove="all"/> |
|
1150 | <modify-function signature="toShort(bool*, int) const" remove="all"/> | |
@@ -1243,24 +1380,50 | |||||
1243 | </modify-argument> |
|
1380 | </modify-argument> | |
1244 | </modify-function> |
|
1381 | </modify-function> | |
1245 | </value-type> |
|
1382 | </value-type> | |
1246 |
|
1383 | |||
1247 | <value-type name="QTextBoundaryFinder"> |
|
1384 | <value-type name="QTextBoundaryFinder"> | |
1248 | <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/> |
|
1385 | <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/> | |
1249 | <modify-function signature="operator=(QTextBoundaryFinder)" remove="all"/> |
|
1386 | <modify-function signature="operator=(QTextBoundaryFinder)" remove="all"/> | |
1250 | </value-type> |
|
1387 | </value-type> | |
1251 |
|
1388 | |||
|
1389 | <value-type name="QEasingCurve"> | |||
|
1390 | <modify-function signature="customType()const" remove="all"/> | |||
|
1391 | <modify-function signature="setCustomType(double)" remove="all"/> | |||
|
1392 | </value-type> | |||
|
1393 | ||||
|
1394 | <object-type name="QAbstractAnimation"/> | |||
|
1395 | <object-type name="QVariantAnimation"/> | |||
|
1396 | <object-type name="QAnimationGroup"/> | |||
|
1397 | <object-type name="QPauseAnimation"/> | |||
|
1398 | <object-type name="QParallelAnimationGroup"/> | |||
|
1399 | <object-type name="QSequentialAnimationGroup"/> | |||
|
1400 | <object-type name="QPropertyAnimation"/> | |||
|
1401 | ||||
|
1402 | <object-type name="QAbstractState"/> | |||
|
1403 | <object-type name="QAbstractTransition"/> | |||
|
1404 | <object-type name="QState"/> | |||
|
1405 | <object-type name="QStateMachine"/> | |||
|
1406 | <object-type name="QHistoryState"/> | |||
|
1407 | <object-type name="QSignalTransition"/> | |||
|
1408 | <object-type name="QEventTransition"/> | |||
|
1409 | <object-type name="QFinalState"/> | |||
|
1410 | ||||
1252 | <object-type name="QXmlStreamEntityResolver"/> |
|
1411 | <object-type name="QXmlStreamEntityResolver"/> | |
1253 | <object-type name="QAbstractEventDispatcher"> |
|
1412 | <object-type name="QAbstractEventDispatcher"> | |
1254 | <extra-includes> |
|
1413 | <extra-includes> | |
1255 | <include file-name="QPair" location="global"/> |
|
1414 | <include file-name="QPair" location="global"/> | |
1256 | </extra-includes> |
|
1415 | </extra-includes> | |
1257 |
</object-type> |
|
1416 | </object-type> | |
1258 | <object-type name="QEventLoop"/> |
|
1417 | <object-type name="QEventLoop"/> | |
1259 |
<object-type name="QFile"> |
|
1418 | <object-type name="QFile"> | |
1260 |
<modify-function signature="readLink()const" remove="all"/> |
|
1419 | <modify-function signature="readLink()const" remove="all"/> | |
1261 | <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1420 | <!--### Obsolete in 4.3--> | |
1262 | <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all"/> <!-- Can't provide same API and performance --> |
|
1421 | <modify-function signature="readLink(QString)" remove="all"/> | |
1263 | <modify-function signature="unmap(uchar*)" remove="all"/> <!-- Can't provide same API and performance --> |
|
1422 | <!--### Obsolete in 4.3--> | |
|
1423 | <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/> | |||
|
1424 | <!-- Can't provide same API and performance --> | |||
|
1425 | <modify-function signature="unmap(unsigned char*)" remove="all"/> | |||
|
1426 | <!-- Can't provide same API and performance --> | |||
1264 |
|
1427 | |||
1265 | <modify-function signature="open(int,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> |
|
1428 | <modify-function signature="open(int,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> | |
1266 | <modify-function signature="decodeName(const char*)" remove="all"/> |
|
1429 | <modify-function signature="decodeName(const char*)" remove="all"/> | |
@@ -1274,12 +1437,14 | |||||
1274 | <modify-function signature="readLine(char *,qint64)" remove="all"/> |
|
1437 | <modify-function signature="readLine(char *,qint64)" remove="all"/> | |
1275 | <modify-function signature="write(const char *,qint64)" remove="all"/> |
|
1438 | <modify-function signature="write(const char *,qint64)" remove="all"/> | |
1276 | </object-type> |
|
1439 | </object-type> | |
|
1440 | <object-type name="QStateMachine::SignalEvent" polymorphic-id-expression="%1->type() == QEvent::StateMachineSignal"/> | |||
|
1441 | <object-type name="QStateMachine::WrappedEvent" polymorphic-id-expression="%1->type() == QEvent::StateMachineWrapped"/> | |||
1277 |
|
1442 | |||
1278 | <object-type name="QCryptographicHash"> |
|
1443 | <object-type name="QCryptographicHash"> | |
1279 | <modify-function signature="addData(const char*,int)" remove="all"/> |
|
1444 | <modify-function signature="addData(const char*,int)" remove="all"/> | |
1280 | </object-type> |
|
1445 | </object-type> | |
1281 | <object-type name="QLibraryInfo"/> |
|
1446 | <object-type name="QLibraryInfo"/> | |
1282 |
<object-type name="QMutex"/> |
|
1447 | <object-type name="QMutex"/> | |
1283 | <object-type name="QSemaphore"/> |
|
1448 | <object-type name="QSemaphore"/> | |
1284 | <object-type name="QSocketNotifier"/> |
|
1449 | <object-type name="QSocketNotifier"/> | |
1285 | <object-type name="QSystemLocale"/> |
|
1450 | <object-type name="QSystemLocale"/> | |
@@ -1297,74 +1462,71 | |||||
1297 | </object-type> |
|
1462 | </object-type> | |
1298 | <object-type name="QMimeData"> |
|
1463 | <object-type name="QMimeData"> | |
1299 | <extra-includes> |
|
1464 | <extra-includes> | |
1300 |
|
|
1465 | <include file-name="QStringList" location="global"/> | |
1301 |
|
|
1466 | <include file-name="QUrl" location="global"/> | |
1302 | </extra-includes> |
|
1467 | </extra-includes> | |
1303 |
</object-type> |
|
1468 | </object-type> | |
1304 |
<object-type name="QTextCodec"> |
|
1469 | <object-type name="QTextCodec"> | |
1305 |
|
1470 | |||
1306 | <modify-function signature="setCodecForTr(QTextCodec*)"> |
|
1471 | <modify-function signature="setCodecForTr(QTextCodec*)"> | |
1307 |
|
|
1472 | <access modifier="private"/> | |
1308 |
|
|
1473 | <modify-argument index="1"> | |
1309 |
|
|
1474 | <reference-count action="set" variable-name="__rcCodecForTr"/> | |
1310 |
|
|
1475 | </modify-argument> | |
1311 | </modify-function> |
|
1476 | </modify-function> | |
1312 | <modify-function signature="setCodecForCStrings(QTextCodec*)"> |
|
1477 | <modify-function signature="setCodecForCStrings(QTextCodec*)"> | |
1313 |
|
|
1478 | <modify-argument index="1"> | |
1314 |
|
|
1479 | <reference-count action="set" variable-name="__rcCodecForCStrings"/> | |
1315 |
|
|
1480 | </modify-argument> | |
1316 | </modify-function> |
|
1481 | </modify-function> | |
1317 | <modify-function signature="setCodecForLocale(QTextCodec*)"> |
|
1482 | <modify-function signature="setCodecForLocale(QTextCodec*)"> | |
1318 |
|
|
1483 | <modify-argument index="1"> | |
1319 |
|
|
1484 | <reference-count action="set" variable-name="__rcCodecForLocale"/> | |
1320 |
|
|
1485 | </modify-argument> | |
1321 | </modify-function> |
|
1486 | </modify-function> | |
1322 |
|
1487 | |||
1323 |
|
1488 | |||
1324 | <modify-function signature="codecForTr()"> |
|
1489 | <modify-function signature="codecForTr()"> | |
1325 |
|
|
1490 | <remove/> | |
1326 | </modify-function> |
|
1491 | </modify-function> | |
1327 |
|
1492 | |||
1328 | <modify-function signature="QTextCodec()"> |
|
1493 | <modify-function signature="QTextCodec()"> | |
1329 |
|
|
1494 | <modify-argument index="-1"> | |
1330 |
|
|
1495 | <define-ownership class="java" owner="c++"/> | |
1331 |
|
|
1496 | </modify-argument> | |
1332 | </modify-function> |
|
1497 | </modify-function> | |
1333 |
|
1498 | |||
1334 | <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const"> |
|
1499 | <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const"> | |
1335 |
|
|
1500 | <remove/> | |
1336 | </modify-function> |
|
1501 | </modify-function> | |
1337 |
|
1502 | |||
1338 | <modify-function signature="toUnicode(const char*,int,QTextCodec::ConverterState*)const"> |
|
1503 | <modify-function signature="toUnicode(const char*,int,QTextCodec::ConverterState*)const"> | |
1339 |
|
|
1504 | <remove/> | |
1340 | </modify-function> |
|
1505 | </modify-function> | |
1341 |
|
1506 | |||
1342 | <modify-function signature="toUnicode(const char*)const"> |
|
1507 | <modify-function signature="toUnicode(const char*)const"> | |
1343 |
|
|
1508 | <remove/> | |
1344 | </modify-function> |
|
1509 | </modify-function> | |
1345 | </object-type> |
|
1510 | </object-type> | |
1346 |
|
1511 | |||
1347 | <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory"/> |
|
|||
1348 | <object-type name="QTextCodecPlugin"/> |
|
|||
1349 |
|
||||
1350 | <object-type name="QTextDecoder"> |
|
1512 | <object-type name="QTextDecoder"> | |
1351 | <modify-function signature="toUnicode(const char*,int)"> |
|
1513 | <modify-function signature="toUnicode(const char*,int)"> | |
1352 |
|
|
1514 | <remove/> | |
1353 |
</modify-function> |
|
1515 | </modify-function> | |
1354 | <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/> |
|
1516 | <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/> | |
1355 | </object-type> |
|
1517 | </object-type> | |
1356 | <object-type name="QTextEncoder"> |
|
1518 | <object-type name="QTextEncoder"> | |
1357 | <modify-function signature="fromUnicode(const QChar*,int)"> |
|
1519 | <modify-function signature="fromUnicode(const QChar*,int)"> | |
1358 |
|
|
1520 | <remove/> | |
1359 |
</modify-function> |
|
1521 | </modify-function> | |
1360 | </object-type> |
|
1522 | </object-type> | |
1361 |
<object-type name="QTimeLine"/> |
|
1523 | <object-type name="QTimeLine"/> | |
1362 | <object-type name="QTranslator"> |
|
1524 | <object-type name="QTranslator"> | |
1363 | <modify-function signature="translate(const char*,const char*,const char*,int)const"> |
|
1525 | <modify-function signature="translate(const char*,const char*,const char*,int)const"> | |
1364 |
|
|
1526 | <remove/> | |
1365 | </modify-function> |
|
1527 | </modify-function> | |
1366 | </object-type> |
|
1528 | </object-type> | |
1367 |
|
1529 | |||
1368 | <object-type name="QWaitCondition"/> |
|
1530 | <object-type name="QWaitCondition"/> | |
1369 |
|
1531 | |||
1370 | <object-type name="QFileSystemWatcher"> |
|
1532 | <object-type name="QFileSystemWatcher"> | |
@@ -1372,15 +1534,17 | |||||
1372 | <include file-name="QStringList" location="global"/> |
|
1534 | <include file-name="QStringList" location="global"/> | |
1373 | </extra-includes> |
|
1535 | </extra-includes> | |
1374 | </object-type> |
|
1536 | </object-type> | |
1375 |
|
1537 | |||
1376 | <object-type name="QTextCodec::ConverterState"> |
|
1538 | <object-type name="QTextCodec::ConverterState"> | |
1377 | <include file-name="QTextCodec" location="global"/> |
|
1539 | <include file-name="QTextCodec" location="global"/> | |
1378 | </object-type> |
|
1540 | </object-type> | |
1379 |
|
1541 | |||
1380 |
<object-type name="QBuffer"> |
|
1542 | <object-type name="QBuffer"> | |
1381 | <modify-function signature="buffer()"> |
|
1543 | <modify-function signature="buffer()"> | |
1382 |
|
|
1544 | <remove/> | |
1383 | </modify-function> |
|
1545 | </modify-function> | |
|
1546 | <modify-function signature="connectNotify(const char *)" remove="all"/> | |||
|
1547 | <modify-function signature="disconnectNotify(const char *)" remove="all"/> | |||
1384 |
|
1548 | |||
1385 | <!-- ### modify to return value by pointer? --> |
|
1549 | <!-- ### modify to return value by pointer? --> | |
1386 | <modify-function signature="buffer()const" remove="all"/> |
|
1550 | <modify-function signature="buffer()const" remove="all"/> | |
@@ -1388,47 +1552,49 | |||||
1388 |
|
1552 | |||
1389 | <modify-function signature="setData(const char*,int)" remove="all"/> |
|
1553 | <modify-function signature="setData(const char*,int)" remove="all"/> | |
1390 | </object-type> |
|
1554 | </object-type> | |
1391 |
|
1555 | |||
1392 | <object-type name="QTimer"/> |
|
1556 | <object-type name="QTimer"/> | |
1393 |
|
1557 | |||
1394 | <object-type name="QAbstractFileEngineHandler"> |
|
1558 | <object-type name="QAbstractFileEngineHandler"> | |
1395 | <modify-function signature="create(const QString &) const"> |
|
1559 | <modify-function signature="create(const QString &) const"> | |
1396 |
|
|
1560 | <modify-argument index="return"> | |
1397 |
|
|
1561 | <define-ownership owner="c++" class="shell"/> | |
1398 |
|
|
1562 | </modify-argument> | |
1399 | </modify-function> |
|
1563 | </modify-function> | |
1400 | </object-type> |
|
1564 | </object-type> | |
1401 |
|
1565 | |||
1402 |
|
|
1566 | <object-type name="QAbstractFileEngine::MapExtensionOption"/> | |
1403 |
|
|
1567 | <object-type name="QAbstractFileEngine::MapExtensionReturn"/> | |
1404 |
|
|
1568 | <object-type name="QAbstractFileEngine::UnMapExtensionOption"/> | |
1405 | <object-type name="QAbstractFileEngine"> |
|
1569 | <object-type name="QAbstractFileEngine"> | |
1406 | <extra-includes> |
|
1570 | <extra-includes> | |
1407 |
|
|
1571 | <include file-name="QDateTime" location="global"/> | |
1408 | </extra-includes> |
|
1572 | </extra-includes> | |
1409 |
<modify-function signature="map( |
|
1573 | <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/> | |
1410 | <modify-function signature="unmap(unsigned char*)" remove="all"/> |
|
1574 | <modify-function signature="unmap(unsigned char*)" remove="all"/> | |
1411 | </object-type> |
|
1575 | </object-type> | |
1412 |
|
1576 | |||
1413 | <object-type name="QProcess"> |
|
1577 | <object-type name="QProcess"> | |
1414 |
<modify-function signature="readChannelMode()const" remove="all"/> |
|
1578 | <modify-function signature="readChannelMode()const" remove="all"/> | |
1415 | <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1579 | <!--### Obsolete in 4.3--> | |
|
1580 | <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> | |||
|
1581 | <!--### Obsolete in 4.3--> | |||
1416 | </object-type> |
|
1582 | </object-type> | |
1417 |
|
1583 | |||
1418 | <object-type name="QSignalMapper"> |
|
1584 | <object-type name="QSignalMapper"> | |
1419 | <modify-function signature="mapped(const QString &)"> |
|
1585 | <modify-function signature="mapped(const QString &)"> | |
1420 |
|
|
1586 | <rename to="mappedString"/> | |
1421 | </modify-function> |
|
1587 | </modify-function> | |
1422 | <modify-function signature="mapped(int)"> |
|
1588 | <modify-function signature="mapped(int)"> | |
1423 |
|
|
1589 | <rename to="mappedInteger"/> | |
1424 |
</modify-function> |
|
1590 | </modify-function> | |
1425 | <modify-function signature="mapped(QObject *)"> |
|
1591 | <modify-function signature="mapped(QObject *)"> | |
1426 |
|
|
1592 | <rename to="mappedQObject"/> | |
1427 |
</modify-function> |
|
1593 | </modify-function> | |
1428 | <modify-function signature="mapped(QWidget *)" remove="all"/> |
|
1594 | <modify-function signature="mapped(QWidget *)" remove="all"/> | |
1429 |
|
1595 | |||
1430 | <modify-function signature="mapping(QWidget*)const" remove="all"/> |
|
1596 | <modify-function signature="mapping(QWidget*)const" remove="all"/> | |
1431 |
|
1597 | |||
1432 | <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/> |
|
1598 | <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/> | |
1433 |
|
1599 | |||
1434 | <!-- ### overloads --> |
|
1600 | <!-- ### overloads --> | |
@@ -1450,62 +1616,62 | |||||
1450 | <modify-function signature="setMapping(QObject*,QObject*)"> |
|
1616 | <modify-function signature="setMapping(QObject*,QObject*)"> | |
1451 | <rename to="setMappingByObject"/> |
|
1617 | <rename to="setMappingByObject"/> | |
1452 | </modify-function> |
|
1618 | </modify-function> | |
1453 |
</object-type> |
|
1619 | </object-type> | |
1454 |
|
1620 | |||
1455 | <object-type name="QObject"> |
|
1621 | <object-type name="QObject"> | |
1456 | <modify-function signature="childEvent(QChildEvent*)"> |
|
1622 | <modify-function signature="childEvent(QChildEvent*)"> | |
1457 |
|
|
1623 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1458 | </modify-function> |
|
1624 | </modify-function> | |
1459 | <modify-function signature="customEvent(QEvent*)"> |
|
1625 | <modify-function signature="customEvent(QEvent*)"> | |
1460 |
|
|
1626 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1461 | </modify-function> |
|
1627 | </modify-function> | |
1462 | <modify-function signature="event(QEvent*)"> |
|
1628 | <modify-function signature="event(QEvent*)"> | |
1463 |
|
|
1629 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1464 | </modify-function> |
|
1630 | </modify-function> | |
1465 | <modify-function signature="eventFilter(QObject*,QEvent*)"> |
|
1631 | <modify-function signature="eventFilter(QObject*,QEvent*)"> | |
1466 |
|
|
1632 | <modify-argument index="2" invalidate-after-use="yes"/> | |
1467 | </modify-function> |
|
1633 | </modify-function> | |
1468 | <modify-function signature="timerEvent(QTimerEvent*)"> |
|
1634 | <modify-function signature="timerEvent(QTimerEvent*)"> | |
1469 |
|
|
1635 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1470 | </modify-function> |
|
1636 | </modify-function> | |
1471 |
|
1637 | |||
1472 | <modify-function signature="installEventFilter(QObject*)"> |
|
1638 | <modify-function signature="installEventFilter(QObject*)"> | |
1473 |
|
|
1639 | <modify-argument index="1"> | |
1474 |
|
|
1640 | <reference-count action="add" variable-name="__rcEventFilters"/> | |
1475 |
|
|
1641 | </modify-argument> | |
1476 | </modify-function> |
|
1642 | </modify-function> | |
1477 | <modify-function signature="removeEventFilter(QObject*)"> |
|
1643 | <modify-function signature="removeEventFilter(QObject*)"> | |
1478 |
|
|
1644 | <modify-argument index="1"> | |
1479 |
|
|
1645 | <reference-count action="remove" variable-name="__rcEventFilters"/> | |
1480 |
|
|
1646 | </modify-argument> | |
1481 | </modify-function> |
|
1647 | </modify-function> | |
1482 | <modify-function signature="setParent(QObject*)"> |
|
1648 | <modify-function signature="setParent(QObject*)"> | |
1483 |
|
|
1649 | <modify-argument index="1"> | |
1484 |
|
|
1650 | <reference-count action="ignore"/> | |
1485 |
|
|
1651 | </modify-argument> | |
1486 | </modify-function> |
|
1652 | </modify-function> | |
1487 |
|
1653 | |||
1488 | <modify-function signature="deleteLater()"> |
|
1654 | <modify-function signature="deleteLater()"> | |
1489 |
|
|
1655 | <rename to="disposeLater"/> | |
1490 | </modify-function> |
|
1656 | </modify-function> | |
1491 | <!-- |
|
1657 | ||
1492 | <modify-function signature="inherits(const char*)const"> |
|
1658 | <modify-function signature="inherits(const char*)const"> | |
1493 |
|
|
1659 | <remove/> | |
1494 | </modify-function> |
|
1660 | </modify-function> | |
1495 | --> |
|
1661 | ||
1496 | <modify-function signature="property(const char*)const"> |
|
1662 | <modify-function signature="property(const char*)const"> | |
1497 |
|
|
1663 | <access modifier="private"/> | |
1498 | </modify-function> |
|
1664 | </modify-function> | |
1499 |
|
1665 | |||
1500 | <modify-function signature="setProperty(const char*,QVariant)"> |
|
1666 | <modify-function signature="setProperty(const char*,QVariant)"> | |
1501 |
|
|
1667 | <access modifier="private"/> | |
1502 | </modify-function> |
|
1668 | </modify-function> | |
1503 |
|
1669 | |||
1504 |
|
1670 | |||
1505 | <extra-includes> |
|
1671 | <extra-includes> | |
1506 |
|
|
1672 | <include file-name="QVarLengthArray" location="global"/> | |
1507 | </extra-includes> |
|
1673 | </extra-includes> | |
1508 |
|
1674 | |||
1509 |
|
1675 | |||
1510 | <modify-function signature="property(const char*)const"> |
|
1676 | <modify-function signature="property(const char*)const"> | |
1511 | <modify-argument index="1"> |
|
1677 | <modify-argument index="1"> | |
@@ -1537,49 +1703,51 | |||||
1537 |
|
1703 | |||
1538 | <object-type name="QCoreApplication"> |
|
1704 | <object-type name="QCoreApplication"> | |
1539 | <extra-includes> |
|
1705 | <extra-includes> | |
1540 |
|
|
1706 | <include file-name="QStringList" location="global"/> | |
1541 | </extra-includes> |
|
1707 | </extra-includes> | |
1542 |
|
1708 | |||
1543 |
<modify-function signature="argv()" remove="all"/> |
|
1709 | <modify-function signature="argv()" remove="all"/> | |
1544 | <modify-function signature="argc()" remove="all"/> <!-- Obsolete --> |
|
1710 | <!-- Obsolete --> | |
1545 |
|
1711 | <modify-function signature="argc()" remove="all"/> | ||
|
1712 | <!-- Obsolete --> | |||
|
1713 | ||||
1546 | <modify-function signature="notify(QObject*,QEvent*)"> |
|
1714 | <modify-function signature="notify(QObject*,QEvent*)"> | |
1547 |
|
|
1715 | <modify-argument index="2" invalidate-after-use="yes"/> | |
1548 | </modify-function> |
|
1716 | </modify-function> | |
1549 |
|
1717 | |||
1550 |
|
1718 | |||
1551 | <modify-function signature="QCoreApplication(int &, char **)"> |
|
1719 | <modify-function signature="QCoreApplication(int &, char **)"> | |
1552 | <access modifier="private"/> |
|
1720 | <access modifier="private"/> | |
1553 |
</modify-function> |
|
1721 | </modify-function> | |
1554 | <modify-function signature="removePostedEvents(QObject*)"> |
|
1722 | <modify-function signature="removePostedEvents(QObject*)"> | |
1555 |
|
|
1723 | <modify-argument index="1"> | |
1556 |
|
|
1724 | <reference-count action="ignore"/> | |
1557 |
|
|
1725 | </modify-argument> | |
1558 | </modify-function> |
|
1726 | </modify-function> | |
1559 | <modify-function signature="removePostedEvents(QObject*,int)"> |
|
1727 | <modify-function signature="removePostedEvents(QObject*,int)"> | |
1560 |
|
|
1728 | <modify-argument index="1"> | |
1561 |
|
|
1729 | <reference-count action="ignore"/> | |
1562 |
|
|
1730 | </modify-argument> | |
1563 | </modify-function> |
|
1731 | </modify-function> | |
1564 |
|
1732 | |||
1565 | <modify-function signature="installTranslator(QTranslator *)"> |
|
1733 | <modify-function signature="installTranslator(QTranslator *)"> | |
1566 |
|
|
1734 | <modify-argument index="1"> | |
1567 |
|
|
1735 | <reference-count action="add" variable-name="__rcTranslators"/> | |
1568 |
|
|
1736 | </modify-argument> | |
1569 | </modify-function> |
|
1737 | </modify-function> | |
1570 |
|
1738 | |||
1571 | <modify-function signature="removeTranslator(QTranslator *)"> |
|
1739 | <modify-function signature="removeTranslator(QTranslator *)"> | |
1572 |
|
|
1740 | <modify-argument index="1"> | |
1573 |
|
|
1741 | <reference-count action="remove" variable-name="__rcTranslators"/> | |
1574 |
|
|
1742 | </modify-argument> | |
1575 |
</modify-function> |
|
1743 | </modify-function> | |
1576 |
|
1744 | |||
1577 |
|
1745 | |||
1578 | <modify-function signature="postEvent(QObject*,QEvent*)"> |
|
1746 | <modify-function signature="postEvent(QObject*,QEvent*)"> | |
1579 |
|
|
1747 | <modify-argument index="2"> | |
1580 |
|
|
1748 | <define-ownership class="java" owner="c++"/> | |
1581 |
|
|
1749 | </modify-argument> | |
1582 |
</modify-function> |
|
1750 | </modify-function> | |
1583 |
|
1751 | |||
1584 | <modify-function signature="QCoreApplication(int &, char **)" remove="all"/> |
|
1752 | <modify-function signature="QCoreApplication(int &, char **)" remove="all"/> | |
1585 | <!-- ### arguments() causes a warning: "QScriptValue::setProperty(arguments): cannot change flags of a native property" --> |
|
1753 | <!-- ### arguments() causes a warning: "QScriptValue::setProperty(arguments): cannot change flags of a native property" --> | |
@@ -1629,11 +1797,19 | |||||
1629 |
|
1797 | |||
1630 | <object-type name="QSettings"> |
|
1798 | <object-type name="QSettings"> | |
1631 | <extra-includes> |
|
1799 | <extra-includes> | |
1632 |
|
|
1800 | <include file-name="QStringList" location="global"/> | |
1633 | </extra-includes> |
|
1801 | </extra-includes> | |
1634 |
|
1802 | |||
1635 | <modify-function signature="setSystemIniPath(const QString&)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1803 | <modify-function signature="setIniCodec(QTextCodec*)"> | |
1636 | <modify-function signature="setUserIniPath(const QString&)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1804 | <modify-argument index="1"> | |
|
1805 | <reference-count action="set" variable-name="__rcIniCodec"/> | |||
|
1806 | </modify-argument> | |||
|
1807 | </modify-function> | |||
|
1808 | ||||
|
1809 | <modify-function signature="setSystemIniPath(const QString&)" remove="all"/> | |||
|
1810 | <!--### Obsolete in 4.3--> | |||
|
1811 | <modify-function signature="setUserIniPath(const QString&)" remove="all"/> | |||
|
1812 | <!--### Obsolete in 4.3--> | |||
1637 | </object-type> |
|
1813 | </object-type> | |
1638 |
|
1814 | |||
1639 | <object-type name="QEvent" polymorphic-base="yes" polymorphic-id-expression="%1->type() == QEvent::None"/> |
|
1815 | <object-type name="QEvent" polymorphic-base="yes" polymorphic-id-expression="%1->type() == QEvent::None"/> | |
@@ -1641,34 +1817,62 | |||||
1641 | <modify-field name="c" read="false" write="false"/> |
|
1817 | <modify-field name="c" read="false" write="false"/> | |
1642 | </object-type> |
|
1818 | </object-type> | |
1643 | <object-type name="QTimerEvent" polymorphic-id-expression="%1->type() == QEvent::Timer"/> |
|
1819 | <object-type name="QTimerEvent" polymorphic-id-expression="%1->type() == QEvent::Timer"/> | |
1644 |
<object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1->type() == QEvent::DynamicPropertyChange"/> |
|
1820 | <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1->type() == QEvent::DynamicPropertyChange"/> | |
1645 |
|
1821 | |||
1646 |
<object-type name="QDataStream"> |
|
1822 | <object-type name="QDataStream"> | |
1647 | <modify-function signature="setDevice(QIODevice*)"> |
|
1823 | <modify-function signature="setDevice(QIODevice*)"> | |
1648 |
|
|
1824 | <modify-argument index="1"> | |
1649 |
|
|
1825 | <reference-count action="set" variable-name="__rcDevice"/> | |
1650 |
|
|
1826 | </modify-argument> | |
1651 | </modify-function> |
|
1827 | </modify-function> | |
1652 | <!-- |
|
|||
1653 | <modify-function signature="unsetDevice()"> |
|
1828 | <modify-function signature="unsetDevice()"> | |
1654 |
|
|
1829 | <inject-code position="end"> | |
1655 |
|
|
1830 | __rcDevice = null; | |
1656 |
|
|
1831 | </inject-code> | |
1657 | </modify-function> |
|
1832 | </modify-function> | |
1658 | --> |
|
|||
1659 |
|
1833 | |||
1660 |
|
1834 | |||
1661 |
<modify-function signature="operator<<(const char*)"> |
|
1835 | <modify-function signature="operator<<(const char*)"> | |
1662 | <modify-function signature="operator<<(unsigned int)"> <remove/> </modify-function> |
|
1836 | <remove/> | |
1663 | <modify-function signature="operator<<(unsigned long long)"> <remove/> </modify-function> |
|
1837 | </modify-function> | |
1664 |
<modify-function signature="operator<<(unsigned |
|
1838 | <modify-function signature="operator<<(unsigned char)"> | |
|
1839 | <remove/> | |||
|
1840 | </modify-function> | |||
|
1841 | <modify-function signature="operator<<(unsigned int)"> | |||
|
1842 | <remove/> | |||
|
1843 | </modify-function> | |||
|
1844 | <modify-function signature="operator<<(unsigned long long)"> | |||
|
1845 | <remove/> | |||
|
1846 | </modify-function> | |||
|
1847 | <modify-function signature="operator<<(unsigned short)"> | |||
|
1848 | <remove/> | |||
|
1849 | </modify-function> | |||
1665 |
|
1850 | |||
1666 |
<modify-function signature="operator>>(char &*)"> |
|
1851 | <modify-function signature="operator>>(char &*)"> | |
|
1852 | <remove/> | |||
|
1853 | </modify-function> | |||
|
1854 | <modify-function signature="operator>>(uint&)"> | |||
|
1855 | <remove/> | |||
|
1856 | </modify-function> | |||
|
1857 | <modify-function signature="operator>>(unsigned char&)"> | |||
|
1858 | <remove/> | |||
|
1859 | </modify-function> | |||
|
1860 | <modify-function signature="operator>>(unsigned long long&)"> | |||
|
1861 | <remove/> | |||
|
1862 | </modify-function> | |||
1667 |
|
1863 | |||
1668 |
<modify-function signature="readRawData(char*,int)"> |
|
1864 | <modify-function signature="readRawData(char*,int)"> | |
1669 | <modify-function signature="readBytes(char&*,uint&)"> <remove/> </modify-function> |
|
1865 | <remove/> | |
1670 | <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function> |
|
1866 | </modify-function> | |
1671 |
<modify-function signature=" |
|
1867 | <modify-function signature="readBytes(char&*,uint&)"> | |
|
1868 | <remove/> | |||
|
1869 | </modify-function> | |||
|
1870 | <modify-function signature="writeRawData(const char*,int)"> | |||
|
1871 | <remove/> | |||
|
1872 | </modify-function> | |||
|
1873 | <modify-function signature="writeBytes(const char*,uint)"> | |||
|
1874 | <remove/> | |||
|
1875 | </modify-function> | |||
1672 |
|
1876 | |||
1673 | <modify-function signature="operator>>(signed char&)" remove="all"/> |
|
1877 | <modify-function signature="operator>>(signed char&)" remove="all"/> | |
1674 | <modify-function signature="operator<<(signed char)" remove="all"/> |
|
1878 | <modify-function signature="operator<<(signed char)" remove="all"/> | |
@@ -1855,49 +2059,99 | |||||
1855 | </object-type> |
|
2059 | </object-type> | |
1856 |
|
2060 | |||
1857 | <object-type name="QFSFileEngine"> |
|
2061 | <object-type name="QFSFileEngine"> | |
1858 | <extra-includes> |
|
2062 | <extra-includes> | |
1859 |
|
|
2063 | <include file-name="QDateTime" location="global"/> | |
1860 |
|
|
2064 | </extra-includes> | |
1861 | </object-type> |
|
2065 | </object-type> | |
1862 |
|
2066 | |||
1863 | <object-type name="QTextStream"> |
|
2067 | <object-type name="QTextStream"> | |
1864 |
<modify-function signature="QTextStream(QByteArray *, QFlags<QIODevice::OpenModeFlag>)"> |
|
2068 | <modify-function signature="QTextStream(QByteArray *, QFlags<QIODevice::OpenModeFlag>)"> | |
1865 | <modify-function signature="QTextStream(QString*,QFlags<QIODevice::OpenModeFlag>)"> <remove/> </modify-function> |
|
2069 | <remove/> | |
1866 | <modify-function signature="operator>>(QChar&)"> <remove/> </modify-function> |
|
2070 | </modify-function> | |
1867 | <modify-function signature="operator<<(const void*)"> <remove/> </modify-function> |
|
2071 | <modify-function signature="QTextStream(QString*,QFlags<QIODevice::OpenModeFlag>)"> | |
1868 | <modify-function signature="operator<<(unsigned int)"> <remove/> </modify-function> |
|
2072 | <remove/> | |
1869 | <modify-function signature="operator<<(qlonglong)"> <remove/> </modify-function> |
|
2073 | </modify-function> | |
1870 |
<modify-function signature="operator& |
|
2074 | <modify-function signature="operator>>(QChar&)"> | |
1871 | <modify-function signature="operator<<(unsigned long)"> <remove/> </modify-function> |
|
2075 | <remove/> | |
1872 | <modify-function signature="operator<<(signed long)"> <remove/> </modify-function> |
|
2076 | </modify-function> | |
1873 |
<modify-function signature="operator<<(const |
|
2077 | <modify-function signature="operator<<(const void*)"> | |
1874 | <modify-function signature="operator<<(unsigned short)"> <remove/> </modify-function> |
|
2078 | <remove/> | |
1875 | <modify-function signature="operator>>(qulonglong&)"> <remove/> </modify-function> |
|
2079 | </modify-function> | |
1876 |
<modify-function signature="operator& |
|
2080 | <modify-function signature="operator<<(unsigned int)"> | |
1877 | <modify-function signature="setString(QString*,QFlags<QIODevice::OpenModeFlag>)"> <remove/> </modify-function> |
|
2081 | <remove/> | |
1878 | <modify-function signature="string()const"> <remove/> </modify-function> |
|
2082 | </modify-function> | |
1879 |
<modify-function signature="operator& |
|
2083 | <modify-function signature="operator<<(unsigned long long)"> | |
1880 | <modify-function signature="operator>>(char*)"> <remove/> </modify-function> |
|
2084 | <remove/> | |
1881 | <modify-function signature="operator>>(QByteArray&)"> <remove/> </modify-function> |
|
2085 | </modify-function> | |
1882 |
<modify-function signature="operator& |
|
2086 | <modify-function signature="operator<<(const QChar &)"> | |
1883 |
|
2087 | <remove/> | ||
1884 |
|
2088 | </modify-function> | ||
|
2089 | <modify-function signature="operator<<(unsigned long)"> | |||
|
2090 | <remove/> | |||
|
2091 | </modify-function> | |||
|
2092 | <modify-function signature="operator<<(signed long)"> | |||
|
2093 | <remove/> | |||
|
2094 | </modify-function> | |||
|
2095 | <modify-function signature="operator<<(const char*)"> | |||
|
2096 | <remove/> | |||
|
2097 | </modify-function> | |||
|
2098 | <modify-function signature="operator<<(unsigned short)"> | |||
|
2099 | <remove/> | |||
|
2100 | </modify-function> | |||
|
2101 | <modify-function signature="operator<<(const QByteArray&)"> | |||
|
2102 | <remove/> | |||
|
2103 | </modify-function> | |||
|
2104 | <modify-function signature="operator>>(unsigned long long&)"> | |||
|
2105 | <remove/> | |||
|
2106 | </modify-function> | |||
|
2107 | <modify-function signature="operator>>(uint&)"> | |||
|
2108 | <remove/> | |||
|
2109 | </modify-function> | |||
|
2110 | <modify-function signature="operator>>(ulong&)"> | |||
|
2111 | <remove/> | |||
|
2112 | </modify-function> | |||
|
2113 | <modify-function signature="setString(QString*,QFlags<QIODevice::OpenModeFlag>)"> | |||
|
2114 | <remove/> | |||
|
2115 | </modify-function> | |||
|
2116 | <modify-function signature="string()const"> | |||
|
2117 | <remove/> | |||
|
2118 | </modify-function> | |||
|
2119 | <modify-function signature="operator>>(signed long&)"> | |||
|
2120 | <remove/> | |||
|
2121 | </modify-function> | |||
|
2122 | <modify-function signature="operator>>(char*)"> | |||
|
2123 | <remove/> | |||
|
2124 | </modify-function> | |||
|
2125 | <modify-function signature="operator>>(QByteArray&)"> | |||
|
2126 | <remove/> | |||
|
2127 | </modify-function> | |||
|
2128 | <modify-function signature="operator>>(QString&)"> | |||
|
2129 | <remove/> | |||
|
2130 | </modify-function> | |||
|
2131 | <modify-function signature="operator>>(unsigned short&)"> | |||
|
2132 | <remove/> | |||
|
2133 | </modify-function> | |||
|
2134 | <modify-function signature="operator<<(const QString&)"> | |||
|
2135 | <remove/> | |||
|
2136 | </modify-function> | |||
|
2137 | ||||
|
2138 | ||||
1885 | <modify-function signature="setCodec(QTextCodec *)"> |
|
2139 | <modify-function signature="setCodec(QTextCodec *)"> | |
1886 |
|
|
2140 | <modify-argument index="1"> | |
1887 |
|
|
2141 | <reference-count action="set" variable-name="__rcCodec"/> | |
1888 |
|
|
2142 | </modify-argument> | |
1889 | </modify-function> |
|
2143 | </modify-function> | |
1890 |
|
2144 | |||
1891 | <modify-function signature="QTextStream(QIODevice *)"> |
|
2145 | <modify-function signature="QTextStream(QIODevice *)"> | |
1892 |
|
|
2146 | <modify-argument index="1"> | |
1893 |
|
|
2147 | <reference-count action="set" variable-name="__rcDevice"/> | |
1894 |
|
|
2148 | </modify-argument> | |
1895 |
</modify-function> |
|
2149 | </modify-function> | |
1896 | <modify-function signature="setDevice(QIODevice *)"> |
|
2150 | <modify-function signature="setDevice(QIODevice *)"> | |
1897 |
|
|
2151 | <modify-argument index="1"> | |
1898 |
|
|
2152 | <reference-count action="set" variable-name="__rcDevice"/> | |
1899 |
|
|
2153 | </modify-argument> | |
1900 |
</modify-function> |
|
2154 | </modify-function> | |
1901 |
|
2155 | |||
1902 | <modify-function signature="setCodec(const char *)"> |
|
2156 | <modify-function signature="setCodec(const char *)"> | |
1903 | <modify-argument index="1"> |
|
2157 | <modify-argument index="1"> | |
@@ -2084,433 +2338,61 | |||||
2084 | <modify-function signature="operator<<(qulonglong)" remove="all"/> |
|
2338 | <modify-function signature="operator<<(qulonglong)" remove="all"/> | |
2085 | <modify-function signature="operator>>(qulonglong&)" remove="all"/> |
|
2339 | <modify-function signature="operator>>(qulonglong&)" remove="all"/> | |
2086 | </object-type> |
|
2340 | </object-type> | |
2087 |
|
2341 | |||
2088 | <object-type name="QSystemSemaphore"/> |
|
2342 | <object-type name="QSystemSemaphore"/> | |
2089 |
|
2343 | |||
2090 | <namespace-type name="QtConcurrent" target-type="class"> |
|
2344 | <namespace-type name="QtConcurrent" target-type="class"> | |
2091 | <extra-includes> |
|
2345 | <extra-includes> | |
2092 | <include file-name="qtconcurrentreducekernel.h" location="global"/> |
|
2346 | <include file-name="qtconcurrentreducekernel.h" location="global"/> | |
2093 | <include file-name="qtconcurrentthreadengine.h" location="global"/> |
|
2347 | <include file-name="qtconcurrentthreadengine.h" location="global"/> | |
2094 | </extra-includes> |
|
2348 | </extra-includes> | |
2095 | </namespace-type> |
|
2349 | </namespace-type> | |
2096 |
|
2350 | |||
2097 | <value-type name="QFuture" generate="no"> |
|
2351 | <value-type name="QFuture" generate="no"> | |
2098 | <modify-function signature="operator T() const" remove="all"/> |
|
2352 | <modify-function signature="operator T() const" remove="all"/> | |
2099 | <modify-function signature="operator=(const QFuture &)" remove="all"/> |
|
2353 | <modify-function signature="operator=(const QFuture &)" remove="all"/> | |
2100 | </value-type> |
|
2354 | </value-type> | |
2101 |
<value-type name="Qt |
|
2355 | <value-type name="QtJambiVoidFuture" java-name="QFutureVoid"> | |
2102 | <modify-function signature="resultCount()const" remove="all"/> |
|
2356 | <modify-function signature="resultCount()const" remove="all"/> | |
2103 | <modify-function signature="isResultReadyAt(int)const" remove="all"/> |
|
2357 | <modify-function signature="isResultReadyAt(int)const" remove="all"/> | |
2104 |
|
||||
2105 | <modify-function signature="operator==(const QFuture &)const"> |
|
|||
2106 | <modify-argument index="1"> |
|
|||
2107 | <replace-type modified-type="QtScriptVoidFuture"/> |
|
|||
2108 | </modify-argument> |
|
|||
2109 | </modify-function> |
|
|||
2110 | <modify-function signature="QFuture(const QFuture &)"> |
|
|||
2111 | <modify-argument index="1"> |
|
|||
2112 | <replace-type modified-type="QtScriptVoidFuture"/> |
|
|||
2113 | </modify-argument> |
|
|||
2114 | </modify-function> |
|
|||
2115 | </value-type> |
|
2358 | </value-type> | |
2116 |
<value-type name="Qt |
|
2359 | <value-type name="QtJambiFuture" java-name="QFuture" generic-class="yes"/> | |
2117 | <modify-function signature="operator==(const QFuture &)const"> |
|
2360 | ||
2118 | <modify-argument index="1"> |
|
|||
2119 | <replace-type modified-type="QtScriptFuture"/> |
|
|||
2120 | </modify-argument> |
|
|||
2121 | </modify-function> |
|
|||
2122 | <modify-function signature="QFuture(const QFuture &)"> |
|
|||
2123 | <modify-argument index="1"> |
|
|||
2124 | <replace-type modified-type="QtScriptFuture"/> |
|
|||
2125 | </modify-argument> |
|
|||
2126 | </modify-function> |
|
|||
2127 | <inject-code class="native"> |
|
|||
2128 | </inject-code> |
|
|||
2129 | </value-type> |
|
|||
2130 |
|
||||
2131 | <object-type name="QFutureWatcherBase"> |
|
2361 | <object-type name="QFutureWatcherBase"> | |
2132 | <modify-function signature="connectNotify(const char *)" remove="all"/> |
|
2362 | <modify-function signature="connectNotify(const char *)" remove="all"/> | |
2133 | <modify-function signature="disconnectNotify(const char *)" remove="all"/> |
|
2363 | <modify-function signature="disconnectNotify(const char *)" remove="all"/> | |
2134 | </object-type> |
|
|||
2135 | <object-type name="QtScriptVoidFutureWatcher" java-name="QFutureWatcherVoid"> |
|
|||
2136 | <modify-function signature="setFuture(const QFuture &)"> |
|
|||
2137 | <modify-argument index="1"> |
|
|||
2138 | <replace-type modified-type="QtScriptVoidFuture"/> |
|
|||
2139 | </modify-argument> |
|
|||
2140 | </modify-function> |
|
|||
2141 | </object-type> |
|
2364 | </object-type> | |
2142 |
|
2365 | <object-type name="QtJambiVoidFutureWatcher" java-name="QFutureWatcherVoid"/> | ||
|
2366 | ||||
2143 | <object-type name="QFutureWatcher" generate="no"> |
|
2367 | <object-type name="QFutureWatcher" generate="no"> | |
2144 | <modify-function signature="future()const" remove="all"/> |
|
2368 | <modify-function signature="future()const" remove="all"/> | |
2145 | </object-type> |
|
2369 | </object-type> | |
2146 |
<object-type name="Qt |
|
2370 | <object-type name="QtJambiFutureWatcher" java-name="QFutureWatcher" generic-class="yes"/> | |
2147 | <modify-function signature="setFuture(const QFuture &)"> |
|
2371 | ||
2148 | <modify-argument index="1"> |
|
|||
2149 | <replace-type modified-type="QtScriptFuture"/> |
|
|||
2150 | </modify-argument> |
|
|||
2151 | </modify-function> |
|
|||
2152 | </object-type> |
|
|||
2153 |
|
||||
2154 | <object-type name="QFutureSynchronizer" generate="no"/> |
|
2372 | <object-type name="QFutureSynchronizer" generate="no"/> | |
2155 |
<object-type name="Qt |
|
2373 | <object-type name="QtJambiFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer"/> | |
2156 | <modify-function signature="QFutureSynchronizer(const QFuture &)"> |
|
2374 | <object-type name="QtJambiVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid"/> | |
2157 | <modify-argument index="1"> |
|
|||
2158 | <replace-type modified-type="QtScriptFuture"/> |
|
|||
2159 | </modify-argument> |
|
|||
2160 | </modify-function> |
|
|||
2161 | <modify-function signature="addFuture(const QFuture &)"> |
|
|||
2162 | <modify-argument index="1"> |
|
|||
2163 | <replace-type modified-type="QtScriptFuture"/> |
|
|||
2164 | </modify-argument> |
|
|||
2165 | </modify-function> |
|
|||
2166 | <modify-function signature="setFuture(const QFuture &)"> |
|
|||
2167 | <modify-argument index="1"> |
|
|||
2168 | <replace-type modified-type="QtScriptFuture"/> |
|
|||
2169 | </modify-argument> |
|
|||
2170 | </modify-function> |
|
|||
2171 | <modify-function signature="futures()const" remove="all"/> |
|
|||
2172 | </object-type> |
|
|||
2173 | <object-type name="QtScriptVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid"> |
|
|||
2174 | <modify-function signature="QFutureSynchronizer(const QFuture &)"> |
|
|||
2175 | <modify-argument index="1"> |
|
|||
2176 | <replace-type modified-type="QtScriptVoidFuture"/> |
|
|||
2177 | </modify-argument> |
|
|||
2178 | </modify-function> |
|
|||
2179 | <modify-function signature="addFuture(const QFuture &)"> |
|
|||
2180 | <modify-argument index="1"> |
|
|||
2181 | <replace-type modified-type="QtScriptVoidFuture"/> |
|
|||
2182 | </modify-argument> |
|
|||
2183 | </modify-function> |
|
|||
2184 | <modify-function signature="setFuture(const QFuture &)"> |
|
|||
2185 | <modify-argument index="1"> |
|
|||
2186 | <replace-type modified-type="QtScriptVoidFuture"/> |
|
|||
2187 | </modify-argument> |
|
|||
2188 | </modify-function> |
|
|||
2189 | <modify-function signature="futures()const" remove="all"/> |
|
|||
2190 | </object-type> |
|
|||
2191 | <object-type name="QThreadPool"/> |
|
2375 | <object-type name="QThreadPool"/> | |
2192 |
|
2376 | |||
2193 | <object-type name="QFutureIterator" generate="no"> |
|
2377 | <object-type name="QFutureIterator" generate="no"> | |
2194 |
|
|
2378 | <modify-function signature="operator=(const QFuture&)" remove="all"/> | |
2195 | </object-type> |
|
|||
2196 | <object-type name="QtScriptFutureIterator" generic-class="yes" java-name="QFutureIterator"> |
|
|||
2197 | <modify-function signature="QFutureIterator(const QFuture &)"> |
|
|||
2198 | <modify-argument index="1"> |
|
|||
2199 | <replace-type modified-type="QtScriptFuture"/> |
|
|||
2200 | </modify-argument> |
|
|||
2201 | </modify-function> |
|
|||
2202 | </object-type> |
|
2379 | </object-type> | |
|
2380 | <object-type name="QtJambiFutureIterator" generic-class="yes" java-name="QFutureIterator"/> | |||
2203 | <object-type name="QRunnable"/> |
|
2381 | <object-type name="QRunnable"/> | |
2204 |
|
2382 | |||
2205 |
|
2383 | <!-- Inefficient hash codes --> | ||
2206 | <value-type name="QXmlStreamAttribute"> |
|
2384 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
2207 | <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/> |
|
2385 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
2208 |
|
2386 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | ||
2209 | <modify-function signature="name()const"> |
|
2387 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
2210 | <modify-argument index="return"> |
|
2388 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
2211 | <conversion-rule class="native"> |
|
2389 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
2212 | <insert-template name="core.convert_stringref_to_string"/> |
|
2390 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QProcessEnvironment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
2213 | </conversion-rule> |
|
|||
2214 | </modify-argument> |
|
|||
2215 | </modify-function> |
|
|||
2216 |
|
||||
2217 | <modify-function signature="namespaceUri()const"> |
|
|||
2218 | <modify-argument index="return"> |
|
|||
2219 | <conversion-rule class="native"> |
|
|||
2220 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2221 | </conversion-rule> |
|
|||
2222 | </modify-argument> |
|
|||
2223 | </modify-function> |
|
|||
2224 |
|
||||
2225 | <modify-function signature="prefix()const"> |
|
|||
2226 | <modify-argument index="return"> |
|
|||
2227 | <conversion-rule class="native"> |
|
|||
2228 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2229 | </conversion-rule> |
|
|||
2230 | </modify-argument> |
|
|||
2231 | </modify-function> |
|
|||
2232 |
|
||||
2233 | <modify-function signature="qualifiedName()const"> |
|
|||
2234 | <modify-argument index="return"> |
|
|||
2235 | <conversion-rule class="native"> |
|
|||
2236 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2237 | </conversion-rule> |
|
|||
2238 | </modify-argument> |
|
|||
2239 | </modify-function> |
|
|||
2240 |
|
||||
2241 | <modify-function signature="value()const"> |
|
|||
2242 | <modify-argument index="return"> |
|
|||
2243 | <conversion-rule class="native"> |
|
|||
2244 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2245 | </conversion-rule> |
|
|||
2246 | </modify-argument> |
|
|||
2247 | </modify-function> |
|
|||
2248 |
|
||||
2249 | </value-type> |
|
|||
2250 | <value-type name="QXmlStreamAttributes"> |
|
|||
2251 | <modify-function signature="operator+(QVector<QXmlStreamAttribute>)const" remove="all"/> |
|
|||
2252 | <modify-function signature="operator<<(QVector<QXmlStreamAttribute>)" remove="all"/> |
|
|||
2253 | <modify-function signature="operator<<(QXmlStreamAttribute)" remove="all"/> |
|
|||
2254 | <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/> |
|
|||
2255 | <modify-function signature="pop_back()" remove="all"/> |
|
|||
2256 | <modify-function signature="push_front(QXmlStreamAttribute)" remove="all"/> |
|
|||
2257 | <modify-function signature="pop_front()" remove="all"/> |
|
|||
2258 |
|
||||
2259 | <modify-function signature="value(const QString &, const QLatin1String &)const"> |
|
|||
2260 | <remove/> |
|
|||
2261 | </modify-function> |
|
|||
2262 | <modify-function signature="value(const QLatin1String &, const QLatin1String &)const"> |
|
|||
2263 | <remove/> |
|
|||
2264 | </modify-function> |
|
|||
2265 | <modify-function signature="value(const QLatin1String &)const"> |
|
|||
2266 | <remove/> |
|
|||
2267 | </modify-function> |
|
|||
2268 | <modify-function signature="hasAttribute(const QLatin1String &)const"> |
|
|||
2269 | <remove/> |
|
|||
2270 | </modify-function> |
|
|||
2271 |
|
||||
2272 |
|
||||
2273 | <modify-function signature="value(QString,QString)const"> |
|
|||
2274 | <modify-argument index="return"> |
|
|||
2275 | <conversion-rule class="native"> |
|
|||
2276 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2277 | </conversion-rule> |
|
|||
2278 | </modify-argument> |
|
|||
2279 | </modify-function> |
|
|||
2280 |
|
||||
2281 | <modify-function signature="value(QString)const"> |
|
|||
2282 | <modify-argument index="return"> |
|
|||
2283 | <conversion-rule class="native"> |
|
|||
2284 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2285 | </conversion-rule> |
|
|||
2286 | </modify-argument> |
|
|||
2287 | </modify-function> |
|
|||
2288 |
|
||||
2289 | </value-type> |
|
|||
2290 | <value-type name="QXmlStreamNamespaceDeclaration"> |
|
|||
2291 | <modify-function signature="operator=(QXmlStreamNamespaceDeclaration)" remove="all"/> |
|
|||
2292 |
|
||||
2293 | <modify-function signature="namespaceUri()const"> |
|
|||
2294 | <modify-argument index="return"> |
|
|||
2295 | <conversion-rule class="native"> |
|
|||
2296 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2297 | </conversion-rule> |
|
|||
2298 | </modify-argument> |
|
|||
2299 | </modify-function> |
|
|||
2300 |
|
||||
2301 | <modify-function signature="prefix()const"> |
|
|||
2302 | <modify-argument index="return"> |
|
|||
2303 | <conversion-rule class="native"> |
|
|||
2304 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2305 | </conversion-rule> |
|
|||
2306 | </modify-argument> |
|
|||
2307 | </modify-function> |
|
|||
2308 |
|
||||
2309 | </value-type> |
|
|||
2310 | <value-type name="QXmlStreamNotationDeclaration"> |
|
|||
2311 | <modify-function signature="operator=(QXmlStreamNotationDeclaration)" remove="all"/> |
|
|||
2312 |
|
2391 | |||
2313 | <modify-function signature="name()const"> |
|
2392 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::selectIteration', unmatched parameter type 'T'"/> | |
2314 | <modify-argument index="return"> |
|
2393 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QVariantAnimation::registerInterpolator', unmatched parameter type 'QVariantAnimation::Interpolator'"/> | |
2315 | <conversion-rule class="native"> |
|
|||
2316 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2317 | </conversion-rule> |
|
|||
2318 | </modify-argument> |
|
|||
2319 | </modify-function> |
|
|||
2320 |
|
||||
2321 | <modify-function signature="publicId()const"> |
|
|||
2322 | <modify-argument index="return"> |
|
|||
2323 | <conversion-rule class="native"> |
|
|||
2324 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2325 | </conversion-rule> |
|
|||
2326 | </modify-argument> |
|
|||
2327 | </modify-function> |
|
|||
2328 |
|
||||
2329 | <modify-function signature="systemId()const"> |
|
|||
2330 | <modify-argument index="return"> |
|
|||
2331 | <conversion-rule class="native"> |
|
|||
2332 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2333 | </conversion-rule> |
|
|||
2334 | </modify-argument> |
|
|||
2335 | </modify-function> |
|
|||
2336 |
|
||||
2337 | </value-type> |
|
|||
2338 | <value-type name="QXmlStreamEntityDeclaration"> |
|
|||
2339 | <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/> |
|
|||
2340 |
|
||||
2341 | <modify-function signature="name()const"> |
|
|||
2342 | <modify-argument index="return"> |
|
|||
2343 | <conversion-rule class="native"> |
|
|||
2344 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2345 | </conversion-rule> |
|
|||
2346 | </modify-argument> |
|
|||
2347 | </modify-function> |
|
|||
2348 |
|
||||
2349 | <modify-function signature="notationName()const"> |
|
|||
2350 | <modify-argument index="return"> |
|
|||
2351 | <conversion-rule class="native"> |
|
|||
2352 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2353 | </conversion-rule> |
|
|||
2354 | </modify-argument> |
|
|||
2355 | </modify-function> |
|
|||
2356 |
|
||||
2357 | <modify-function signature="publicId()const"> |
|
|||
2358 | <modify-argument index="return"> |
|
|||
2359 | <conversion-rule class="native"> |
|
|||
2360 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2361 | </conversion-rule> |
|
|||
2362 | </modify-argument> |
|
|||
2363 | </modify-function> |
|
|||
2364 |
|
||||
2365 | <modify-function signature="systemId()const"> |
|
|||
2366 | <modify-argument index="return"> |
|
|||
2367 | <conversion-rule class="native"> |
|
|||
2368 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2369 | </conversion-rule> |
|
|||
2370 | </modify-argument> |
|
|||
2371 | </modify-function> |
|
|||
2372 |
|
||||
2373 | <modify-function signature="value()const"> |
|
|||
2374 | <modify-argument index="return"> |
|
|||
2375 | <conversion-rule class="native"> |
|
|||
2376 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2377 | </conversion-rule> |
|
|||
2378 | </modify-argument> |
|
|||
2379 | </modify-function> |
|
|||
2380 |
|
||||
2381 | </value-type> |
|
|||
2382 | <object-type name="QXmlStreamReader"> |
|
|||
2383 | <modify-function signature="QXmlStreamReader(const char*)" remove="all"/> |
|
|||
2384 | <modify-function signature="addData(const char*)" remove="all"/> |
|
|||
2385 | <modify-function signature="setEntityResolver(QXmlStreamEntityResolver*)"> |
|
|||
2386 | <modify-argument index="1"> |
|
|||
2387 | <reference-count action="set" variable-name="__rcEntityResolver"/> |
|
|||
2388 | </modify-argument> |
|
|||
2389 | </modify-function> |
|
|||
2390 |
|
||||
2391 | <modify-function signature="name()const"> |
|
|||
2392 | <modify-argument index="return"> |
|
|||
2393 | <conversion-rule class="native"> |
|
|||
2394 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2395 | </conversion-rule> |
|
|||
2396 | </modify-argument> |
|
|||
2397 | </modify-function> |
|
|||
2398 |
|
||||
2399 | <modify-function signature="documentEncoding()const"> |
|
|||
2400 | <modify-argument index="return"> |
|
|||
2401 | <conversion-rule class="native"> |
|
|||
2402 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2403 | </conversion-rule> |
|
|||
2404 | </modify-argument> |
|
|||
2405 | </modify-function> |
|
|||
2406 |
|
||||
2407 | <modify-function signature="documentVersion()const"> |
|
|||
2408 | <modify-argument index="return"> |
|
|||
2409 | <conversion-rule class="native"> |
|
|||
2410 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2411 | </conversion-rule> |
|
|||
2412 | </modify-argument> |
|
|||
2413 | </modify-function> |
|
|||
2414 |
|
||||
2415 | <modify-function signature="dtdName()const"> |
|
|||
2416 | <modify-argument index="return"> |
|
|||
2417 | <conversion-rule class="native"> |
|
|||
2418 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2419 | </conversion-rule> |
|
|||
2420 | </modify-argument> |
|
|||
2421 | </modify-function> |
|
|||
2422 |
|
||||
2423 | <modify-function signature="dtdPublicId()const"> |
|
|||
2424 | <modify-argument index="return"> |
|
|||
2425 | <conversion-rule class="native"> |
|
|||
2426 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2427 | </conversion-rule> |
|
|||
2428 | </modify-argument> |
|
|||
2429 | </modify-function> |
|
|||
2430 |
|
||||
2431 | <modify-function signature="dtdSystemId()const"> |
|
|||
2432 | <modify-argument index="return"> |
|
|||
2433 | <conversion-rule class="native"> |
|
|||
2434 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2435 | </conversion-rule> |
|
|||
2436 | </modify-argument> |
|
|||
2437 | </modify-function> |
|
|||
2438 |
|
||||
2439 | <modify-function signature="namespaceUri()const"> |
|
|||
2440 | <modify-argument index="return"> |
|
|||
2441 | <conversion-rule class="native"> |
|
|||
2442 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2443 | </conversion-rule> |
|
|||
2444 | </modify-argument> |
|
|||
2445 | </modify-function> |
|
|||
2446 |
|
||||
2447 | <modify-function signature="prefix()const"> |
|
|||
2448 | <modify-argument index="return"> |
|
|||
2449 | <conversion-rule class="native"> |
|
|||
2450 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2451 | </conversion-rule> |
|
|||
2452 | </modify-argument> |
|
|||
2453 | </modify-function> |
|
|||
2454 |
|
||||
2455 | <modify-function signature="processingInstructionData()const"> |
|
|||
2456 | <modify-argument index="return"> |
|
|||
2457 | <conversion-rule class="native"> |
|
|||
2458 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2459 | </conversion-rule> |
|
|||
2460 | </modify-argument> |
|
|||
2461 | </modify-function> |
|
|||
2462 |
|
||||
2463 | <modify-function signature="processingInstructionTarget()const"> |
|
|||
2464 | <modify-argument index="return"> |
|
|||
2465 | <conversion-rule class="native"> |
|
|||
2466 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2467 | </conversion-rule> |
|
|||
2468 | </modify-argument> |
|
|||
2469 | </modify-function> |
|
|||
2470 |
|
||||
2471 | <modify-function signature="qualifiedName()const"> |
|
|||
2472 | <modify-argument index="return"> |
|
|||
2473 | <conversion-rule class="native"> |
|
|||
2474 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2475 | </conversion-rule> |
|
|||
2476 | </modify-argument> |
|
|||
2477 | </modify-function> |
|
|||
2478 |
|
||||
2479 | <modify-function signature="text()const"> |
|
|||
2480 | <modify-argument index="return"> |
|
|||
2481 | <conversion-rule class="native"> |
|
|||
2482 | <insert-template name="core.convert_stringref_to_string"/> |
|
|||
2483 | </conversion-rule> |
|
|||
2484 | </modify-argument> |
|
|||
2485 | </modify-function> |
|
|||
2486 | </object-type> |
|
|||
2487 | <object-type name="QXmlStreamWriter"> |
|
|||
2488 | <modify-function signature="QXmlStreamWriter(QString *)"> |
|
|||
2489 | <remove/> |
|
|||
2490 | </modify-function> |
|
|||
2491 |
|
||||
2492 | <modify-function signature="setCodec(const char*)"> |
|
|||
2493 | <modify-argument index="1"> |
|
|||
2494 | <replace-type modified-type="QString"/> |
|
|||
2495 | <conversion-rule class="native"> |
|
|||
2496 | <insert-template name="core.convert_string_arg_to_char*"/> |
|
|||
2497 | </conversion-rule> |
|
|||
2498 | </modify-argument> |
|
|||
2499 | </modify-function> |
|
|||
2500 |
|
||||
2501 | <modify-function signature="writeCurrentToken(QXmlStreamReader)"> |
|
|||
2502 | <modify-argument index="1"> |
|
|||
2503 | <replace-type modified-type="QXmlStreamReader*"/> |
|
|||
2504 | <conversion-rule class="native"> |
|
|||
2505 | QXmlStreamReader & %out% = *qscriptvalue_cast<QXmlStreamReader*>(%in%); |
|
|||
2506 | </conversion-rule> |
|
|||
2507 | </modify-argument> |
|
|||
2508 | </modify-function> |
|
|||
2509 |
|
||||
2510 | </object-type> |
|
|||
2511 |
|
||||
2512 | <value-type name="QModelIndex"/> |
|
|||
2513 |
|
2394 | |||
|
2395 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'Qt::Initialization'"/> | |||
2514 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'std::*'"/> |
|
2396 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'std::*'"/> | |
2515 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/> |
|
2397 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/> | |
2516 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/> |
|
2398 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/> | |
@@ -2527,40 +2409,23 | |||||
2527 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> |
|
2409 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> | |
2528 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPointer<*>'"/> |
|
2410 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPointer<*>'"/> | |
2529 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QVector<*>'"/> |
|
2411 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QVector<*>'"/> | |
2530 |
<suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/> |
|
2412 | <suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/> | |
2531 |
<suppress-warning text="* private virtual function '*' in 'QAbstractTableModel'"/> |
|
2413 | <suppress-warning text="* private virtual function '*' in 'QAbstractTableModel'"/> | |
2532 |
<suppress-warning text="* private virtual function '*' in 'QListWidget'"/> |
|
2414 | <suppress-warning text="* private virtual function '*' in 'QListWidget'"/> | |
2533 |
<suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/> |
|
2415 | <suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/> | |
2534 |
<suppress-warning text="* private virtual function '*' in 'QFontDialog'"/> |
|
2416 | <suppress-warning text="* private virtual function '*' in 'QFontDialog'"/> | |
2535 |
<suppress-warning text="* private virtual function '*' in 'QTableWidget'"/> |
|
2417 | <suppress-warning text="* private virtual function '*' in 'QTableWidget'"/> | |
2536 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDateTime' has equals operators but no qHash() function"/> |
|
|||
2537 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPersistentModelIndex' has equals operators but no qHash() function"/> |
|
|||
2538 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function"/> |
|
|||
2539 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRect' has equals operators but no qHash() function"/> |
|
|||
2540 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTime' has equals operators but no qHash() function"/> |
|
|||
2541 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function"/> |
|
|||
2542 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDir' has equals operators but no qHash() function"/> |
|
|||
2543 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPointF' has equals operators but no qHash() function"/> |
|
|||
2544 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSize' has equals operators but no qHash() function"/> |
|
|||
2545 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFileInfo' has equals operators but no qHash() function"/> |
|
|||
2546 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizeF' has equals operators but no qHash() function"/> |
|
|||
2547 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function"/> |
|
|||
2548 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRectF' has equals operators but no qHash() function"/> |
|
|||
2549 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDate' has equals operators but no qHash() function"/> |
|
|||
2550 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPoint' has equals operators but no qHash() function"/> |
|
|||
2551 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function"/> |
|
|||
2552 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase&'"/> |
|
2418 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase&'"/> | |
2553 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase const&'"/> |
|
2419 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase const&'"/> | |
2554 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase&'"/> |
|
2420 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase&'"/> | |
2555 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase const&'"/> |
|
2421 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase const&'"/> | |
2556 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function"/> |
|
|||
2557 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown operator 'T'"/> |
|
2422 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown operator 'T'"/> | |
2558 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function"/> |
|
|||
2559 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constBegin', unmatched return type 'const_iterator'"/> |
|
2423 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constBegin', unmatched return type 'const_iterator'"/> | |
2560 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::end', unmatched return type 'const_iterator'"/> |
|
2424 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::end', unmatched return type 'const_iterator'"/> | |
2561 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd', unmatched return type 'const_iterator'"/> |
|
2425 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd', unmatched return type 'const_iterator'"/> | |
2562 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface<T>*'"/> |
|
2426 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface<T>*'"/> | |
2563 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::begin', unmatched return type 'const_iterator'"/> |
|
2427 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::begin', unmatched return type 'const_iterator'"/> | |
|
2428 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::advance', unmatched parameter type 'It&'"/> | |||
2564 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'"/> |
|
2429 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'"/> | |
2565 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList<U>'"/> |
|
2430 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList<U>'"/> | |
2566 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList<MapFunctor::result_type>'"/> |
|
2431 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList<MapFunctor::result_type>'"/> | |
@@ -2568,6 +2433,7 | |||||
2568 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Iterator'"/> |
|
2433 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Iterator'"/> | |
2569 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Sequence const&'"/> |
|
2434 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Sequence const&'"/> | |
2570 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filter', unmatched parameter type 'Sequence&'"/> |
|
2435 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filter', unmatched parameter type 'Sequence&'"/> | |
|
2436 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<qValueType<Iterator>::value_type>"/> | |||
2571 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<Sequence::value_type>'"/> |
|
2437 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<Sequence::value_type>'"/> | |
2572 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<Iterator::value_type>'"/> |
|
2438 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter<Iterator::value_type>'"/> | |
2573 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMappedReduced', unmatched return type 'V'"/> |
|
2439 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMappedReduced', unmatched return type 'V'"/> | |
@@ -2606,4 +2472,9 | |||||
2606 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingFilter', unmatched parameter type 'Sequence&'"/> |
|
2472 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingFilter', unmatched parameter type 'Sequence&'"/> | |
2607 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::createFunctor', unmatched return type 'QtConcurrent::SelectMemberFunctor0<T,Class>::type'"/> |
|
2473 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::createFunctor', unmatched return type 'QtConcurrent::SelectMemberFunctor0<T,Class>::type'"/> | |
2608 |
|
2474 | |||
|
2475 | <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFuture<void>::operator= - definition *ignored*"/> | |||
|
2476 | <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureInterface<void>::future - definition *ignored*"/> | |||
|
2477 | <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureWatcher<void>::setFuture - definition *ignored*"/> | |||
|
2478 | ||||
|
2479 | ||||
2609 | </typesystem> |
|
2480 | </typesystem> |
This diff has been collapsed as it changes many lines, (1370 lines changed) Show them Hide them | |||||
@@ -1,13 +1,18 | |||||
1 | <?xml version="1.0"?> |
|
1 | <?xml version="1.0"?> | |
2 | <typesystem> |
|
2 | <typesystem> | |
|
3 | ||||
3 | <rejection class="*" function-name="d_func"/> |
|
4 | <rejection class="*" function-name="d_func"/> | |
4 |
|
5 | |||
5 | <rejection class="*" field-name="d_ptr"/> |
|
6 | <rejection class="*" field-name="d_ptr"/> | |
6 | <rejection class="*" field-name="d"/> |
|
7 | <rejection class="*" field-name="d"/> | |
7 |
|
8 | |||
|
9 | <rejection class="QGenericMatrix" /> | |||
|
10 | <rejection class="QPixmapFilterPrivate" /> | |||
|
11 | <rejection class="QPenPrivate" /> | |||
|
12 | <rejection class="QGtkStyle" /> | |||
8 | <rejection class="QWindowsCEStyle" /> |
|
13 | <rejection class="QWindowsCEStyle" /> | |
9 | <rejection class="QWindowsMobileStyle" /> |
|
14 | <rejection class="QWindowsMobileStyle" /> | |
10 |
<rejection class="QAbstractUndoItem"/> |
|
15 | <rejection class="QAbstractUndoItem"/> | |
11 | <rejection class="QAccessibleApplication"/> |
|
16 | <rejection class="QAccessibleApplication"/> | |
12 | <rejection class="QBrushData"/> |
|
17 | <rejection class="QBrushData"/> | |
13 | <rejection class="QImageTextKeyLang"/> |
|
18 | <rejection class="QImageTextKeyLang"/> | |
@@ -37,8 +42,8 | |||||
37 | <rejection class="QAccessibleEditableTextInterface"/> |
|
42 | <rejection class="QAccessibleEditableTextInterface"/> | |
38 | <rejection class="QAccessibleSimpleEditableTextInterface"/> |
|
43 | <rejection class="QAccessibleSimpleEditableTextInterface"/> | |
39 | <rejection class="QAccessibleTextInterface"/> |
|
44 | <rejection class="QAccessibleTextInterface"/> | |
40 |
<rejection class="QAccessibleValueInterface"/> |
|
45 | <rejection class="QAccessibleValueInterface"/> | |
41 |
<rejection class="QIconEngineFactoryInterface"/> |
|
46 | <rejection class="QIconEngineFactoryInterface"/> | |
42 | <rejection class="QIconEnginePlugin"/> |
|
47 | <rejection class="QIconEnginePlugin"/> | |
43 | <rejection class="QWidgetItemV2" /> |
|
48 | <rejection class="QWidgetItemV2" /> | |
44 | <rejection class="QAbstractItemDelegate" function-name="operator="/> |
|
49 | <rejection class="QAbstractItemDelegate" function-name="operator="/> | |
@@ -46,7 +51,7 | |||||
46 | <rejection class="QAccessible" function-name="installRootObjectHandler"/> |
|
51 | <rejection class="QAccessible" function-name="installRootObjectHandler"/> | |
47 | <rejection class="QAccessible" function-name="installUpdateHandler"/> |
|
52 | <rejection class="QAccessible" function-name="installUpdateHandler"/> | |
48 | <rejection class="QAccessible" function-name="removeFactory"/> |
|
53 | <rejection class="QAccessible" function-name="removeFactory"/> | |
49 |
<rejection class="QApplication" function-name="compressEvent"/> |
|
54 | <rejection class="QApplication" function-name="compressEvent"/> | |
50 | <rejection class="QBrush" function-name="cleanUp"/> |
|
55 | <rejection class="QBrush" function-name="cleanUp"/> | |
51 | <rejection class="QPictureIO" function-name="defineIOHandler"/> |
|
56 | <rejection class="QPictureIO" function-name="defineIOHandler"/> | |
52 | <rejection class="QPolygon" function-name="putPoints"/> |
|
57 | <rejection class="QPolygon" function-name="putPoints"/> | |
@@ -61,27 +66,43 | |||||
61 | <rejection class="QWidget" function-name="handle"/> |
|
66 | <rejection class="QWidget" function-name="handle"/> | |
62 | <rejection class="QWidget" function-name="styleChange"/> |
|
67 | <rejection class="QWidget" function-name="styleChange"/> | |
63 | <rejection class="QWidget" function-name="internalWinId"/> |
|
68 | <rejection class="QWidget" function-name="internalWinId"/> | |
64 |
<rejection class="QActionGroup" function-name="selected"/> |
|
69 | <rejection class="QActionGroup" function-name="selected"/> | |
65 |
<rejection class="QPaintEngine" function-name="fix_neg_rect"/> |
|
70 | <rejection class="QPaintEngine" function-name="fix_neg_rect"/> | |
66 | <rejection class="QTreeModel" function-name="node"/> |
|
71 | <rejection class="QTreeModel" function-name="node"/> | |
67 | <rejection class="QTreeModel" function-name="initializeNode"/> |
|
72 | <rejection class="QTreeModel" function-name="initializeNode"/> | |
68 | <rejection class="QTreeModel" function-name="queryChildren"/> |
|
73 | <rejection class="QTreeModel" function-name="queryChildren"/> | |
|
74 | <rejection class="QTextObjectInterface" /> | |||
69 | <rejection class="QAccessible" function-name="cast_helper"/> |
|
75 | <rejection class="QAccessible" function-name="cast_helper"/> | |
70 | <rejection class="QAccessible2"/> |
|
76 | <rejection class="QAccessible2"/> | |
71 | <rejection class="QAccessibleInterface" function-name="backgroundColor"/> |
|
77 | <rejection class="QAccessibleInterface" function-name="backgroundColor"/> | |
72 | <rejection class="QAccessibleInterface" function-name="foregroundColor"/> |
|
78 | <rejection class="QAccessibleInterface" function-name="foregroundColor"/> | |
73 | <rejection class="QAccessibleInterface" function-name="textInterface"/> |
|
79 | <rejection class="QAccessibleInterface" function-name="textInterface"/> | |
74 |
<rejection class="QAccessibleInterface" function-name="valueInterface"/> |
|
80 | <rejection class="QAccessibleInterface" function-name="valueInterface"/> | |
75 | <rejection class="QAccessibleInterface" function-name="tableInterface"/> |
|
81 | <rejection class="QAccessibleInterface" function-name="tableInterface"/> | |
76 | <rejection class="QAccessibleInterface" function-name="editableTextInterface"/> |
|
82 | <rejection class="QAccessibleInterface" function-name="editableTextInterface"/> | |
77 | <rejection class="QAccessibleInterface" function-name="cast_helper"/> |
|
83 | <rejection class="QAccessibleInterface" function-name="cast_helper"/> | |
78 | <rejection class="QAccessibleInterfaceEx" function-name="interface_cast"/> |
|
84 | <rejection class="QAccessibleInterfaceEx" function-name="interface_cast"/> | |
79 | <rejection class="QAccessibleBridgePlugin" /> |
|
85 | <rejection class="QAccessibleBridgePlugin" /> | |
80 |
<rejection class="QAccessibleBridgeFactoryInterface" /> |
|
86 | <rejection class="QAccessibleBridgeFactoryInterface" /> | |
81 |
<rejection class="QTabletEvent" field-name="mExtra"/> |
|
87 | <rejection class="QTabletEvent" field-name="mExtra"/> | |
82 | <rejection class="QWidgetItem" field-name="wid" /> |
|
88 | <rejection class="QWidgetItem" field-name="wid" /> | |
83 | <rejection class="QFont" enum-name="ResolveProperties" /> |
|
89 | <rejection class="QFont" enum-name="ResolveProperties" /> | |
|
90 | <rejection class="QGradient" enum-name="InterpolationMode" /> | |||
|
91 | <rejection class="QIconEngineV2::AvailableSizesArgument" /> | |||
|
92 | <rejection class="QIconEngineV2" enum-name="IconEngineHook" /> | |||
|
93 | <rejection class="QGradient" enum-name="InterpolationMode" /> | |||
|
94 | <rejection class="QGradient" function-name="setInterpolationMode" /> | |||
|
95 | <rejection class="QGradient" function-name="interpolationMode" /> | |||
|
96 | <rejection class="QAbstractTextDocumentLayout" function-name="handlerForObject" /> | |||
|
97 | ||||
84 |
|
98 | |||
|
99 | <enum-type name="QStyleOptionTabBarBaseV2::StyleOptionVersion" /> | |||
|
100 | <enum-type name="QTabBar::SelectionBehavior" /> | |||
|
101 | <enum-type name="QTabBar::ButtonPosition" /> | |||
|
102 | <enum-type name="QInputDialog::InputMode" /> | |||
|
103 | <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions" /> | |||
|
104 | <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions" /> | |||
|
105 | <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions" /> | |||
85 | <enum-type name="QAbstractItemDelegate::EndEditHint"/> |
|
106 | <enum-type name="QAbstractItemDelegate::EndEditHint"/> | |
86 | <enum-type name="QAbstractItemView::CursorAction"/> |
|
107 | <enum-type name="QAbstractItemView::CursorAction"/> | |
87 | <enum-type name="QAbstractItemView::DragDropMode"/> |
|
108 | <enum-type name="QAbstractItemView::DragDropMode"/> | |
@@ -106,7 +127,7 | |||||
106 | <enum-type name="QAccessible::StateFlag" flags="QAccessible::State"/> |
|
127 | <enum-type name="QAccessible::StateFlag" flags="QAccessible::State"/> | |
107 | <enum-type name="QAccessible::Text"/> |
|
128 | <enum-type name="QAccessible::Text"/> | |
108 | <enum-type name="QDesktopServices::StandardLocation" /> |
|
129 | <enum-type name="QDesktopServices::StandardLocation" /> | |
109 |
<enum-type name="QDirModel::Roles"/> |
|
130 | <enum-type name="QDirModel::Roles"/> | |
110 | <enum-type name="QFont::Capitalization" /> |
|
131 | <enum-type name="QFont::Capitalization" /> | |
111 | <enum-type name="QFont::SpacingType" /> |
|
132 | <enum-type name="QFont::SpacingType" /> | |
112 | <enum-type name="QGraphicsItem::CacheMode" /> |
|
133 | <enum-type name="QGraphicsItem::CacheMode" /> | |
@@ -116,18 +137,20 | |||||
116 | <enum-type name="QFileSystemModel::Roles" /> |
|
137 | <enum-type name="QFileSystemModel::Roles" /> | |
117 | <enum-type name="QFormLayout::FieldGrowthPolicy" /> |
|
138 | <enum-type name="QFormLayout::FieldGrowthPolicy" /> | |
118 | <enum-type name="QFormLayout::FormStyle" /> |
|
139 | <enum-type name="QFormLayout::FormStyle" /> | |
119 |
<enum-type name="QFormLayout::ItemRole" /> |
|
140 | <enum-type name="QFormLayout::ItemRole" /> | |
120 | <enum-type name="QFormLayout::RowWrapPolicy" /> |
|
141 | <enum-type name="QFormLayout::RowWrapPolicy" /> | |
121 | <enum-type name="QGraphicsProxyWidget::enum_1" /> |
|
142 | <enum-type name="QGraphicsProxyWidget::enum_1" /> | |
122 | <enum-type name="QGraphicsWidget::enum_1" /> |
|
143 | <enum-type name="QGraphicsWidget::enum_1" /> | |
123 | <enum-type name="QPlainTextEdit::LineWrapMode" /> |
|
144 | <enum-type name="QPlainTextEdit::LineWrapMode" /> | |
124 | <enum-type name="QPrintPreviewWidget::ViewMode" /> |
|
145 | <enum-type name="QPrintPreviewWidget::ViewMode" /> | |
125 | <enum-type name="QPrintPreviewWidget::ZoomMode" /> |
|
146 | <enum-type name="QPrintPreviewWidget::ZoomMode" /> | |
|
147 | <enum-type name="QStyleOptionTabV3::StyleOptionVersion" /> | |||
|
148 | <enum-type name="QStyleOptionFrameV3::StyleOptionVersion" /> | |||
126 | <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion" /> |
|
149 | <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion" /> | |
127 | <enum-type name="QStyleOptionViewItemV4::ViewItemPosition" /> |
|
150 | <enum-type name="QStyleOptionViewItemV4::ViewItemPosition" /> | |
128 |
|
151 | |||
129 | <enum-type name="QMdiSubWindow::SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/> |
|
152 | <enum-type name="QMdiSubWindow::SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/> | |
130 |
|
|
153 | ||
131 | <enum-type name="QAction::ActionEvent"/> |
|
154 | <enum-type name="QAction::ActionEvent"/> | |
132 | <enum-type name="QAction::MenuRole"/> |
|
155 | <enum-type name="QAction::MenuRole"/> | |
133 | <enum-type name="QApplication::ColorSpec"/> |
|
156 | <enum-type name="QApplication::ColorSpec"/> | |
@@ -136,7 +159,6 | |||||
136 | <enum-type name="QCalendarWidget::SelectionMode"/> |
|
159 | <enum-type name="QCalendarWidget::SelectionMode"/> | |
137 | <enum-type name="QCalendarWidget::VerticalHeaderFormat"/> |
|
160 | <enum-type name="QCalendarWidget::VerticalHeaderFormat"/> | |
138 | <enum-type name="QColor::Spec"/> |
|
161 | <enum-type name="QColor::Spec"/> | |
139 | <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/> |
|
|||
140 | <enum-type name="QColormap::Mode"/> |
|
162 | <enum-type name="QColormap::Mode"/> | |
141 | <enum-type name="QComboBox::InsertPolicy"/> |
|
163 | <enum-type name="QComboBox::InsertPolicy"/> | |
142 | <enum-type name="QComboBox::SizeAdjustPolicy"/> |
|
164 | <enum-type name="QComboBox::SizeAdjustPolicy"/> | |
@@ -159,7 +181,6 | |||||
159 | <enum-type name="QFont::StyleStrategy"/> |
|
181 | <enum-type name="QFont::StyleStrategy"/> | |
160 | <enum-type name="QFont::Weight"/> |
|
182 | <enum-type name="QFont::Weight"/> | |
161 | <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/> |
|
183 | <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/> | |
162 | <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/> |
|
|||
163 | <enum-type name="QFrame::Shadow" extensible="yes"/> |
|
184 | <enum-type name="QFrame::Shadow" extensible="yes"/> | |
164 | <enum-type name="QFrame::Shape"/> |
|
185 | <enum-type name="QFrame::Shape"/> | |
165 | <enum-type name="QFrame::StyleMask"/> |
|
186 | <enum-type name="QFrame::StyleMask"/> | |
@@ -186,7 +207,7 | |||||
186 | <enum-type name="QGraphicsView::DragMode"/> |
|
207 | <enum-type name="QGraphicsView::DragMode"/> | |
187 | <enum-type name="QGraphicsView::OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/> |
|
208 | <enum-type name="QGraphicsView::OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/> | |
188 | <enum-type name="QGraphicsView::ViewportAnchor"/> |
|
209 | <enum-type name="QGraphicsView::ViewportAnchor"/> | |
189 |
<enum-type name="QGraphicsView::ViewportUpdateMode"/> |
|
210 | <enum-type name="QGraphicsView::ViewportUpdateMode"/> | |
190 | <enum-type name="QIcon::Mode"/> |
|
211 | <enum-type name="QIcon::Mode"/> | |
191 | <enum-type name="QIcon::State"/> |
|
212 | <enum-type name="QIcon::State"/> | |
192 | <enum-type name="QImage::Format"/> |
|
213 | <enum-type name="QImage::Format"/> | |
@@ -195,8 +216,6 | |||||
195 | <enum-type name="QImageReader::ImageReaderError"/> |
|
216 | <enum-type name="QImageReader::ImageReaderError"/> | |
196 | <enum-type name="QImageWriter::ImageWriterError"/> |
|
217 | <enum-type name="QImageWriter::ImageWriterError"/> | |
197 | <enum-type name="QInputContext::StandardFormat"/> |
|
218 | <enum-type name="QInputContext::StandardFormat"/> | |
198 | <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions"/> |
|
|||
199 | <enum-type name="QInputDialog::InputMode"/> |
|
|||
200 | <enum-type name="QInputMethodEvent::AttributeType"/> |
|
219 | <enum-type name="QInputMethodEvent::AttributeType"/> | |
201 | <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/> |
|
220 | <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/> | |
202 | <enum-type name="QKeySequence::SequenceFormat"/> |
|
221 | <enum-type name="QKeySequence::SequenceFormat"/> | |
@@ -241,8 +260,7 | |||||
241 | <enum-type name="QPrinter::Unit" /> |
|
260 | <enum-type name="QPrinter::Unit" /> | |
242 | <enum-type name="QPrinter::DuplexMode" /> |
|
261 | <enum-type name="QPrinter::DuplexMode" /> | |
243 | <enum-type name="QProgressBar::Direction"/> |
|
262 | <enum-type name="QProgressBar::Direction"/> | |
244 |
<enum-type name="QRe |
|
263 | <enum-type name="QRegion::RegionType"/> | |
245 | <enum-type name="QRegion::RegionType"/> |
|
|||
246 | <enum-type name="QRubberBand::Shape"/> |
|
264 | <enum-type name="QRubberBand::Shape"/> | |
247 | <enum-type name="QSessionManager::RestartHint"/> |
|
265 | <enum-type name="QSessionManager::RestartHint"/> | |
248 | <enum-type name="QSizePolicy::Policy"/> |
|
266 | <enum-type name="QSizePolicy::Policy"/> | |
@@ -348,8 +366,6 | |||||
348 | <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/> |
|
366 | <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/> | |
349 | <enum-type name="QSystemTrayIcon::ActivationReason"/> |
|
367 | <enum-type name="QSystemTrayIcon::ActivationReason"/> | |
350 | <enum-type name="QSystemTrayIcon::MessageIcon"/> |
|
368 | <enum-type name="QSystemTrayIcon::MessageIcon"/> | |
351 | <enum-type name="QTabBar::ButtonPosition"/> |
|
|||
352 | <enum-type name="QTabBar::SelectionBehavior"/> |
|
|||
353 | <enum-type name="QTabBar::Shape"/> |
|
369 | <enum-type name="QTabBar::Shape"/> | |
354 | <enum-type name="QTabWidget::TabPosition"/> |
|
370 | <enum-type name="QTabWidget::TabPosition"/> | |
355 | <enum-type name="QTabWidget::TabShape"/> |
|
371 | <enum-type name="QTabWidget::TabShape"/> | |
@@ -391,7 +407,7 | |||||
391 | <enum-type name="QStyleOptionToolBoxV2::StyleOptionVersion"/> |
|
407 | <enum-type name="QStyleOptionToolBoxV2::StyleOptionVersion"/> | |
392 | <enum-type name="QStyleOptionToolBoxV2::TabPosition"/> |
|
408 | <enum-type name="QStyleOptionToolBoxV2::TabPosition"/> | |
393 | <enum-type name="QStyleOptionViewItemV3::StyleOptionVersion"/> |
|
409 | <enum-type name="QStyleOptionViewItemV3::StyleOptionVersion"/> | |
394 |
<enum-type name="QTransform::TransformationType"/> |
|
410 | <enum-type name="QTransform::TransformationType"/> | |
395 | <enum-type name="QTreeWidgetItem::ChildIndicatorPolicy"/> |
|
411 | <enum-type name="QTreeWidgetItem::ChildIndicatorPolicy"/> | |
396 | <enum-type name="QWizard::WizardOption" flags="QWizard::WizardOptions"/> |
|
412 | <enum-type name="QWizard::WizardOption" flags="QWizard::WizardOptions"/> | |
397 | <enum-type name="QWizard::WizardPixmap"/> |
|
413 | <enum-type name="QWizard::WizardPixmap"/> | |
@@ -422,12 +438,12 | |||||
422 | <enum-type name="QDialogButtonBox::StandardButton" flags="QDialogButtonBox::StandardButtons"> |
|
438 | <enum-type name="QDialogButtonBox::StandardButton" flags="QDialogButtonBox::StandardButtons"> | |
423 | <reject-enum-value name="FirstButton"/> |
|
439 | <reject-enum-value name="FirstButton"/> | |
424 | <reject-enum-value name="LastButton"/> |
|
440 | <reject-enum-value name="LastButton"/> | |
425 |
<reject-enum-value name="YesAll"/> |
|
441 | <reject-enum-value name="YesAll"/> | |
426 | <reject-enum-value name="NoAll"/> |
|
442 | <reject-enum-value name="NoAll"/> | |
427 |
<reject-enum-value name="Default"/> |
|
443 | <reject-enum-value name="Default"/> | |
428 | <reject-enum-value name="Escape"/> |
|
444 | <reject-enum-value name="Escape"/> | |
429 | <reject-enum-value name="FlagMask"/> |
|
445 | <reject-enum-value name="FlagMask"/> | |
430 |
<reject-enum-value name="ButtonMask"/> |
|
446 | <reject-enum-value name="ButtonMask"/> | |
431 | </enum-type> |
|
447 | </enum-type> | |
432 |
|
448 | |||
433 | <enum-type name="QDockWidget::DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/> |
|
449 | <enum-type name="QDockWidget::DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/> | |
@@ -487,20 +503,38 | |||||
487 | <reject-enum-value name="FirstFontProperty"/> |
|
503 | <reject-enum-value name="FirstFontProperty"/> | |
488 | <reject-enum-value name="LastFontProperty"/> |
|
504 | <reject-enum-value name="LastFontProperty"/> | |
489 | </enum-type> |
|
505 | </enum-type> | |
|
506 | ||||
|
507 | <enum-type name="QAction::Priority" /> | |||
|
508 | <enum-type name="QAction::SoftKeyRole" /> | |||
|
509 | <enum-type name="QGraphicsEffect::ChangeFlag" flags="QGraphicsEffect::ChangeFlags" /> | |||
|
510 | <enum-type name="QGraphicsItem::PanelModality" /> | |||
|
511 | <enum-type name="QPinchGesture::WhatChange" flags="QPinchGesture::WhatChanged" /> | |||
|
512 | <enum-type name="QStyle::RequestSoftwareInputPanel" /> | |||
|
513 | <enum-type name="QSwipeGesture::SwipeDirection" /> | |||
|
514 | <enum-type name="QTouchEvent::DeviceType" /> | |||
490 |
|
515 | |||
|
516 | ||||
|
517 | <value-type name="QPixmapCache::Key" /> | |||
|
518 | <value-type name="QTileRules" /> | |||
|
519 | <value-type name="QVector2D" /> | |||
|
520 | <value-type name="QVector3D" /> | |||
|
521 | <value-type name="QVector4D" /> | |||
|
522 | <value-type name="QTouchEvent::TouchPoint" /> | |||
|
523 | ||||
|
524 | ||||
491 | <value-type name="QTransform"> |
|
525 | <value-type name="QTransform"> | |
492 | <modify-function signature="operator=(QTransform)" remove="all"/> |
|
526 | <modify-function signature="operator=(QTransform)" remove="all"/> | |
493 | <modify-function signature="map(int,int,int*,int*)const" remove="all"/> |
|
527 | <modify-function signature="map(int,int,int*,int*)const" remove="all"/> | |
494 |
<modify-function signature="map( |
|
528 | <modify-function signature="map(double,double,double*,double*)const" remove="all"/> | |
495 |
|
529 | |||
496 |
<modify-function signature="operator*=( |
|
530 | <modify-function signature="operator*=(double)" access="private"/> | |
497 |
<modify-function signature="operator+=( |
|
531 | <modify-function signature="operator+=(double)" access="private"/> | |
498 |
<modify-function signature="operator-=( |
|
532 | <modify-function signature="operator-=(double)" access="private"/> | |
499 |
<modify-function signature="operator/=( |
|
533 | <modify-function signature="operator/=(double)" access="private"/> | |
500 | <modify-function signature="operator*(QTransform)const" rename="multiplied" /> |
|
534 | <modify-function signature="operator*(QTransform)const" rename="multiplied" /> | |
501 | <modify-function signature="operator*=(QTransform)" access="private"/> |
|
535 | <modify-function signature="operator*=(QTransform)" access="private"/> | |
502 |
</value-type> |
|
536 | </value-type> | |
503 |
|
537 | |||
504 | <value-type name="QStyleOption" delete-in-main-thread="yes" polymorphic-base="yes" polymorphic-id-expression="%1->type == QStyleOption::SO_Default"> |
|
538 | <value-type name="QStyleOption" delete-in-main-thread="yes" polymorphic-base="yes" polymorphic-id-expression="%1->type == QStyleOption::SO_Default"> | |
505 | <modify-function signature="operator=(QStyleOption)" remove="all"/> |
|
539 | <modify-function signature="operator=(QStyleOption)" remove="all"/> | |
506 | <modify-function signature="init(const QWidget*)" remove="all"/> <!--### Obsolete in 4.3--> |
|
540 | <modify-function signature="init(const QWidget*)" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -511,62 +545,71 | |||||
511 | <value-type name="QStyleOptionComboBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionComboBox::Type && %1->version == QStyleOptionComboBox::Version"/> |
|
545 | <value-type name="QStyleOptionComboBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionComboBox::Type && %1->version == QStyleOptionComboBox::Version"/> | |
512 | <value-type name="QStyleOptionComplex" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionComplex::Type && %1->version == QStyleOptionComplex::Version"/> |
|
546 | <value-type name="QStyleOptionComplex" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionComplex::Type && %1->version == QStyleOptionComplex::Version"/> | |
513 | <value-type name="QStyleOptionDockWidget" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionDockWidget::Type && %1->version == QStyleOptionDockWidget::Version"/> |
|
547 | <value-type name="QStyleOptionDockWidget" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionDockWidget::Type && %1->version == QStyleOptionDockWidget::Version"/> | |
514 |
<value-type name="QStyleOptionDockWidgetV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionDockWidgetV2::Type && %1->version == QStyleOptionDockWidgetV2::Version"> |
|
548 | <value-type name="QStyleOptionDockWidgetV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionDockWidgetV2::Type && %1->version == QStyleOptionDockWidgetV2::Version"> | |
515 | <modify-function signature="operator=(QStyleOptionDockWidget)" remove="all"/> |
|
549 | <modify-function signature="operator=(QStyleOptionDockWidget)" remove="all"/> | |
516 | </value-type> |
|
550 | </value-type> | |
517 | <value-type name="QStyleOptionFocusRect" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFocusRect::Type && %1->version == QStyleOptionFocusRect::Version"/> |
|
551 | <value-type name="QStyleOptionFocusRect" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFocusRect::Type && %1->version == QStyleOptionFocusRect::Version"/> | |
518 | <value-type name="QStyleOptionFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrame::Type && %1->version == QStyleOptionFrame::Version"/> |
|
552 | <value-type name="QStyleOptionFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrame::Type && %1->version == QStyleOptionFrame::Version"/> | |
519 |
|
553 | |||
520 | <value-type name="QStyleOptionFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrameV2::Type && %1->version == QStyleOptionFrameV2::Version"> |
|
554 | <value-type name="QStyleOptionFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrameV2::Type && %1->version == QStyleOptionFrameV2::Version"> | |
521 | <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/> |
|
555 | <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/> | |
522 |
</value-type> |
|
556 | </value-type> | |
523 |
|
557 | <value-type name="QStyleOptionFrameV3" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrameV3::Type && %1->version == QStyleOptionFrameV3::Version"> | ||
|
558 | <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/> | |||
|
559 | </value-type> | |||
|
560 | ||||
524 | <value-type name="QStyleOptionGroupBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionGroupBox::Type && %1->version == QStyleOptionGroupBox::Version"/> |
|
561 | <value-type name="QStyleOptionGroupBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionGroupBox::Type && %1->version == QStyleOptionGroupBox::Version"/> | |
525 | <value-type name="QStyleOptionHeader" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionHeader::Type && %1->version == QStyleOptionHeader::Version"/> |
|
562 | <value-type name="QStyleOptionHeader" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionHeader::Type && %1->version == QStyleOptionHeader::Version"/> | |
526 | <value-type name="QStyleOptionMenuItem" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionMenuItem::Type && %1->version == QStyleOptionMenuItem::Version"/> |
|
563 | <value-type name="QStyleOptionMenuItem" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionMenuItem::Type && %1->version == QStyleOptionMenuItem::Version"/> | |
527 | <value-type name="QStyleOptionProgressBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionProgressBar::Type && %1->version == QStyleOptionProgressBar::Version"/> |
|
564 | <value-type name="QStyleOptionProgressBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionProgressBar::Type && %1->version == QStyleOptionProgressBar::Version"/> | |
528 |
|
565 | |||
529 | <value-type name="QStyleOptionProgressBarV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionProgressBarV2::Type && %1->version == QStyleOptionProgressBarV2::Version"> |
|
566 | <value-type name="QStyleOptionProgressBarV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionProgressBarV2::Type && %1->version == QStyleOptionProgressBarV2::Version"> | |
530 | <modify-function signature="operator=(QStyleOptionProgressBar)" remove="all"/> |
|
567 | <modify-function signature="operator=(QStyleOptionProgressBar)" remove="all"/> | |
531 |
</value-type> |
|
568 | </value-type> | |
532 |
|
569 | |||
533 | <value-type name="QStyleOptionRubberBand" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionRubberBand::Type && %1->version == QStyleOptionRubberBand::Version"/> |
|
570 | <value-type name="QStyleOptionRubberBand" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionRubberBand::Type && %1->version == QStyleOptionRubberBand::Version"/> | |
534 | <value-type name="QStyleOptionSlider" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionSlider::Type && %1->version == QStyleOptionSlider::Version"/> |
|
571 | <value-type name="QStyleOptionSlider" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionSlider::Type && %1->version == QStyleOptionSlider::Version"/> | |
535 | <value-type name="QStyleOptionSpinBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionSpinBox::Type && %1->version == QStyleOptionSpinBox::Version"/> |
|
572 | <value-type name="QStyleOptionSpinBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionSpinBox::Type && %1->version == QStyleOptionSpinBox::Version"/> | |
536 | <value-type name="QStyleOptionTab" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTab::Type && %1->version == QStyleOptionTab::Version"/> |
|
573 | <value-type name="QStyleOptionTab" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTab::Type && %1->version == QStyleOptionTab::Version"/> | |
537 | <value-type name="QStyleOptionTabV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabV2::Type && %1->version == QStyleOptionTabV2::Version"> |
|
574 | <value-type name="QStyleOptionTabV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabV2::Type && %1->version == QStyleOptionTabV2::Version"> | |
538 | <modify-function signature="operator=(const QStyleOptionTab &)" remove="all"/> |
|
575 | <modify-function signature="operator=(const QStyleOptionTab &)" remove="all"/> | |
539 |
</value-type> |
|
576 | </value-type> | |
540 |
<value-type name="QStyleOptionTab |
|
577 | <value-type name="QStyleOptionTabV3" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabV3::Type && %1->version == QStyleOptionTabV3::Version"> | |
|
578 | <modify-function signature="operator=(QStyleOptionTab)" remove="all" /> | |||
|
579 | </value-type> | |||
|
580 | <value-type name="QStyleOptionTabBarBase" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabBarBase::Type && %1->version == QStyleOptionTabBarBase::Version"/> | |||
|
581 | <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabBarBaseV2::Type && %1->version == QStyleOptionTabBarBaseV2::Version"> | |||
|
582 | <modify-function signature="operator=(QStyleOptionTabBarBase)" remove="all" /> | |||
|
583 | </value-type> | |||
541 | <value-type name="QStyleOptionTabWidgetFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabWidgetFrame::Type && %1->version == QStyleOptionTabWidgetFrame::Version"/> |
|
584 | <value-type name="QStyleOptionTabWidgetFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabWidgetFrame::Type && %1->version == QStyleOptionTabWidgetFrame::Version"/> | |
542 | <value-type name="QStyleOptionTitleBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTitleBar::Type && %1->version == QStyleOptionTitleBar::Version"/> |
|
585 | <value-type name="QStyleOptionTitleBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTitleBar::Type && %1->version == QStyleOptionTitleBar::Version"/> | |
543 | <value-type name="QStyleOptionToolBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBar::Type && %1->version == QStyleOptionToolBar::Version"/> |
|
586 | <value-type name="QStyleOptionToolBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBar::Type && %1->version == QStyleOptionToolBar::Version"/> | |
544 | <value-type name="QStyleOptionToolBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBox::Type && %1->version == QStyleOptionToolBox::Version"/> |
|
587 | <value-type name="QStyleOptionToolBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBox::Type && %1->version == QStyleOptionToolBox::Version"/> | |
545 | <value-type name="QStyleOptionToolBoxV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBoxV2::Type && %1->version == QStyleOptionToolBoxV2::Version"> |
|
588 | <value-type name="QStyleOptionToolBoxV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBoxV2::Type && %1->version == QStyleOptionToolBoxV2::Version"> | |
546 | <modify-function signature="operator=(QStyleOptionToolBox)" remove="all"/> |
|
589 | <modify-function signature="operator=(QStyleOptionToolBox)" remove="all"/> | |
547 |
</value-type> |
|
590 | </value-type> | |
548 | <value-type name="QStyleOptionToolButton" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolButton::Type && %1->version == QStyleOptionToolButton::Version"/> |
|
591 | <value-type name="QStyleOptionToolButton" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolButton::Type && %1->version == QStyleOptionToolButton::Version"/> | |
549 |
<value-type name="QStyleOptionViewItem" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItem::Type && %1->version == QStyleOptionViewItem::Version"/> |
|
592 | <value-type name="QStyleOptionViewItem" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItem::Type && %1->version == QStyleOptionViewItem::Version"/> | |
550 |
<value-type name="QStyleOptionViewItemV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV2::Type && %1->version == QStyleOptionViewItemV2::Version"> |
|
593 | <value-type name="QStyleOptionViewItemV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV2::Type && %1->version == QStyleOptionViewItemV2::Version"> | |
551 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> |
|
594 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> | |
552 |
</value-type> |
|
595 | </value-type> | |
553 | <value-type name="QStyleOptionViewItemV3" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV3::Type && %1->version == QStyleOptionViewItemV3::Version"> |
|
596 | <value-type name="QStyleOptionViewItemV3" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV3::Type && %1->version == QStyleOptionViewItemV3::Version"> | |
554 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> |
|
597 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> | |
555 |
</value-type> |
|
598 | </value-type> | |
556 | <value-type name="QStyleOptionViewItemV4" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV4::Type && %1->version == QStyleOptionViewItemV4::Version"> |
|
599 | <value-type name="QStyleOptionViewItemV4" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV4::Type && %1->version == QStyleOptionViewItemV4::Version"> | |
557 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all" /> |
|
600 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all" /> | |
558 | </value-type> |
|
601 | </value-type> | |
559 |
<value-type name="QTextFragment" delete-in-main-thread="yes"> |
|
602 | <value-type name="QTextFragment" delete-in-main-thread="yes"> | |
560 | <modify-function signature="operator=(QTextFragment)" remove="all"/> |
|
603 | <modify-function signature="operator=(QTextFragment)" remove="all"/> | |
561 | </value-type> |
|
604 | </value-type> | |
562 |
<value-type name="QBitmap" delete-in-main-thread="yes"> |
|
605 | <value-type name="QBitmap" delete-in-main-thread="yes"> | |
563 | <modify-function signature="operator=(const QPixmap &)" remove="all"/> |
|
606 | <modify-function signature="operator=(const QPixmap &)" remove="all"/> | |
564 | <modify-function signature="QBitmap(QString,const char*)" access="private"> |
|
607 | <modify-function signature="QBitmap(QString,const char*)" access="private"> | |
565 | <modify-argument index="2"> <remove-default-expression/> </modify-argument> |
|
608 | <modify-argument index="2"> <remove-default-expression/> </modify-argument> | |
566 | </modify-function> |
|
609 | </modify-function> | |
567 |
|
610 | |||
568 | <modify-function signature="fromData(QSize,const uchar*,QImage::Format)"> |
|
611 | <modify-function signature="fromData(QSize,const unsigned char*,QImage::Format)"> | |
569 |
<access modifier="private"/> |
|
612 | <access modifier="private"/> | |
570 | <modify-argument index="3"> |
|
613 | <modify-argument index="3"> | |
571 | <remove-default-expression/> |
|
614 | <remove-default-expression/> | |
572 | </modify-argument> |
|
615 | </modify-argument> | |
@@ -598,12 +641,12 | |||||
598 | <value-type name="QLine"/> |
|
641 | <value-type name="QLine"/> | |
599 | <value-type name="QLineF"/> |
|
642 | <value-type name="QLineF"/> | |
600 |
|
643 | |||
601 |
<value-type name="QPainterPath"> |
|
644 | <value-type name="QPainterPath"> | |
602 | <modify-function signature="operator=(QPainterPath)" remove="all"/> |
|
645 | <modify-function signature="operator=(QPainterPath)" remove="all"/> | |
603 | </value-type> |
|
646 | </value-type> | |
604 | <value-type name="QPalette"> |
|
647 | <value-type name="QPalette"> | |
605 | <modify-function signature="operator=(const QPalette&)" remove="all"/> |
|
648 | <modify-function signature="operator=(const QPalette&)" remove="all"/> | |
606 |
|
649 | |||
607 | <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
650 | <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
608 | <modify-function signature="background()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
651 | <modify-function signature="background()const" remove="all"/> <!--### Obsolete in 4.3--> | |
609 | <modify-function signature="foreground()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
652 | <modify-function signature="foreground()const" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -620,7 +663,7 | |||||
620 | <modify-function signature="pictureFormat(QString)"> |
|
663 | <modify-function signature="pictureFormat(QString)"> | |
621 | <remove/> |
|
664 | <remove/> | |
622 | </modify-function> |
|
665 | </modify-function> | |
623 |
|
666 | |||
624 | <modify-function signature="inputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> |
|
667 | <modify-function signature="inputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> | |
625 | <modify-function signature="inputFormats()" remove="all"/> <!--### Obsolete in 4.3--> |
|
668 | <modify-function signature="inputFormats()" remove="all"/> <!--### Obsolete in 4.3--> | |
626 | <modify-function signature="outputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> |
|
669 | <modify-function signature="outputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -660,16 +703,16 | |||||
660 | <value-type name="QTextTableCellFormat" delete-in-main-thread="yes" /> |
|
703 | <value-type name="QTextTableCellFormat" delete-in-main-thread="yes" /> | |
661 | <value-type name="QTextCharFormat" delete-in-main-thread="yes"> |
|
704 | <value-type name="QTextCharFormat" delete-in-main-thread="yes"> | |
662 | <modify-function signature="isValid()const" access="non-final"/> |
|
705 | <modify-function signature="isValid()const" access="non-final"/> | |
663 |
|
706 | |||
664 | <modify-function signature="anchorName()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
707 | <modify-function signature="anchorName()const" remove="all"/> <!--### Obsolete in 4.3--> | |
665 | <modify-function signature="setAnchorName(QString)" remove="all"/> <!--### Obsolete in 4.3--> |
|
708 | <modify-function signature="setAnchorName(QString)" remove="all"/> <!--### Obsolete in 4.3--> | |
666 | </value-type> |
|
709 | </value-type> | |
667 | <value-type name="QTextFormat" delete-in-main-thread="yes"> |
|
710 | <value-type name="QTextFormat" delete-in-main-thread="yes"> | |
668 | <modify-function signature="operator=(QTextFormat)" remove="all"/> |
|
711 | <modify-function signature="operator=(QTextFormat)" remove="all"/> | |
669 | <modify-function signature="isValid()const" access="non-final"/> |
|
712 | <modify-function signature="isValid()const" access="non-final"/> | |
670 |
|
713 | |||
671 | </value-type> |
|
714 | </value-type> | |
672 |
|
715 | |||
673 | <value-type name="QTextListFormat" delete-in-main-thread="yes"/> |
|
716 | <value-type name="QTextListFormat" delete-in-main-thread="yes"/> | |
674 | <value-type name="QPolygon"> |
|
717 | <value-type name="QPolygon"> | |
675 | <modify-function signature="QPolygon(int, const int *)" remove="all"/> |
|
718 | <modify-function signature="QPolygon(int, const int *)" remove="all"/> | |
@@ -686,7 +729,7 | |||||
686 | <modify-function signature="operator<<(QVector<QPointF>)" remove="all"/> |
|
729 | <modify-function signature="operator<<(QVector<QPointF>)" remove="all"/> | |
687 | </value-type> |
|
730 | </value-type> | |
688 |
|
731 | |||
689 |
<value-type name="QIcon" delete-in-main-thread="yes"> |
|
732 | <value-type name="QIcon" delete-in-main-thread="yes"> | |
690 | <modify-function signature="operator=(QIcon)" remove="all"/> |
|
733 | <modify-function signature="operator=(QIcon)" remove="all"/> | |
691 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
734 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> | |
692 | <modify-function signature="QIcon(QIconEngineV2 *)"> |
|
735 | <modify-function signature="QIcon(QIconEngineV2 *)"> | |
@@ -698,8 +741,8 | |||||
698 | <modify-argument index="1"> |
|
741 | <modify-argument index="1"> | |
699 | <define-ownership class="java" owner="c++" /> |
|
742 | <define-ownership class="java" owner="c++" /> | |
700 | </modify-argument> |
|
743 | </modify-argument> | |
701 |
</modify-function> |
|
744 | </modify-function> | |
702 |
</value-type> |
|
745 | </value-type> | |
703 |
|
746 | |||
704 | <value-type name="QTextFrame::iterator" delete-in-main-thread="yes"> |
|
747 | <value-type name="QTextFrame::iterator" delete-in-main-thread="yes"> | |
705 | <include file-name="QTextFrame" location="global"/> |
|
748 | <include file-name="QTextFrame" location="global"/> | |
@@ -710,7 +753,7 | |||||
710 | <modify-function signature="operator--()" access="private"/> |
|
753 | <modify-function signature="operator--()" access="private"/> | |
711 | </value-type> |
|
754 | </value-type> | |
712 |
|
755 | |||
713 |
<value-type name="QTreeWidgetItemIterator" delete-in-main-thread="yes"> |
|
756 | <value-type name="QTreeWidgetItemIterator" delete-in-main-thread="yes"> | |
714 | <custom-constructor> |
|
757 | <custom-constructor> | |
715 | return new QTreeWidgetItemIterator(*copy); |
|
758 | return new QTreeWidgetItemIterator(*copy); | |
716 | </custom-constructor> |
|
759 | </custom-constructor> | |
@@ -726,10 +769,10 | |||||
726 | <modify-function signature="operator--()" access="private"/> |
|
769 | <modify-function signature="operator--()" access="private"/> | |
727 | <modify-function signature="operator*()const" access="private"/> |
|
770 | <modify-function signature="operator*()const" access="private"/> | |
728 | </value-type> |
|
771 | </value-type> | |
729 |
|
772 | |||
730 | <value-type name="QTextBlock::iterator" delete-in-main-thread="yes"> |
|
773 | <value-type name="QTextBlock::iterator" delete-in-main-thread="yes"> | |
731 | <include file-name="QTextBlock" location="global"/> |
|
774 | <include file-name="QTextBlock" location="global"/> | |
732 |
|
775 | |||
733 | <modify-function signature="operator++()" access="private"/> |
|
776 | <modify-function signature="operator++()" access="private"/> | |
734 | <modify-function signature="operator--()" access="private"/> |
|
777 | <modify-function signature="operator--()" access="private"/> | |
735 | <modify-function signature="operator++(int)" remove="all"/> |
|
778 | <modify-function signature="operator++(int)" remove="all"/> | |
@@ -745,18 +788,18 | |||||
745 | <modify-function signature="operator=(QPixmap)" remove="all"/> |
|
788 | <modify-function signature="operator=(QPixmap)" remove="all"/> | |
746 | <modify-function signature="operator!()const" remove="all"/> |
|
789 | <modify-function signature="operator!()const" remove="all"/> | |
747 | <modify-function signature="QPixmap(const char **)" access="private"/> |
|
790 | <modify-function signature="QPixmap(const char **)" access="private"/> | |
748 |
<modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
791 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> | |
749 | </value-type> |
|
792 | </value-type> | |
750 |
|
793 | |||
751 | <value-type name="QTextCursor" delete-in-main-thread="yes"> |
|
794 | <value-type name="QTextCursor" delete-in-main-thread="yes"> | |
752 | <extra-includes> |
|
795 | <extra-includes> | |
753 | <include file-name="QTextBlock" location="global"/> |
|
796 | <include file-name="QTextBlock" location="global"/> | |
754 | <include file-name="QTextDocumentFragment" location="global"/> |
|
797 | <include file-name="QTextDocumentFragment" location="global"/> | |
755 |
</extra-includes> |
|
798 | </extra-includes> | |
756 | <modify-function signature="operator=(QTextCursor)" remove="all"/> |
|
799 | <modify-function signature="operator=(QTextCursor)" remove="all"/> | |
757 | <modify-function signature="selectedTableCells(int*,int*,int*,int*)const"> |
|
800 | <modify-function signature="selectedTableCells(int*,int*,int*,int*)const"> | |
758 | <access modifier="private"/> |
|
801 | <access modifier="private"/> | |
759 |
</modify-function> |
|
802 | </modify-function> | |
760 | </value-type> |
|
803 | </value-type> | |
761 |
|
804 | |||
762 | <value-type name="QTextLayout::FormatRange"> |
|
805 | <value-type name="QTextLayout::FormatRange"> | |
@@ -772,8 +815,8 | |||||
772 | delete copy; |
|
815 | delete copy; | |
773 | </custom-destructor> |
|
816 | </custom-destructor> | |
774 | </value-type> |
|
817 | </value-type> | |
775 |
|
818 | |||
776 |
<value-type name="QItemSelection" delete-in-main-thread="yes"> |
|
819 | <value-type name="QItemSelection" delete-in-main-thread="yes"> | |
777 |
|
820 | |||
778 | <modify-function signature="operator+(const QList<QItemSelectionRange>&)const" remove="all"/> |
|
821 | <modify-function signature="operator+(const QList<QItemSelectionRange>&)const" remove="all"/> | |
779 | <modify-function signature="operator+=(const QList<QItemSelectionRange>&)" remove="all"/> |
|
822 | <modify-function signature="operator+=(const QList<QItemSelectionRange>&)" remove="all"/> | |
@@ -782,26 +825,30 | |||||
782 | <modify-function signature="operator<<(QItemSelectionRange)" remove="all"/> |
|
825 | <modify-function signature="operator<<(QItemSelectionRange)" remove="all"/> | |
783 | </value-type> |
|
826 | </value-type> | |
784 |
|
827 | |||
|
828 | <value-type name="QMatrix4x4"> | |||
|
829 | <modify-function signature="data()const" remove="all" /> | |||
|
830 | <modify-function signature="operator()(int, int)const" remove="all" /> | |||
|
831 | </value-type> | |||
785 | <value-type name="QMatrix"> |
|
832 | <value-type name="QMatrix"> | |
786 | <extra-includes> |
|
833 | <extra-includes> | |
787 | <include file-name="QPainterPath" location="global"/> |
|
834 | <include file-name="QPainterPath" location="global"/> | |
788 | </extra-includes> |
|
835 | </extra-includes> | |
789 |
|
836 | |||
790 | <modify-function signature="map(int,int,int*,int*)const" remove="all"/> |
|
837 | <modify-function signature="map(int,int,int*,int*)const" remove="all"/> | |
791 |
<modify-function signature="map( |
|
838 | <modify-function signature="map(double,double,double*,double*)const" remove="all"/> | |
792 | <modify-function signature="operator=(QMatrix)" remove="all"/> |
|
839 | <modify-function signature="operator=(QMatrix)" remove="all"/> | |
793 |
|
840 | |||
794 | <modify-function signature="operator*(QMatrix)const" access="private"/> |
|
841 | <modify-function signature="operator*(QMatrix)const" access="private"/> | |
795 | <modify-function signature="operator*=(QMatrix)" access="private"/> |
|
842 | <modify-function signature="operator*=(QMatrix)" access="private"/> | |
796 |
<modify-function signature="rotate( |
|
843 | <modify-function signature="rotate(double)" access="private" rename="rotate_private"/> | |
797 |
<modify-function signature="scale( |
|
844 | <modify-function signature="scale(double,double)" access="private" rename="scale_private"/> | |
798 |
<modify-function signature="shear( |
|
845 | <modify-function signature="shear(double,double)" access="private" rename="shear_private"/> | |
799 |
<modify-function signature="translate( |
|
846 | <modify-function signature="translate(double,double)" access="private" rename="translate_private"/> | |
800 |
|
847 | |||
801 | <modify-function signature="inverted(bool*)const"> |
|
848 | <modify-function signature="inverted(bool*)const"> | |
802 | <access modifier="private"/> |
|
849 | <access modifier="private"/> | |
803 | <modify-argument index="1"> |
|
850 | <modify-argument index="1"> | |
804 |
|
|
851 | <remove-default-expression/> | |
805 | </modify-argument> |
|
852 | </modify-argument> | |
806 | </modify-function> |
|
853 | </modify-function> | |
807 |
|
854 | |||
@@ -810,21 +857,21 | |||||
810 | <replace from="%FUNCTION_NAME" to="rotate"/> |
|
857 | <replace from="%FUNCTION_NAME" to="rotate"/> | |
811 | <replace from="%OUT_TYPE" to="QMatrix"/> |
|
858 | <replace from="%OUT_TYPE" to="QMatrix"/> | |
812 | <replace from="%IN_TYPE" to="double"/> |
|
859 | <replace from="%IN_TYPE" to="double"/> | |
813 |
</insert-template> |
|
860 | </insert-template> | |
814 |
|
861 | |||
815 | <insert-template name="core.private_function_return_self"> |
|
862 | <insert-template name="core.private_function_return_self"> | |
816 | <replace from="%RETURN_TYPE" to="QMatrix"/> |
|
863 | <replace from="%RETURN_TYPE" to="QMatrix"/> | |
817 | <replace from="%FUNCTION_NAME" to="scale"/> |
|
864 | <replace from="%FUNCTION_NAME" to="scale"/> | |
818 | <replace from="%ARGUMENTS" to="double sx, double sy"/> |
|
865 | <replace from="%ARGUMENTS" to="double sx, double sy"/> | |
819 | <replace from="%ARGUMENT_NAMES" to="sx, sy"/> |
|
866 | <replace from="%ARGUMENT_NAMES" to="sx, sy"/> | |
820 |
</insert-template> |
|
867 | </insert-template> | |
821 |
|
868 | |||
822 | <insert-template name="core.private_function_return_self"> |
|
869 | <insert-template name="core.private_function_return_self"> | |
823 | <replace from="%RETURN_TYPE" to="QMatrix"/> |
|
870 | <replace from="%RETURN_TYPE" to="QMatrix"/> | |
824 | <replace from="%FUNCTION_NAME" to="shear"/> |
|
871 | <replace from="%FUNCTION_NAME" to="shear"/> | |
825 | <replace from="%ARGUMENTS" to="double sh, double sv"/> |
|
872 | <replace from="%ARGUMENTS" to="double sh, double sv"/> | |
826 | <replace from="%ARGUMENT_NAMES" to="sh, sv"/> |
|
873 | <replace from="%ARGUMENT_NAMES" to="sh, sv"/> | |
827 |
</insert-template> |
|
874 | </insert-template> | |
828 |
|
875 | |||
829 | <insert-template name="core.private_function_return_self"> |
|
876 | <insert-template name="core.private_function_return_self"> | |
830 | <replace from="%RETURN_TYPE" to="QMatrix"/> |
|
877 | <replace from="%RETURN_TYPE" to="QMatrix"/> | |
@@ -841,10 +888,10 | |||||
841 | </custom-constructor> |
|
888 | </custom-constructor> | |
842 | <custom-destructor> |
|
889 | <custom-destructor> | |
843 | delete copy; |
|
890 | delete copy; | |
844 |
</custom-destructor> |
|
891 | </custom-destructor> | |
845 | </value-type> |
|
892 | </value-type> | |
846 |
|
893 | |||
847 | <value-type name="QFontInfo" delete-in-main-thread="yes"> |
|
894 | <value-type name="QFontInfo" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000"> | |
848 | <custom-constructor> |
|
895 | <custom-constructor> | |
849 | return new QFontInfo(*copy); |
|
896 | return new QFontInfo(*copy); | |
850 | </custom-constructor> |
|
897 | </custom-constructor> | |
@@ -852,7 +899,7 | |||||
852 | delete copy; |
|
899 | delete copy; | |
853 | </custom-destructor> |
|
900 | </custom-destructor> | |
854 | <modify-function signature="operator=(QFontInfo)" remove="all"/> |
|
901 | <modify-function signature="operator=(QFontInfo)" remove="all"/> | |
855 |
|
902 | |||
856 | </value-type> |
|
903 | </value-type> | |
857 |
|
904 | |||
858 | <value-type name="QRadialGradient" polymorphic-id-expression="%1->type() == QGradient::RadialGradient"> |
|
905 | <value-type name="QRadialGradient" polymorphic-id-expression="%1->type() == QGradient::RadialGradient"> | |
@@ -863,7 +910,7 | |||||
863 | delete copy; |
|
910 | delete copy; | |
864 | </custom-destructor> |
|
911 | </custom-destructor> | |
865 | </value-type> |
|
912 | </value-type> | |
866 |
|
913 | |||
867 | <value-type name="QPainterPath::Element"> |
|
914 | <value-type name="QPainterPath::Element"> | |
868 | <modify-field name="x" write="false"/> |
|
915 | <modify-field name="x" write="false"/> | |
869 | <modify-field name="y" write="false"/> |
|
916 | <modify-field name="y" write="false"/> | |
@@ -876,10 +923,10 | |||||
876 | <include file-name="QTextEdit" location="global"/> |
|
923 | <include file-name="QTextEdit" location="global"/> | |
877 | </value-type> |
|
924 | </value-type> | |
878 |
|
925 | |||
879 | <value-type name="QFont" delete-in-main-thread="yes"> |
|
926 | <value-type name="QFont" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000"> | |
880 | <extra-includes> |
|
927 | <extra-includes> | |
881 | <include file-name="QStringList" location="global"/> |
|
928 | <include file-name="QStringList" location="global"/> | |
882 |
</extra-includes> |
|
929 | </extra-includes> | |
883 | <modify-function signature="operator=(QFont)" remove="all"/> |
|
930 | <modify-function signature="operator=(QFont)" remove="all"/> | |
884 | </value-type> |
|
931 | </value-type> | |
885 |
|
932 | |||
@@ -889,7 +936,7 | |||||
889 | </extra-includes> |
|
936 | </extra-includes> | |
890 | <modify-function signature="operator=(QTextTableCell)" remove="all"/> |
|
937 | <modify-function signature="operator=(QTextTableCell)" remove="all"/> | |
891 | </value-type> |
|
938 | </value-type> | |
892 |
|
939 | |||
893 | <value-type name="QImage" expense-limit="67108864" expense-cost="height()*bytesPerLine()"> |
|
940 | <value-type name="QImage" expense-limit="67108864" expense-cost="height()*bytesPerLine()"> | |
894 | <modify-function signature="QImage(const char *, const char *)"> |
|
941 | <modify-function signature="QImage(const char *, const char *)"> | |
895 | <remove/> |
|
942 | <remove/> | |
@@ -897,8 +944,8 | |||||
897 | <modify-function signature="QImage(const char **)"> |
|
944 | <modify-function signature="QImage(const char **)"> | |
898 | <access modifier="private"/> |
|
945 | <access modifier="private"/> | |
899 | </modify-function> |
|
946 | </modify-function> | |
900 | <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)"> |
|
947 | <modify-function signature="QImage(const unsigned char*,int,int,int,QImage::Format)"> | |
901 |
|
|
948 | <remove/> | |
902 | </modify-function> |
|
949 | </modify-function> | |
903 | <modify-function signature="bits()const"> |
|
950 | <modify-function signature="bits()const"> | |
904 | <remove/> |
|
951 | <remove/> | |
@@ -906,77 +953,85 | |||||
906 | <modify-function signature="scanLine(int)const"> |
|
953 | <modify-function signature="scanLine(int)const"> | |
907 | <remove/> |
|
954 | <remove/> | |
908 | </modify-function> |
|
955 | </modify-function> | |
909 | <modify-function signature="QImage(const uchar *, int, int, QImage::Format)"> |
|
956 | <modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)"> | |
910 | <remove/> |
|
957 | <remove/> | |
911 | </modify-function> |
|
958 | </modify-function> | |
912 |
|
959 | |||
913 | <extra-includes> |
|
960 | <extra-includes> | |
914 | <include file-name="QStringList" location="global"/> |
|
961 | <include file-name="QStringList" location="global"/> | |
915 | <include file-name="QMatrix" location="global"/> |
|
962 | <include file-name="QMatrix" location="global"/> | |
916 | </extra-includes> |
|
963 | </extra-includes> | |
917 |
|
964 | <modify-function signature="save(const QString &, const char *, int) const"> | ||
918 | <modify-function signature="QImage(uchar*,int,int,QImage::Format)"> |
|
965 | <access modifier="private"/> | |
|
966 | <rename to="private_save"/> | |||
|
967 | <modify-argument index="2"> | |||
|
968 | <remove-default-expression/> | |||
|
969 | </modify-argument> | |||
|
970 | <modify-argument index="3"> | |||
|
971 | <remove-default-expression/> | |||
|
972 | </modify-argument> | |||
|
973 | </modify-function> | |||
|
974 | ||||
|
975 | <modify-function signature="QImage(unsigned char*,int,int,QImage::Format)"> | |||
919 | <access modifier="private"/> |
|
976 | <access modifier="private"/> | |
920 | </modify-function> |
|
977 | </modify-function> | |
921 |
|
978 | |||
922 | <!-- |
|
|||
923 | <modify-function signature="QImage(QString,const char*)"> |
|
979 | <modify-function signature="QImage(QString,const char*)"> | |
924 | <access modifier="private"/> |
|
980 | <access modifier="private"/> | |
925 | <modify-argument index="2"> |
|
981 | <modify-argument index="2"> | |
926 | <remove-default-expression/> |
|
982 | <remove-default-expression/> | |
927 | </modify-argument> |
|
983 | </modify-argument> | |
928 | </modify-function> |
|
984 | </modify-function> | |
929 | --> |
|
985 | ||
930 |
|
||||
931 | <modify-function signature="load(QString,const char*)"> |
|
986 | <modify-function signature="load(QString,const char*)"> | |
932 | <access modifier="private"/> |
|
987 | <access modifier="private"/> | |
933 | <modify-argument index="2"> |
|
988 | <modify-argument index="2"> | |
934 | <remove-default-expression/> |
|
989 | <remove-default-expression/> | |
935 | </modify-argument> |
|
990 | </modify-argument> | |
936 | </modify-function> |
|
991 | </modify-function> | |
937 |
|
992 | |||
938 | <modify-function signature="load(QIODevice*,const char*)"> |
|
993 | <modify-function signature="load(QIODevice*,const char*)"> | |
939 | <access modifier="private"/> |
|
994 | <access modifier="private"/> | |
940 | </modify-function> |
|
995 | </modify-function> | |
941 |
|
996 | |||
942 | <modify-function signature="loadFromData(const uchar*,int,const char*)"> |
|
997 | <modify-function signature="loadFromData(const unsigned char*,int,const char*)"> | |
943 | <access modifier="private"/> |
|
998 | <access modifier="private"/> | |
944 | <modify-argument index="2"> |
|
999 | <modify-argument index="2"> | |
945 | <remove-default-expression/> |
|
1000 | <remove-default-expression/> | |
946 | </modify-argument> |
|
1001 | </modify-argument> | |
947 | <modify-argument index="3"> |
|
1002 | <modify-argument index="3"> | |
948 | <remove-default-expression/> |
|
1003 | <remove-default-expression/> | |
949 |
</modify-argument> |
|
1004 | </modify-argument> | |
950 | </modify-function> |
|
1005 | </modify-function> | |
951 |
|
1006 | |||
952 | <modify-function signature="loadFromData(QByteArray,const char*)"> |
|
1007 | <modify-function signature="loadFromData(QByteArray,const char*)"> | |
953 | <access modifier="private"/> |
|
1008 | <access modifier="private"/> | |
954 | <modify-argument index="2"> |
|
1009 | <modify-argument index="2"> | |
955 | <remove-default-expression/> |
|
1010 | <remove-default-expression/> | |
956 | </modify-argument> |
|
1011 | </modify-argument> | |
957 | </modify-function> |
|
1012 | </modify-function> | |
958 |
|
1013 | |||
959 | <modify-function signature="operator=(QImage)" remove="all"/> |
|
1014 | <modify-function signature="operator=(QImage)" remove="all"/> | |
960 |
|
1015 | |||
961 | <modify-function signature="setText(const char*,const char*,QString)"> |
|
1016 | <modify-function signature="setText(const char*,const char*,QString)"> | |
962 | <remove/> |
|
1017 | <remove/> | |
963 | </modify-function> |
|
1018 | </modify-function> | |
964 |
|
1019 | |||
965 | <modify-function signature="text(const char*,const char*)const"> |
|
1020 | <modify-function signature="text(const char*,const char*)const"> | |
966 | <remove/> |
|
1021 | <remove/> | |
967 | </modify-function> |
|
1022 | </modify-function> | |
968 |
|
1023 | |||
969 | <modify-function signature="fromData(QByteArray,const char*)"> |
|
1024 | <modify-function signature="fromData(QByteArray,const char*)"> | |
970 | <access modifier="private"/> |
|
1025 | <access modifier="private"/> | |
971 | <modify-argument index="2"> |
|
1026 | <modify-argument index="2"> | |
972 | <remove-default-expression/> |
|
1027 | <remove-default-expression/> | |
973 | </modify-argument> |
|
1028 | </modify-argument> | |
974 | </modify-function> |
|
1029 | </modify-function> | |
975 |
|
1030 | |||
976 | <modify-function signature="fromData(const uchar*,int,const char*)"> |
|
1031 | <modify-function signature="fromData(const unsigned char*,int,const char*)"> | |
977 | <remove/> |
|
1032 | <remove/> | |
978 |
</modify-function> |
|
1033 | </modify-function> | |
979 |
|
1034 | |||
980 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1035 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> | |
981 | <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1036 | <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3--> | |
982 | </value-type> |
|
1037 | </value-type> | |
@@ -985,27 +1040,27 | |||||
985 | <modify-function signature="operator=(QColormap)" remove="all"/> |
|
1040 | <modify-function signature="operator=(QColormap)" remove="all"/> | |
986 | <extra-includes> |
|
1041 | <extra-includes> | |
987 | <include file-name="QColor" location="global"/> |
|
1042 | <include file-name="QColor" location="global"/> | |
988 |
</extra-includes> |
|
1043 | </extra-includes> | |
989 | <custom-constructor> |
|
1044 | <custom-constructor> | |
990 | return new QColormap(*copy); |
|
1045 | return new QColormap(*copy); | |
991 | </custom-constructor> |
|
1046 | </custom-constructor> | |
992 | <custom-destructor> |
|
1047 | <custom-destructor> | |
993 | delete copy; |
|
1048 | delete copy; | |
994 |
</custom-destructor> |
|
1049 | </custom-destructor> | |
995 | </value-type> |
|
1050 | </value-type> | |
996 |
|
1051 | |||
997 |
<value-type name="QCursor" delete-in-main-thread="yes"> |
|
1052 | <value-type name="QCursor" delete-in-main-thread="yes"> | |
998 | <extra-includes> |
|
1053 | <extra-includes> | |
999 | <include file-name="QPixmap" location="global"/> |
|
1054 | <include file-name="QPixmap" location="global"/> | |
1000 | </extra-includes> |
|
1055 | </extra-includes> | |
1001 | <modify-function signature="operator=(QCursor)" remove="all"/> |
|
1056 | <modify-function signature="operator=(QCursor)" remove="all"/> | |
1002 | </value-type> |
|
1057 | </value-type> | |
1003 |
|
1058 | |||
1004 | <value-type name="QFontDatabase" delete-in-main-thread="yes"> |
|
1059 | <value-type name="QFontDatabase" delete-in-main-thread="yes"> | |
1005 | <extra-includes> |
|
1060 | <extra-includes> | |
1006 | <include file-name="QStringList" location="global"/> |
|
1061 | <include file-name="QStringList" location="global"/> | |
1007 | </extra-includes> |
|
1062 | </extra-includes> | |
1008 |
</value-type> |
|
1063 | </value-type> | |
1009 |
|
1064 | |||
1010 | <value-type name="QPen"> |
|
1065 | <value-type name="QPen"> | |
1011 | <extra-includes> |
|
1066 | <extra-includes> | |
@@ -1013,15 +1068,15 | |||||
1013 | </extra-includes> |
|
1068 | </extra-includes> | |
1014 |
|
1069 | |||
1015 | <modify-function signature="operator=(QPen)" remove="all"/> |
|
1070 | <modify-function signature="operator=(QPen)" remove="all"/> | |
1016 |
</value-type> |
|
1071 | </value-type> | |
1017 |
|
1072 | |||
1018 | <value-type name="QBrush"> |
|
1073 | <value-type name="QBrush"> | |
1019 | <modify-function signature="QBrush(Qt::GlobalColor, Qt::BrushStyle)" remove="all"/> |
|
1074 | <modify-function signature="QBrush(Qt::GlobalColor, Qt::BrushStyle)" remove="all"/> | |
1020 | <modify-function signature="operator=(const QBrush &)" remove="all"/> |
|
1075 | <modify-function signature="operator=(const QBrush &)" remove="all"/> | |
1021 |
|
1076 | |||
1022 | <extra-includes> |
|
1077 | <extra-includes> | |
1023 | <include file-name="QPixmap" location="global"/> |
|
1078 | <include file-name="QPixmap" location="global"/> | |
1024 |
</extra-includes> |
|
1079 | </extra-includes> | |
1025 | </value-type> |
|
1080 | </value-type> | |
1026 |
|
1081 | |||
1027 | <value-type name="QColor"> |
|
1082 | <value-type name="QColor"> | |
@@ -1032,36 +1087,36 | |||||
1032 | <modify-function signature="QColor(const char*)"> |
|
1087 | <modify-function signature="QColor(const char*)"> | |
1033 | <remove/> |
|
1088 | <remove/> | |
1034 | </modify-function> |
|
1089 | </modify-function> | |
1035 |
|
1090 | |||
1036 | <modify-function signature="getCmyk(int*,int*,int*,int*,int*)"> |
|
1091 | <modify-function signature="getCmyk(int*,int*,int*,int*,int*)"> | |
1037 | <remove/> |
|
1092 | <remove/> | |
1038 | </modify-function> |
|
1093 | </modify-function> | |
1039 |
|
1094 | |||
1040 |
<modify-function signature="getCmykF( |
|
1095 | <modify-function signature="getCmykF(double*,double*,double*,double*,double*)"> | |
1041 | <remove/> |
|
1096 | <remove/> | |
1042 | </modify-function> |
|
1097 | </modify-function> | |
1043 |
|
1098 | |||
1044 | <modify-function signature="getHsv(int*,int*,int*,int*)const"> |
|
1099 | <modify-function signature="getHsv(int*,int*,int*,int*)const"> | |
1045 | <remove/> |
|
1100 | <remove/> | |
1046 | </modify-function> |
|
1101 | </modify-function> | |
1047 |
|
1102 | |||
1048 |
<modify-function signature="getHsvF( |
|
1103 | <modify-function signature="getHsvF(double*,double*,double*,double*)const"> | |
1049 | <remove/> |
|
1104 | <remove/> | |
1050 | </modify-function> |
|
1105 | </modify-function> | |
1051 |
|
1106 | |||
1052 | <modify-function signature="getRgb(int*,int*,int*,int*)const"> |
|
1107 | <modify-function signature="getRgb(int*,int*,int*,int*)const"> | |
1053 | <remove/> |
|
1108 | <remove/> | |
1054 | </modify-function> |
|
1109 | </modify-function> | |
1055 |
|
1110 | |||
1056 |
<modify-function signature="getRgbF( |
|
1111 | <modify-function signature="getRgbF(double*,double*,double*,double*)const"> | |
1057 | <remove/> |
|
1112 | <remove/> | |
1058 | </modify-function> |
|
1113 | </modify-function> | |
1059 |
|
1114 | |||
1060 | <modify-function signature="dark(int)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1115 | <modify-function signature="dark(int)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1061 | <modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1116 | <modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1062 | </value-type> |
|
1117 | </value-type> | |
1063 |
|
|
1118 | ||
1064 | <value-type name="QFontMetricsF" delete-in-main-thread="yes"> |
|
1119 | <value-type name="QFontMetricsF" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000"> | |
1065 | <custom-constructor> |
|
1120 | <custom-constructor> | |
1066 | return new QFontMetricsF(*copy); |
|
1121 | return new QFontMetricsF(*copy); | |
1067 | </custom-constructor> |
|
1122 | </custom-constructor> | |
@@ -1073,8 +1128,8 | |||||
1073 | </modify-function> |
|
1128 | </modify-function> | |
1074 | <modify-function signature="operator==(const QFontMetricsF &)"> |
|
1129 | <modify-function signature="operator==(const QFontMetricsF &)"> | |
1075 | <remove/> |
|
1130 | <remove/> | |
1076 |
</modify-function> |
|
1131 | </modify-function> | |
1077 |
|
1132 | |||
1078 | <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const"> |
|
1133 | <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const"> | |
1079 | <access modifier="private"/> |
|
1134 | <access modifier="private"/> | |
1080 | <modify-argument index="4"> |
|
1135 | <modify-argument index="4"> | |
@@ -1082,25 +1137,25 | |||||
1082 | </modify-argument> |
|
1137 | </modify-argument> | |
1083 | <modify-argument index="5"> |
|
1138 | <modify-argument index="5"> | |
1084 | <remove-default-expression/> |
|
1139 | <remove-default-expression/> | |
1085 |
</modify-argument> |
|
1140 | </modify-argument> | |
1086 | </modify-function> |
|
1141 | </modify-function> | |
1087 |
|
1142 | |||
1088 | <modify-function signature="operator=(QFontMetrics)" remove="all"/> |
|
1143 | <modify-function signature="operator=(QFontMetrics)" remove="all"/> | |
1089 | <modify-function signature="operator=(QFontMetricsF)" remove="all"/> |
|
1144 | <modify-function signature="operator=(QFontMetricsF)" remove="all"/> | |
1090 |
|
1145 | |||
1091 | <modify-function signature="size(int,QString,int,int*)const"> |
|
1146 | <modify-function signature="size(int,QString,int,int*)const"> | |
1092 | <access modifier="private"/> |
|
1147 | <access modifier="private"/> | |
1093 | <modify-argument index="3"> |
|
1148 | <modify-argument index="3"> | |
1094 | <remove-default-expression/> |
|
1149 | <remove-default-expression/> | |
1095 |
</modify-argument> |
|
1150 | </modify-argument> | |
1096 | <modify-argument index="4"> |
|
1151 | <modify-argument index="4"> | |
1097 | <remove-default-expression/> |
|
1152 | <remove-default-expression/> | |
1098 |
</modify-argument> |
|
1153 | </modify-argument> | |
1099 | </modify-function> |
|
1154 | </modify-function> | |
1100 | </value-type> |
|
1155 | </value-type> | |
1101 | <value-type name="QTextOption::Tab" /> |
|
1156 | <value-type name="QTextOption::Tab" /> | |
1102 |
|
1157 | |||
1103 | <value-type name="QFontMetrics" delete-in-main-thread="yes"> |
|
1158 | <value-type name="QFontMetrics" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000"> | |
1104 | <custom-constructor> |
|
1159 | <custom-constructor> | |
1105 | return new QFontMetrics(*copy); |
|
1160 | return new QFontMetrics(*copy); | |
1106 | </custom-constructor> |
|
1161 | </custom-constructor> | |
@@ -1112,7 +1167,7 | |||||
1112 | </modify-function> |
|
1167 | </modify-function> | |
1113 | <modify-function signature="operator==(const QFontMetrics &)"> |
|
1168 | <modify-function signature="operator==(const QFontMetrics &)"> | |
1114 | <remove/> |
|
1169 | <remove/> | |
1115 |
</modify-function> |
|
1170 | </modify-function> | |
1116 |
|
1171 | |||
1117 | <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const"> |
|
1172 | <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const"> | |
1118 | <access modifier="private"/> |
|
1173 | <access modifier="private"/> | |
@@ -1121,9 +1176,9 | |||||
1121 | </modify-argument> |
|
1176 | </modify-argument> | |
1122 | <modify-argument index="8"> |
|
1177 | <modify-argument index="8"> | |
1123 | <remove-default-expression/> |
|
1178 | <remove-default-expression/> | |
1124 |
</modify-argument> |
|
1179 | </modify-argument> | |
1125 | </modify-function> |
|
1180 | </modify-function> | |
1126 |
|
1181 | |||
1127 | <modify-function signature="boundingRect(QRect,int,QString,int,int*)const"> |
|
1182 | <modify-function signature="boundingRect(QRect,int,QString,int,int*)const"> | |
1128 | <access modifier="private"/> |
|
1183 | <access modifier="private"/> | |
1129 | <modify-argument index="4"> |
|
1184 | <modify-argument index="4"> | |
@@ -1131,21 +1186,21 | |||||
1131 | </modify-argument> |
|
1186 | </modify-argument> | |
1132 | <modify-argument index="5"> |
|
1187 | <modify-argument index="5"> | |
1133 | <remove-default-expression/> |
|
1188 | <remove-default-expression/> | |
1134 |
</modify-argument> |
|
1189 | </modify-argument> | |
1135 | </modify-function> |
|
1190 | </modify-function> | |
1136 |
|
1191 | |||
1137 | <modify-function signature="operator=(QFontMetrics)" remove="all"/> |
|
1192 | <modify-function signature="operator=(QFontMetrics)" remove="all"/> | |
1138 |
|
1193 | |||
1139 | <modify-function signature="size(int,QString,int,int*)const"> |
|
1194 | <modify-function signature="size(int,QString,int,int*)const"> | |
1140 | <access modifier="private"/> |
|
1195 | <access modifier="private"/> | |
1141 | <modify-argument index="3"> |
|
1196 | <modify-argument index="3"> | |
1142 | <remove-default-expression/> |
|
1197 | <remove-default-expression/> | |
1143 |
</modify-argument> |
|
1198 | </modify-argument> | |
1144 | <modify-argument index="4"> |
|
1199 | <modify-argument index="4"> | |
1145 | <remove-default-expression/> |
|
1200 | <remove-default-expression/> | |
1146 |
</modify-argument> |
|
1201 | </modify-argument> | |
1147 | </modify-function> |
|
1202 | </modify-function> | |
1148 |
|
1203 | |||
1149 | </value-type> |
|
1204 | </value-type> | |
1150 |
|
1205 | |||
1151 | <value-type name="QGradient" force-abstract="yes" polymorphic-base="yes" polymorphic-id-expression="%1->type() == QGradient::NoGradient"> |
|
1206 | <value-type name="QGradient" force-abstract="yes" polymorphic-base="yes" polymorphic-id-expression="%1->type() == QGradient::NoGradient"> | |
@@ -1159,7 +1214,7 | |||||
1159 | </custom-destructor> |
|
1214 | </custom-destructor> | |
1160 | <modify-function signature="operator==(const QGradient &)"> |
|
1215 | <modify-function signature="operator==(const QGradient &)"> | |
1161 | <remove/> |
|
1216 | <remove/> | |
1162 |
</modify-function> |
|
1217 | </modify-function> | |
1163 | </value-type> |
|
1218 | </value-type> | |
1164 |
|
1219 | |||
1165 | <value-type name="QLinearGradient" polymorphic-id-expression="%1->type() == QGradient::LinearGradient"> |
|
1220 | <value-type name="QLinearGradient" polymorphic-id-expression="%1->type() == QGradient::LinearGradient"> | |
@@ -1173,17 +1228,20 | |||||
1173 | delete copy; |
|
1228 | delete copy; | |
1174 | </custom-destructor> |
|
1229 | </custom-destructor> | |
1175 | </value-type> |
|
1230 | </value-type> | |
1176 |
|
1231 | |||
1177 | <value-type name="QPrinterInfo"> |
|
1232 | <value-type name="QPrinterInfo"> | |
1178 | <modify-function signature="operator=(const QPrinterInfo &)" remove="all" /> |
|
1233 | <modify-function signature="operator=(const QPrinterInfo &)" remove="all" /> | |
1179 | </value-type> |
|
1234 | </value-type> | |
1180 |
|
1235 | |||
|
1236 | <value-type name="QMargins" /> | |||
|
1237 | ||||
1181 | <interface-type name="QLayoutItem"/> |
|
1238 | <interface-type name="QLayoutItem"/> | |
1182 | <interface-type name="QPaintDevice"/> |
|
1239 | <interface-type name="QPaintDevice"/> | |
1183 |
|
1240 | |||
1184 | <interface-type name="QGraphicsItem" delete-in-main-thread="yes"> |
|
1241 | <interface-type name="QGraphicsItem" delete-in-main-thread="yes"> | |
1185 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> |
|
1242 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> | |
1186 |
|
1243 | <modify-function signature="toGraphicsObject() const" remove="all" /> | ||
|
1244 | ||||
1187 | <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)"> |
|
1245 | <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)"> | |
1188 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
1246 | <modify-argument index="1" invalidate-after-use="yes" /> | |
1189 | </modify-function> |
|
1247 | </modify-function> | |
@@ -1255,48 +1313,48 | |||||
1255 | <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)"> |
|
1313 | <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)"> | |
1256 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
1314 | <modify-argument index="1" invalidate-after-use="yes" /> | |
1257 | </modify-function> |
|
1315 | </modify-function> | |
1258 |
|
1316 | |||
1259 |
<modify-function signature="children()const" remove="all"/> |
|
1317 | <modify-function signature="children()const" remove="all"/> | |
1260 | <modify-function signature="installSceneEventFilter(QGraphicsItem *)"> |
|
1318 | <modify-function signature="installSceneEventFilter(QGraphicsItem *)"> | |
1261 | <modify-argument index="1"> |
|
1319 | <modify-argument index="1"> | |
1262 |
<!-- Safe to ignore because items in a scene are memory managed by the scene --> |
|
1320 | <!-- Safe to ignore because items in a scene are memory managed by the scene --> | |
1263 |
<reference-count action="ignore"/> |
|
1321 | <reference-count action="ignore"/> | |
1264 | </modify-argument> |
|
1322 | </modify-argument> | |
1265 | </modify-function> |
|
1323 | </modify-function> | |
1266 | <modify-function signature="removeSceneEventFilter(QGraphicsItem *)"> |
|
1324 | <modify-function signature="removeSceneEventFilter(QGraphicsItem *)"> | |
1267 | <modify-argument index="1"> |
|
1325 | <modify-argument index="1"> | |
1268 |
<!-- Safe to ignore because items in a scene are memory managed by the scene --> |
|
1326 | <!-- Safe to ignore because items in a scene are memory managed by the scene --> | |
1269 |
<reference-count action="ignore"/> |
|
1327 | <reference-count action="ignore"/> | |
1270 | </modify-argument> |
|
1328 | </modify-argument> | |
1271 | </modify-function> |
|
1329 | </modify-function> | |
1272 |
|
1330 | |||
1273 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1331 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1274 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
1332 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
1275 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1333 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1276 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1334 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
1277 |
</interface-type> |
|
1335 | </interface-type> | |
1278 |
|
1336 | |||
1279 | <object-type name="QAbstractGraphicsShapeItem" delete-in-main-thread="yes"> |
|
1337 | <object-type name="QAbstractGraphicsShapeItem" delete-in-main-thread="yes"> | |
1280 | <modify-function signature="QAbstractGraphicsShapeItem(QGraphicsItem*,QGraphicsScene*)"> |
|
1338 | <modify-function signature="QAbstractGraphicsShapeItem(QGraphicsItem*,QGraphicsScene*)"> | |
1281 | <inject-code position="end"> |
|
1339 | <inject-code position="end"> | |
1282 | <argument-map index="1" meta-name="%1"/> |
|
1340 | <argument-map index="1" meta-name="%1"/> | |
1283 | if (%1 != null) disableGarbageCollection(); |
|
1341 | if (%1 != null) disableGarbageCollection(); | |
1284 | </inject-code> |
|
1342 | </inject-code> | |
1285 |
</modify-function> |
|
1343 | </modify-function> | |
1286 |
|
1344 | |||
1287 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1345 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1288 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
1346 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
1289 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1347 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1290 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1348 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
1291 | </object-type> |
|
1349 | </object-type> | |
1292 |
|
1350 | |||
1293 | <object-type name="QAbstractItemView"> |
|
1351 | <object-type name="QAbstractItemView"> | |
1294 | <modify-function signature="update()" remove="all"/> |
|
1352 | <modify-function signature="update()" remove="all"/> | |
1295 | <modify-function signature="horizontalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1353 | <modify-function signature="horizontalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1296 | <modify-function signature="setHorizontalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1354 | <modify-function signature="setHorizontalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3--> | |
1297 | <modify-function signature="setVerticalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1355 | <modify-function signature="setVerticalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3--> | |
1298 | <modify-function signature="verticalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1356 | <modify-function signature="verticalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1299 |
|
1357 | |||
1300 | <modify-function signature="edit(QModelIndex,QAbstractItemView::EditTrigger,QEvent*)"> |
|
1358 | <modify-function signature="edit(QModelIndex,QAbstractItemView::EditTrigger,QEvent*)"> | |
1301 | <modify-argument index="3" invalidate-after-use="yes" /> |
|
1359 | <modify-argument index="3" invalidate-after-use="yes" /> | |
1302 | </modify-function> |
|
1360 | </modify-function> | |
@@ -1304,16 +1362,16 | |||||
1304 | <modify-argument index="2" invalidate-after-use="yes" /> |
|
1362 | <modify-argument index="2" invalidate-after-use="yes" /> | |
1305 | </modify-function> |
|
1363 | </modify-function> | |
1306 |
|
1364 | |||
1307 |
</object-type> |
|
1365 | </object-type> | |
1308 |
|
1366 | |||
1309 | <object-type name="QAbstractPageSetupDialog"/> |
|
1367 | <object-type name="QAbstractPageSetupDialog"/> | |
1310 | <object-type name="QAbstractPrintDialog"/> |
|
1368 | <object-type name="QAbstractPrintDialog"/> | |
1311 |
<object-type name="QAbstractSlider"/> |
|
1369 | <object-type name="QAbstractSlider"/> | |
1312 | <object-type name="QAbstractTextDocumentLayout"> |
|
1370 | <object-type name="QAbstractTextDocumentLayout"> | |
1313 | <modify-function signature="setPaintDevice(QPaintDevice*)"> |
|
1371 | <modify-function signature="setPaintDevice(QPaintDevice*)"> | |
1314 | <modify-argument index="1"> |
|
1372 | <modify-argument index="1"> | |
1315 | <reference-count action="set" variable-name="__rcPaintDevice"/> |
|
1373 | <reference-count action="set" variable-name="__rcPaintDevice"/> | |
1316 | </modify-argument> |
|
1374 | </modify-argument> | |
1317 | </modify-function> |
|
1375 | </modify-function> | |
1318 |
|
1376 | |||
1319 | <modify-function signature="draw(QPainter*,QAbstractTextDocumentLayout::PaintContext)"> |
|
1377 | <modify-function signature="draw(QPainter*,QAbstractTextDocumentLayout::PaintContext)"> | |
@@ -1337,7 +1395,7 | |||||
1337 | <define-ownership class="java" owner="java" /> |
|
1395 | <define-ownership class="java" owner="java" /> | |
1338 | </modify-argument> |
|
1396 | </modify-argument> | |
1339 | </modify-function> |
|
1397 | </modify-function> | |
1340 |
</object-type> |
|
1398 | </object-type> | |
1341 | <object-type name="QAccessibleBridge"> |
|
1399 | <object-type name="QAccessibleBridge"> | |
1342 | <modify-function signature="setRootObject(QAccessibleInterface *)"> |
|
1400 | <modify-function signature="setRootObject(QAccessibleInterface *)"> | |
1343 | <modify-argument index="1"> |
|
1401 | <modify-argument index="1"> | |
@@ -1347,25 +1405,25 | |||||
1347 | <modify-function signature="notifyAccessibilityUpdate(int,QAccessibleInterface*,int)"> |
|
1405 | <modify-function signature="notifyAccessibilityUpdate(int,QAccessibleInterface*,int)"> | |
1348 | <modify-argument invalidate-after-use="yes" index="2" /> |
|
1406 | <modify-argument invalidate-after-use="yes" index="2" /> | |
1349 | </modify-function> |
|
1407 | </modify-function> | |
1350 |
</object-type> |
|
1408 | </object-type> | |
1351 | <object-type name="QAccessible2Interface"/> |
|
1409 | <object-type name="QAccessible2Interface"/> | |
1352 | <object-type name="QAccessibleTableInterface"> |
|
1410 | <object-type name="QAccessibleTableInterface"> | |
1353 | <modify-function signature="qAccessibleTableCastHelper()" remove="all"/> |
|
1411 | <modify-function signature="qAccessibleTableCastHelper()" remove="all"/> | |
1354 | </object-type> |
|
1412 | </object-type> | |
1355 |
|
1413 | |||
1356 | <object-type name="QAccessibleInterface"> |
|
1414 | <object-type name="QAccessibleInterface"> | |
1357 | <modify-function signature="indexOfChild(const QAccessibleInterface*)const"> |
|
1415 | <modify-function signature="indexOfChild(const QAccessibleInterface*)const"> | |
1358 | <modify-argument invalidate-after-use="yes" index="1" /> |
|
1416 | <modify-argument invalidate-after-use="yes" index="1" /> | |
1359 | </modify-function> |
|
1417 | </modify-function> | |
1360 | <modify-function signature="relationTo(int,const QAccessibleInterface*,int)const"> |
|
1418 | <modify-function signature="relationTo(int,const QAccessibleInterface*,int)const"> | |
1361 | <modify-argument invalidate-after-use="yes" index="2" /> |
|
1419 | <modify-argument invalidate-after-use="yes" index="2" /> | |
1362 |
</modify-function> |
|
1420 | </modify-function> | |
1363 | </object-type> |
|
1421 | </object-type> | |
1364 | <object-type name="QAccessibleInterfaceEx"/> |
|
1422 | <object-type name="QAccessibleInterfaceEx"/> | |
1365 | <object-type name="QAccessibleObject"/> |
|
1423 | <object-type name="QAccessibleObject"/> | |
1366 | <object-type name="QAccessibleObjectEx"/> |
|
1424 | <object-type name="QAccessibleObjectEx"/> | |
1367 | <object-type name="QAccessibleWidget"/> |
|
1425 | <object-type name="QAccessibleWidget"/> | |
1368 |
<object-type name="QAccessibleWidgetEx"/> |
|
1426 | <object-type name="QAccessibleWidgetEx"/> | |
1369 | <object-type name="QActionGroup" /> |
|
1427 | <object-type name="QActionGroup" /> | |
1370 | <object-type name="QCDEStyle"> |
|
1428 | <object-type name="QCDEStyle"> | |
1371 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
1429 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
@@ -1375,14 +1433,14 | |||||
1375 | <access modifier="private"/> |
|
1433 | <access modifier="private"/> | |
1376 | </modify-function> |
|
1434 | </modify-function> | |
1377 | </object-type> |
|
1435 | </object-type> | |
1378 |
<object-type name="QCleanlooksStyle"> |
|
1436 | <object-type name="QCleanlooksStyle"> | |
1379 | <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1437 | <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1380 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
1438 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
1381 |
</object-type> |
|
1439 | </object-type> | |
1382 | <object-type name="QCommonStyle"> |
|
1440 | <object-type name="QCommonStyle"> | |
1383 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1441 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1384 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
1442 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
1385 |
</object-type> |
|
1443 | </object-type> | |
1386 | <object-type name="QDataWidgetMapper"> |
|
1444 | <object-type name="QDataWidgetMapper"> | |
1387 | <modify-function signature="addMapping(QWidget*,int)"> |
|
1445 | <modify-function signature="addMapping(QWidget*,int)"> | |
1388 | <modify-argument index="1"> |
|
1446 | <modify-argument index="1"> | |
@@ -1423,9 +1481,11 | |||||
1423 | <modify-function signature="exec()" access="non-final"/> |
|
1481 | <modify-function signature="exec()" access="non-final"/> | |
1424 | <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1482 | <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1425 | <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1483 | <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3--> | |
|
1484 | <modify-function signature="open()" virtual-slot="yes" /> | |||
1426 | <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1485 | <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3--> | |
1427 | <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1486 | <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
1428 | </object-type> |
|
1487 | <modify-function signature="setVisible(bool)" allow-as-slot="yes"/> | |
|
1488 | </object-type> | |||
1429 | <object-type name="QDialogButtonBox"> |
|
1489 | <object-type name="QDialogButtonBox"> | |
1430 | <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)"> |
|
1490 | <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)"> | |
1431 | <modify-argument index="1"> |
|
1491 | <modify-argument index="1"> | |
@@ -1481,7 +1541,7 | |||||
1481 | <remove-default-expression/> |
|
1541 | <remove-default-expression/> | |
1482 | </modify-argument> |
|
1542 | </modify-argument> | |
1483 | </modify-function> |
|
1543 | </modify-function> | |
1484 |
|
1544 | |||
1485 | </object-type> |
|
1545 | </object-type> | |
1486 | <object-type name="QFocusFrame"> |
|
1546 | <object-type name="QFocusFrame"> | |
1487 | <modify-function signature="initStyleOption(QStyleOption*)const"> |
|
1547 | <modify-function signature="initStyleOption(QStyleOption*)const"> | |
@@ -1496,10 +1556,11 | |||||
1496 | <insert-template name="gui.init_style_option"> |
|
1556 | <insert-template name="gui.init_style_option"> | |
1497 | <replace from="%TYPE" to="QStyleOption"/> |
|
1557 | <replace from="%TYPE" to="QStyleOption"/> | |
1498 | </insert-template> |
|
1558 | </insert-template> | |
1499 |
</inject-code> |
|
1559 | </inject-code> | |
1500 | </object-type> |
|
1560 | </object-type> | |
1501 | <object-type name="QFontComboBox"/> |
|
1561 | <object-type name="QFontComboBox"/> | |
1502 | <object-type name="QFontDialog"/> |
|
1562 | <object-type name="QFontDialog" /> | |
|
1563 | ||||
1503 | <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/> |
|
1564 | <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/> | |
1504 | <object-type name="QGraphicsItemAnimation" > |
|
1565 | <object-type name="QGraphicsItemAnimation" > | |
1505 | <modify-function signature="setItem(QGraphicsItem*)"> |
|
1566 | <modify-function signature="setItem(QGraphicsItem*)"> | |
@@ -1511,9 +1572,9 | |||||
1511 | <modify-argument index="1"> |
|
1572 | <modify-argument index="1"> | |
1512 | <reference-count action="set" variable-name="__rcTimeLine"/> |
|
1573 | <reference-count action="set" variable-name="__rcTimeLine"/> | |
1513 | </modify-argument> |
|
1574 | </modify-argument> | |
1514 |
</modify-function> |
|
1575 | </modify-function> | |
1515 | </object-type> |
|
1576 | </object-type> | |
1516 |
<object-type name="QGraphicsItemGroup" delete-in-main-thread="yes"> |
|
1577 | <object-type name="QGraphicsItemGroup" delete-in-main-thread="yes"> | |
1517 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1578 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1518 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
1579 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
1519 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1580 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -1526,7 +1587,7 | |||||
1526 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1587 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
1527 | </object-type> |
|
1588 | </object-type> | |
1528 | <object-type name="QGraphicsPathItem" delete-in-main-thread="yes"/> |
|
1589 | <object-type name="QGraphicsPathItem" delete-in-main-thread="yes"/> | |
1529 |
|
1590 | |||
1530 | <object-type name="QGraphicsPixmapItem" delete-in-main-thread="yes"> |
|
1591 | <object-type name="QGraphicsPixmapItem" delete-in-main-thread="yes"> | |
1531 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1592 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1532 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
1593 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -1541,16 +1602,16 | |||||
1541 | <modify-function signature="initStyleOption(QStyleOptionHeader*)const"> |
|
1602 | <modify-function signature="initStyleOption(QStyleOptionHeader*)const"> | |
1542 | <access modifier="private"/> |
|
1603 | <access modifier="private"/> | |
1543 | </modify-function> |
|
1604 | </modify-function> | |
1544 |
|
1605 | |||
1545 | <modify-function signature="paintSection(QPainter*,QRect,int)const"> |
|
1606 | <modify-function signature="paintSection(QPainter*,QRect,int)const"> | |
1546 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
1607 | <modify-argument index="1" invalidate-after-use="yes" /> | |
1547 | </modify-function> |
|
1608 | </modify-function> | |
1548 |
|
1609 | |||
1549 | <inject-code> |
|
1610 | <inject-code> | |
1550 | <insert-template name="gui.init_style_option"> |
|
1611 | <insert-template name="gui.init_style_option"> | |
1551 | <replace from="%TYPE" to="QStyleOptionHeader"/> |
|
1612 | <replace from="%TYPE" to="QStyleOptionHeader"/> | |
1552 | </insert-template> |
|
1613 | </insert-template> | |
1553 |
</inject-code> |
|
1614 | </inject-code> | |
1554 | <modify-function signature="setModel(QAbstractItemModel*)"> |
|
1615 | <modify-function signature="setModel(QAbstractItemModel*)"> | |
1555 | <modify-argument index="1"> |
|
1616 | <modify-argument index="1"> | |
1556 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcModel"/> |
|
1617 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcModel"/> | |
@@ -1560,7 +1621,7 | |||||
1560 | <object-type name="QIconEngine"> |
|
1621 | <object-type name="QIconEngine"> | |
1561 | <modify-function signature="paint(QPainter*,QRect,QIcon::Mode,QIcon::State)"> |
|
1622 | <modify-function signature="paint(QPainter*,QRect,QIcon::Mode,QIcon::State)"> | |
1562 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
1623 | <modify-argument index="1" invalidate-after-use="yes" /> | |
1563 |
</modify-function> |
|
1624 | </modify-function> | |
1564 | </object-type> |
|
1625 | </object-type> | |
1565 | <object-type name="QIconEngineV2"> |
|
1626 | <object-type name="QIconEngineV2"> | |
1566 | <modify-function signature="read(QDataStream&)"> |
|
1627 | <modify-function signature="read(QDataStream&)"> | |
@@ -1569,13 +1630,13 | |||||
1569 | <modify-function signature="write(QDataStream&)const"> |
|
1630 | <modify-function signature="write(QDataStream&)const"> | |
1570 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
1631 | <modify-argument index="1" invalidate-after-use="yes" /> | |
1571 | </modify-function> |
|
1632 | </modify-function> | |
1572 |
|
1633 | |||
1573 | <modify-function signature="virtual_hook(int,void*)" remove="all"/> |
|
1634 | <modify-function signature="virtual_hook(int,void*)" remove="all"/> | |
1574 | <modify-function signature="clone()const"> |
|
1635 | <modify-function signature="clone()const"> | |
1575 | <modify-argument index="return"> |
|
1636 | <modify-argument index="return"> | |
1576 | <define-ownership class="shell" owner="c++"/> |
|
1637 | <define-ownership class="shell" owner="c++"/> | |
1577 |
</modify-argument> |
|
1638 | </modify-argument> | |
1578 |
</modify-function> |
|
1639 | </modify-function> | |
1579 | </object-type> |
|
1640 | </object-type> | |
1580 | <object-type name="QImageWriter"> |
|
1641 | <object-type name="QImageWriter"> | |
1581 | <modify-function signature="setDevice(QIODevice*)"> |
|
1642 | <modify-function signature="setDevice(QIODevice*)"> | |
@@ -1588,11 +1649,11 | |||||
1588 | </object-type> |
|
1649 | </object-type> | |
1589 | <object-type name="QInputContextFactory"/> |
|
1650 | <object-type name="QInputContextFactory"/> | |
1590 | <object-type name="QIntValidator"/> |
|
1651 | <object-type name="QIntValidator"/> | |
1591 |
<object-type name="QItemDelegate"> |
|
1652 | <object-type name="QItemDelegate"> | |
1592 | <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const"> |
|
1653 | <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const"> | |
1593 | <remove/> |
|
1654 | <remove/> | |
1594 | </modify-function> |
|
1655 | </modify-function> | |
1595 |
|
1656 | |||
1596 | <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const"> |
|
1657 | <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const"> | |
1597 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
1658 | <modify-argument index="1" invalidate-after-use="yes" /> | |
1598 | </modify-function> |
|
1659 | </modify-function> | |
@@ -1606,7 +1667,7 | |||||
1606 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
1667 | <modify-argument index="1" invalidate-after-use="yes" /> | |
1607 | </modify-function> |
|
1668 | </modify-function> | |
1608 |
|
1669 | |||
1609 |
|
1670 | |||
1610 | <modify-function signature="selected(QPixmap,QPalette,bool)const"> |
|
1671 | <modify-function signature="selected(QPixmap,QPalette,bool)const"> | |
1611 | <remove/> |
|
1672 | <remove/> | |
1612 | </modify-function> |
|
1673 | </modify-function> | |
@@ -1625,7 +1686,7 | |||||
1625 | <reference-count action="ignore"/> |
|
1686 | <reference-count action="ignore"/> | |
1626 | </modify-argument> |
|
1687 | </modify-argument> | |
1627 | </modify-function> |
|
1688 | </modify-function> | |
1628 |
|
1689 | |||
1629 | </object-type> |
|
1690 | </object-type> | |
1630 | <object-type name="QItemEditorCreatorBase"/> |
|
1691 | <object-type name="QItemEditorCreatorBase"/> | |
1631 | <object-type name="QItemEditorFactory"> |
|
1692 | <object-type name="QItemEditorFactory"> | |
@@ -1659,7 +1720,7 | |||||
1659 | <no-null-pointer/> |
|
1720 | <no-null-pointer/> | |
1660 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> |
|
1721 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> | |
1661 | </modify-argument> |
|
1722 | </modify-argument> | |
1662 |
</modify-function> |
|
1723 | </modify-function> | |
1663 | </object-type> |
|
1724 | </object-type> | |
1664 | <object-type name="QMainWindow"> |
|
1725 | <object-type name="QMainWindow"> | |
1665 | <modify-function signature="addDockWidget(Qt::DockWidgetArea,QDockWidget*,Qt::Orientation)"> |
|
1726 | <modify-function signature="addDockWidget(Qt::DockWidgetArea,QDockWidget*,Qt::Orientation)"> | |
@@ -1738,25 +1799,25 | |||||
1738 | <reference-count action="ignore"/> |
|
1799 | <reference-count action="ignore"/> | |
1739 | </modify-argument> |
|
1800 | </modify-argument> | |
1740 | </modify-function> |
|
1801 | </modify-function> | |
1741 |
|
1802 | |||
1742 | <modify-function signature="removeSubWindow(QWidget*)"> |
|
1803 | <modify-function signature="removeSubWindow(QWidget*)"> | |
1743 | <modify-argument index="1"> |
|
1804 | <modify-argument index="1"> | |
1744 | <reference-count action="ignore"/> |
|
1805 | <reference-count action="ignore"/> | |
1745 | </modify-argument> |
|
1806 | </modify-argument> | |
1746 | </modify-function> |
|
1807 | </modify-function> | |
1747 |
|
1808 | |||
1748 | <modify-function signature="setActiveSubWindow(QMdiSubWindow*)"> |
|
1809 | <modify-function signature="setActiveSubWindow(QMdiSubWindow*)"> | |
1749 | <modify-argument index="1"> |
|
1810 | <modify-argument index="1"> | |
1750 | <reference-count action="ignore"/> |
|
1811 | <reference-count action="ignore"/> | |
1751 | </modify-argument> |
|
1812 | </modify-argument> | |
1752 | </modify-function> |
|
1813 | </modify-function> | |
1753 |
|
1814 | |||
1754 | <modify-function signature="setupViewport(QWidget*)"> |
|
1815 | <modify-function signature="setupViewport(QWidget*)"> | |
1755 | <modify-argument index="1"> |
|
1816 | <modify-argument index="1"> | |
1756 | <reference-count action="ignore"/> |
|
1817 | <reference-count action="ignore"/> | |
1757 | </modify-argument> |
|
1818 | </modify-argument> | |
1758 | </modify-function> |
|
1819 | </modify-function> | |
1759 |
|
1820 | |||
1760 | </object-type> |
|
1821 | </object-type> | |
1761 | <object-type name="QMdiSubWindow"> |
|
1822 | <object-type name="QMdiSubWindow"> | |
1762 | <modify-function signature="setSystemMenu(QMenu*)"> |
|
1823 | <modify-function signature="setSystemMenu(QMenu*)"> | |
@@ -1803,26 +1864,26 | |||||
1803 | <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const"> |
|
1864 | <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const"> | |
1804 | <access modifier="private"/> |
|
1865 | <access modifier="private"/> | |
1805 | </modify-function> |
|
1866 | </modify-function> | |
1806 |
|
1867 | |||
1807 | <modify-function signature="addAction(QString,const QObject*,const char*,QKeySequence)"> |
|
1868 | <modify-function signature="addAction(QString,const QObject*,const char*,QKeySequence)"> | |
1808 |
<remove/> |
|
1869 | <remove/> | |
1809 | </modify-function> |
|
1870 | </modify-function> | |
1810 |
|
1871 | |||
1811 | <modify-function signature="addAction(QIcon,QString,const QObject*,const char*,QKeySequence)"> |
|
1872 | <modify-function signature="addAction(QIcon,QString,const QObject*,const char*,QKeySequence)"> | |
1812 | <remove/> |
|
1873 | <remove/> | |
1813 | </modify-function> |
|
1874 | </modify-function> | |
1814 | </object-type> |
|
1875 | </object-type> | |
1815 |
|
1876 | |||
1816 |
<object-type name="QMenuBar"> |
|
1877 | <object-type name="QMenuBar"> | |
1817 | <modify-function signature="addAction(QAction *)" remove="all"/> |
|
1878 | <modify-function signature="addAction(QAction *)" remove="all"/> | |
1818 | <modify-function signature="addAction(QString,const QObject*,const char*)"> |
|
1879 | <modify-function signature="addAction(QString,const QObject*,const char*)"> | |
1819 | <remove/> |
|
1880 | <remove/> | |
1820 | </modify-function> |
|
1881 | </modify-function> | |
1821 |
|
1882 | |||
1822 | <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const"> |
|
1883 | <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const"> | |
1823 | <access modifier="private"/> |
|
1884 | <access modifier="private"/> | |
1824 | </modify-function> |
|
1885 | </modify-function> | |
1825 |
|
1886 | |||
1826 | <modify-function signature="addMenu(QMenu*)"> |
|
1887 | <modify-function signature="addMenu(QMenu*)"> | |
1827 | <modify-argument index="1"> |
|
1888 | <modify-argument index="1"> | |
1828 | <reference-count action="add" variable-name="__rcMenus"/> |
|
1889 | <reference-count action="add" variable-name="__rcMenus"/> | |
@@ -1831,7 +1892,7 | |||||
1831 | <modify-function signature="insertMenu(QAction*,QMenu*)"> |
|
1892 | <modify-function signature="insertMenu(QAction*,QMenu*)"> | |
1832 | <modify-argument index="1"> |
|
1893 | <modify-argument index="1"> | |
1833 | <reference-count action="ignore"/> |
|
1894 | <reference-count action="ignore"/> | |
1834 |
</modify-argument> |
|
1895 | </modify-argument> | |
1835 | <modify-argument index="2"> |
|
1896 | <modify-argument index="2"> | |
1836 | <reference-count action="add" variable-name="__rcMenus"/> |
|
1897 | <reference-count action="add" variable-name="__rcMenus"/> | |
1837 | </modify-argument> |
|
1898 | </modify-argument> | |
@@ -1855,9 +1916,9 | |||||
1855 | <object-type name="QMotifStyle"> |
|
1916 | <object-type name="QMotifStyle"> | |
1856 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1917 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1857 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
1918 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
1858 |
</object-type> |
|
1919 | </object-type> | |
1859 | <object-type name="QPainterPathStroker"/> |
|
1920 | <object-type name="QPainterPathStroker"/> | |
1860 |
|
|
1921 | ||
1861 | <object-type name="QPictureIO"> |
|
1922 | <object-type name="QPictureIO"> | |
1862 | <modify-function signature="QPictureIO(QIODevice*,const char*)"> |
|
1923 | <modify-function signature="QPictureIO(QIODevice*,const char*)"> | |
1863 | <access modifier="private"/> |
|
1924 | <access modifier="private"/> | |
@@ -1865,42 +1926,43 | |||||
1865 | <reference-count action="set" variable-name="__rcDevice"/> |
|
1926 | <reference-count action="set" variable-name="__rcDevice"/> | |
1866 | </modify-argument> |
|
1927 | </modify-argument> | |
1867 | </modify-function> |
|
1928 | </modify-function> | |
1868 |
|
1929 | |||
1869 | <modify-function signature="setIODevice(QIODevice*)"> |
|
1930 | <modify-function signature="setIODevice(QIODevice*)"> | |
1870 | <modify-argument index="1"> |
|
1931 | <modify-argument index="1"> | |
1871 | <reference-count action="set" variable-name="__rcDevice"/> |
|
1932 | <reference-count action="set" variable-name="__rcDevice"/> | |
1872 | </modify-argument> |
|
1933 | </modify-argument> | |
1873 | </modify-function> |
|
1934 | </modify-function> | |
1874 |
|
1935 | |||
1875 | <modify-function signature="QPictureIO(QString,const char*)"> |
|
1936 | <modify-function signature="QPictureIO(QString,const char*)"> | |
1876 | <access modifier="private"/> |
|
1937 | <access modifier="private"/> | |
1877 | </modify-function> |
|
1938 | </modify-function> | |
1878 |
|
1939 | |||
1879 | <modify-function signature="format()const"> |
|
1940 | <modify-function signature="format()const"> | |
1880 | <access modifier="private"/> |
|
1941 | <access modifier="private"/> | |
1881 | <rename to="format_private"/> |
|
1942 | <rename to="format_private"/> | |
1882 | </modify-function> |
|
1943 | </modify-function> | |
1883 |
|
1944 | |||
1884 | <modify-function signature="parameters()const"> |
|
1945 | <modify-function signature="parameters()const"> | |
1885 | <access modifier="private"/> |
|
1946 | <access modifier="private"/> | |
1886 | <rename to="parameters_private"/> |
|
1947 | <rename to="parameters_private"/> | |
1887 | </modify-function> |
|
1948 | </modify-function> | |
1888 |
|
1949 | |||
1889 | <modify-function signature="setFormat(const char*)"> |
|
1950 | <modify-function signature="setFormat(const char*)"> | |
1890 | <access modifier="private"/> |
|
1951 | <access modifier="private"/> | |
1891 | </modify-function> |
|
1952 | </modify-function> | |
1892 |
|
1953 | |||
1893 | <modify-function signature="setParameters(const char*)"> |
|
1954 | <modify-function signature="setParameters(const char*)"> | |
1894 | <access modifier="private"/> |
|
1955 | <access modifier="private"/> | |
1895 | </modify-function> |
|
1956 | </modify-function> | |
1896 |
|
1957 | |||
1897 | </object-type> |
|
1958 | </object-type> | |
1898 |
|
1959 | |||
1899 | <object-type name="QPixmapCache"> |
|
1960 | <object-type name="QPixmapCache"> | |
1900 | <modify-function signature="find(QString)"> |
|
1961 | <modify-function signature="find(QString)"> | |
1901 | <remove/> |
|
1962 | <remove/> | |
1902 | </modify-function> |
|
1963 | </modify-function> | |
1903 |
|
1964 | <modify-function signature="find(QString,QPixmap*)" remove="all" /> | ||
|
1965 | ||||
1904 | <modify-function signature="find(QString,QPixmap&)"> |
|
1966 | <modify-function signature="find(QString,QPixmap&)"> | |
1905 | <access modifier="private"/> |
|
1967 | <access modifier="private"/> | |
1906 | </modify-function> |
|
1968 | </modify-function> | |
@@ -1908,9 +1970,10 | |||||
1908 | <object-type name="QPlastiqueStyle"> |
|
1970 | <object-type name="QPlastiqueStyle"> | |
1909 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1971 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1910 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
1972 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
1911 |
<modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes" /> |
|
1973 | <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes" /> | |
|
1974 | </object-type> | |||
|
1975 | <object-type name="QPrintDialog"> | |||
1912 | </object-type> |
|
1976 | </object-type> | |
1913 | <object-type name="QPrintDialog" /> |
|
|||
1914 | <object-type name="QPrintEngine"/> |
|
1977 | <object-type name="QPrintEngine"/> | |
1915 | <object-type name="QProgressBar"> |
|
1978 | <object-type name="QProgressBar"> | |
1916 | <modify-function signature="initStyleOption(QStyleOptionProgressBar*)const"> |
|
1979 | <modify-function signature="initStyleOption(QStyleOptionProgressBar*)const"> | |
@@ -1921,21 +1984,20 | |||||
1921 | <modify-function signature="initStyleOption(QStyleOptionButton*)const"> |
|
1984 | <modify-function signature="initStyleOption(QStyleOptionButton*)const"> | |
1922 | <access modifier="private"/> |
|
1985 | <access modifier="private"/> | |
1923 | </modify-function> |
|
1986 | </modify-function> | |
1924 |
|
1987 | |||
1925 | <modify-function signature="setMenu(QMenu*)"> |
|
1988 | <modify-function signature="setMenu(QMenu*)"> | |
1926 | <modify-argument index="1"> |
|
1989 | <modify-argument index="1"> | |
1927 | <reference-count action="set" variable-name="__rcMenu"/> |
|
1990 | <reference-count action="set" variable-name="__rcMenu"/> | |
1928 | </modify-argument> |
|
1991 | </modify-argument> | |
1929 | </modify-function> |
|
1992 | </modify-function> | |
1930 | </object-type> |
|
1993 | </object-type> | |
1931 | <object-type name="QReadWriteLock"/> |
|
|||
1932 | <object-type name="QRegExpValidator"/> |
|
1994 | <object-type name="QRegExpValidator"/> | |
1933 | <object-type name="QScrollArea"> |
|
1995 | <object-type name="QScrollArea"> | |
1934 | <modify-function signature="setWidget(QWidget*)"> |
|
1996 | <modify-function signature="setWidget(QWidget*)"> | |
1935 | <modify-argument index="1"> |
|
1997 | <modify-argument index="1"> | |
1936 | <reference-count action="ignore"/> |
|
1998 | <reference-count action="ignore"/> | |
1937 | </modify-argument> |
|
1999 | </modify-argument> | |
1938 |
</modify-function> |
|
2000 | </modify-function> | |
1939 | </object-type> |
|
2001 | </object-type> | |
1940 | <object-type name="QSessionManager"/> |
|
2002 | <object-type name="QSessionManager"/> | |
1941 | <object-type name="QShortcut"> |
|
2003 | <object-type name="QShortcut"> | |
@@ -1949,11 +2011,11 | |||||
1949 | </modify-argument> |
|
2011 | </modify-argument> | |
1950 | <modify-argument index="5"> |
|
2012 | <modify-argument index="5"> | |
1951 | <remove-default-expression/> |
|
2013 | <remove-default-expression/> | |
1952 |
</modify-argument> |
|
2014 | </modify-argument> | |
1953 |
</modify-function> |
|
2015 | </modify-function> | |
1954 | </object-type> |
|
2016 | </object-type> | |
1955 | <object-type name="QSizeGrip"/> |
|
2017 | <object-type name="QSizeGrip"/> | |
1956 |
<object-type name="QSound"/> |
|
2018 | <object-type name="QSound"/> | |
1957 | <object-type name="QSpacerItem"/> |
|
2019 | <object-type name="QSpacerItem"/> | |
1958 | <object-type name="QStandardItem"> |
|
2020 | <object-type name="QStandardItem"> | |
1959 | <modify-function signature="operator=(QStandardItem)" remove="all"/> |
|
2021 | <modify-function signature="operator=(QStandardItem)" remove="all"/> | |
@@ -1968,7 +2030,7 | |||||
1968 | </modify-function> |
|
2030 | </modify-function> | |
1969 |
|
2031 | |||
1970 | </object-type> |
|
2032 | </object-type> | |
1971 |
<object-type name="QStatusBar"> |
|
2033 | <object-type name="QStatusBar"> | |
1972 | <modify-function signature="addPermanentWidget(QWidget *, int)"> |
|
2034 | <modify-function signature="addPermanentWidget(QWidget *, int)"> | |
1973 | <modify-argument index="1"> |
|
2035 | <modify-argument index="1"> | |
1974 | <reference-count action="ignore"/> |
|
2036 | <reference-count action="ignore"/> | |
@@ -2012,7 +2074,7 | |||||
2012 | <reference-count action="set" variable-name="__rcDocument"/> |
|
2074 | <reference-count action="set" variable-name="__rcDocument"/> | |
2013 | </modify-argument> |
|
2075 | </modify-argument> | |
2014 | </modify-function> |
|
2076 | </modify-function> | |
2015 |
|
2077 | |||
2016 | </object-type> |
|
2078 | </object-type> | |
2017 | <object-type name="QSystemTrayIcon"> |
|
2079 | <object-type name="QSystemTrayIcon"> | |
2018 | <modify-function signature="setContextMenu(QMenu*)"> |
|
2080 | <modify-function signature="setContextMenu(QMenu*)"> | |
@@ -2042,8 +2104,8 | |||||
2042 | <no-null-pointer/> |
|
2104 | <no-null-pointer/> | |
2043 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> |
|
2105 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> | |
2044 | </modify-argument> |
|
2106 | </modify-argument> | |
2045 |
</modify-function> |
|
2107 | </modify-function> | |
2046 |
|
2108 | |||
2047 | <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3--> |
|
2109 | <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3--> | |
2048 | </object-type> |
|
2110 | </object-type> | |
2049 | <object-type name="QTextBlockGroup" delete-in-main-thread="yes"/> |
|
2111 | <object-type name="QTextBlockGroup" delete-in-main-thread="yes"/> | |
@@ -2051,15 +2113,22 | |||||
2051 | <object-type name="QTextItem" delete-in-main-thread="yes"/> |
|
2113 | <object-type name="QTextItem" delete-in-main-thread="yes"/> | |
2052 | <object-type name="QTextList" delete-in-main-thread="yes"> |
|
2114 | <object-type name="QTextList" delete-in-main-thread="yes"> | |
2053 | <modify-function signature="format()const" rename="textListFormat"/> |
|
2115 | <modify-function signature="format()const" rename="textListFormat"/> | |
2054 |
|
2116 | |||
2055 | <modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2117 | <modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3--> | |
2056 | </object-type> |
|
2118 | </object-type> | |
2057 | <object-type name="QTextObject" delete-in-main-thread="yes"/> |
|
2119 | <object-type name="QTextObject" delete-in-main-thread="yes"/> | |
2058 | <object-type name="QTextObjectInterface" delete-in-main-thread="yes"> |
|
2120 | ||
|
2121 | <!-- The original QTextObjectInterface has been rejected and replaced by this, since the original | |||
|
2122 | usage is based on an interface pattern we can't mimic in Java (our users can't implement our | |||
|
2123 | interfaces.) The new class inherits both QObject and QTextObjectInterface, and can be extended | |||
|
2124 | in Java to get a type that can properly be used with registerHandler() in | |||
|
2125 | QAbstractTextDocumentLayout. --> | |||
|
2126 | <object-type name="QtJambiTextObjectInterface" delete-in-main-thread="yes" java-name="QTextObjectInterface"> | |||
2059 | <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)"> |
|
2127 | <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)"> | |
2060 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
2128 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2061 | </modify-function> |
|
2129 | </modify-function> | |
2062 | </object-type> |
|
2130 | </object-type> | |
|
2131 | ||||
2063 | <object-type name="QTimeEdit"/> |
|
2132 | <object-type name="QTimeEdit"/> | |
2064 | <object-type name="QToolBox"> |
|
2133 | <object-type name="QToolBox"> | |
2065 | <modify-function signature="addItem(QWidget*,QString)"> |
|
2134 | <modify-function signature="addItem(QWidget*,QString)"> | |
@@ -2092,7 +2161,7 | |||||
2092 | <modify-function signature="initStyleOption(QStyleOptionToolButton*)const"> |
|
2161 | <modify-function signature="initStyleOption(QStyleOptionToolButton*)const"> | |
2093 | <access modifier="private"/> |
|
2162 | <access modifier="private"/> | |
2094 | </modify-function> |
|
2163 | </modify-function> | |
2095 |
|
2164 | |||
2096 | <modify-function signature="setDefaultAction(QAction *)"> |
|
2165 | <modify-function signature="setDefaultAction(QAction *)"> | |
2097 | <modify-argument index="1"> |
|
2166 | <modify-argument index="1"> | |
2098 | <reference-count action="set" variable-name="__rcDefaultAction"/> |
|
2167 | <reference-count action="set" variable-name="__rcDefaultAction"/> | |
@@ -2106,7 +2175,7 | |||||
2106 | </object-type> |
|
2175 | </object-type> | |
2107 | <object-type name="QToolTip"/> |
|
2176 | <object-type name="QToolTip"/> | |
2108 | <object-type name="QTreeView"> |
|
2177 | <object-type name="QTreeView"> | |
2109 |
|
2178 | |||
2110 | <modify-function signature="drawBranches(QPainter*,QRect,QModelIndex)const"> |
|
2179 | <modify-function signature="drawBranches(QPainter*,QRect,QModelIndex)const"> | |
2111 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
2180 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2112 | </modify-function> |
|
2181 | </modify-function> | |
@@ -2129,8 +2198,8 | |||||
2129 | <no-null-pointer/> |
|
2198 | <no-null-pointer/> | |
2130 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> |
|
2199 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> | |
2131 | </modify-argument> |
|
2200 | </modify-argument> | |
2132 |
</modify-function> |
|
2201 | </modify-function> | |
2133 |
|
2202 | |||
2134 | <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3--> |
|
2203 | <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3--> | |
2135 | </object-type> |
|
2204 | </object-type> | |
2136 | <object-type name="QUndoCommand"> |
|
2205 | <object-type name="QUndoCommand"> | |
@@ -2157,7 +2226,7 | |||||
2157 | </object-type> |
|
2226 | </object-type> | |
2158 |
|
2227 | |||
2159 | <object-type name="QUndoStack"/> |
|
2228 | <object-type name="QUndoStack"/> | |
2160 |
|
|
2229 | ||
2161 | <object-type name="QUndoView"> |
|
2230 | <object-type name="QUndoView"> | |
2162 | <modify-function signature="setGroup(QUndoGroup *)"> |
|
2231 | <modify-function signature="setGroup(QUndoGroup *)"> | |
2163 | <modify-argument index="1"> |
|
2232 | <modify-argument index="1"> | |
@@ -2190,11 +2259,11 | |||||
2190 | </modify-argument> |
|
2259 | </modify-argument> | |
2191 | </modify-function> |
|
2260 | </modify-function> | |
2192 | </object-type> |
|
2261 | </object-type> | |
2193 |
<object-type name="QWidgetItem" /> |
|
2262 | <object-type name="QWidgetItem" /> | |
2194 | <object-type name="QWindowsStyle"> |
|
2263 | <object-type name="QWindowsStyle"> | |
2195 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2264 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
2196 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
2265 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
2197 |
</object-type> |
|
2266 | </object-type> | |
2198 | <object-type name="QWorkspace"> |
|
2267 | <object-type name="QWorkspace"> | |
2199 | <modify-function signature="addWindow(QWidget*,QFlags<Qt::WindowType>)"> |
|
2268 | <modify-function signature="addWindow(QWidget*,QFlags<Qt::WindowType>)"> | |
2200 | <modify-argument index="1"> |
|
2269 | <modify-argument index="1"> | |
@@ -2207,39 +2276,39 | |||||
2207 | </modify-argument> |
|
2276 | </modify-argument> | |
2208 | </modify-function> |
|
2277 | </modify-function> | |
2209 | </object-type> |
|
2278 | </object-type> | |
2210 |
|
2279 | |||
2211 | <object-type name="QActionEvent" polymorphic-id-expression="%1->type() == QEvent::ActionAdded || %1->type() == QEvent::ActionRemoved || %1->type() == QEvent::ActionChanged"/> |
|
2280 | <object-type name="QActionEvent" polymorphic-id-expression="%1->type() == QEvent::ActionAdded || %1->type() == QEvent::ActionRemoved || %1->type() == QEvent::ActionChanged"/> | |
2212 | <object-type name="QClipboardEvent" polymorphic-id-expression="%1->type() == QEvent::Clipboard"/> |
|
2281 | <object-type name="QClipboardEvent" polymorphic-id-expression="%1->type() == QEvent::Clipboard"/> | |
2213 |
<object-type name="QCloseEvent" polymorphic-id-expression="%1->type() == QEvent::Close"/> |
|
2282 | <object-type name="QCloseEvent" polymorphic-id-expression="%1->type() == QEvent::Close"/> | |
2214 | <object-type name="QContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::ContextMenu"/> |
|
2283 | <object-type name="QContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::ContextMenu"/> | |
2215 | <object-type name="QDragEnterEvent" polymorphic-id-expression="%1->type() == QEvent::DragEnter"/> |
|
2284 | <object-type name="QDragEnterEvent" polymorphic-id-expression="%1->type() == QEvent::DragEnter"/> | |
2216 | <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1->type() == QEvent::DragLeave"/> |
|
2285 | <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1->type() == QEvent::DragLeave"/> | |
2217 | <object-type name="QDragMoveEvent" polymorphic-id-expression="%1->type() == QEvent::DragMove"> |
|
2286 | <object-type name="QDragMoveEvent" polymorphic-id-expression="%1->type() == QEvent::DragMove"> | |
2218 | <modify-function signature="accept()" remove="all"/> |
|
2287 | <modify-function signature="accept()" remove="all"/> | |
2219 |
<modify-function signature="ignore()" remove="all"/> |
|
2288 | <modify-function signature="ignore()" remove="all"/> | |
2220 |
</object-type> |
|
2289 | </object-type> | |
2221 | <object-type name="QDropEvent" polymorphic-id-expression="%1->type() == QEvent::Drop"> |
|
2290 | <object-type name="QDropEvent" polymorphic-id-expression="%1->type() == QEvent::Drop"> | |
2222 | <modify-function signature="encodedData(const char*)const"> |
|
2291 | <modify-function signature="encodedData(const char*)const"> | |
2223 | <remove/> |
|
2292 | <remove/> | |
2224 | </modify-function> |
|
2293 | </modify-function> | |
2225 |
|
2294 | |||
2226 | <modify-function signature="format(int)const"> |
|
2295 | <modify-function signature="format(int)const"> | |
2227 | <remove/> |
|
2296 | <remove/> | |
2228 | </modify-function> |
|
2297 | </modify-function> | |
2229 |
|
2298 | |||
2230 | <modify-function signature="provides(const char*)const"> |
|
2299 | <modify-function signature="provides(const char*)const"> | |
2231 | <remove/> |
|
2300 | <remove/> | |
2232 | </modify-function> |
|
2301 | </modify-function> | |
2233 |
|
2302 | |||
2234 |
|
2303 | |||
2235 | </object-type> |
|
2304 | </object-type> | |
2236 | <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> |
|
2305 | <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> | |
2237 | <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> |
|
2306 | <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> | |
2238 | <modify-function signature="reason()const"> |
|
2307 | <modify-function signature="reason()const"> | |
2239 | <remove/> |
|
2308 | <remove/> | |
2240 |
</modify-function> |
|
2309 | </modify-function> | |
2241 | </object-type> |
|
2310 | </object-type> | |
2242 |
|
2311 | |||
2243 | <object-type name="QGraphicsSceneContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneContextMenu"/> |
|
2312 | <object-type name="QGraphicsSceneContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneContextMenu"/> | |
2244 | <object-type name="QGraphicsSceneDragDropEvent" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneDragEnter || %1->type() == QEvent::GraphicsSceneDragLeave || %1->type() == QEvent::GraphicsSceneDragMove || %1->type() == QEvent::GraphicsSceneDrop"> |
|
2313 | <object-type name="QGraphicsSceneDragDropEvent" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneDragEnter || %1->type() == QEvent::GraphicsSceneDragLeave || %1->type() == QEvent::GraphicsSceneDragMove || %1->type() == QEvent::GraphicsSceneDrop"> | |
2245 | <modify-function signature="setMimeData(const QMimeData *)"> |
|
2314 | <modify-function signature="setMimeData(const QMimeData *)"> | |
@@ -2271,13 +2340,13 | |||||
2271 | <!-- All these have const overloads that are used instead --> |
|
2340 | <!-- All these have const overloads that are used instead --> | |
2272 | <modify-function signature="isAmbiguous()"> |
|
2341 | <modify-function signature="isAmbiguous()"> | |
2273 | <remove/> |
|
2342 | <remove/> | |
2274 |
</modify-function> |
|
2343 | </modify-function> | |
2275 | <modify-function signature="shortcutId()"> |
|
2344 | <modify-function signature="shortcutId()"> | |
2276 | <remove/> |
|
2345 | <remove/> | |
2277 |
</modify-function> |
|
2346 | </modify-function> | |
2278 | <modify-function signature="key()"> |
|
2347 | <modify-function signature="key()"> | |
2279 | <remove/> |
|
2348 | <remove/> | |
2280 |
</modify-function> |
|
2349 | </modify-function> | |
2281 | </object-type> |
|
2350 | </object-type> | |
2282 | <object-type name="QShowEvent" polymorphic-id-expression="%1->type() == QEvent::Show"/> |
|
2351 | <object-type name="QShowEvent" polymorphic-id-expression="%1->type() == QEvent::Show"/> | |
2283 | <object-type name="QStatusTipEvent" polymorphic-id-expression="%1->type() == QEvent::StatusTip"/> |
|
2352 | <object-type name="QStatusTipEvent" polymorphic-id-expression="%1->type() == QEvent::StatusTip"/> | |
@@ -2287,20 +2356,20 | |||||
2287 | <object-type name="QWheelEvent" polymorphic-id-expression="%1->type() == QEvent::Wheel"/> |
|
2356 | <object-type name="QWheelEvent" polymorphic-id-expression="%1->type() == QEvent::Wheel"/> | |
2288 | <object-type name="QWindowStateChangeEvent" polymorphic-id-expression="%1->type() == QEvent::WindowStateChange"/> |
|
2357 | <object-type name="QWindowStateChangeEvent" polymorphic-id-expression="%1->type() == QEvent::WindowStateChange"/> | |
2289 | <object-type name="QDragResponseEvent" polymorphic-id-expression="%1->type() == QEvent::DragResponse"/> |
|
2358 | <object-type name="QDragResponseEvent" polymorphic-id-expression="%1->type() == QEvent::DragResponse"/> | |
2290 |
<object-type name="QInputEvent"> |
|
2359 | <object-type name="QInputEvent"> | |
2291 | <modify-function signature="modifiers()const" access="non-final"/> |
|
2360 | <modify-function signature="modifiers()const" access="non-final"/> | |
2292 | </object-type> |
|
2361 | </object-type> | |
2293 | <object-type name="QKeyEvent" polymorphic-id-expression="%1->type() == QEvent::KeyPress || %1->type() == QEvent::KeyRelease"/> |
|
2362 | <object-type name="QKeyEvent" polymorphic-id-expression="%1->type() == QEvent::KeyPress || %1->type() == QEvent::KeyRelease"/> | |
2294 | <object-type name="QMouseEvent" polymorphic-id-expression="%1->type() == QEvent::MouseButtonDblClick || %1->type() == QEvent::MouseButtonPress || %1->type() == QEvent::MouseButtonRelease || %1->type() == QEvent::MouseMove"/> |
|
2363 | <object-type name="QMouseEvent" polymorphic-id-expression="%1->type() == QEvent::MouseButtonDblClick || %1->type() == QEvent::MouseButtonPress || %1->type() == QEvent::MouseButtonRelease || %1->type() == QEvent::MouseMove"/> | |
2295 | <object-type name="QPaintEvent" polymorphic-id-expression="%1->type() == QEvent::Paint"/> |
|
2364 | <object-type name="QPaintEvent" polymorphic-id-expression="%1->type() == QEvent::Paint"/> | |
2296 | <object-type name="QAccessibleEvent" polymorphic-id-expression="%1->type() == QEvent::AccessibilityDescription || %1->type() == QEvent::AccessibilityHelp"/> |
|
2365 | <object-type name="QAccessibleEvent" polymorphic-id-expression="%1->type() == QEvent::AccessibilityDescription || %1->type() == QEvent::AccessibilityHelp"/> | |
2297 |
|
2366 | |||
2298 | <object-type name="QAbstractButton" /> |
|
2367 | <object-type name="QAbstractButton" /> | |
2299 |
|
2368 | |||
2300 | <object-type name="QStyle"> |
|
2369 | <object-type name="QStyle"> | |
2301 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
2370 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
2302 | <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes" /> |
|
2371 | <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes" /> | |
2303 |
|
2372 | |||
2304 | <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const"> |
|
2373 | <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const"> | |
2305 | <modify-argument index="3" invalidate-after-use="yes" /> |
|
2374 | <modify-argument index="3" invalidate-after-use="yes" /> | |
2306 | </modify-function> |
|
2375 | </modify-function> | |
@@ -2323,21 +2392,32 | |||||
2323 | </object-type> |
|
2392 | </object-type> | |
2324 |
|
2393 | |||
2325 | <object-type name="QColorDialog"> |
|
2394 | <object-type name="QColorDialog"> | |
|
2395 | ||||
2326 | <modify-function signature="getColor(const QColor &, QWidget *)"> |
|
2396 | <modify-function signature="getColor(const QColor &, QWidget *)"> | |
2327 | <modify-argument index="1"> |
|
2397 | <modify-argument index="1"> | |
2328 |
<replace-default-expression with="QColor.white"/> |
|
2398 | <replace-default-expression with="QColor.white"/> | |
2329 | </modify-argument> |
|
2399 | </modify-argument> | |
2330 | </modify-function> |
|
2400 | </modify-function> | |
2331 | <modify-function signature="getRgba(uint,bool*,QWidget*)"> |
|
2401 | <modify-function signature="getRgba(uint,bool*,QWidget*)"> | |
2332 | <remove/> |
|
2402 | <rename to="getRgba_internal"/> | |
2333 | </modify-function> |
|
2403 | <access modifier="private"/> | |
|
2404 | <modify-argument index="1"> | |||
|
2405 | <remove-default-expression /> | |||
|
2406 | </modify-argument> | |||
|
2407 | <modify-argument index="2"> | |||
|
2408 | <remove-default-expression /> | |||
|
2409 | </modify-argument> | |||
|
2410 | <modify-argument index="3"> | |||
|
2411 | <remove-default-expression /> | |||
|
2412 | </modify-argument> | |||
|
2413 | </modify-function> | |||
2334 | </object-type> |
|
2414 | </object-type> | |
2335 |
|
2415 | |||
2336 |
<object-type name="QLayout"> |
|
2416 | <object-type name="QLayout"> | |
2337 | <modify-function signature="addItem(QLayoutItem*)"> |
|
2417 | <modify-function signature="addItem(QLayoutItem*)"> | |
2338 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
2418 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2339 | </modify-function> |
|
2419 | </modify-function> | |
2340 |
|
2420 | |||
2341 | <modify-function signature="setSpacing(int)" rename="setWidgetSpacing"/> |
|
2421 | <modify-function signature="setSpacing(int)" rename="setWidgetSpacing"/> | |
2342 | <modify-function signature="spacing()const" rename="widgetSpacing"/> |
|
2422 | <modify-function signature="spacing()const" rename="widgetSpacing"/> | |
2343 | <modify-function signature="addWidget(QWidget *)"> |
|
2423 | <modify-function signature="addWidget(QWidget *)"> | |
@@ -2351,14 +2431,14 | |||||
2351 | <no-null-pointer/> |
|
2431 | <no-null-pointer/> | |
2352 | <reference-count variable-name="__rcWidgets" action="add"/> |
|
2432 | <reference-count variable-name="__rcWidgets" action="add"/> | |
2353 | </modify-argument> |
|
2433 | </modify-argument> | |
2354 |
</modify-function> |
|
2434 | </modify-function> | |
2355 | <modify-function signature="removeWidget(QWidget *)"> |
|
2435 | <modify-function signature="removeWidget(QWidget *)"> | |
2356 | <modify-argument index="1"> |
|
2436 | <modify-argument index="1"> | |
2357 | <no-null-pointer/> |
|
2437 | <no-null-pointer/> | |
2358 | <reference-count variable-name="__rcWidgets" action="remove"/> |
|
2438 | <reference-count variable-name="__rcWidgets" action="remove"/> | |
2359 | </modify-argument> |
|
2439 | </modify-argument> | |
2360 | </modify-function> |
|
2440 | </modify-function> | |
2361 |
|
2441 | |||
2362 | <modify-function signature="setAlignment(QWidget*,QFlags<Qt::AlignmentFlag>)"> |
|
2442 | <modify-function signature="setAlignment(QWidget*,QFlags<Qt::AlignmentFlag>)"> | |
2363 | <modify-argument index="1"> |
|
2443 | <modify-argument index="1"> | |
2364 | <reference-count action="ignore"/> |
|
2444 | <reference-count action="ignore"/> | |
@@ -2377,12 +2457,12 | |||||
2377 | <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> |
|
2457 | <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> | |
2378 | <access modifier="private"/> |
|
2458 | <access modifier="private"/> | |
2379 | </modify-function> |
|
2459 | </modify-function> | |
2380 |
|
2460 | |||
2381 | <modify-function signature="margin()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2461 | <modify-function signature="margin()const" remove="all"/> <!--### Obsolete in 4.3--> | |
2382 | <!-- <modify-function signature="setMargin(int)" remove="all"/> --> <!--### Obsolete in 4.3--> |
|
2462 | <!-- <modify-function signature="setMargin(int)" remove="all"/> --> <!--### Obsolete in 4.3--> | |
2383 | </object-type> |
|
2463 | </object-type> | |
2384 |
|
2464 | |||
2385 |
<object-type name="QStackedLayout"> |
|
2465 | <object-type name="QStackedLayout"> | |
2386 | <modify-function signature="addItem(QLayoutItem *)"> |
|
2466 | <modify-function signature="addItem(QLayoutItem *)"> | |
2387 | <modify-argument index="1"> |
|
2467 | <modify-argument index="1"> | |
2388 | <define-ownership class="java" owner="c++"/> |
|
2468 | <define-ownership class="java" owner="c++"/> | |
@@ -2399,7 +2479,7 | |||||
2399 | <no-null-pointer/> |
|
2479 | <no-null-pointer/> | |
2400 | <reference-count action="add" declare-variable="QLayout" variable-name="__rcWidgets"/> |
|
2480 | <reference-count action="add" declare-variable="QLayout" variable-name="__rcWidgets"/> | |
2401 | </modify-argument> |
|
2481 | </modify-argument> | |
2402 |
</modify-function> |
|
2482 | </modify-function> | |
2403 | <modify-function signature="insertWidget(int,QWidget*)"> |
|
2483 | <modify-function signature="insertWidget(int,QWidget*)"> | |
2404 | <modify-argument index="2"> |
|
2484 | <modify-argument index="2"> | |
2405 | <no-null-pointer/> |
|
2485 | <no-null-pointer/> | |
@@ -2413,13 +2493,13 | |||||
2413 | </modify-argument> |
|
2493 | </modify-argument> | |
2414 | </modify-function> |
|
2494 | </modify-function> | |
2415 | </object-type> |
|
2495 | </object-type> | |
2416 |
|
2496 | |||
2417 |
<object-type name="QBoxLayout"> |
|
2497 | <object-type name="QBoxLayout"> | |
2418 | <modify-function signature="addWidget(QWidget *, int, QFlags<Qt::AlignmentFlag>)"> |
|
2498 | <modify-function signature="addWidget(QWidget *, int, QFlags<Qt::AlignmentFlag>)"> | |
2419 | <modify-argument index="1"> |
|
2499 | <modify-argument index="1"> | |
2420 | <no-null-pointer/> |
|
2500 | <no-null-pointer/> | |
2421 | </modify-argument> |
|
2501 | </modify-argument> | |
2422 |
</modify-function> |
|
2502 | </modify-function> | |
2423 | <modify-function signature="addItem(QLayoutItem *)"> |
|
2503 | <modify-function signature="addItem(QLayoutItem *)"> | |
2424 | <modify-argument index="1"> |
|
2504 | <modify-argument index="1"> | |
2425 | <define-ownership class="java" owner="c++"/> |
|
2505 | <define-ownership class="java" owner="c++"/> | |
@@ -2429,12 +2509,12 | |||||
2429 | <modify-argument index="2"> |
|
2509 | <modify-argument index="2"> | |
2430 | <define-ownership class="java" owner="c++"/> |
|
2510 | <define-ownership class="java" owner="c++"/> | |
2431 | </modify-argument> |
|
2511 | </modify-argument> | |
2432 |
</modify-function> |
|
2512 | </modify-function> | |
2433 | <modify-function signature="insertItem(int, QLayoutItem *)"> |
|
2513 | <modify-function signature="insertItem(int, QLayoutItem *)"> | |
2434 | <modify-argument index="2"> |
|
2514 | <modify-argument index="2"> | |
2435 | <define-ownership class="java" owner="c++"/> |
|
2515 | <define-ownership class="java" owner="c++"/> | |
2436 |
</modify-argument> |
|
2516 | </modify-argument> | |
2437 |
</modify-function> |
|
2517 | </modify-function> | |
2438 | <modify-function signature="addSpacerItem(QSpacerItem*)"> |
|
2518 | <modify-function signature="addSpacerItem(QSpacerItem*)"> | |
2439 | <modify-argument index="1"> |
|
2519 | <modify-argument index="1"> | |
2440 | <define-ownership class="java" owner="c++" /> |
|
2520 | <define-ownership class="java" owner="c++" /> | |
@@ -2445,7 +2525,7 | |||||
2445 | <define-ownership class="java" owner="c++" /> |
|
2525 | <define-ownership class="java" owner="c++" /> | |
2446 | </modify-argument> |
|
2526 | </modify-argument> | |
2447 | </modify-function> |
|
2527 | </modify-function> | |
2448 |
|
2528 | |||
2449 | <modify-function signature="addLayout(QLayout *, int)"> |
|
2529 | <modify-function signature="addLayout(QLayout *, int)"> | |
2450 | <modify-argument index="1"> |
|
2530 | <modify-argument index="1"> | |
2451 | <define-ownership class="java" owner="c++"/> |
|
2531 | <define-ownership class="java" owner="c++"/> | |
@@ -2473,7 +2553,7 | |||||
2473 | </modify-function> |
|
2553 | </modify-function> | |
2474 | </object-type> |
|
2554 | </object-type> | |
2475 |
|
2555 | |||
2476 |
<object-type name="QGridLayout"> |
|
2556 | <object-type name="QGridLayout"> | |
2477 | <modify-function signature="addWidget(QWidget *)" remove="all"/> |
|
2557 | <modify-function signature="addWidget(QWidget *)" remove="all"/> | |
2478 | <modify-function signature="addItem(QLayoutItem *)"> |
|
2558 | <modify-function signature="addItem(QLayoutItem *)"> | |
2479 | <modify-argument index="1"> |
|
2559 | <modify-argument index="1"> | |
@@ -2484,7 +2564,7 | |||||
2484 | <modify-argument index="1"> |
|
2564 | <modify-argument index="1"> | |
2485 | <define-ownership class="java" owner="c++"/> |
|
2565 | <define-ownership class="java" owner="c++"/> | |
2486 | </modify-argument> |
|
2566 | </modify-argument> | |
2487 |
</modify-function> |
|
2567 | </modify-function> | |
2488 | <modify-function signature="addLayout(QLayout *, int, int, QFlags<Qt::AlignmentFlag>)"> |
|
2568 | <modify-function signature="addLayout(QLayout *, int, int, QFlags<Qt::AlignmentFlag>)"> | |
2489 | <modify-argument index="1"> |
|
2569 | <modify-argument index="1"> | |
2490 | <define-ownership class="java" owner="c++"/> |
|
2570 | <define-ownership class="java" owner="c++"/> | |
@@ -2494,7 +2574,7 | |||||
2494 | <modify-argument index="1"> |
|
2574 | <modify-argument index="1"> | |
2495 | <define-ownership class="java" owner="c++"/> |
|
2575 | <define-ownership class="java" owner="c++"/> | |
2496 | </modify-argument> |
|
2576 | </modify-argument> | |
2497 |
</modify-function> |
|
2577 | </modify-function> | |
2498 | <modify-function signature="addWidget(QWidget*,int,int,QFlags<Qt::AlignmentFlag>)"> |
|
2578 | <modify-function signature="addWidget(QWidget*,int,int,QFlags<Qt::AlignmentFlag>)"> | |
2499 | <modify-argument index="1"> |
|
2579 | <modify-argument index="1"> | |
2500 | <reference-count declare-variable="QLayout" action="add" variable-name="__rcWidgets"/> |
|
2580 | <reference-count declare-variable="QLayout" action="add" variable-name="__rcWidgets"/> | |
@@ -2514,12 +2594,17 | |||||
2514 | <access modifier="private"/> |
|
2594 | <access modifier="private"/> | |
2515 | </modify-function> |
|
2595 | </modify-function> | |
2516 | </object-type> |
|
2596 | </object-type> | |
2517 |
|
2597 | |||
2518 | <object-type name="QGraphicsView"> |
|
2598 | <object-type name="QGraphicsView"> | |
2519 | <extra-includes> |
|
2599 | <extra-includes> | |
2520 | <include file-name="QPainterPath" location="global"/> |
|
2600 | <include file-name="QPainterPath" location="global"/> | |
2521 |
<include file-name="QVarLengthArray" location="global"/> |
|
2601 | <include file-name="QVarLengthArray" location="global"/> | |
2522 |
</extra-includes> |
|
2602 | </extra-includes> | |
|
2603 | <modify-function signature="fitInView(const QGraphicsItem *, Qt::AspectRatioMode)"> | |||
|
2604 | <modify-argument index="1"> | |||
|
2605 | <no-null-pointer /> | |||
|
2606 | </modify-argument> | |||
|
2607 | </modify-function> | |||
2523 | <modify-function signature="setupViewport(QWidget *)" access="non-final"/> |
|
2608 | <modify-function signature="setupViewport(QWidget *)" access="non-final"/> | |
2524 | <modify-function signature="setScene(QGraphicsScene*)"> |
|
2609 | <modify-function signature="setScene(QGraphicsScene*)"> | |
2525 | <modify-argument index="1"> |
|
2610 | <modify-argument index="1"> | |
@@ -2531,7 +2616,7 | |||||
2531 | <reference-count action="ignore"/> |
|
2616 | <reference-count action="ignore"/> | |
2532 | </modify-argument> |
|
2617 | </modify-argument> | |
2533 | </modify-function> |
|
2618 | </modify-function> | |
2534 |
|
2619 | |||
2535 | <modify-function signature="drawBackground(QPainter*,QRectF)"> |
|
2620 | <modify-function signature="drawBackground(QPainter*,QRectF)"> | |
2536 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
2621 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2537 | </modify-function> |
|
2622 | </modify-function> | |
@@ -2541,8 +2626,7 | |||||
2541 | <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)"> |
|
2626 | <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)"> | |
2542 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
2627 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2543 | </modify-function> |
|
2628 | </modify-function> | |
2544 |
|
2629 | |||
2545 | <!-- |
|
|||
2546 | <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)"> |
|
2630 | <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)"> | |
2547 | <modify-argument index="2"> |
|
2631 | <modify-argument index="2"> | |
2548 | <remove-argument/> |
|
2632 | <remove-argument/> | |
@@ -2554,8 +2638,8 | |||||
2554 | <replace from="%ARRAY" to="%3"/> |
|
2638 | <replace from="%ARRAY" to="%3"/> | |
2555 | </insert-template> |
|
2639 | </insert-template> | |
2556 | int __length = %out; |
|
2640 | int __length = %out; | |
2557 |
</conversion-rule> |
|
2641 | </conversion-rule> | |
2558 |
</modify-argument> |
|
2642 | </modify-argument> | |
2559 |
|
2643 | |||
2560 | <modify-argument index="3"> |
|
2644 | <modify-argument index="3"> | |
2561 | <replace-type modified-type="com.trolltech.qt.gui.QGraphicsItemInterface[]"/> |
|
2645 | <replace-type modified-type="com.trolltech.qt.gui.QGraphicsItemInterface[]"/> | |
@@ -2563,33 +2647,64 | |||||
2563 | <insert-template name="gui.convert_graphicsitem_array_to_java"> |
|
2647 | <insert-template name="gui.convert_graphicsitem_array_to_java"> | |
2564 | <replace from="%LENGTH" to="%2"/> |
|
2648 | <replace from="%LENGTH" to="%2"/> | |
2565 | </insert-template> |
|
2649 | </insert-template> | |
|
2650 | jobjectArray graphicsItemArrayHolder = %out; | |||
2566 | </conversion-rule> |
|
2651 | </conversion-rule> | |
2567 | <conversion-rule class="native"> |
|
2652 | <conversion-rule class="native"> | |
2568 |
<insert-template name="gui.convert_graphicsitem_array_from_java"/> |
|
2653 | <insert-template name="gui.convert_graphicsitem_array_from_java"/> | |
2569 |
</conversion-rule> |
|
2654 | </conversion-rule> | |
2570 |
</modify-argument> |
|
2655 | </modify-argument> | |
2571 |
|
2656 | |||
2572 | <modify-argument index="4"> |
|
2657 | <modify-argument index="4"> | |
2573 | <replace-type modified-type="com.trolltech.qt.gui.QStyleOptionGraphicsItem[]"/> |
|
2658 | <replace-type modified-type="com.trolltech.qt.gui.QStyleOptionGraphicsItem[]"/> | |
2574 | <conversion-rule class="shell"> |
|
2659 | <conversion-rule class="shell"> | |
2575 | <insert-template name="gui.convert_styleoptiongraphicsitem_array_to_java"> |
|
2660 | <insert-template name="gui.convert_styleoptiongraphicsitem_array_to_java"> | |
2576 | <replace from="%LENGTH" to="%2"/> |
|
2661 | <replace from="%LENGTH" to="%2"/> | |
2577 | </insert-template> |
|
2662 | </insert-template> | |
|
2663 | jobjectArray styleOptionArrayHolder = %out; | |||
2578 | </conversion-rule> |
|
2664 | </conversion-rule> | |
2579 | <conversion-rule class="native"> |
|
2665 | <conversion-rule class="native"> | |
2580 | <insert-template name="gui.convert_styleoptiongraphicsitem_array_from_java"/> |
|
2666 | <insert-template name="gui.convert_styleoptiongraphicsitem_array_from_java"/> | |
2581 |
</conversion-rule> |
|
2667 | </conversion-rule> | |
2582 | </modify-argument> |
|
2668 | </modify-argument> | |
|
2669 | ||||
|
2670 | <modify-argument index="return"> | |||
|
2671 | <conversion-rule class="shell"> | |||
|
2672 | qtjambi_invalidate_array(__jni_env, styleOptionArrayHolder); | |||
|
2673 | qtjambi_invalidate_array(__jni_env, graphicsItemArrayHolder); | |||
|
2674 | </conversion-rule> | |||
|
2675 | </modify-argument> | |||
|
2676 | ||||
2583 | </modify-function> |
|
2677 | </modify-function> | |
2584 | --> |
|
|||
2585 | </object-type> |
|
2678 | </object-type> | |
2586 |
|
2679 | |||
2587 | <object-type name="QInputDialog"> |
|
2680 | <object-type name="QInputDialog"> | |
|
2681 | ||||
|
2682 | <modify-function signature="getInt(QWidget*,QString,QString,int,int,int,int,bool*,QFlags<Qt::WindowType>)"> | |||
|
2683 | <rename to="getInt_private" /> | |||
|
2684 | <access modifier="private" /> | |||
|
2685 | <modify-argument index="4"> | |||
|
2686 | <remove-default-expression /> | |||
|
2687 | </modify-argument> | |||
|
2688 | <modify-argument index="5"> | |||
|
2689 | <remove-default-expression /> | |||
|
2690 | </modify-argument> | |||
|
2691 | <modify-argument index="6"> | |||
|
2692 | <remove-default-expression /> | |||
|
2693 | </modify-argument> | |||
|
2694 | <modify-argument index="7"> | |||
|
2695 | <remove-default-expression /> | |||
|
2696 | </modify-argument> | |||
|
2697 | <modify-argument index="8"> | |||
|
2698 | <remove-default-expression /> | |||
|
2699 | </modify-argument> | |||
|
2700 | <modify-argument index="9"> | |||
|
2701 | <remove-default-expression /> | |||
|
2702 | </modify-argument> | |||
|
2703 | </modify-function> | |||
|
2704 | ||||
2588 | <modify-function signature="getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>)"> |
|
2705 | <modify-function signature="getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>)"> | |
2589 | <!-- |
|
|||
2590 | <rename to="getDouble_internal"/> |
|
2706 | <rename to="getDouble_internal"/> | |
2591 | <access modifier="private"/> |
|
2707 | <access modifier="private"/> | |
2592 | --> |
|
|||
2593 | <modify-argument index="4"> |
|
2708 | <modify-argument index="4"> | |
2594 | <remove-default-expression /> |
|
2709 | <remove-default-expression /> | |
2595 | </modify-argument> |
|
2710 | </modify-argument> | |
@@ -2607,14 +2722,12 | |||||
2607 | </modify-argument> |
|
2722 | </modify-argument> | |
2608 | <modify-argument index="9"> |
|
2723 | <modify-argument index="9"> | |
2609 | <remove-default-expression /> |
|
2724 | <remove-default-expression /> | |
2610 |
</modify-argument> |
|
2725 | </modify-argument> | |
2611 | </modify-function> |
|
2726 | </modify-function> | |
2612 |
|
2727 | |||
2613 | <modify-function signature="getInteger(QWidget *, const QString &, const QString &, int, int, int, int, bool *, QFlags<Qt::WindowType>)"> |
|
2728 | <modify-function signature="getInteger(QWidget *, const QString &, const QString &, int, int, int, int, bool *, QFlags<Qt::WindowType>)"> | |
2614 | <!-- |
|
|||
2615 | <rename to="getInteger_internal"/> |
|
2729 | <rename to="getInteger_internal"/> | |
2616 | <access modifier="private"/> |
|
2730 | <access modifier="private"/> | |
2617 | --> |
|
|||
2618 | <modify-argument index="4"> |
|
2731 | <modify-argument index="4"> | |
2619 | <remove-default-expression /> |
|
2732 | <remove-default-expression /> | |
2620 | </modify-argument> |
|
2733 | </modify-argument> | |
@@ -2632,14 +2745,12 | |||||
2632 | </modify-argument> |
|
2745 | </modify-argument> | |
2633 | <modify-argument index="9"> |
|
2746 | <modify-argument index="9"> | |
2634 | <remove-default-expression /> |
|
2747 | <remove-default-expression /> | |
2635 |
</modify-argument> |
|
2748 | </modify-argument> | |
2636 | </modify-function> |
|
2749 | </modify-function> | |
2637 |
|
2750 | |||
2638 | <modify-function signature="getItem(QWidget *, const QString &, const QString &, const QStringList<QString> &, int, bool, bool *, QFlags<Qt::WindowType>)"> |
|
2751 | <modify-function signature="getItem(QWidget *, const QString &, const QString &, const QStringList<QString> &, int, bool, bool *, QFlags<Qt::WindowType>)"> | |
2639 | <!-- |
|
|||
2640 | <rename to="getItem_internal"/> |
|
2752 | <rename to="getItem_internal"/> | |
2641 | <access modifier="private"/> |
|
2753 | <access modifier="private"/> | |
2642 | --> |
|
|||
2643 | <modify-argument index="4"> |
|
2754 | <modify-argument index="4"> | |
2644 | <remove-default-expression /> |
|
2755 | <remove-default-expression /> | |
2645 | </modify-argument> |
|
2756 | </modify-argument> | |
@@ -2656,12 +2767,10 | |||||
2656 | <remove-default-expression /> |
|
2767 | <remove-default-expression /> | |
2657 | </modify-argument> |
|
2768 | </modify-argument> | |
2658 | </modify-function> |
|
2769 | </modify-function> | |
2659 |
|
2770 | |||
2660 | <modify-function signature="getText(QWidget *, const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *, QFlags<Qt::WindowType>)"> |
|
2771 | <modify-function signature="getText(QWidget *, const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *, QFlags<Qt::WindowType>)"> | |
2661 | <!-- |
|
|||
2662 | <rename to="getText_internal"/> |
|
2772 | <rename to="getText_internal"/> | |
2663 | <access modifier="private"/> |
|
2773 | <access modifier="private"/> | |
2664 | --> |
|
|||
2665 | <modify-argument index="4"> |
|
2774 | <modify-argument index="4"> | |
2666 | <remove-default-expression /> |
|
2775 | <remove-default-expression /> | |
2667 | </modify-argument> |
|
2776 | </modify-argument> | |
@@ -2676,13 +2785,13 | |||||
2676 | </modify-argument> |
|
2785 | </modify-argument> | |
2677 | </modify-function> |
|
2786 | </modify-function> | |
2678 | </object-type> |
|
2787 | </object-type> | |
2679 |
|
2788 | |||
2680 |
|
2789 | |||
2681 | <object-type name="QGraphicsScene"> |
|
2790 | <object-type name="QGraphicsScene"> | |
2682 | <extra-includes> |
|
2791 | <extra-includes> | |
2683 | <include file-name="QVarLengthArray" location="global"/> |
|
2792 | <include file-name="QVarLengthArray" location="global"/> | |
2684 | </extra-includes> |
|
2793 | </extra-includes> | |
2685 |
|
2794 | |||
2686 | <modify-function signature="contextMenuEvent(QGraphicsSceneContextMenuEvent*)"> |
|
2795 | <modify-function signature="contextMenuEvent(QGraphicsSceneContextMenuEvent*)"> | |
2687 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
2796 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2688 | </modify-function> |
|
2797 | </modify-function> | |
@@ -2740,7 +2849,7 | |||||
2740 | <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)"> |
|
2849 | <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)"> | |
2741 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
2850 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2742 | </modify-function> |
|
2851 | </modify-function> | |
2743 |
|
2852 | |||
2744 | <modify-function signature="setActiveWindow(QGraphicsWidget*)"> |
|
2853 | <modify-function signature="setActiveWindow(QGraphicsWidget*)"> | |
2745 | <modify-argument index="1"> |
|
2854 | <modify-argument index="1"> | |
2746 | <reference-count action="ignore" /> |
|
2855 | <reference-count action="ignore" /> | |
@@ -2756,7 +2865,7 | |||||
2756 | <modify-argument index="1"> |
|
2865 | <modify-argument index="1"> | |
2757 | <define-ownership class="java" owner="c++"/> |
|
2866 | <define-ownership class="java" owner="c++"/> | |
2758 | </modify-argument> |
|
2867 | </modify-argument> | |
2759 |
</modify-function> |
|
2868 | </modify-function> | |
2760 | <modify-function signature="addEllipse(const QRectF &, const QPen &, const QBrush &)"> |
|
2869 | <modify-function signature="addEllipse(const QRectF &, const QPen &, const QBrush &)"> | |
2761 | <modify-argument index="return"> |
|
2870 | <modify-argument index="return"> | |
2762 | <define-ownership class="java" owner="c++"/> |
|
2871 | <define-ownership class="java" owner="c++"/> | |
@@ -2790,7 +2899,7 | |||||
2790 | <modify-function signature="addText(const QString &, const QFont &)"> |
|
2899 | <modify-function signature="addText(const QString &, const QFont &)"> | |
2791 | <modify-argument index="return"> |
|
2900 | <modify-argument index="return"> | |
2792 | <define-ownership class="java" owner="c++"/> |
|
2901 | <define-ownership class="java" owner="c++"/> | |
2793 |
</modify-argument> |
|
2902 | </modify-argument> | |
2794 | </modify-function> |
|
2903 | </modify-function> | |
2795 | <modify-function signature="addWidget(QWidget*,QFlags<Qt::WindowType>)"> |
|
2904 | <modify-function signature="addWidget(QWidget*,QFlags<Qt::WindowType>)"> | |
2796 | <modify-argument index="return"> |
|
2905 | <modify-argument index="return"> | |
@@ -2817,16 +2926,30 | |||||
2817 | <extra-includes> |
|
2926 | <extra-includes> | |
2818 | <include file-name="QTextCharFormat" location="global"/> |
|
2927 | <include file-name="QTextCharFormat" location="global"/> | |
2819 | </extra-includes> |
|
2928 | </extra-includes> | |
2820 |
|
2929 | |||
2821 | <modify-function signature="isHeaderVisible()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2930 | <modify-function signature="isHeaderVisible()const" remove="all"/> <!--### Obsolete in 4.3--> | |
2822 | <modify-function signature="setHeaderVisible(bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
2931 | <modify-function signature="setHeaderVisible(bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
2823 |
|
2932 | |||
2824 | <modify-function signature="paintCell(QPainter*,QRect,QDate)const"> |
|
2933 | <modify-function signature="paintCell(QPainter*,QRect,QDate)const"> | |
2825 | <modify-argument invalidate-after-use="yes" index="1" /> |
|
2934 | <modify-argument invalidate-after-use="yes" index="1" /> | |
2826 | </modify-function> |
|
2935 | </modify-function> | |
2827 | </object-type> |
|
2936 | </object-type> | |
2828 |
|
2937 | |||
2829 | <object-type name="QTreeWidget"> |
|
2938 | <object-type name="QTreeWidget"> | |
|
2939 | <modify-function signature="setSelectionModel(QItemSelectionModel*)"> | |||
|
2940 | <modify-argument index="1"> | |||
|
2941 | <no-null-pointer/> | |||
|
2942 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> | |||
|
2943 | </modify-argument> | |||
|
2944 | </modify-function> | |||
|
2945 | <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)"> | |||
|
2946 | <modify-argument index="1"> | |||
|
2947 | <reference-count action="ignore" /> | |||
|
2948 | </modify-argument> | |||
|
2949 | </modify-function> | |||
|
2950 | <modify-function signature="mimeData(const QList<QTreeWidgetItem*>)const"> | |||
|
2951 | <modify-argument index="1" invalidate-after-use="yes"/> | |||
|
2952 | </modify-function> | |||
2830 | <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)"> |
|
2953 | <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)"> | |
2831 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
2954 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2832 | </modify-function> |
|
2955 | </modify-function> | |
@@ -2848,8 +2971,8 | |||||
2848 | <modify-function signature="addTopLevelItems(const QList<QTreeWidgetItem*> &)"> |
|
2971 | <modify-function signature="addTopLevelItems(const QList<QTreeWidgetItem*> &)"> | |
2849 | <modify-argument index="1"> |
|
2972 | <modify-argument index="1"> | |
2850 | <define-ownership class="java" owner="c++"/> |
|
2973 | <define-ownership class="java" owner="c++"/> | |
2851 |
</modify-argument> |
|
2974 | </modify-argument> | |
2852 |
</modify-function> |
|
2975 | </modify-function> | |
2853 | <modify-function signature="insertTopLevelItem(int, QTreeWidgetItem *)"> |
|
2976 | <modify-function signature="insertTopLevelItem(int, QTreeWidgetItem *)"> | |
2854 | <modify-argument index="2"> |
|
2977 | <modify-argument index="2"> | |
2855 | <define-ownership class="java" owner="c++"/> |
|
2978 | <define-ownership class="java" owner="c++"/> | |
@@ -2859,7 +2982,7 | |||||
2859 | <modify-argument index="2"> |
|
2982 | <modify-argument index="2"> | |
2860 | <define-ownership class="java" owner="c++"/> |
|
2983 | <define-ownership class="java" owner="c++"/> | |
2861 | </modify-argument> |
|
2984 | </modify-argument> | |
2862 |
</modify-function> |
|
2985 | </modify-function> | |
2863 | <modify-function signature="setHeaderItem(QTreeWidgetItem *)"> |
|
2986 | <modify-function signature="setHeaderItem(QTreeWidgetItem *)"> | |
2864 | <modify-argument index="1"> |
|
2987 | <modify-argument index="1"> | |
2865 | <define-ownership class="java" owner="c++"/> |
|
2988 | <define-ownership class="java" owner="c++"/> | |
@@ -2870,11 +2993,6 | |||||
2870 | <define-ownership class="java" owner="default"/> |
|
2993 | <define-ownership class="java" owner="default"/> | |
2871 | </modify-argument> |
|
2994 | </modify-argument> | |
2872 | </modify-function> |
|
2995 | </modify-function> | |
2873 | <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)"> |
|
|||
2874 | <modify-argument index="1"> |
|
|||
2875 | <define-ownership class="java" owner="default"/> |
|
|||
2876 | </modify-argument> |
|
|||
2877 | </modify-function> |
|
|||
2878 | <modify-function signature="setCurrentItem(QTreeWidgetItem*,int,QFlags<QItemSelectionModel::SelectionFlag>)"> |
|
2996 | <modify-function signature="setCurrentItem(QTreeWidgetItem*,int,QFlags<QItemSelectionModel::SelectionFlag>)"> | |
2879 | <modify-argument index="1"> |
|
2997 | <modify-argument index="1"> | |
2880 | <reference-count action="ignore" /> |
|
2998 | <reference-count action="ignore" /> | |
@@ -2910,8 +3028,8 | |||||
2910 | <modify-function signature="isItemSelected(const QTreeWidgetItem*)const"> |
|
3028 | <modify-function signature="isItemSelected(const QTreeWidgetItem*)const"> | |
2911 | <remove/> |
|
3029 | <remove/> | |
2912 | </modify-function> |
|
3030 | </modify-function> | |
2913 |
<modify-function signature="setItemSelected(const QTreeWidgetItem*,bool)"> |
|
3031 | <modify-function signature="setItemSelected(const QTreeWidgetItem*,bool)"> | |
2914 |
<remove/> |
|
3032 | <remove/> | |
2915 | </modify-function> |
|
3033 | </modify-function> | |
2916 | <modify-function signature="setItemWidget(QTreeWidgetItem*,int,QWidget*)"> |
|
3034 | <modify-function signature="setItemWidget(QTreeWidgetItem*,int,QWidget*)"> | |
2917 | <modify-argument index="1"> |
|
3035 | <modify-argument index="1"> | |
@@ -2919,17 +3037,17 | |||||
2919 | </modify-argument> |
|
3037 | </modify-argument> | |
2920 | <modify-argument index="3"> |
|
3038 | <modify-argument index="3"> | |
2921 | <reference-count action="ignore"/> |
|
3039 | <reference-count action="ignore"/> | |
2922 |
</modify-argument> |
|
3040 | </modify-argument> | |
2923 | </modify-function> |
|
3041 | </modify-function> | |
2924 | <modify-function signature="setModel(QAbstractItemModel*)"> |
|
3042 | <modify-function signature="setModel(QAbstractItemModel*)"> | |
2925 | <modify-argument index="1"> |
|
3043 | <modify-argument index="1"> | |
2926 | <reference-count action="ignore"/> |
|
3044 | <reference-count action="ignore"/> | |
2927 | </modify-argument> |
|
3045 | </modify-argument> | |
2928 |
</modify-function> |
|
3046 | </modify-function> | |
2929 |
|
3047 | |||
2930 | <modify-function signature="items(const QMimeData*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3048 | <modify-function signature="items(const QMimeData*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
2931 | </object-type> |
|
3049 | </object-type> | |
2932 |
|
3050 | |||
2933 | <object-type name="QAbstractItemDelegate"> |
|
3051 | <object-type name="QAbstractItemDelegate"> | |
2934 | <modify-function signature="setEditorData(QWidget*,QModelIndex)const"> |
|
3052 | <modify-function signature="setEditorData(QWidget*,QModelIndex)const"> | |
2935 | <modify-argument index="1"> |
|
3053 | <modify-argument index="1"> | |
@@ -2945,14 +3063,14 | |||||
2945 | <reference-count action="ignore"/> |
|
3063 | <reference-count action="ignore"/> | |
2946 | </modify-argument> |
|
3064 | </modify-argument> | |
2947 | </modify-function> |
|
3065 | </modify-function> | |
2948 |
|
3066 | |||
2949 | <modify-function signature="paint(QPainter*,QStyleOptionViewItem,QModelIndex)const"> |
|
3067 | <modify-function signature="paint(QPainter*,QStyleOptionViewItem,QModelIndex)const"> | |
2950 |
<modify-argument index="1" invalidate-after-use="yes" /> |
|
3068 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2951 | </modify-function> |
|
3069 | </modify-function> | |
2952 | <modify-function signature="editorEvent(QEvent*,QAbstractItemModel*,QStyleOptionViewItem,QModelIndex)"> |
|
3070 | <modify-function signature="editorEvent(QEvent*,QAbstractItemModel*,QStyleOptionViewItem,QModelIndex)"> | |
2953 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
3071 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2954 | </modify-function> |
|
3072 | </modify-function> | |
2955 |
|
3073 | |||
2956 | <modify-function signature="elidedText(QFontMetrics, int, Qt::TextElideMode, QString)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3074 | <modify-function signature="elidedText(QFontMetrics, int, Qt::TextElideMode, QString)" remove="all"/> <!--### Obsolete in 4.3--> | |
2957 | </object-type> |
|
3075 | </object-type> | |
2958 |
|
3076 | |||
@@ -2962,13 +3080,13 | |||||
2962 | <modify-argument index="return"> |
|
3080 | <modify-argument index="return"> | |
2963 | <define-ownership class="shell" owner="c++"/> |
|
3081 | <define-ownership class="shell" owner="c++"/> | |
2964 | </modify-argument> |
|
3082 | </modify-argument> | |
2965 |
</modify-function> |
|
3083 | </modify-function> | |
2966 |
|
3084 | |||
2967 | <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3085 | <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> | |
2968 | <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3086 | <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
2969 | <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3087 | <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
2970 | <modify-function signature="textColor()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3088 | <modify-function signature="textColor()const" remove="all"/> <!--### Obsolete in 4.3--> | |
2971 |
|
3089 | |||
2972 | <modify-function signature="operator<(QTableWidgetItem)const"> |
|
3090 | <modify-function signature="operator<(QTableWidgetItem)const"> | |
2973 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
3091 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2974 | </modify-function> |
|
3092 | </modify-function> | |
@@ -2982,7 +3100,7 | |||||
2982 | </object-type> |
|
3100 | </object-type> | |
2983 |
|
3101 | |||
2984 | <object-type name="QListWidgetItem" delete-in-main-thread="yes"> |
|
3102 | <object-type name="QListWidgetItem" delete-in-main-thread="yes"> | |
2985 |
|
3103 | |||
2986 | <modify-function signature="operator<(QListWidgetItem)const"> |
|
3104 | <modify-function signature="operator<(QListWidgetItem)const"> | |
2987 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
3105 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2988 | </modify-function> |
|
3106 | </modify-function> | |
@@ -2993,7 +3111,7 | |||||
2993 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
3111 | <modify-argument index="1" invalidate-after-use="yes" /> | |
2994 | </modify-function> |
|
3112 | </modify-function> | |
2995 |
|
3113 | |||
2996 |
|
3114 | |||
2997 | <modify-function signature="operator=(const QListWidgetItem&)" remove="all"/> |
|
3115 | <modify-function signature="operator=(const QListWidgetItem&)" remove="all"/> | |
2998 | <modify-function signature="QListWidgetItem(QListWidget *, int)"> |
|
3116 | <modify-function signature="QListWidgetItem(QListWidget *, int)"> | |
2999 | <modify-argument index="this"> |
|
3117 | <modify-argument index="this"> | |
@@ -3004,18 +3122,18 | |||||
3004 | <modify-argument index="this"> |
|
3122 | <modify-argument index="this"> | |
3005 | <define-ownership class="java" owner="c++"/> |
|
3123 | <define-ownership class="java" owner="c++"/> | |
3006 | </modify-argument> |
|
3124 | </modify-argument> | |
3007 |
</modify-function> |
|
3125 | </modify-function> | |
3008 | <modify-function signature="QListWidgetItem(const QIcon &, const QString &, QListWidget *, int)"> |
|
3126 | <modify-function signature="QListWidgetItem(const QIcon &, const QString &, QListWidget *, int)"> | |
3009 | <modify-argument index="this"> |
|
3127 | <modify-argument index="this"> | |
3010 | <define-ownership class="java" owner="c++"/> |
|
3128 | <define-ownership class="java" owner="c++"/> | |
3011 |
</modify-argument> |
|
3129 | </modify-argument> | |
3012 |
</modify-function> |
|
3130 | </modify-function> | |
3013 | <modify-function signature="clone() const"> |
|
3131 | <modify-function signature="clone() const"> | |
3014 | <modify-argument index="return"> |
|
3132 | <modify-argument index="return"> | |
3015 | <define-ownership class="shell" owner="c++"/> |
|
3133 | <define-ownership class="shell" owner="c++"/> | |
3016 | </modify-argument> |
|
3134 | </modify-argument> | |
3017 | </modify-function> |
|
3135 | </modify-function> | |
3018 |
|
3136 | |||
3019 | <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3137 | <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3020 | <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3138 | <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
3021 | <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3139 | <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -3031,24 +3149,24 | |||||
3031 | <argument-map index="1" meta-name="%1"/> |
|
3149 | <argument-map index="1" meta-name="%1"/> | |
3032 | if (%1 != null) disableGarbageCollection(); |
|
3150 | if (%1 != null) disableGarbageCollection(); | |
3033 | </inject-code> |
|
3151 | </inject-code> | |
3034 |
</modify-function> |
|
3152 | </modify-function> | |
3035 | <modify-function signature="QGraphicsTextItem(const QString &,QGraphicsItem*,QGraphicsScene*)"> |
|
3153 | <modify-function signature="QGraphicsTextItem(const QString &,QGraphicsItem*,QGraphicsScene*)"> | |
3036 | <inject-code position="end"> |
|
3154 | <inject-code position="end"> | |
3037 | <argument-map index="2" meta-name="%2"/> |
|
3155 | <argument-map index="2" meta-name="%2"/> | |
3038 | if (%2 != null) disableGarbageCollection(); |
|
3156 | if (%2 != null) disableGarbageCollection(); | |
3039 | </inject-code> |
|
3157 | </inject-code> | |
3040 |
</modify-function> |
|
3158 | </modify-function> | |
3041 | <modify-function signature="setDocument(QTextDocument*)"> |
|
3159 | <modify-function signature="setDocument(QTextDocument*)"> | |
3042 | <modify-argument index="1"> |
|
3160 | <modify-argument index="1"> | |
3043 | <reference-count action="set" variable-name="__rcDocument"/> |
|
3161 | <reference-count action="set" variable-name="__rcDocument"/> | |
3044 | </modify-argument> |
|
3162 | </modify-argument> | |
3045 | </modify-function> |
|
3163 | </modify-function> | |
3046 |
|
3164 | |||
3047 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3165 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3048 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
3166 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
3049 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3167 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3050 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3168 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
3051 |
|
|
3169 | </object-type> | |
3052 |
|
3170 | |||
3053 | <object-type name="QCompleter"> |
|
3171 | <object-type name="QCompleter"> | |
3054 | <modify-function signature="activated(const QModelIndex &)"> |
|
3172 | <modify-function signature="activated(const QModelIndex &)"> | |
@@ -3100,12 +3218,12 | |||||
3100 | <modify-argument index="this"> |
|
3218 | <modify-argument index="this"> | |
3101 | <define-ownership class="java" owner="c++"/> |
|
3219 | <define-ownership class="java" owner="c++"/> | |
3102 | </modify-argument> |
|
3220 | </modify-argument> | |
3103 |
</modify-function> |
|
3221 | </modify-function> | |
3104 | <modify-function signature="QTreeWidgetItem(QTreeWidget *,QTreeWidgetItem *,int)"> |
|
3222 | <modify-function signature="QTreeWidgetItem(QTreeWidget *,QTreeWidgetItem *,int)"> | |
3105 | <modify-argument index="this"> |
|
3223 | <modify-argument index="this"> | |
3106 | <define-ownership class="java" owner="c++"/> |
|
3224 | <define-ownership class="java" owner="c++"/> | |
3107 | </modify-argument> |
|
3225 | </modify-argument> | |
3108 |
</modify-function> |
|
3226 | </modify-function> | |
3109 | <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,int)"> |
|
3227 | <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,int)"> | |
3110 | <modify-argument index="this"> |
|
3228 | <modify-argument index="this"> | |
3111 | <define-ownership class="java" owner="c++"/> |
|
3229 | <define-ownership class="java" owner="c++"/> | |
@@ -3115,12 +3233,12 | |||||
3115 | <modify-argument index="this"> |
|
3233 | <modify-argument index="this"> | |
3116 | <define-ownership class="java" owner="c++"/> |
|
3234 | <define-ownership class="java" owner="c++"/> | |
3117 | </modify-argument> |
|
3235 | </modify-argument> | |
3118 |
</modify-function> |
|
3236 | </modify-function> | |
3119 | <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,QTreeWidgetItem *,int)"> |
|
3237 | <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,QTreeWidgetItem *,int)"> | |
3120 | <modify-argument index="this"> |
|
3238 | <modify-argument index="this"> | |
3121 | <define-ownership class="java" owner="c++"/> |
|
3239 | <define-ownership class="java" owner="c++"/> | |
3122 |
</modify-argument> |
|
3240 | </modify-argument> | |
3123 |
</modify-function> |
|
3241 | </modify-function> | |
3124 | <modify-function signature="clone() const"> |
|
3242 | <modify-function signature="clone() const"> | |
3125 | <modify-argument index="return"> |
|
3243 | <modify-argument index="return"> | |
3126 | <define-ownership class="shell" owner="c++"/> |
|
3244 | <define-ownership class="shell" owner="c++"/> | |
@@ -3135,7 +3253,7 | |||||
3135 | <modify-argument index="1"> |
|
3253 | <modify-argument index="1"> | |
3136 | <define-ownership class="java" owner="c++"/> |
|
3254 | <define-ownership class="java" owner="c++"/> | |
3137 | </modify-argument> |
|
3255 | </modify-argument> | |
3138 |
</modify-function> |
|
3256 | </modify-function> | |
3139 | <modify-function signature="insertChild(int, QTreeWidgetItem *)"> |
|
3257 | <modify-function signature="insertChild(int, QTreeWidgetItem *)"> | |
3140 | <modify-argument index="2"> |
|
3258 | <modify-argument index="2"> | |
3141 | <define-ownership class="java" owner="c++"/> |
|
3259 | <define-ownership class="java" owner="c++"/> | |
@@ -3145,7 +3263,7 | |||||
3145 | <modify-argument index="2"> |
|
3263 | <modify-argument index="2"> | |
3146 | <define-ownership class="java" owner="c++"/> |
|
3264 | <define-ownership class="java" owner="c++"/> | |
3147 | </modify-argument> |
|
3265 | </modify-argument> | |
3148 |
</modify-function> |
|
3266 | </modify-function> | |
3149 | <modify-function signature="removeChild(QTreeWidgetItem*)"> |
|
3267 | <modify-function signature="removeChild(QTreeWidgetItem*)"> | |
3150 | <modify-argument index="1"> |
|
3268 | <modify-argument index="1"> | |
3151 | <define-ownership class="java" owner="default"/> |
|
3269 | <define-ownership class="java" owner="default"/> | |
@@ -3161,7 +3279,7 | |||||
3161 | <define-ownership class="java" owner="default"/> |
|
3279 | <define-ownership class="java" owner="default"/> | |
3162 | </modify-argument> |
|
3280 | </modify-argument> | |
3163 | </modify-function> |
|
3281 | </modify-function> | |
3164 |
|
3282 | |||
3165 | <modify-function signature="backgroundColor(int)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3283 | <modify-function signature="backgroundColor(int)const" remove="all"/> <!--### Obsolete in 4.3--> | |
3166 | <modify-function signature="setBackgroundColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3284 | <modify-function signature="setBackgroundColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
3167 | <modify-function signature="setTextColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3285 | <modify-function signature="setTextColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -3169,6 +3287,9 | |||||
3169 | </object-type> |
|
3287 | </object-type> | |
3170 |
|
3288 | |||
3171 | <object-type name="QListWidget"> |
|
3289 | <object-type name="QListWidget"> | |
|
3290 | <modify-function signature="mimeData(const QList<QListWidgetItem *>)const"> | |||
|
3291 | <modify-argument index="1" invalidate-after-use="yes" /> | |||
|
3292 | </modify-function> | |||
3172 | <modify-function signature="addItem(QListWidgetItem *)"> |
|
3293 | <modify-function signature="addItem(QListWidgetItem *)"> | |
3173 | <modify-argument index="1"> |
|
3294 | <modify-argument index="1"> | |
3174 | <define-ownership class="java" owner="c++"/> |
|
3295 | <define-ownership class="java" owner="c++"/> | |
@@ -3177,11 +3298,6 | |||||
3177 | <modify-function signature="insertItem(int, QListWidgetItem *)"> |
|
3298 | <modify-function signature="insertItem(int, QListWidgetItem *)"> | |
3178 | <modify-argument index="2"> |
|
3299 | <modify-argument index="2"> | |
3179 | <define-ownership class="java" owner="c++"/> |
|
3300 | <define-ownership class="java" owner="c++"/> | |
3180 | </modify-argument> |
|
|||
3181 | </modify-function> |
|
|||
3182 | <modify-function signature="removeItemWidget(QListWidgetItem*)"> |
|
|||
3183 | <modify-argument index="1"> |
|
|||
3184 | <define-ownership class="java" owner="default"/> |
|
|||
3185 | </modify-argument> |
|
3301 | </modify-argument> | |
3186 | </modify-function> |
|
3302 | </modify-function> | |
3187 | <modify-function signature="setCurrentItem(QListWidgetItem*)"> |
|
3303 | <modify-function signature="setCurrentItem(QListWidgetItem*)"> | |
@@ -3193,7 +3309,7 | |||||
3193 | <modify-argument index="1"> |
|
3309 | <modify-argument index="1"> | |
3194 | <reference-count action="ignore"/> |
|
3310 | <reference-count action="ignore"/> | |
3195 | </modify-argument> |
|
3311 | </modify-argument> | |
3196 |
</modify-function> |
|
3312 | </modify-function> | |
3197 | <modify-function signature="setItemHidden(const QListWidgetItem*,bool)"> |
|
3313 | <modify-function signature="setItemHidden(const QListWidgetItem*,bool)"> | |
3198 | <remove/> |
|
3314 | <remove/> | |
3199 | </modify-function> |
|
3315 | </modify-function> | |
@@ -3218,7 +3334,12 | |||||
3218 | <modify-argument index="2"> |
|
3334 | <modify-argument index="2"> | |
3219 | <reference-count action="ignore"/> |
|
3335 | <reference-count action="ignore"/> | |
3220 | </modify-argument> |
|
3336 | </modify-argument> | |
3221 |
</modify-function> |
|
3337 | </modify-function> | |
|
3338 | <modify-function signature="removeItemWidget(QListWidgetItem*)"> | |||
|
3339 | <modify-argument index="1"> | |||
|
3340 | <reference-count action="ignore" /> | |||
|
3341 | </modify-argument> | |||
|
3342 | </modify-function> | |||
3222 | <modify-function signature="setModel(QAbstractItemModel*)"> |
|
3343 | <modify-function signature="setModel(QAbstractItemModel*)"> | |
3223 | <modify-argument index="1"> |
|
3344 | <modify-argument index="1"> | |
3224 | <reference-count action="ignore"/> |
|
3345 | <reference-count action="ignore"/> | |
@@ -3231,8 +3352,8 | |||||
3231 | <extra-includes> |
|
3352 | <extra-includes> | |
3232 | <include file-name="QIcon" location="global"/> |
|
3353 | <include file-name="QIcon" location="global"/> | |
3233 | <include file-name="QMessageBox" location="global"/> |
|
3354 | <include file-name="QMessageBox" location="global"/> | |
3234 |
</extra-includes> |
|
3355 | </extra-includes> | |
3235 |
|
3356 | |||
3236 | <modify-function signature="actionEvent(QActionEvent*)"> |
|
3357 | <modify-function signature="actionEvent(QActionEvent*)"> | |
3237 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
3358 | <modify-argument index="1" invalidate-after-use="yes" /> | |
3238 | </modify-function> |
|
3359 | </modify-function> | |
@@ -3318,8 +3439,7 | |||||
3318 | <remove-default-expression /> |
|
3439 | <remove-default-expression /> | |
3319 | </modify-argument> |
|
3440 | </modify-argument> | |
3320 | </modify-function> |
|
3441 | </modify-function> | |
3321 |
|
3442 | |||
3322 | <!-- |
|
|||
3323 | <inject-code class="native"> |
|
3443 | <inject-code class="native"> | |
3324 | extern "C" JNIEXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_com_trolltech_qt_gui_QWidget__1_1qt_1QMessageBox_1setWindowTitle) |
|
3444 | extern "C" JNIEXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_com_trolltech_qt_gui_QWidget__1_1qt_1QMessageBox_1setWindowTitle) | |
3325 | (JNIEnv *__jni_env, |
|
3445 | (JNIEnv *__jni_env, | |
@@ -3335,7 +3455,7 | |||||
3335 | Q_ASSERT(__qt_this); |
|
3455 | Q_ASSERT(__qt_this); | |
3336 | __qt_this->setWindowTitle((const QString& )__qt_title0); |
|
3456 | __qt_this->setWindowTitle((const QString& )__qt_title0); | |
3337 | QTJAMBI_DEBUG_TRACE("(native) -> leaving: QMessageBox::setWindowTitle(const QString & title)"); |
|
3457 | QTJAMBI_DEBUG_TRACE("(native) -> leaving: QMessageBox::setWindowTitle(const QString & title)"); | |
3338 |
} |
|
3458 | } | |
3339 | </inject-code> |
|
3459 | </inject-code> | |
3340 |
|
3460 | |||
3341 | <inject-code class="native"> |
|
3461 | <inject-code class="native"> | |
@@ -3356,18 +3476,17 | |||||
3356 | QTJAMBI_DEBUG_TRACE("(native) -> leaving: QMessageBox::setWindowModality(Qt::WindowModality modality)"); |
|
3476 | QTJAMBI_DEBUG_TRACE("(native) -> leaving: QMessageBox::setWindowModality(Qt::WindowModality modality)"); | |
3357 | } |
|
3477 | } | |
3358 | </inject-code> |
|
3478 | </inject-code> | |
3359 | --> |
|
3479 | ||
3360 |
|
||||
3361 | <modify-function signature="render(QPaintDevice *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"> |
|
3480 | <modify-function signature="render(QPaintDevice *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"> | |
3362 | <modify-argument index="4"> |
|
3481 | <modify-argument index="4"> | |
3363 | <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/> |
|
3482 | <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/> | |
3364 | </modify-argument> |
|
3483 | </modify-argument> | |
3365 |
</modify-function> |
|
3484 | </modify-function> | |
3366 | <modify-function signature="render(QPainter *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"> |
|
3485 | <modify-function signature="render(QPainter *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"> | |
3367 | <modify-argument index="4"> |
|
3486 | <modify-argument index="4"> | |
3368 | <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/> |
|
3487 | <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/> | |
3369 | </modify-argument> |
|
3488 | </modify-argument> | |
3370 |
</modify-function> |
|
3489 | </modify-function> | |
3371 | <modify-function signature="setFocusProxy(QWidget*)"> |
|
3490 | <modify-function signature="setFocusProxy(QWidget*)"> | |
3372 | <modify-argument index="1"> |
|
3491 | <modify-argument index="1"> | |
3373 | <reference-count action="set" variable-name="__rcFocusProxy"/> |
|
3492 | <reference-count action="set" variable-name="__rcFocusProxy"/> | |
@@ -3405,12 +3524,12 | |||||
3405 | </modify-argument> |
|
3524 | </modify-argument> | |
3406 | <modify-argument index="2"> |
|
3525 | <modify-argument index="2"> | |
3407 | <reference-count action="ignore"/> |
|
3526 | <reference-count action="ignore"/> | |
3408 |
</modify-argument> |
|
3527 | </modify-argument> | |
3409 |
</modify-function> |
|
3528 | </modify-function> | |
3410 | <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> |
|
3529 | <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> | |
3411 | <access modifier="private"/> |
|
3530 | <access modifier="private"/> | |
3412 | </modify-function> |
|
3531 | </modify-function> | |
3413 |
|
3532 | |||
3414 | <modify-function signature="addAction(QAction *)"> |
|
3533 | <modify-function signature="addAction(QAction *)"> | |
3415 | <modify-argument index="1"> |
|
3534 | <modify-argument index="1"> | |
3416 | <reference-count action="add" variable-name="__rcActions"/> |
|
3535 | <reference-count action="add" variable-name="__rcActions"/> | |
@@ -3451,8 +3570,10 | |||||
3451 | </object-type> |
|
3570 | </object-type> | |
3452 |
|
3571 | |||
3453 | <object-type name="QMessageBox"> |
|
3572 | <object-type name="QMessageBox"> | |
|
3573 | ||||
|
3574 | ||||
3454 | <modify-function signature="setWindowTitle(const QString &)" remove="all"/> |
|
3575 | <modify-function signature="setWindowTitle(const QString &)" remove="all"/> | |
3455 |
<modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/> |
|
3576 | <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/> | |
3456 | <extra-includes> |
|
3577 | <extra-includes> | |
3457 | <include file-name="QPixmap" location="global"/> |
|
3578 | <include file-name="QPixmap" location="global"/> | |
3458 | </extra-includes> |
|
3579 | </extra-includes> | |
@@ -3476,7 +3597,7 | |||||
3476 | <reference-count action="ignore"/> |
|
3597 | <reference-count action="ignore"/> | |
3477 | </modify-argument> |
|
3598 | </modify-argument> | |
3478 | </modify-function> |
|
3599 | </modify-function> | |
3479 |
|
3600 | |||
3480 | <modify-function signature="QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3601 | <modify-function signature="QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> <!--### Obsolete in 4.3--> | |
3481 | <modify-function signature="buttonText(int)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3602 | <modify-function signature="buttonText(int)const" remove="all"/> <!--### Obsolete in 4.3--> | |
3482 | <modify-function signature="setButtonText(int, QString)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3603 | <modify-function signature="setButtonText(int, QString)" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -3508,13 +3629,13 | |||||
3508 | <object-type name="QTextFrame" delete-in-main-thread="yes"> |
|
3629 | <object-type name="QTextFrame" delete-in-main-thread="yes"> | |
3509 | <extra-includes> |
|
3630 | <extra-includes> | |
3510 | <include file-name="QTextCursor" location="global"/> |
|
3631 | <include file-name="QTextCursor" location="global"/> | |
3511 |
</extra-includes> |
|
3632 | </extra-includes> | |
3512 | </object-type> |
|
3633 | </object-type> | |
3513 |
|
3634 | |||
3514 | <object-type name="QImageIOHandler"> |
|
3635 | <object-type name="QImageIOHandler"> | |
3515 | <extra-includes> |
|
3636 | <extra-includes> | |
3516 | <include file-name="QRect" location="global"/> |
|
3637 | <include file-name="QRect" location="global"/> | |
3517 |
</extra-includes> |
|
3638 | </extra-includes> | |
3518 | <modify-function signature="setFormat(const QByteArray &)const"> |
|
3639 | <modify-function signature="setFormat(const QByteArray &)const"> | |
3519 | <remove/> |
|
3640 | <remove/> | |
3520 | </modify-function> |
|
3641 | </modify-function> | |
@@ -3523,18 +3644,17 | |||||
3523 | <reference-count action="set" variable-name="__rcDevice"/> |
|
3644 | <reference-count action="set" variable-name="__rcDevice"/> | |
3524 | </modify-argument> |
|
3645 | </modify-argument> | |
3525 | </modify-function> |
|
3646 | </modify-function> | |
3526 | <!-- |
|
|||
3527 | <modify-function signature="read(QImage*)"> |
|
3647 | <modify-function signature="read(QImage*)"> | |
3528 | <modify-argument index="1"> |
|
3648 | <modify-argument index="1"> | |
3529 | <replace-type modified-type="com.trolltech.qt.gui.QImage"/> |
|
3649 | <replace-type modified-type="com.trolltech.qt.gui.QImage"/> | |
3530 | <conversion-rule class="shell"> |
|
3650 | <conversion-rule class="shell"> | |
3531 | jobject %out = qtjambi_from_object(__jni_env, %in, "QImage", "com/trolltech/qt/gui/", false); |
|
3651 | jobject %out = qtjambi_from_object(__jni_env, %in, "QImage", "com/trolltech/qt/gui/", false); | |
3532 |
|
3652 | |||
3533 |
QtJambiLink *__link = %out != 0 ? QtJambiLink::findLink(__jni_env, %out) : 0; |
|
3653 | QtJambiLink *__link = %out != 0 ? QtJambiLink::findLink(__jni_env, %out) : 0; | |
3534 |
</conversion-rule> |
|
3654 | </conversion-rule> | |
3535 | <conversion-rule class="native"> |
|
3655 | <conversion-rule class="native"> | |
3536 | QImage *%out = (QImage *) qtjambi_to_object(__jni_env, %in); |
|
3656 | QImage *%out = (QImage *) qtjambi_to_object(__jni_env, %in); | |
3537 |
</conversion-rule> |
|
3657 | </conversion-rule> | |
3538 | </modify-argument> |
|
3658 | </modify-argument> | |
3539 | <modify-argument index="0"> |
|
3659 | <modify-argument index="0"> | |
3540 | <conversion-rule class="shell"> |
|
3660 | <conversion-rule class="shell"> | |
@@ -3542,20 +3662,19 | |||||
3542 | if (__link != 0) __link->resetObject(__jni_env); |
|
3662 | if (__link != 0) __link->resetObject(__jni_env); | |
3543 | bool %out = (bool) %in; |
|
3663 | bool %out = (bool) %in; | |
3544 | </conversion-rule> |
|
3664 | </conversion-rule> | |
3545 |
</modify-argument> |
|
3665 | </modify-argument> | |
3546 |
</modify-function> |
|
3666 | </modify-function> | |
3547 | --> |
|
3667 | ||
3548 |
|
||||
3549 | <modify-function signature="name()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3668 | <modify-function signature="name()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3550 | </object-type> |
|
3669 | </object-type> | |
3551 |
|
3670 | |||
3552 | <object-type name="QProxyModel"> |
|
3671 | <object-type name="QProxyModel"> | |
3553 | <modify-function signature="parent()const" remove="all"/> |
|
3672 | <modify-function signature="parent()const" remove="all"/> | |
3554 | <extra-includes> |
|
3673 | <extra-includes> | |
3555 | <include file-name="QPixmap" location="global"/> |
|
3674 | <include file-name="QPixmap" location="global"/> | |
3556 | <include file-name="QStringList" location="global"/> |
|
3675 | <include file-name="QStringList" location="global"/> | |
3557 | <include file-name="QSize" location="global"/> |
|
3676 | <include file-name="QSize" location="global"/> | |
3558 |
</extra-includes> |
|
3677 | </extra-includes> | |
3559 | <modify-function signature="setModel(QAbstractItemModel*)"> |
|
3678 | <modify-function signature="setModel(QAbstractItemModel*)"> | |
3560 | <modify-argument index="1"> |
|
3679 | <modify-argument index="1"> | |
3561 | <reference-count action="set" variable-name="__rcModel"/> |
|
3680 | <reference-count action="set" variable-name="__rcModel"/> | |
@@ -3563,14 +3682,14 | |||||
3563 | </modify-function> |
|
3682 | </modify-function> | |
3564 | </object-type> |
|
3683 | </object-type> | |
3565 |
|
3684 | |||
3566 |
<object-type name="QImageReader"> |
|
3685 | <object-type name="QImageReader"> | |
3567 | <extra-includes> |
|
3686 | <extra-includes> | |
3568 | <include file-name="QColor" location="global"/> |
|
3687 | <include file-name="QColor" location="global"/> | |
3569 | <include file-name="QRect" location="global"/> |
|
3688 | <include file-name="QRect" location="global"/> | |
3570 | <include file-name="QSize" location="global"/> |
|
3689 | <include file-name="QSize" location="global"/> | |
3571 | <include file-name="QStringList" location="global"/> |
|
3690 | <include file-name="QStringList" location="global"/> | |
3572 | <include file-name="QImage" location="global"/> |
|
3691 | <include file-name="QImage" location="global"/> | |
3573 |
</extra-includes> |
|
3692 | </extra-includes> | |
3574 | <modify-function signature="read(QImage*) "> |
|
3693 | <modify-function signature="read(QImage*) "> | |
3575 | <remove/> |
|
3694 | <remove/> | |
3576 | </modify-function> |
|
3695 | </modify-function> | |
@@ -3578,9 +3697,9 | |||||
3578 | <modify-argument index="1"> |
|
3697 | <modify-argument index="1"> | |
3579 | <reference-count action="set" variable-name="__rcDevice"/> |
|
3698 | <reference-count action="set" variable-name="__rcDevice"/> | |
3580 | </modify-argument> |
|
3699 | </modify-argument> | |
3581 |
</modify-function> |
|
3700 | </modify-function> | |
3582 | </object-type> |
|
3701 | </object-type> | |
3583 |
|
3702 | |||
3584 | <object-type name="QMovie"> |
|
3703 | <object-type name="QMovie"> | |
3585 | <extra-includes> |
|
3704 | <extra-includes> | |
3586 | <include file-name="QColor" location="global"/> |
|
3705 | <include file-name="QColor" location="global"/> | |
@@ -3588,7 +3707,7 | |||||
3588 | <include file-name="QPixmap" location="global"/> |
|
3707 | <include file-name="QPixmap" location="global"/> | |
3589 | <include file-name="QRect" location="global"/> |
|
3708 | <include file-name="QRect" location="global"/> | |
3590 | <include file-name="QSize" location="global"/> |
|
3709 | <include file-name="QSize" location="global"/> | |
3591 |
</extra-includes> |
|
3710 | </extra-includes> | |
3592 | <modify-function signature="cacheMode()"> |
|
3711 | <modify-function signature="cacheMode()"> | |
3593 | <remove/> |
|
3712 | <remove/> | |
3594 | </modify-function> |
|
3713 | </modify-function> | |
@@ -3598,9 +3717,8 | |||||
3598 | </modify-argument> |
|
3717 | </modify-argument> | |
3599 | </modify-function> |
|
3718 | </modify-function> | |
3600 | </object-type> |
|
3719 | </object-type> | |
3601 |
|
3720 | |||
3602 | <object-type name="QPageSetupDialog"> |
|
3721 | <object-type name="QPageSetupDialog" /> | |
3603 | </object-type> |
|
|||
3604 |
|
3722 | |||
3605 | <object-type name="QTabWidget"> |
|
3723 | <object-type name="QTabWidget"> | |
3606 | <modify-function signature="initStyleOption(QStyleOptionTabWidgetFrame*)const"> |
|
3724 | <modify-function signature="initStyleOption(QStyleOptionTabWidgetFrame*)const"> | |
@@ -3610,7 +3728,7 | |||||
3610 | <insert-template name="gui.init_style_option"> |
|
3728 | <insert-template name="gui.init_style_option"> | |
3611 | <replace from="%TYPE" to="QStyleOptionTabWidgetFrame"/> |
|
3729 | <replace from="%TYPE" to="QStyleOptionTabWidgetFrame"/> | |
3612 | </insert-template> |
|
3730 | </insert-template> | |
3613 |
</inject-code> |
|
3731 | </inject-code> | |
3614 | <modify-function signature="addTab(QWidget*,QIcon,QString)"> |
|
3732 | <modify-function signature="addTab(QWidget*,QIcon,QString)"> | |
3615 | <modify-argument index="1"> |
|
3733 | <modify-argument index="1"> | |
3616 | <reference-count action="ignore"/> |
|
3734 | <reference-count action="ignore"/> | |
@@ -3651,25 +3769,25 | |||||
3651 | <extra-includes> |
|
3769 | <extra-includes> | |
3652 | <include file-name="QPoint" location="global"/> |
|
3770 | <include file-name="QPoint" location="global"/> | |
3653 | <include file-name="QPixmap" location="global"/> |
|
3771 | <include file-name="QPixmap" location="global"/> | |
3654 |
</extra-includes> |
|
3772 | </extra-includes> | |
3655 | <modify-function signature="setMimeData(QMimeData*)"> |
|
3773 | <modify-function signature="setMimeData(QMimeData*)"> | |
3656 | <modify-argument index="1"> |
|
3774 | <modify-argument index="1"> | |
3657 | <define-ownership class="java" owner="c++"/> |
|
3775 | <define-ownership class="java" owner="c++"/> | |
3658 | </modify-argument> |
|
3776 | </modify-argument> | |
3659 |
</modify-function> |
|
3777 | </modify-function> | |
3660 |
|
3778 | |||
3661 | <modify-function signature="start(QFlags<Qt::DropAction>)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3779 | <modify-function signature="start(QFlags<Qt::DropAction>)" remove="all"/> <!--### Obsolete in 4.3--> | |
3662 | </object-type> |
|
3780 | </object-type> | |
3663 |
|
3781 | |||
3664 | <object-type name="QDateTimeEdit"> |
|
3782 | <object-type name="QDateTimeEdit"> | |
3665 | <modify-function signature="initStyleOption(QStyleOptionSpinBox*)const" access="private" rename="initDateTimeEditStyleOption"/> |
|
3783 | <modify-function signature="initStyleOption(QStyleOptionSpinBox*)const" access="private" rename="initDateTimeEditStyleOption"/> | |
3666 | <modify-function signature="setCalendarWidget(QCalendarWidget*)"> |
|
3784 | <modify-function signature="setCalendarWidget(QCalendarWidget*)"> | |
3667 | <modify-argument index="1"> |
|
3785 | <modify-argument index="1"> | |
3668 |
<!-- Safe to ignore because widget is reparented --> |
|
3786 | <!-- Safe to ignore because widget is reparented --> | |
3669 |
<reference-count action="ignore"/> |
|
3787 | <reference-count action="ignore"/> | |
3670 | </modify-argument> |
|
3788 | </modify-argument> | |
3671 | </modify-function> |
|
3789 | </modify-function> | |
3672 |
|
3790 | |||
3673 | </object-type> |
|
3791 | </object-type> | |
3674 |
|
3792 | |||
3675 | <object-type name="QSortFilterProxyModel"> |
|
3793 | <object-type name="QSortFilterProxyModel"> | |
@@ -3678,14 +3796,14 | |||||
3678 | <include file-name="QItemSelection" location="global"/> |
|
3796 | <include file-name="QItemSelection" location="global"/> | |
3679 | <include file-name="QStringList" location="global"/> |
|
3797 | <include file-name="QStringList" location="global"/> | |
3680 | <include file-name="QSize" location="global"/> |
|
3798 | <include file-name="QSize" location="global"/> | |
3681 |
</extra-includes> |
|
3799 | </extra-includes> | |
3682 |
|
3800 | |||
3683 | <modify-function signature="setSourceModel(QAbstractItemModel *)"> |
|
3801 | <modify-function signature="setSourceModel(QAbstractItemModel *)"> | |
3684 | <modify-argument index="1"> |
|
3802 | <modify-argument index="1"> | |
3685 | <reference-count action="set" variable-name="__rcSourceModel"/> |
|
3803 | <reference-count action="set" variable-name="__rcSourceModel"/> | |
3686 | </modify-argument> |
|
3804 | </modify-argument> | |
3687 | </modify-function> |
|
3805 | </modify-function> | |
3688 |
|
3806 | |||
3689 | <modify-function signature="clear()" remove="all"/> <!--### Obsolete in 4.3--> |
|
3807 | <modify-function signature="clear()" remove="all"/> <!--### Obsolete in 4.3--> | |
3690 | <modify-function signature="filterChanged()" remove="all"/> <!--### Obsolete in 4.3--> |
|
3808 | <modify-function signature="filterChanged()" remove="all"/> <!--### Obsolete in 4.3--> | |
3691 | </object-type> |
|
3809 | </object-type> | |
@@ -3699,7 +3817,7 | |||||
3699 | <object-type name="QInputContext"> |
|
3817 | <object-type name="QInputContext"> | |
3700 | <extra-includes> |
|
3818 | <extra-includes> | |
3701 | <include file-name="QTextFormat" location="global"/> |
|
3819 | <include file-name="QTextFormat" location="global"/> | |
3702 |
</extra-includes> |
|
3820 | </extra-includes> | |
3703 | <modify-function signature="setFocusWidget(QWidget*)"> |
|
3821 | <modify-function signature="setFocusWidget(QWidget*)"> | |
3704 | <remove/> |
|
3822 | <remove/> | |
3705 | </modify-function> |
|
3823 | </modify-function> | |
@@ -3711,8 +3829,9 | |||||
3711 | </modify-function> |
|
3829 | </modify-function> | |
3712 |
|
3830 | |||
3713 | </object-type> |
|
3831 | </object-type> | |
3714 |
|
3832 | |||
3715 | <object-type name="QProgressDialog"> |
|
3833 | <object-type name="QProgressDialog"> | |
|
3834 | ||||
3716 | <modify-function signature="setBar(QProgressBar*)"> |
|
3835 | <modify-function signature="setBar(QProgressBar*)"> | |
3717 | <modify-argument index="1"> |
|
3836 | <modify-argument index="1"> | |
3718 | <define-ownership class="java" owner="c++"/> |
|
3837 | <define-ownership class="java" owner="c++"/> | |
@@ -3730,7 +3849,7 | |||||
3730 | <reference-count action="ignore"/> |
|
3849 | <reference-count action="ignore"/> | |
3731 | </modify-argument> |
|
3850 | </modify-argument> | |
3732 | </modify-function> |
|
3851 | </modify-function> | |
3733 |
|
3852 | |||
3734 | </object-type> |
|
3853 | </object-type> | |
3735 |
|
3854 | |||
3736 | <object-type name="QLabel"> |
|
3855 | <object-type name="QLabel"> | |
@@ -3738,7 +3857,7 | |||||
3738 | <access modifier="private"/> |
|
3857 | <access modifier="private"/> | |
3739 | <rename to="picture_private"/> |
|
3858 | <rename to="picture_private"/> | |
3740 | </modify-function> |
|
3859 | </modify-function> | |
3741 |
|
3860 | |||
3742 | <modify-function signature="setBuddy(QWidget *)"> |
|
3861 | <modify-function signature="setBuddy(QWidget *)"> | |
3743 | <modify-argument index="1"> |
|
3862 | <modify-argument index="1"> | |
3744 | <reference-count action="set" variable-name="__rcBuddy"/> |
|
3863 | <reference-count action="set" variable-name="__rcBuddy"/> | |
@@ -3751,7 +3870,7 | |||||
3751 | </modify-function> |
|
3870 | </modify-function> | |
3752 | <modify-function signature="pixmap()const"> |
|
3871 | <modify-function signature="pixmap()const"> | |
3753 | <access modifier="private"/> |
|
3872 | <access modifier="private"/> | |
3754 |
<rename to="pixmap_private"/> |
|
3873 | <rename to="pixmap_private"/> | |
3755 | </modify-function> |
|
3874 | </modify-function> | |
3756 | </object-type> |
|
3875 | </object-type> | |
3757 |
|
3876 | |||
@@ -3759,7 +3878,7 | |||||
3759 | <extra-includes> |
|
3878 | <extra-includes> | |
3760 | <include file-name="QUrl" location="global"/> |
|
3879 | <include file-name="QUrl" location="global"/> | |
3761 | </extra-includes> |
|
3880 | </extra-includes> | |
3762 | <!-- |
|
3881 | ||
3763 | <modify-function signature="getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> |
|
3882 | <modify-function signature="getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> | |
3764 | <access modifier="private"/> |
|
3883 | <access modifier="private"/> | |
3765 | <modify-argument index="1"> |
|
3884 | <modify-argument index="1"> | |
@@ -3779,9 +3898,9 | |||||
3779 | </modify-argument> |
|
3898 | </modify-argument> | |
3780 | <modify-argument index="6"> |
|
3899 | <modify-argument index="6"> | |
3781 | <remove-default-expression/> |
|
3900 | <remove-default-expression/> | |
3782 |
</modify-argument> |
|
3901 | </modify-argument> | |
3783 | </modify-function> |
|
3902 | </modify-function> | |
3784 |
|
3903 | |||
3785 | <modify-function signature="getOpenFileNames(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> |
|
3904 | <modify-function signature="getOpenFileNames(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> | |
3786 | <access modifier="private"/> |
|
3905 | <access modifier="private"/> | |
3787 | <modify-argument index="1"> |
|
3906 | <modify-argument index="1"> | |
@@ -3801,9 +3920,9 | |||||
3801 | </modify-argument> |
|
3920 | </modify-argument> | |
3802 | <modify-argument index="6"> |
|
3921 | <modify-argument index="6"> | |
3803 | <remove-default-expression/> |
|
3922 | <remove-default-expression/> | |
3804 |
</modify-argument> |
|
3923 | </modify-argument> | |
3805 | </modify-function> |
|
3924 | </modify-function> | |
3806 |
|
3925 | |||
3807 | <modify-function signature="getSaveFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> |
|
3926 | <modify-function signature="getSaveFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> | |
3808 | <access modifier="private"/> |
|
3927 | <access modifier="private"/> | |
3809 | <modify-argument index="1"> |
|
3928 | <modify-argument index="1"> | |
@@ -3823,29 +3942,28 | |||||
3823 | </modify-argument> |
|
3942 | </modify-argument> | |
3824 | <modify-argument index="6"> |
|
3943 | <modify-argument index="6"> | |
3825 | <remove-default-expression/> |
|
3944 | <remove-default-expression/> | |
3826 |
</modify-argument> |
|
3945 | </modify-argument> | |
3827 | </modify-function> |
|
3946 | </modify-function> | |
3828 | --> |
|
3947 | ||
3829 |
|
||||
3830 | <modify-function signature="setIconProvider(QFileIconProvider*)"> |
|
3948 | <modify-function signature="setIconProvider(QFileIconProvider*)"> | |
3831 | <modify-argument index="1"> |
|
3949 | <modify-argument index="1"> | |
3832 | <reference-count action="set" variable-name="__rcIconProvider"/> |
|
3950 | <reference-count action="set" variable-name="__rcIconProvider"/> | |
3833 | </modify-argument> |
|
3951 | </modify-argument> | |
3834 | </modify-function> |
|
3952 | </modify-function> | |
3835 |
|
3953 | |||
3836 | <modify-function signature="setItemDelegate(QAbstractItemDelegate*)"> |
|
3954 | <modify-function signature="setItemDelegate(QAbstractItemDelegate*)"> | |
3837 | <modify-argument index="1"> |
|
3955 | <modify-argument index="1"> | |
3838 | <reference-count action="set" variable-name="__rcItemDelegate"/> |
|
3956 | <reference-count action="set" variable-name="__rcItemDelegate"/> | |
3839 | </modify-argument> |
|
3957 | </modify-argument> | |
3840 | </modify-function> |
|
3958 | </modify-function> | |
3841 |
|
3959 | |||
3842 | <modify-function signature="setProxyModel(QAbstractProxyModel*)"> |
|
3960 | <modify-function signature="setProxyModel(QAbstractProxyModel*)"> | |
3843 | <modify-argument index="1"> |
|
3961 | <modify-argument index="1"> | |
3844 | <!-- Reparented --> |
|
3962 | <!-- Reparented --> | |
3845 | <reference-count action="ignore"/> |
|
3963 | <reference-count action="ignore"/> | |
3846 | </modify-argument> |
|
3964 | </modify-argument> | |
3847 | </modify-function> |
|
3965 | </modify-function> | |
3848 |
|
3966 | |||
3849 | </object-type> |
|
3967 | </object-type> | |
3850 |
|
3968 | |||
3851 | <object-type name="QErrorMessage" /> |
|
3969 | <object-type name="QErrorMessage" /> | |
@@ -3853,10 +3971,15 | |||||
3853 | <object-type name="QTabBar"> |
|
3971 | <object-type name="QTabBar"> | |
3854 | <extra-includes> |
|
3972 | <extra-includes> | |
3855 | <include file-name="QIcon" location="global"/> |
|
3973 | <include file-name="QIcon" location="global"/> | |
3856 |
</extra-includes> |
|
3974 | </extra-includes> | |
3857 | <modify-function signature="initStyleOption(QStyleOptionTab*,int)const"> |
|
3975 | <modify-function signature="initStyleOption(QStyleOptionTab*,int)const"> | |
3858 | <access modifier="private"/> |
|
3976 | <access modifier="private"/> | |
3859 | </modify-function> |
|
3977 | </modify-function> | |
|
3978 | <modify-function signature="setTabButton(int,QTabBar::ButtonPosition,QWidget*)"> | |||
|
3979 | <modify-argument index="3"> | |||
|
3980 | <reference-count action="ignore" /> | |||
|
3981 | </modify-argument> | |||
|
3982 | </modify-function> | |||
3860 | </object-type> |
|
3983 | </object-type> | |
3861 |
|
3984 | |||
3862 | <object-type name="QStandardItemModel"> |
|
3985 | <object-type name="QStandardItemModel"> | |
@@ -3866,8 +3989,8 | |||||
3866 | <extra-includes> |
|
3989 | <extra-includes> | |
3867 | <include file-name="QStringList" location="global"/> |
|
3990 | <include file-name="QStringList" location="global"/> | |
3868 | <include file-name="QSize" location="global"/> |
|
3991 | <include file-name="QSize" location="global"/> | |
3869 |
</extra-includes> |
|
3992 | </extra-includes> | |
3870 |
|
3993 | |||
3871 | <modify-function signature="appendColumn(const QList<QStandardItem *>&)"> |
|
3994 | <modify-function signature="appendColumn(const QList<QStandardItem *>&)"> | |
3872 | <modify-argument index="1"> |
|
3995 | <modify-argument index="1"> | |
3873 | <define-ownership class="java" owner="c++"/> |
|
3996 | <define-ownership class="java" owner="c++"/> | |
@@ -3882,22 +4005,22 | |||||
3882 | <modify-argument index="return"> |
|
4005 | <modify-argument index="return"> | |
3883 | <define-ownership class="java" owner="default"/> |
|
4006 | <define-ownership class="java" owner="default"/> | |
3884 | </modify-argument> |
|
4007 | </modify-argument> | |
3885 |
</modify-function> |
|
4008 | </modify-function> | |
3886 | <modify-function signature="takeHorizontalHeaderItem(int)"> |
|
4009 | <modify-function signature="takeHorizontalHeaderItem(int)"> | |
3887 | <modify-argument index="return"> |
|
4010 | <modify-argument index="return"> | |
3888 | <define-ownership class="java" owner="default"/> |
|
4011 | <define-ownership class="java" owner="default"/> | |
3889 | </modify-argument> |
|
4012 | </modify-argument> | |
3890 |
</modify-function> |
|
4013 | </modify-function> | |
3891 | <modify-function signature="takeVerticalHeaderItem(int)"> |
|
4014 | <modify-function signature="takeVerticalHeaderItem(int)"> | |
3892 | <modify-argument index="return"> |
|
4015 | <modify-argument index="return"> | |
3893 | <define-ownership class="java" owner="default"/> |
|
4016 | <define-ownership class="java" owner="default"/> | |
3894 | </modify-argument> |
|
4017 | </modify-argument> | |
3895 |
</modify-function> |
|
4018 | </modify-function> | |
3896 | <modify-function signature="takeItem(int,int)"> |
|
4019 | <modify-function signature="takeItem(int,int)"> | |
3897 | <modify-argument index="return"> |
|
4020 | <modify-argument index="return"> | |
3898 | <define-ownership class="java" owner="default"/> |
|
4021 | <define-ownership class="java" owner="default"/> | |
3899 | </modify-argument> |
|
4022 | </modify-argument> | |
3900 |
</modify-function> |
|
4023 | </modify-function> | |
3901 | <modify-function signature="appendRow(const QList<QStandardItem *>&)"> |
|
4024 | <modify-function signature="appendRow(const QList<QStandardItem *>&)"> | |
3902 | <modify-argument index="1"> |
|
4025 | <modify-argument index="1"> | |
3903 | <define-ownership class="java" owner="c++"/> |
|
4026 | <define-ownership class="java" owner="c++"/> | |
@@ -3906,7 +4029,7 | |||||
3906 | <modify-function signature="appendRow(QStandardItem *)"> |
|
4029 | <modify-function signature="appendRow(QStandardItem *)"> | |
3907 | <modify-argument index="1"> |
|
4030 | <modify-argument index="1"> | |
3908 | <define-ownership class="java" owner="c++"/> |
|
4031 | <define-ownership class="java" owner="c++"/> | |
3909 |
</modify-argument> |
|
4032 | </modify-argument> | |
3910 | </modify-function> |
|
4033 | </modify-function> | |
3911 | <modify-function signature="insertColumn(int, const QList<QStandardItem *>&)"> |
|
4034 | <modify-function signature="insertColumn(int, const QList<QStandardItem *>&)"> | |
3912 | <modify-argument index="2"> |
|
4035 | <modify-argument index="2"> | |
@@ -3921,7 +4044,7 | |||||
3921 | <modify-function signature="insertRow(int, QStandardItem *)"> |
|
4044 | <modify-function signature="insertRow(int, QStandardItem *)"> | |
3922 | <modify-argument index="2"> |
|
4045 | <modify-argument index="2"> | |
3923 | <define-ownership class="java" owner="c++"/> |
|
4046 | <define-ownership class="java" owner="c++"/> | |
3924 |
</modify-argument> |
|
4047 | </modify-argument> | |
3925 | </modify-function> |
|
4048 | </modify-function> | |
3926 | <modify-function signature="setHorizontalHeaderItem(int, QStandardItem *)"> |
|
4049 | <modify-function signature="setHorizontalHeaderItem(int, QStandardItem *)"> | |
3927 | <modify-argument index="2"> |
|
4050 | <modify-argument index="2"> | |
@@ -3942,12 +4065,12 | |||||
3942 | <modify-argument index="1"> |
|
4065 | <modify-argument index="1"> | |
3943 | <define-ownership class="java" owner="c++"/> |
|
4066 | <define-ownership class="java" owner="c++"/> | |
3944 | </modify-argument> |
|
4067 | </modify-argument> | |
3945 |
</modify-function> |
|
4068 | </modify-function> | |
3946 | <modify-function signature="setVerticalHeaderItem(int, QStandardItem *)"> |
|
4069 | <modify-function signature="setVerticalHeaderItem(int, QStandardItem *)"> | |
3947 | <modify-argument index="2"> |
|
4070 | <modify-argument index="2"> | |
3948 | <define-ownership class="java" owner="c++"/> |
|
4071 | <define-ownership class="java" owner="c++"/> | |
3949 | </modify-argument> |
|
4072 | </modify-argument> | |
3950 |
</modify-function> |
|
4073 | </modify-function> | |
3951 | </object-type> |
|
4074 | </object-type> | |
3952 |
|
4075 | |||
3953 | <object-type name="QRadioButton"> |
|
4076 | <object-type name="QRadioButton"> | |
@@ -3966,7 +4089,7 | |||||
3966 | <extra-includes> |
|
4089 | <extra-includes> | |
3967 | <include file-name="QImage" location="global"/> |
|
4090 | <include file-name="QImage" location="global"/> | |
3968 | <include file-name="QPixmap" location="global"/> |
|
4091 | <include file-name="QPixmap" location="global"/> | |
3969 |
</extra-includes> |
|
4092 | </extra-includes> | |
3970 | <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)"> |
|
4093 | <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)"> | |
3971 | <modify-argument index="1"> |
|
4094 | <modify-argument index="1"> | |
3972 | <define-ownership class="java" owner="c++"/> |
|
4095 | <define-ownership class="java" owner="c++"/> | |
@@ -3978,11 +4101,11 | |||||
3978 | <remove-default-expression/> |
|
4101 | <remove-default-expression/> | |
3979 | </modify-argument> |
|
4102 | </modify-argument> | |
3980 | </modify-function> |
|
4103 | </modify-function> | |
3981 |
|
4104 | |||
3982 | </object-type> |
|
4105 | </object-type> | |
3983 |
|
4106 | |||
3984 | <object-type name="QAbstractScrollArea"> |
|
4107 | <object-type name="QAbstractScrollArea"> | |
3985 |
<modify-function signature="setupViewport(QWidget *)" access="non-final"/> |
|
4108 | <modify-function signature="setupViewport(QWidget *)" access="non-final"/> | |
3986 | <modify-function signature="addScrollBarWidget(QWidget*,QFlags<Qt::AlignmentFlag>)"> |
|
4109 | <modify-function signature="addScrollBarWidget(QWidget*,QFlags<Qt::AlignmentFlag>)"> | |
3987 | <modify-argument index="1"> |
|
4110 | <modify-argument index="1"> | |
3988 | <reference-count action="ignore"/> |
|
4111 | <reference-count action="ignore"/> | |
@@ -3998,35 +4121,35 | |||||
3998 | <reference-count action="ignore"/> |
|
4121 | <reference-count action="ignore"/> | |
3999 | </modify-argument> |
|
4122 | </modify-argument> | |
4000 | </modify-function> |
|
4123 | </modify-function> | |
4001 |
|
4124 | |||
4002 | <modify-function signature="setVerticalScrollBar(QScrollBar*)"> |
|
4125 | <modify-function signature="setVerticalScrollBar(QScrollBar*)"> | |
4003 | <modify-argument index="1"> |
|
4126 | <modify-argument index="1"> | |
4004 | <reference-count action="ignore"/> |
|
4127 | <reference-count action="ignore"/> | |
4005 | </modify-argument> |
|
4128 | </modify-argument> | |
4006 | </modify-function> |
|
4129 | </modify-function> | |
4007 |
|
4130 | |||
4008 | <modify-function signature="setViewport(QWidget*)"> |
|
4131 | <modify-function signature="setViewport(QWidget*)"> | |
4009 | <modify-argument index="1"> |
|
4132 | <modify-argument index="1"> | |
4010 | <reference-count action="ignore"/> |
|
4133 | <reference-count action="ignore"/> | |
4011 | </modify-argument> |
|
4134 | </modify-argument> | |
4012 | </modify-function> |
|
4135 | </modify-function> | |
4013 |
|
4136 | |||
4014 | <modify-function signature="setupViewport(QWidget*)"> |
|
4137 | <modify-function signature="setupViewport(QWidget*)"> | |
4015 | <modify-argument index="1"> |
|
4138 | <modify-argument index="1"> | |
4016 | <reference-count action="ignore"/> |
|
4139 | <reference-count action="ignore"/> | |
4017 | </modify-argument> |
|
4140 | </modify-argument> | |
4018 | </modify-function> |
|
4141 | </modify-function> | |
4019 |
|
4142 | |||
4020 | <modify-function signature="viewportEvent(QEvent*)"> |
|
4143 | <modify-function signature="viewportEvent(QEvent*)"> | |
4021 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
4144 | <modify-argument index="1" invalidate-after-use="yes" /> | |
4022 | </modify-function> |
|
4145 | </modify-function> | |
4023 |
|
4146 | |||
4024 | </object-type> |
|
4147 | </object-type> | |
4025 |
|
4148 | |||
4026 | <object-type name="QPaintEngineState"> |
|
4149 | <object-type name="QPaintEngineState"> | |
4027 | <extra-includes> |
|
4150 | <extra-includes> | |
4028 | <include file-name="QPainterPath" location="global"/> |
|
4151 | <include file-name="QPainterPath" location="global"/> | |
4029 |
</extra-includes> |
|
4152 | </extra-includes> | |
4030 | </object-type> |
|
4153 | </object-type> | |
4031 |
|
4154 | |||
4032 | <object-type name="QRubberBand"> |
|
4155 | <object-type name="QRubberBand"> | |
@@ -4044,12 +4167,15 | |||||
4044 | <object-type name="QTextLayout"> |
|
4167 | <object-type name="QTextLayout"> | |
4045 | <extra-includes> |
|
4168 | <extra-includes> | |
4046 | <include file-name="QTextOption" location="global"/> |
|
4169 | <include file-name="QTextOption" location="global"/> | |
4047 |
</extra-includes> |
|
4170 | </extra-includes> | |
4048 |
</object-type> |
|
4171 | </object-type> | |
4049 |
|
4172 | |||
4050 | <object-type name="QTableWidget"> |
|
4173 | <object-type name="QTableWidget"> | |
|
4174 | <modify-function signature="mimeData(const QList<QTableWidgetItem*>)const"> | |||
|
4175 | <modify-argument index="1" invalidate-after-use="yes"/> | |||
|
4176 | </modify-function> | |||
4051 | <modify-function signature="isSortingEnabled()const" remove="all"/> |
|
4177 | <modify-function signature="isSortingEnabled()const" remove="all"/> | |
4052 |
<modify-function signature="setSortingEnabled(bool)" remove="all"/> |
|
4178 | <modify-function signature="setSortingEnabled(bool)" remove="all"/> | |
4053 | <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)"> |
|
4179 | <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)"> | |
4054 | <modify-argument index="2"> |
|
4180 | <modify-argument index="2"> | |
4055 | <define-ownership class="java" owner="c++"/> |
|
4181 | <define-ownership class="java" owner="c++"/> | |
@@ -4059,7 +4185,7 | |||||
4059 | <modify-argument index="3"> |
|
4185 | <modify-argument index="3"> | |
4060 | <define-ownership class="java" owner="c++"/> |
|
4186 | <define-ownership class="java" owner="c++"/> | |
4061 | </modify-argument> |
|
4187 | </modify-argument> | |
4062 |
</modify-function> |
|
4188 | </modify-function> | |
4063 | <modify-function signature="takeHorizontalHeaderItem(int)"> |
|
4189 | <modify-function signature="takeHorizontalHeaderItem(int)"> | |
4064 | <modify-argument index="return"> |
|
4190 | <modify-argument index="return"> | |
4065 | <define-ownership class="java" owner="default"/> |
|
4191 | <define-ownership class="java" owner="default"/> | |
@@ -4069,22 +4195,22 | |||||
4069 | <modify-argument index="return"> |
|
4195 | <modify-argument index="return"> | |
4070 | <define-ownership class="java" owner="default"/> |
|
4196 | <define-ownership class="java" owner="default"/> | |
4071 | </modify-argument> |
|
4197 | </modify-argument> | |
4072 |
</modify-function> |
|
4198 | </modify-function> | |
4073 | <modify-function signature="takeItem(int,int)"> |
|
4199 | <modify-function signature="takeItem(int,int)"> | |
4074 | <modify-argument index="return"> |
|
4200 | <modify-argument index="return"> | |
4075 | <define-ownership class="java" owner="default"/> |
|
4201 | <define-ownership class="java" owner="default"/> | |
4076 | </modify-argument> |
|
4202 | </modify-argument> | |
4077 |
</modify-function> |
|
4203 | </modify-function> | |
4078 | <modify-function signature="setItemPrototype(const QTableWidgetItem *)"> |
|
4204 | <modify-function signature="setItemPrototype(const QTableWidgetItem *)"> | |
4079 | <modify-argument index="1"> |
|
4205 | <modify-argument index="1"> | |
4080 | <define-ownership class="java" owner="c++"/> |
|
4206 | <define-ownership class="java" owner="c++"/> | |
4081 | </modify-argument> |
|
4207 | </modify-argument> | |
4082 |
</modify-function> |
|
4208 | </modify-function> | |
4083 | <modify-function signature="setVerticalHeaderItem(int, QTableWidgetItem *)"> |
|
4209 | <modify-function signature="setVerticalHeaderItem(int, QTableWidgetItem *)"> | |
4084 | <modify-argument index="2"> |
|
4210 | <modify-argument index="2"> | |
4085 | <define-ownership class="java" owner="c++"/> |
|
4211 | <define-ownership class="java" owner="c++"/> | |
4086 | </modify-argument> |
|
4212 | </modify-argument> | |
4087 |
</modify-function> |
|
4213 | </modify-function> | |
4088 | <modify-function signature="setCellWidget(int,int,QWidget*)"> |
|
4214 | <modify-function signature="setCellWidget(int,int,QWidget*)"> | |
4089 | <modify-argument index="3"> |
|
4215 | <modify-argument index="3"> | |
4090 | <reference-count action="ignore"/> |
|
4216 | <reference-count action="ignore"/> | |
@@ -4117,23 +4243,36 | |||||
4117 | <include file-name="QTextBlock" location="global"/> |
|
4243 | <include file-name="QTextBlock" location="global"/> | |
4118 | <include file-name="QTextFormat" location="global"/> |
|
4244 | <include file-name="QTextFormat" location="global"/> | |
4119 | <include file-name="QTextCursor" location="global"/> |
|
4245 | <include file-name="QTextCursor" location="global"/> | |
4120 |
</extra-includes> |
|
4246 | </extra-includes> | |
4121 | <modify-function signature="redo(QTextCursor*)"> |
|
4247 | <modify-function signature="redo(QTextCursor*)"> | |
4122 |
<access modifier="private"/> |
|
4248 | <access modifier="private"/> | |
4123 | </modify-function> |
|
4249 | </modify-function> | |
4124 | <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)"> |
|
4250 | <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)"> | |
4125 | <modify-argument index="1"> |
|
4251 | <modify-argument index="1"> | |
4126 | <define-ownership class="java" owner="c++"/> |
|
4252 | <define-ownership class="java" owner="c++"/> | |
4127 | </modify-argument> |
|
4253 | </modify-argument> | |
4128 | </modify-function> |
|
4254 | </modify-function> | |
4129 |
|
4255 | |||
4130 | <modify-function signature="undo(QTextCursor*)"> |
|
4256 | <modify-function signature="undo(QTextCursor*)"> | |
4131 |
<access modifier="private"/> |
|
4257 | <access modifier="private"/> | |
|
4258 | </modify-function> | |||
|
4259 | </object-type> | |||
|
4260 | ||||
|
4261 | <object-type name="QTextDocumentWriter"> | |||
|
4262 | <modify-function signature="setCodec(QTextCodec*)"> | |||
|
4263 | <modify-argument index="1"> | |||
|
4264 | <reference-count action="set" variable-name="__rcCodec" /> | |||
|
4265 | </modify-argument> | |||
|
4266 | </modify-function> | |||
|
4267 | <modify-function signature="setDevice(QIODevice*)"> | |||
|
4268 | <modify-argument index="1"> | |||
|
4269 | <reference-count action="set" variable-name="__rcDevice" /> | |||
|
4270 | </modify-argument> | |||
4132 | </modify-function> |
|
4271 | </modify-function> | |
4133 | </object-type> |
|
4272 | </object-type> | |
4134 |
|
4273 | |||
4135 | <object-type name="QSplitter"> |
|
4274 | <object-type name="QSplitter"> | |
4136 |
|
4275 | |||
4137 | <modify-function signature="getRange(int,int*,int*)const"> |
|
4276 | <modify-function signature="getRange(int,int*,int*)const"> | |
4138 | <access modifier="private"/> |
|
4277 | <access modifier="private"/> | |
4139 | </modify-function> |
|
4278 | </modify-function> | |
@@ -4148,7 +4287,7 | |||||
4148 | </modify-argument> |
|
4287 | </modify-argument> | |
4149 | </modify-function> |
|
4288 | </modify-function> | |
4150 | </object-type> |
|
4289 | </object-type> | |
4151 |
|
4290 | |||
4152 | <object-type name="QGroupBox"> |
|
4291 | <object-type name="QGroupBox"> | |
4153 | <modify-function signature="initStyleOption(QStyleOptionGroupBox*)const"> |
|
4292 | <modify-function signature="initStyleOption(QStyleOptionGroupBox*)const"> | |
4154 | <access modifier="private"/> |
|
4293 | <access modifier="private"/> | |
@@ -4202,9 +4341,9 | |||||
4202 | </modify-argument> |
|
4341 | </modify-argument> | |
4203 | </modify-function> |
|
4342 | </modify-function> | |
4204 | </object-type> |
|
4343 | </object-type> | |
4205 |
|
4344 | |||
4206 | <object-type name="QLCDNumber" /> |
|
4345 | <object-type name="QLCDNumber" /> | |
4207 |
|
4346 | |||
4208 | <object-type name="QSplashScreen"> |
|
4347 | <object-type name="QSplashScreen"> | |
4209 | <modify-function signature="showMessage(const QString &, int, const QColor &)"> |
|
4348 | <modify-function signature="showMessage(const QString &, int, const QColor &)"> | |
4210 | <modify-argument index="3"> |
|
4349 | <modify-argument index="3"> | |
@@ -4216,7 +4355,7 | |||||
4216 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
4355 | <modify-argument index="1" invalidate-after-use="yes" /> | |
4217 | </modify-function> |
|
4356 | </modify-function> | |
4218 | </object-type> |
|
4357 | </object-type> | |
4219 |
|
4358 | |||
4220 | <object-type name="QDockWidget"> |
|
4359 | <object-type name="QDockWidget"> | |
4221 | <modify-function signature="initStyleOption(QStyleOptionDockWidget*)const"> |
|
4360 | <modify-function signature="initStyleOption(QStyleOptionDockWidget*)const"> | |
4222 | <access modifier="private"/> |
|
4361 | <access modifier="private"/> | |
@@ -4225,7 +4364,7 | |||||
4225 | <insert-template name="gui.init_style_option"> |
|
4364 | <insert-template name="gui.init_style_option"> | |
4226 | <replace from="%TYPE" to="QStyleOptionDockWidget"/> |
|
4365 | <replace from="%TYPE" to="QStyleOptionDockWidget"/> | |
4227 | </insert-template> |
|
4366 | </insert-template> | |
4228 |
</inject-code> |
|
4367 | </inject-code> | |
4229 | <modify-function signature="setTitleBarWidget(QWidget*)"> |
|
4368 | <modify-function signature="setTitleBarWidget(QWidget*)"> | |
4230 | <modify-argument index="1"> |
|
4369 | <modify-argument index="1"> | |
4231 | <reference-count action="ignore"/> |
|
4370 | <reference-count action="ignore"/> | |
@@ -4244,13 +4383,13 | |||||
4244 | <include file-name="QStringList" location="global"/> |
|
4383 | <include file-name="QStringList" location="global"/> | |
4245 | <include file-name="QSize" location="global"/> |
|
4384 | <include file-name="QSize" location="global"/> | |
4246 | </extra-includes> |
|
4385 | </extra-includes> | |
4247 |
|
4386 | |||
4248 | <modify-function signature="setSourceModel(QAbstractItemModel *)"> |
|
4387 | <modify-function signature="setSourceModel(QAbstractItemModel *)"> | |
4249 | <modify-argument index="1"> |
|
4388 | <modify-argument index="1"> | |
4250 | <reference-count action="set" variable-name="__rcSourceModel"/> |
|
4389 | <reference-count action="set" variable-name="__rcSourceModel"/> | |
4251 | </modify-argument> |
|
4390 | </modify-argument> | |
4252 | </modify-function> |
|
4391 | </modify-function> | |
4253 |
|
4392 | |||
4254 | </object-type> |
|
4393 | </object-type> | |
4255 |
|
4394 | |||
4256 | <object-type name="QDesktopWidget"> |
|
4395 | <object-type name="QDesktopWidget"> | |
@@ -4271,20 +4410,20 | |||||
4271 | <object-type name="QSpinBox"> |
|
4410 | <object-type name="QSpinBox"> | |
4272 | <modify-function signature="valueChanged(const QString &)"> |
|
4411 | <modify-function signature="valueChanged(const QString &)"> | |
4273 | <rename to="valueStringChanged"/> |
|
4412 | <rename to="valueStringChanged"/> | |
4274 |
</modify-function> |
|
4413 | </modify-function> | |
4275 |
</object-type> |
|
4414 | </object-type> | |
4276 |
|
4415 | |||
4277 | <object-type name="QTextBrowser"> |
|
4416 | <object-type name="QTextBrowser"> | |
4278 | <modify-function signature="highlighted(const QString &)"> |
|
4417 | <modify-function signature="highlighted(const QString &)"> | |
4279 | <rename to="highlightedString"/> |
|
4418 | <rename to="highlightedString"/> | |
4280 | </modify-function> |
|
4419 | </modify-function> | |
4281 | </object-type> |
|
4420 | </object-type> | |
4282 |
|
4421 | |||
4283 | <object-type name="QDoubleSpinBox"> |
|
4422 | <object-type name="QDoubleSpinBox"> | |
4284 | <modify-function signature="valueChanged(const QString &)"> |
|
4423 | <modify-function signature="valueChanged(const QString &)"> | |
4285 | <rename to="valueStringChanged"/> |
|
4424 | <rename to="valueStringChanged"/> | |
4286 | </modify-function> |
|
4425 | </modify-function> | |
4287 |
</object-type> |
|
4426 | </object-type> | |
4288 |
|
4427 | |||
4289 | <object-type name="QButtonGroup"> |
|
4428 | <object-type name="QButtonGroup"> | |
4290 | <modify-function signature="buttonClicked(int)"> |
|
4429 | <modify-function signature="buttonClicked(int)"> | |
@@ -4307,21 +4446,21 | |||||
4307 | <reference-count action="add" variable-name="__rcButtons"/> |
|
4446 | <reference-count action="add" variable-name="__rcButtons"/> | |
4308 | <no-null-pointer/> |
|
4447 | <no-null-pointer/> | |
4309 | </modify-argument> |
|
4448 | </modify-argument> | |
4310 |
</modify-function> |
|
4449 | </modify-function> | |
4311 | <modify-function signature="removeButton(QAbstractButton *)"> |
|
4450 | <modify-function signature="removeButton(QAbstractButton *)"> | |
4312 | <modify-argument index="1"> |
|
4451 | <modify-argument index="1"> | |
4313 | <reference-count action="remove" variable-name="__rcButtons"/> |
|
4452 | <reference-count action="remove" variable-name="__rcButtons"/> | |
4314 | <no-null-pointer/> |
|
4453 | <no-null-pointer/> | |
4315 | </modify-argument> |
|
4454 | </modify-argument> | |
4316 |
</modify-function> |
|
4455 | </modify-function> | |
4317 | <modify-function signature="setId(QAbstractButton *,int)"> |
|
4456 | <modify-function signature="setId(QAbstractButton *,int)"> | |
4318 | <modify-argument index="1"> |
|
4457 | <modify-argument index="1"> | |
4319 | <reference-count action="ignore"/> |
|
4458 | <reference-count action="ignore"/> | |
4320 | </modify-argument> |
|
4459 | </modify-argument> | |
4321 | </modify-function> |
|
4460 | </modify-function> | |
4322 | </object-type> |
|
4461 | </object-type> | |
4323 |
|
4462 | |||
4324 |
<object-type name="QToolBar"> |
|
4463 | <object-type name="QToolBar"> | |
4325 | <modify-function signature="addAction(QAction *)" remove="all"/> |
|
4464 | <modify-function signature="addAction(QAction *)" remove="all"/> | |
4326 | <modify-function signature="initStyleOption(QStyleOptionToolBar*)const"> |
|
4465 | <modify-function signature="initStyleOption(QStyleOptionToolBar*)const"> | |
4327 | <access modifier="private"/> |
|
4466 | <access modifier="private"/> | |
@@ -4336,11 +4475,11 | |||||
4336 | <modify-argument index="1"> |
|
4475 | <modify-argument index="1"> | |
4337 | <define-ownership class="java" owner="c++"/> |
|
4476 | <define-ownership class="java" owner="c++"/> | |
4338 | </modify-argument> |
|
4477 | </modify-argument> | |
4339 |
</modify-function> |
|
4478 | </modify-function> | |
4340 | <modify-function signature="insertWidget(QAction*,QWidget*)"> |
|
4479 | <modify-function signature="insertWidget(QAction*,QWidget*)"> | |
4341 | <modify-argument index="1"> |
|
4480 | <modify-argument index="1"> | |
4342 | <reference-count action="ignore"/> |
|
4481 | <reference-count action="ignore"/> | |
4343 |
</modify-argument> |
|
4482 | </modify-argument> | |
4344 | <modify-argument index="2"> |
|
4483 | <modify-argument index="2"> | |
4345 | <define-ownership class="java" owner="c++"/> |
|
4484 | <define-ownership class="java" owner="c++"/> | |
4346 | </modify-argument> |
|
4485 | </modify-argument> | |
@@ -4351,9 +4490,9 | |||||
4351 | </modify-argument> |
|
4490 | </modify-argument> | |
4352 | </modify-function> |
|
4491 | </modify-function> | |
4353 | </object-type> |
|
4492 | </object-type> | |
4354 |
|
4493 | |||
4355 | <object-type name="QPaintEngine"> |
|
4494 | <object-type name="QPaintEngine"> | |
4356 |
|
4495 | |||
4357 | <modify-function signature="begin(QPaintDevice*)"> |
|
4496 | <modify-function signature="begin(QPaintDevice*)"> | |
4358 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
4497 | <modify-argument index="1" invalidate-after-use="yes" /> | |
4359 | </modify-function> |
|
4498 | </modify-function> | |
@@ -4368,13 +4507,20 | |||||
4368 | <include file-name="QVarLengthArray" location="global"/> |
|
4507 | <include file-name="QVarLengthArray" location="global"/> | |
4369 | </extra-includes> |
|
4508 | </extra-includes> | |
4370 | <modify-function signature="setPaintDevice(QPaintDevice*)"> |
|
4509 | <modify-function signature="setPaintDevice(QPaintDevice*)"> | |
4371 |
<remove/> |
|
4510 | <remove/> | |
4372 | </modify-function> |
|
4511 | </modify-function> | |
4373 | <modify-field name="state" read="false" write="false"/> |
|
4512 | <modify-field name="state" read="false" write="false"/> | |
4374 | </object-type> |
|
4513 | </object-type> | |
4375 |
|
4514 | |||
4376 |
<object-type name="Q |
|
4515 | <object-type name="QAbstractTableModel"> | |
4377 |
|
4516 | <extra-includes> | ||
|
4517 | <include file-name="QStringList" location="global"/> | |||
|
4518 | <include file-name="QSize" location="global"/> | |||
|
4519 | </extra-includes> | |||
|
4520 | </object-type> | |||
|
4521 | ||||
|
4522 | <object-type name="QGuiSignalMapper"/> | |||
|
4523 | ||||
4378 | <object-type name="QComboBox"> |
|
4524 | <object-type name="QComboBox"> | |
4379 | <modify-function signature="initStyleOption(QStyleOptionComboBox*)const"> |
|
4525 | <modify-function signature="initStyleOption(QStyleOptionComboBox*)const"> | |
4380 | <access modifier="private"/> |
|
4526 | <access modifier="private"/> | |
@@ -4400,7 +4546,7 | |||||
4400 | <no-null-pointer/> |
|
4546 | <no-null-pointer/> | |
4401 | <!-- Safe to ignore because combo box reparents view --> |
|
4547 | <!-- Safe to ignore because combo box reparents view --> | |
4402 | <reference-count action="ignore"/> |
|
4548 | <reference-count action="ignore"/> | |
4403 |
</modify-argument> |
|
4549 | </modify-argument> | |
4404 | </modify-function> |
|
4550 | </modify-function> | |
4405 | <modify-function signature="setLineEdit(QLineEdit *)"> |
|
4551 | <modify-function signature="setLineEdit(QLineEdit *)"> | |
4406 | <modify-argument index="1"> |
|
4552 | <modify-argument index="1"> | |
@@ -4419,9 +4565,9 | |||||
4419 | <insert-template name="gui.init_style_option"> |
|
4565 | <insert-template name="gui.init_style_option"> | |
4420 | <replace from="%TYPE" to="QStyleOptionComboBox"/> |
|
4566 | <replace from="%TYPE" to="QStyleOptionComboBox"/> | |
4421 | </insert-template> |
|
4567 | </insert-template> | |
4422 |
</inject-code> |
|
4568 | </inject-code> | |
4423 | <modify-function signature="activated(int)">> |
|
4569 | <modify-function signature="activated(int)">> | |
4424 |
<rename to="activatedIndex"/> |
|
4570 | <rename to="activatedIndex"/> | |
4425 | </modify-function> |
|
4571 | </modify-function> | |
4426 | <modify-function signature="currentIndexChanged(const QString &)"> |
|
4572 | <modify-function signature="currentIndexChanged(const QString &)"> | |
4427 | <rename to="currentStringChanged"/> |
|
4573 | <rename to="currentStringChanged"/> | |
@@ -4429,13 +4575,13 | |||||
4429 | <modify-function signature="highlighted(int)"> |
|
4575 | <modify-function signature="highlighted(int)"> | |
4430 | <rename to="highlightedIndex"/> |
|
4576 | <rename to="highlightedIndex"/> | |
4431 | </modify-function> |
|
4577 | </modify-function> | |
4432 |
|
4578 | |||
4433 | <modify-function signature="autoCompletion()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
4579 | <modify-function signature="autoCompletion()const" remove="all"/> <!--### Obsolete in 4.3--> | |
4434 | <modify-function signature="autoCompletionCaseSensitivity()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
4580 | <modify-function signature="autoCompletionCaseSensitivity()const" remove="all"/> <!--### Obsolete in 4.3--> | |
4435 | <modify-function signature="setAutoCompletion(bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4581 | <modify-function signature="setAutoCompletion(bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
4436 | <modify-function signature="setAutoCompletionCaseSensitivity(Qt::CaseSensitivity)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4582 | <modify-function signature="setAutoCompletionCaseSensitivity(Qt::CaseSensitivity)" remove="all"/> <!--### Obsolete in 4.3--> | |
4437 |
</object-type> |
|
4583 | </object-type> | |
4438 |
|
|
4584 | ||
4439 | <object-type name="QTextEdit"> |
|
4585 | <object-type name="QTextEdit"> | |
4440 | <extra-includes> |
|
4586 | <extra-includes> | |
4441 | <include file-name="QTextCursor" location="global"/> |
|
4587 | <include file-name="QTextCursor" location="global"/> | |
@@ -4469,7 +4615,7 | |||||
4469 | <reference-count action="set" variable-name="__rcMenu"/> |
|
4615 | <reference-count action="set" variable-name="__rcMenu"/> | |
4470 | </modify-argument> |
|
4616 | </modify-argument> | |
4471 | </modify-function> |
|
4617 | </modify-function> | |
4472 |
|
4618 | |||
4473 | </object-type> |
|
4619 | </object-type> | |
4474 |
|
4620 | |||
4475 | <object-type name="QPainter"> |
|
4621 | <object-type name="QPainter"> | |
@@ -4478,18 +4624,18 | |||||
4478 | <include file-name="QPainterPath" location="global"/> |
|
4624 | <include file-name="QPainterPath" location="global"/> | |
4479 | <include file-name="QPixmap" location="global"/> |
|
4625 | <include file-name="QPixmap" location="global"/> | |
4480 | </extra-includes> |
|
4626 | </extra-includes> | |
4481 |
|
4627 | |||
4482 | <modify-function signature="drawText(const QPointF &, const QString &, int, int)" remove="all" /> |
|
4628 | <modify-function signature="drawText(const QPointF &, const QString &, int, int)" remove="all" /> | |
4483 |
|
4629 | |||
4484 | <modify-function signature="drawConvexPolygon(const QPoint *, int)"> |
|
4630 | <modify-function signature="drawConvexPolygon(const QPoint *, int)"> | |
4485 | <remove/> |
|
4631 | <remove/> | |
4486 | </modify-function> |
|
4632 | </modify-function> | |
4487 | <modify-function signature="drawConvexPolygon(const QPointF *, int)"> |
|
4633 | <modify-function signature="drawConvexPolygon(const QPointF *, int)"> | |
4488 | <remove/> |
|
4634 | <remove/> | |
4489 |
</modify-function> |
|
4635 | </modify-function> | |
4490 | <modify-function signature="drawLines(const QLine *, int)"> |
|
4636 | <modify-function signature="drawLines(const QLine *, int)"> | |
4491 | <remove/> |
|
4637 | <remove/> | |
4492 |
</modify-function> |
|
4638 | </modify-function> | |
4493 | <modify-function signature="drawLines(const QLineF *, int)"> |
|
4639 | <modify-function signature="drawLines(const QLineF *, int)"> | |
4494 | <remove/> |
|
4640 | <remove/> | |
4495 | </modify-function> |
|
4641 | </modify-function> | |
@@ -4504,28 +4650,28 | |||||
4504 | </modify-function> |
|
4650 | </modify-function> | |
4505 | <modify-function signature="drawPoints(const QPointF *, int)"> |
|
4651 | <modify-function signature="drawPoints(const QPointF *, int)"> | |
4506 | <remove/> |
|
4652 | <remove/> | |
4507 |
</modify-function> |
|
4653 | </modify-function> | |
4508 | <modify-function signature="drawPolygon(const QPoint *, int, Qt::FillRule)"> |
|
4654 | <modify-function signature="drawPolygon(const QPoint *, int, Qt::FillRule)"> | |
4509 | <remove/> |
|
4655 | <remove/> | |
4510 | </modify-function> |
|
4656 | </modify-function> | |
4511 | <modify-function signature="drawPolygon(const QPointF *, int, Qt::FillRule)"> |
|
4657 | <modify-function signature="drawPolygon(const QPointF *, int, Qt::FillRule)"> | |
4512 | <remove/> |
|
4658 | <remove/> | |
4513 |
</modify-function> |
|
4659 | </modify-function> | |
4514 | <modify-function signature="drawPolyline(const QPoint *, int)"> |
|
4660 | <modify-function signature="drawPolyline(const QPoint *, int)"> | |
4515 | <remove/> |
|
4661 | <remove/> | |
4516 | </modify-function> |
|
4662 | </modify-function> | |
4517 | <modify-function signature="drawPolyline(const QPointF *, int)"> |
|
4663 | <modify-function signature="drawPolyline(const QPointF *, int)"> | |
4518 | <remove/> |
|
4664 | <remove/> | |
4519 |
</modify-function> |
|
4665 | </modify-function> | |
4520 | <modify-function signature="drawRects(const QRect *, int)"> |
|
4666 | <modify-function signature="drawRects(const QRect *, int)"> | |
4521 | <remove/> |
|
4667 | <remove/> | |
4522 | </modify-function> |
|
4668 | </modify-function> | |
4523 | <modify-function signature="drawRects(const QRectF *, int)"> |
|
4669 | <modify-function signature="drawRects(const QRectF *, int)"> | |
4524 | <remove/> |
|
4670 | <remove/> | |
4525 |
</modify-function> |
|
4671 | </modify-function> | |
4526 | <modify-function signature="drawLines(const QVector<QPoint> &)"> |
|
4672 | <modify-function signature="drawLines(const QVector<QPoint> &)"> | |
4527 | <rename to="drawLinesFromPoints"/> |
|
4673 | <rename to="drawLinesFromPoints"/> | |
4528 |
</modify-function> |
|
4674 | </modify-function> | |
4529 | <modify-function signature="drawLines(const QVector<QPointF> &)"> |
|
4675 | <modify-function signature="drawLines(const QVector<QPointF> &)"> | |
4530 | <rename to="drawLinesFromPointsF"/> |
|
4676 | <rename to="drawLinesFromPointsF"/> | |
4531 | </modify-function> |
|
4677 | </modify-function> | |
@@ -4534,23 +4680,23 | |||||
4534 | </modify-function> |
|
4680 | </modify-function> | |
4535 | <modify-function signature="drawRects(const QVector<QRectF> &)"> |
|
4681 | <modify-function signature="drawRects(const QVector<QRectF> &)"> | |
4536 | <rename to="drawRectsF"/> |
|
4682 | <rename to="drawRectsF"/> | |
4537 |
</modify-function> |
|
4683 | </modify-function> | |
4538 |
|
4684 | |||
4539 | <modify-function signature="QPainter(QPaintDevice *)"> |
|
4685 | <modify-function signature="QPainter(QPaintDevice *)"> | |
4540 | <modify-argument index="1"> |
|
4686 | <modify-argument index="1"> | |
4541 | <no-null-pointer/> |
|
4687 | <no-null-pointer/> | |
4542 | </modify-argument> |
|
4688 | </modify-argument> | |
4543 |
</modify-function> |
|
4689 | </modify-function> | |
4544 | <modify-function signature="begin(QPaintDevice *)"> |
|
4690 | <modify-function signature="begin(QPaintDevice *)"> | |
4545 | <modify-argument index="1"> |
|
4691 | <modify-argument index="1"> | |
4546 | <no-null-pointer/> |
|
4692 | <no-null-pointer/> | |
4547 | </modify-argument> |
|
4693 | </modify-argument> | |
4548 |
</modify-function> |
|
4694 | </modify-function> | |
4549 | <modify-function signature="initFrom(const QWidget *)"> |
|
4695 | <modify-function signature="initFrom(const QWidget *)"> | |
4550 | <modify-argument index="1"> |
|
4696 | <modify-argument index="1"> | |
4551 | <no-null-pointer/> |
|
4697 | <no-null-pointer/> | |
4552 | </modify-argument> |
|
4698 | </modify-argument> | |
4553 |
</modify-function> |
|
4699 | </modify-function> | |
4554 | <modify-function signature="setRedirected(const QPaintDevice *, QPaintDevice *, const QPoint &)"> |
|
4700 | <modify-function signature="setRedirected(const QPaintDevice *, QPaintDevice *, const QPoint &)"> | |
4555 | <modify-argument index="1"> |
|
4701 | <modify-argument index="1"> | |
4556 | <no-null-pointer /> |
|
4702 | <no-null-pointer /> | |
@@ -4561,28 +4707,28 | |||||
4561 | <no-null-pointer /> |
|
4707 | <no-null-pointer /> | |
4562 | </modify-argument> |
|
4708 | </modify-argument> | |
4563 | </modify-function> |
|
4709 | </modify-function> | |
4564 |
|
4710 | |||
4565 | <modify-function signature="drawText(QRect,int,QString,QRect*)"> |
|
4711 | <modify-function signature="drawText(QRect,int,QString,QRect*)"> | |
4566 | <access modifier="private"/> |
|
4712 | <access modifier="private"/> | |
4567 | <modify-argument index="4"> |
|
4713 | <modify-argument index="4"> | |
4568 | <remove-default-expression/> |
|
4714 | <remove-default-expression/> | |
4569 |
</modify-argument> |
|
4715 | </modify-argument> | |
4570 | </modify-function> |
|
4716 | </modify-function> | |
4571 |
|
4717 | |||
4572 | <modify-function signature="drawText(QRectF,int,QString,QRectF*)"> |
|
4718 | <modify-function signature="drawText(QRectF,int,QString,QRectF*)"> | |
4573 | <access modifier="private"/> |
|
4719 | <access modifier="private"/> | |
4574 | <modify-argument index="4"> |
|
4720 | <modify-argument index="4"> | |
4575 | <remove-default-expression/> |
|
4721 | <remove-default-expression/> | |
4576 |
</modify-argument> |
|
4722 | </modify-argument> | |
4577 | </modify-function> |
|
4723 | </modify-function> | |
4578 |
|
4724 | |||
4579 | <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)"> |
|
4725 | <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)"> | |
4580 | <access modifier="private"/> |
|
4726 | <access modifier="private"/> | |
4581 | <modify-argument index="7"> |
|
4727 | <modify-argument index="7"> | |
4582 | <remove-default-expression/> |
|
4728 | <remove-default-expression/> | |
4583 | </modify-argument> |
|
4729 | </modify-argument> | |
4584 | </modify-function> |
|
4730 | </modify-function> | |
4585 |
|
4731 | |||
4586 | <modify-function signature="redirected(const QPaintDevice*,QPoint*)"> |
|
4732 | <modify-function signature="redirected(const QPaintDevice*,QPoint*)"> | |
4587 | <access modifier="private"/> |
|
4733 | <access modifier="private"/> | |
4588 | <modify-argument index="2"> |
|
4734 | <modify-argument index="2"> | |
@@ -4593,8 +4739,8 | |||||
4593 | <modify-function signature="matrixEnabled()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
4739 | <modify-function signature="matrixEnabled()const" remove="all"/> <!--### Obsolete in 4.3--> | |
4594 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4740 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
4595 | <modify-function signature="setMatrixEnabled(bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4741 | <modify-function signature="setMatrixEnabled(bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
4596 |
</object-type> |
|
4742 | </object-type> | |
4597 |
|
4743 | |||
4598 | <object-type name="QApplication"> |
|
4744 | <object-type name="QApplication"> | |
4599 | <extra-includes> |
|
4745 | <extra-includes> | |
4600 | <include file-name="QBasicTimer" location="global"/> |
|
4746 | <include file-name="QBasicTimer" location="global"/> | |
@@ -4603,18 +4749,18 | |||||
4603 | <include file-name="QPalette" location="global"/> |
|
4749 | <include file-name="QPalette" location="global"/> | |
4604 | <include file-name="QIcon" location="global"/> |
|
4750 | <include file-name="QIcon" location="global"/> | |
4605 | <include file-name="QLocale" location="global"/> |
|
4751 | <include file-name="QLocale" location="global"/> | |
4606 |
</extra-includes> |
|
4752 | </extra-includes> | |
4607 |
|
4753 | |||
4608 | <modify-function signature="QApplication(int &, char **, int)"> |
|
4754 | <modify-function signature="QApplication(int &, char **, int)"> | |
4609 | <access modifier="private"/> |
|
4755 | <access modifier="private"/> | |
4610 |
</modify-function> |
|
4756 | </modify-function> | |
4611 | <modify-function signature="QApplication(int &, char **, QApplication::Type, int)"> |
|
4757 | <modify-function signature="QApplication(int &, char **, QApplication::Type, int)"> | |
4612 |
|
|
4758 | <remove/> | |
4613 | </modify-function> |
|
4759 | </modify-function> | |
4614 | <modify-function signature="QApplication(int &, char **, bool, int)"> |
|
4760 | <modify-function signature="QApplication(int &, char **, bool, int)"> | |
4615 |
|
|
4761 | <remove/> | |
4616 | </modify-function> |
|
4762 | </modify-function> | |
4617 |
|
4763 | |||
4618 | <modify-function signature="font(const char*)"> |
|
4764 | <modify-function signature="font(const char*)"> | |
4619 | <remove/> |
|
4765 | <remove/> | |
4620 | </modify-function> |
|
4766 | </modify-function> | |
@@ -4624,7 +4770,7 | |||||
4624 | <remove-default-expression/> |
|
4770 | <remove-default-expression/> | |
4625 | </modify-argument> |
|
4771 | </modify-argument> | |
4626 | </modify-function> |
|
4772 | </modify-function> | |
4627 |
|
4773 | |||
4628 | <modify-function signature="palette(const char*)"> |
|
4774 | <modify-function signature="palette(const char*)"> | |
4629 | <remove/> |
|
4775 | <remove/> | |
4630 | </modify-function> |
|
4776 | </modify-function> | |
@@ -4634,12 +4780,12 | |||||
4634 | <remove-default-expression/> |
|
4780 | <remove-default-expression/> | |
4635 | </modify-argument> |
|
4781 | </modify-argument> | |
4636 | </modify-function> |
|
4782 | </modify-function> | |
4637 |
|
4783 | |||
4638 | <modify-function signature="overrideCursor()"> |
|
4784 | <modify-function signature="overrideCursor()"> | |
4639 | <access modifier="private"/> |
|
4785 | <access modifier="private"/> | |
4640 | <rename to="overrideCursor_private"/> |
|
4786 | <rename to="overrideCursor_private"/> | |
4641 | </modify-function> |
|
4787 | </modify-function> | |
4642 |
|
4788 | |||
4643 | <modify-function signature="setInputContext(QInputContext*)"> |
|
4789 | <modify-function signature="setInputContext(QInputContext*)"> | |
4644 | <modify-argument index="1"> |
|
4790 | <modify-argument index="1"> | |
4645 | <define-ownership class="java" owner="c++"/> |
|
4791 | <define-ownership class="java" owner="c++"/> | |
@@ -4656,7 +4802,11 | |||||
4656 | </modify-argument> |
|
4802 | </modify-argument> | |
4657 | </modify-function> |
|
4803 | </modify-function> | |
4658 | </object-type> |
|
4804 | </object-type> | |
4659 |
|
4805 | |||
|
4806 | <object-type name="QMouseEventTransition" /> | |||
|
4807 | <object-type name="QKeyEventTransition" /> | |||
|
4808 | <value-type name="QQuaternion" /> | |||
|
4809 | ||||
4660 | <object-type name="QCommandLinkButton" /> |
|
4810 | <object-type name="QCommandLinkButton" /> | |
4661 | <object-type name="QFileSystemModel"> |
|
4811 | <object-type name="QFileSystemModel"> | |
4662 | <modify-function signature="setIconProvider(QFileIconProvider*)"> |
|
4812 | <modify-function signature="setIconProvider(QFileIconProvider*)"> | |
@@ -4664,7 +4814,7 | |||||
4664 | <reference-count action="set" variable-name="__rcIconProvider"/> |
|
4814 | <reference-count action="set" variable-name="__rcIconProvider"/> | |
4665 | </modify-argument> |
|
4815 | </modify-argument> | |
4666 | </modify-function> |
|
4816 | </modify-function> | |
4667 |
</object-type> |
|
4817 | </object-type> | |
4668 | <object-type name="QFormLayout"> |
|
4818 | <object-type name="QFormLayout"> | |
4669 | <modify-function signature="addRow(QWidget*,QWidget*)"> |
|
4819 | <modify-function signature="addRow(QWidget*,QWidget*)"> | |
4670 | <modify-argument index="1"> |
|
4820 | <modify-argument index="1"> | |
@@ -4681,11 +4831,11 | |||||
4681 | </modify-function> |
|
4831 | </modify-function> | |
4682 | <modify-function signature="addRow(QWidget*,QLayout*)"> |
|
4832 | <modify-function signature="addRow(QWidget*,QLayout*)"> | |
4683 | <modify-argument index="1"> |
|
4833 | <modify-argument index="1"> | |
4684 |
<reference-count action="ignore" /> |
|
4834 | <reference-count action="ignore" /> | |
4685 | </modify-argument> |
|
4835 | </modify-argument> | |
4686 | <modify-argument index="2"> |
|
4836 | <modify-argument index="2"> | |
4687 |
<reference-count action="ignore" /> |
|
4837 | <reference-count action="ignore" /> | |
4688 |
</modify-argument> |
|
4838 | </modify-argument> | |
4689 | </modify-function> |
|
4839 | </modify-function> | |
4690 |
|
4840 | |||
4691 | <modify-function signature="addRow(QWidget*)"> |
|
4841 | <modify-function signature="addRow(QWidget*)"> | |
@@ -4714,7 +4864,7 | |||||
4714 | </modify-argument> |
|
4864 | </modify-argument> | |
4715 | <modify-argument index="3"> |
|
4865 | <modify-argument index="3"> | |
4716 | <reference-count action="ignore" /> |
|
4866 | <reference-count action="ignore" /> | |
4717 |
</modify-argument> |
|
4867 | </modify-argument> | |
4718 | </modify-function> |
|
4868 | </modify-function> | |
4719 | <modify-function signature="insertRow(int,QWidget*,QWidget*)"> |
|
4869 | <modify-function signature="insertRow(int,QWidget*,QWidget*)"> | |
4720 | <modify-argument index="2"> |
|
4870 | <modify-argument index="2"> | |
@@ -4722,32 +4872,32 | |||||
4722 | </modify-argument> |
|
4872 | </modify-argument> | |
4723 | <modify-argument index="3"> |
|
4873 | <modify-argument index="3"> | |
4724 | <reference-count action="ignore" /> |
|
4874 | <reference-count action="ignore" /> | |
4725 |
</modify-argument> |
|
4875 | </modify-argument> | |
4726 | </modify-function> |
|
4876 | </modify-function> | |
4727 | <modify-function signature="insertRow(int,QWidget*)"> |
|
4877 | <modify-function signature="insertRow(int,QWidget*)"> | |
4728 | <modify-argument index="2"> |
|
4878 | <modify-argument index="2"> | |
4729 | <reference-count action="ignore" /> |
|
4879 | <reference-count action="ignore" /> | |
4730 |
</modify-argument> |
|
4880 | </modify-argument> | |
4731 | </modify-function> |
|
4881 | </modify-function> | |
4732 | <modify-function signature="insertRow(int,QString,QLayout*)"> |
|
4882 | <modify-function signature="insertRow(int,QString,QLayout*)"> | |
4733 | <modify-argument index="3"> |
|
4883 | <modify-argument index="3"> | |
4734 | <reference-count action="ignore" /> |
|
4884 | <reference-count action="ignore" /> | |
4735 |
</modify-argument> |
|
4885 | </modify-argument> | |
4736 | </modify-function> |
|
4886 | </modify-function> | |
4737 | <modify-function signature="insertRow(int,QString,QWidget*)"> |
|
4887 | <modify-function signature="insertRow(int,QString,QWidget*)"> | |
4738 | <modify-argument index="3"> |
|
4888 | <modify-argument index="3"> | |
4739 | <reference-count action="ignore" /> |
|
4889 | <reference-count action="ignore" /> | |
4740 |
</modify-argument> |
|
4890 | </modify-argument> | |
4741 |
</modify-function> |
|
4891 | </modify-function> | |
4742 | <modify-function signature="setLayout(int,QFormLayout::ItemRole,QLayout*)"> |
|
4892 | <modify-function signature="setLayout(int,QFormLayout::ItemRole,QLayout*)"> | |
4743 | <modify-argument index="3"> |
|
4893 | <modify-argument index="3"> | |
4744 | <reference-count action="ignore" /> |
|
4894 | <reference-count action="ignore" /> | |
4745 |
</modify-argument> |
|
4895 | </modify-argument> | |
4746 | </modify-function> |
|
4896 | </modify-function> | |
4747 | <modify-function signature="setWidget(int,QFormLayout::ItemRole,QWidget*)"> |
|
4897 | <modify-function signature="setWidget(int,QFormLayout::ItemRole,QWidget*)"> | |
4748 | <modify-argument index="3"> |
|
4898 | <modify-argument index="3"> | |
4749 | <reference-count action="ignore" /> |
|
4899 | <reference-count action="ignore" /> | |
4750 |
</modify-argument> |
|
4900 | </modify-argument> | |
4751 | </modify-function> |
|
4901 | </modify-function> | |
4752 | <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)" access="private" rename="setItem_private"> |
|
4902 | <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)" access="private" rename="setItem_private"> | |
4753 | <modify-argument index="3"> |
|
4903 | <modify-argument index="3"> | |
@@ -4757,7 +4907,7 | |||||
4757 | <modify-function signature="addItem(QLayoutItem*)"> |
|
4907 | <modify-function signature="addItem(QLayoutItem*)"> | |
4758 | <modify-argument index="1"> |
|
4908 | <modify-argument index="1"> | |
4759 | <define-ownership class="java" owner="c++"/> |
|
4909 | <define-ownership class="java" owner="c++"/> | |
4760 |
</modify-argument> |
|
4910 | </modify-argument> | |
4761 | </modify-function> |
|
4911 | </modify-function> | |
4762 | </object-type> |
|
4912 | </object-type> | |
4763 | <object-type name="QGraphicsGridLayout" delete-in-main-thread="yes"> |
|
4913 | <object-type name="QGraphicsGridLayout" delete-in-main-thread="yes"> | |
@@ -4776,9 +4926,9 | |||||
4776 | <reference-count action="ignore" /> |
|
4926 | <reference-count action="ignore" /> | |
4777 | </modify-argument> |
|
4927 | </modify-argument> | |
4778 | </modify-function> |
|
4928 | </modify-function> | |
4779 |
</object-type> |
|
4929 | </object-type> | |
4780 | <object-type name="QGraphicsLayout" delete-in-main-thread="yes"> |
|
4930 | <object-type name="QGraphicsLayout" delete-in-main-thread="yes"> | |
4781 |
|
4931 | |||
4782 | <modify-function signature="widgetEvent(QEvent*)"> |
|
4932 | <modify-function signature="widgetEvent(QEvent*)"> | |
4783 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
4933 | <modify-argument index="1" invalidate-after-use="yes" /> | |
4784 | </modify-function> |
|
4934 | </modify-function> | |
@@ -4787,13 +4937,23 | |||||
4787 | <reference-count action="set" variable-name="__rcParentLayoutItem" /> |
|
4937 | <reference-count action="set" variable-name="__rcParentLayoutItem" /> | |
4788 | </modify-argument> |
|
4938 | </modify-argument> | |
4789 | </modify-function> |
|
4939 | </modify-function> | |
4790 | </object-type> |
|
4940 | <modify-function signature="setGraphicsItem(QGraphicsItem*)"> | |
|
4941 | <modify-argument index="1"> | |||
|
4942 | <reference-count action="set" variable-name="__rcItem" /> | |||
|
4943 | </modify-argument> | |||
|
4944 | </modify-function> | |||
|
4945 | </object-type> | |||
4791 | <interface-type name="QGraphicsLayoutItem" delete-in-main-thread="yes"> |
|
4946 | <interface-type name="QGraphicsLayoutItem" delete-in-main-thread="yes"> | |
4792 | <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)"> |
|
4947 | <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)"> | |
4793 | <modify-argument index="1"> |
|
4948 | <modify-argument index="1"> | |
4794 | <reference-count action="set" variable-name="__rcParentLayoutItem" /> |
|
4949 | <reference-count action="set" variable-name="__rcParentLayoutItem" /> | |
4795 | </modify-argument> |
|
4950 | </modify-argument> | |
4796 |
</modify-function> |
|
4951 | </modify-function> | |
|
4952 | <modify-function signature="setGraphicsItem(QGraphicsItem*)"> | |||
|
4953 | <modify-argument index="1"> | |||
|
4954 | <reference-count action="set" variable-name="__rcItem" /> | |||
|
4955 | </modify-argument> | |||
|
4956 | </modify-function> | |||
4797 | </interface-type> |
|
4957 | </interface-type> | |
4798 | <object-type name="QGraphicsLinearLayout" delete-in-main-thread="yes"> |
|
4958 | <object-type name="QGraphicsLinearLayout" delete-in-main-thread="yes"> | |
4799 | <modify-function signature="addItem(QGraphicsLayoutItem*)"> |
|
4959 | <modify-function signature="addItem(QGraphicsLayoutItem*)"> | |
@@ -4821,7 +4981,7 | |||||
4821 | <reference-count action="ignore" /> |
|
4981 | <reference-count action="ignore" /> | |
4822 | </modify-argument> |
|
4982 | </modify-argument> | |
4823 | </modify-function> |
|
4983 | </modify-function> | |
4824 |
</object-type> |
|
4984 | </object-type> | |
4825 | <object-type name="QGraphicsProxyWidget"/> <!-- a QObject so main-thread delete redundant --> |
|
4985 | <object-type name="QGraphicsProxyWidget"/> <!-- a QObject so main-thread delete redundant --> | |
4826 | <object-type name="QGraphicsWidget"> <!-- a QObject so main-thread delete redundant --> |
|
4986 | <object-type name="QGraphicsWidget"> <!-- a QObject so main-thread delete redundant --> | |
4827 | <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi --> |
|
4987 | <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi --> | |
@@ -4831,7 +4991,29 | |||||
4831 | <reference-count action="set" variable-name="__rcLayout" /> |
|
4991 | <reference-count action="set" variable-name="__rcLayout" /> | |
4832 | </modify-argument> |
|
4992 | </modify-argument> | |
4833 | </modify-function> |
|
4993 | </modify-function> | |
4834 |
|
4994 | |||
|
4995 | <modify-function signature="addAction(QAction*)"> | |||
|
4996 | <modify-argument index="1"> | |||
|
4997 | <reference-count action="add" variable-name="__rcActions" /> | |||
|
4998 | </modify-argument> | |||
|
4999 | </modify-function> | |||
|
5000 | <modify-function signature="insertAction(QAction*,QAction*)"> | |||
|
5001 | <modify-argument index="2"> | |||
|
5002 | <reference-count action="add" variable-name="__rcActions" /> | |||
|
5003 | </modify-argument> | |||
|
5004 | </modify-function> | |||
|
5005 | <modify-function signature="insertActions(QAction*,QList<QAction*>)"> | |||
|
5006 | <modify-argument index="2"> | |||
|
5007 | <reference-count action="add" variable-name="__rcActions" /> | |||
|
5008 | </modify-argument> | |||
|
5009 | </modify-function> | |||
|
5010 | <modify-function signature="removeAction(QAction*)"> | |||
|
5011 | <modify-argument index="1"> | |||
|
5012 | <reference-count action="remove" variable-name="__rcActions" /> | |||
|
5013 | </modify-argument> | |||
|
5014 | </modify-function> | |||
|
5015 | ||||
|
5016 | ||||
4835 | <modify-function signature="changeEvent(QEvent*)"> |
|
5017 | <modify-function signature="changeEvent(QEvent*)"> | |
4836 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
5018 | <modify-argument index="1" invalidate-after-use="yes" /> | |
4837 | </modify-function> |
|
5019 | </modify-function> | |
@@ -4868,7 +5050,7 | |||||
4868 | <modify-function signature="windowFrameEvent(QEvent*)"> |
|
5050 | <modify-function signature="windowFrameEvent(QEvent*)"> | |
4869 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
5051 | <modify-argument index="1" invalidate-after-use="yes" /> | |
4870 | </modify-function> |
|
5052 | </modify-function> | |
4871 |
|
5053 | |||
4872 | <modify-function signature="setStyle(QStyle*)"> |
|
5054 | <modify-function signature="setStyle(QStyle*)"> | |
4873 | <modify-argument index="1"> |
|
5055 | <modify-argument index="1"> | |
4874 | <reference-count action="set" variable-name="__rcStyle" /> |
|
5056 | <reference-count action="set" variable-name="__rcStyle" /> | |
@@ -4880,14 +5062,14 | |||||
4880 | </modify-argument> |
|
5062 | </modify-argument> | |
4881 | <modify-argument index="2"> |
|
5063 | <modify-argument index="2"> | |
4882 | <reference-count action="ignore" /> |
|
5064 | <reference-count action="ignore" /> | |
4883 |
</modify-argument> |
|
5065 | </modify-argument> | |
4884 | </modify-function> |
|
5066 | </modify-function> | |
4885 | </object-type> |
|
5067 | </object-type> | |
4886 | <object-type name="QPlainTextDocumentLayout" /> |
|
5068 | <object-type name="QPlainTextDocumentLayout" /> | |
4887 | <object-type name="QPlainTextEdit"> |
|
5069 | <object-type name="QPlainTextEdit"> | |
4888 | <modify-function signature="setDocument(QTextDocument*)"> |
|
5070 | <modify-function signature="setDocument(QTextDocument*)"> | |
4889 | <modify-argument index="1"> |
|
5071 | <modify-argument index="1"> | |
4890 |
<reference-count action="set" variable-name="__rcDocument" /> |
|
5072 | <reference-count action="set" variable-name="__rcDocument" /> | |
4891 | </modify-argument> |
|
5073 | </modify-argument> | |
4892 | </modify-function> |
|
5074 | </modify-function> | |
4893 | <modify-function signature="insertFromMimeData(const QMimeData*)"> |
|
5075 | <modify-function signature="insertFromMimeData(const QMimeData*)"> | |
@@ -4896,7 +5078,8 | |||||
4896 | </modify-argument> |
|
5078 | </modify-argument> | |
4897 | </modify-function> |
|
5079 | </modify-function> | |
4898 | </object-type> |
|
5080 | </object-type> | |
4899 |
<object-type name="QPrintPreviewDialog" |
|
5081 | <object-type name="QPrintPreviewDialog" > | |
|
5082 | </object-type> | |||
4900 | <object-type name="QPrintPreviewWidget" /> |
|
5083 | <object-type name="QPrintPreviewWidget" /> | |
4901 | <object-type name="QStyledItemDelegate"> |
|
5084 | <object-type name="QStyledItemDelegate"> | |
4902 | <modify-function signature="setItemEditorFactory(QItemEditorFactory*)"> |
|
5085 | <modify-function signature="setItemEditorFactory(QItemEditorFactory*)"> | |
@@ -4913,42 +5096,101 | |||||
4913 | <modify-argument index="1"> |
|
5096 | <modify-argument index="1"> | |
4914 | <reference-count action="ignore"/> |
|
5097 | <reference-count action="ignore"/> | |
4915 | </modify-argument> |
|
5098 | </modify-argument> | |
4916 |
</modify-function> |
|
5099 | </modify-function> | |
4917 | </object-type> |
|
5100 | </object-type> | |
4918 |
|
5101 | |||
4919 | <interface-type name="QAccessibleFactoryInterface" java-name="QAbstractAccessibleFactory" /> |
|
5102 | <interface-type name="QAccessibleFactoryInterface" java-name="QAbstractAccessibleFactory" /> | |
4920 | <interface-type name="QIconEngineFactoryInterfaceV2" java-name="QAbstractIconEngineFactoryV2" /> |
|
5103 | <interface-type name="QIconEngineFactoryInterfaceV2" java-name="QAbstractIconEngineFactoryV2" /> | |
4921 |
<interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory" /> |
|
5104 | <interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory" /> | |
4922 | <interface-type name="QInputContextFactoryInterface" java-name="QAbstractInputContextFactory" /> |
|
5105 | <interface-type name="QInputContextFactoryInterface" java-name="QAbstractInputContextFactory" /> | |
4923 | <interface-type name="QStyleFactoryInterface" java-name="QAbstractStyleFactory" /> |
|
5106 | <interface-type name="QStyleFactoryInterface" java-name="QAbstractStyleFactory" /> | |
|
5107 | <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory" /> | |||
4924 | <interface-type name="QPictureFormatInterface" java-name="QAbstractPictureFormat" /> |
|
5108 | <interface-type name="QPictureFormatInterface" java-name="QAbstractPictureFormat" /> | |
4925 |
|
5109 | |||
4926 | <object-type name="QIconEnginePluginV2"/> |
|
5110 | <object-type name="QIconEnginePluginV2"/> | |
4927 |
<object-type name="QAccessiblePlugin"/> |
|
5111 | <object-type name="QAccessiblePlugin"/> | |
4928 | <object-type name="QImageIOPlugin" /> |
|
5112 | <object-type name="QImageIOPlugin" /> | |
4929 | <object-type name="QInputContextPlugin" /> |
|
5113 | <object-type name="QInputContextPlugin" /> | |
4930 | <object-type name="QPictureFormatPlugin" /> |
|
5114 | <object-type name="QPictureFormatPlugin" /> | |
4931 | <object-type name="QStylePlugin" /> |
|
5115 | <object-type name="QStylePlugin" /> | |
4932 |
|
5116 | <object-type name="QTextCodecPlugin" /> | ||
|
5117 | <object-type name="QGesture" /> | |||
|
5118 | <object-type name="QGraphicsAnchorLayout" /> | |||
|
5119 | <object-type name="QGraphicsAnchor" /> | |||
|
5120 | <object-type name="QGraphicsEffect" /> | |||
|
5121 | <object-type name="QGraphicsObject"> | |||
|
5122 | <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi --> | |||
|
5123 | <modify-function signature="children()const" remove="all" /> | |||
|
5124 | </object-type> | |||
|
5125 | <object-type name="QGraphicsOpacityEffect" /> | |||
|
5126 | <object-type name="QGraphicsPixelizeEffect" /> | |||
|
5127 | <object-type name="QGraphicsRotation" /> | |||
|
5128 | <object-type name="QGraphicsScale" /> | |||
|
5129 | <object-type name="QGraphicsTransform" /> | |||
|
5130 | <object-type name="QPanGesture" /> | |||
|
5131 | <object-type name="QPinchGesture" /> | |||
|
5132 | <object-type name="QProxyStyle" /> | |||
|
5133 | <object-type name="QSwipeGesture" /> | |||
|
5134 | <object-type name="QTouchEvent" polymorphic-id-expression="%1->type() == QEvent::TouchBegin || %1->type() == QEvent::TouchUpdate || %1->type() == QEvent::TouchEnd" /> | |||
|
5135 | ||||
|
5136 | <!-- Inefficient hash codes --> | |||
|
5137 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5138 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextTableCell' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5139 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextOption_Tab' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5140 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextLength' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5141 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5142 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5143 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextCursor' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5144 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath_Element' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5145 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5146 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QItemSelection' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5147 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QKeySequence' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5148 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizePolicy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5149 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFragment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5150 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetrics' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5151 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGradient' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5152 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetricsF' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5153 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5154 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QEasingCurve' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5155 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGenericMatrix' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5156 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMatrix4x4' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5157 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMargins' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5158 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPixmapCache_Key' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5159 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector4D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5160 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QQuaternion' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5161 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector2D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5162 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector3D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
5163 | ||||
|
5164 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QPanGesture'" /> | |||
|
5165 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'event(QEvent * event)' in 'QPanGesture'" /> | |||
|
5166 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QSwipeGesture'" /> | |||
|
5167 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QPinchGesture'" /> | |||
|
5168 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'event(QEvent * event)' in 'QPinchGesture'" /> | |||
|
5169 | ||||
|
5170 | <!-- Intentional omissions. See explanation for QtJambiTextObjectInterface class in typesystem and headers. --> | |||
|
5171 | <suppress-warning text="WARNING(MetaJavaBuilder) :: class 'QTextObjectInterface' inherits from unknown base class 'QTextObjectInterface'" /> | |||
|
5172 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown interface for 'QTextObjectInterface': 'QTextObjectInterfaceInterface'" /> | |||
|
5173 | ||||
|
5174 | <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QPixmapFilter' inherits from polymorphic class 'QPixmapFilter', but has no polymorphic id set"/> | |||
4933 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'" /> |
|
5175 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'" /> | |
4934 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/> |
|
5176 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/> | |
4935 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/> |
|
5177 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/> | |
4936 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private const\*'"/> |
|
5178 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private const\*'"/> | |
4937 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextEngine\*'"/> |
|
5179 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextEngine\*'"/> | |
4938 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QFontEngine\*'"/> |
|
5180 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QFontEngine\*'"/> | |
4939 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPixmap::Type'"/> |
|
5181 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPixmap::Type'"/> | |
4940 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QInputDialog::Type'"/> |
|
5182 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QInputDialog::Type'"/> | |
4941 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextFrameLayoutData\*'"/> |
|
5183 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextFrameLayoutData\*'"/> | |
4942 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractUndoItem\*'"/> |
|
5184 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractUndoItem\*'"/> | |
4943 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*QImageTextKeyLang*'"/> |
|
5185 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*QImageTextKeyLang*'"/> | |
4944 | <suppress-warning text="WARNING(MetaJavaBuilder) :: non-public function '*' in interface '*'"/> |
|
5186 | <suppress-warning text="WARNING(MetaJavaBuilder) :: non-public function '*' in interface '*'"/> | |
4945 | <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/> |
|
5187 | <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/> | |
4946 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/> |
|
5188 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/> | |
4947 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVector<FormatRange>()' of argument in function '*', class '*'"/> |
|
5189 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVector<FormatRange>()' of argument in function '*', class '*'"/> | |
4948 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVariantList()' of argument in function '*', class '*'"/> |
|
5190 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVariantList()' of argument in function '*', class '*'"/> | |
4949 |
<suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> |
|
5191 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> | |
4950 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QTextLayout::QTextLayout', unmatched parameter type 'QTextEngine*'"/> |
|
5192 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QTextLayout::QTextLayout', unmatched parameter type 'QTextEngine*'"/> | |
4951 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"/> |
|
5193 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"/> | |
4952 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFileDialog::QFileDialog', unmatched parameter type 'QFileDialogArgs const&'"/> |
|
5194 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFileDialog::QFileDialog', unmatched parameter type 'QFileDialogArgs const&'"/> | |
4953 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '0., 0., 1000000000., 1000000000.' of argument in function 'update', class 'QAbstractTextDocumentLayout'"/> |
|
5195 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '0., 0., 1000000000., 1000000000.' of argument in function 'update', class 'QAbstractTextDocumentLayout'"/> | |
4954 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWidget::windowSurface', unmatched return type 'QWindowSurface*'"/> |
|
5196 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWidget::windowSurface', unmatched return type 'QWindowSurface*'"/> | |
@@ -4960,40 +5202,12 | |||||
4960 | <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QInputEvent' inherits from polymorphic class 'QEvent', but has no polymorphic id set"/> |
|
5202 | <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QInputEvent' inherits from polymorphic class 'QEvent', but has no polymorphic id set"/> | |
4961 | <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenu' but not both"/> |
|
5203 | <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenu' but not both"/> | |
4962 | <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenuBar' but not both"/> |
|
5204 | <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenuBar' but not both"/> | |
4963 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QBrush' has equals operators but no qHash() function"/> |
|
5205 | ||
4964 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function"/> |
|
|||
4965 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegion' has equals operators but no qHash() function"/> |
|
|||
4966 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPolygon' has equals operators but no qHash() function"/> |
|
|||
4967 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextTableCell' has equals operators but no qHash() function"/> |
|
|||
4968 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextLength' has equals operators but no qHash() function"/> |
|
|||
4969 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPalette' has equals operators but no qHash() function"/> |
|
|||
4970 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock_iterator' has equals operators but no qHash() function"/> |
|
|||
4971 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock' has equals operators but no qHash() function"/> |
|
|||
4972 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextCursor' has equals operators but no qHash() function"/> |
|
|||
4973 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFont' has equals operators but no qHash() function"/> |
|
|||
4974 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMatrix' has equals operators but no qHash() function"/> |
|
|||
4975 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPen' has equals operators but no qHash() function"/> |
|
|||
4976 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QColor' has equals operators but no qHash() function"/> |
|
|||
4977 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTransform' has equals operators but no qHash() function"/> |
|
|||
4978 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath_Element' has equals operators but no qHash() function"/> |
|
|||
4979 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath' has equals operators but no qHash() function"/> |
|
|||
4980 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QItemSelection' has equals operators but no qHash() function"/> |
|
|||
4981 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QKeySequence' has equals operators but no qHash() function"/> |
|
|||
4982 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLine' has equals operators but no qHash() function"/> |
|
|||
4983 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPolygonF' has equals operators but no qHash() function"/> |
|
|||
4984 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizePolicy' has equals operators but no qHash() function"/> |
|
|||
4985 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFragment' has equals operators but no qHash() function"/> |
|
|||
4986 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetrics' has equals operators but no qHash() function"/> |
|
|||
4987 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGradient' has equals operators but no qHash() function"/> |
|
|||
4988 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetricsF' has equals operators but no qHash() function"/> |
|
|||
4989 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFormat' has equals operators but no qHash() function"/> |
|
|||
4990 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLineF' has equals operators but no qHash() function"/> |
|
|||
4991 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QImage' has equals operators but no qHash() function"/> |
|
|||
4992 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function" /> |
|
|||
4993 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function" /> |
|
|||
4994 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::pixmapData', unmatched return type 'QPixmapData*'"/> |
|
5206 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::pixmapData', unmatched return type 'QPixmapData*'"/> | |
4995 | <suppress-warning text="WARNING(MetaJavaBuilder) :: object type 'QAccessible' extended by interface type 'QAbstractAccessibleFactory'. The resulting API will be less expressive than the original." /> |
|
5207 | <suppress-warning text="WARNING(MetaJavaBuilder) :: object type 'QAccessible' extended by interface type 'QAbstractAccessibleFactory'. The resulting API will be less expressive than the original." /> | |
4996 |
|
5208 | |||
4997 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: |
|
5209 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles" /> | |
|
5210 | ||||
|
5211 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QtSharedPointer' does not have a type entry" /> | |||
4998 |
|
5212 | |||
4999 | </typesystem> |
|
5213 | </typesystem> |
This diff has been collapsed as it changes many lines, (1370 lines changed) Show them Hide them | |||||
@@ -1,13 +1,18 | |||||
1 | <?xml version="1.0"?> |
|
1 | <?xml version="1.0"?> | |
2 | <typesystem package="com.trolltech.qt.gui"><rejection class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><rejection class="QFontDatabase"/><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"/><rejection class="QAbstractProxyModel"/><rejection class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection class="QFileSystemModel"/><rejection class="QPrinterInfo"/><rejection class="QProxyModel"/><rejection class="QPrinterInfo"/><rejection class="QTextOption"/><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"><rejection class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><rejection class="QFontDatabase"/><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"/><rejection class="QAbstractProxyModel"/><rejection class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection class="QFileSystemModel"/><rejection class="QPrinterInfo"/><rejection class="QProxyModel"/><rejection class="QPrinterInfo"/><rejection class="QTextOption"/><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"/> | |
|
3 | ||||
3 | <rejection class="*" function-name="d_func"/> |
|
4 | <rejection class="*" function-name="d_func"/> | |
4 |
|
5 | |||
5 | <rejection class="*" field-name="d_ptr"/> |
|
6 | <rejection class="*" field-name="d_ptr"/> | |
6 | <rejection class="*" field-name="d"/> |
|
7 | <rejection class="*" field-name="d"/> | |
7 |
|
8 | |||
|
9 | <rejection class="QGenericMatrix"/> | |||
|
10 | <rejection class="QPixmapFilterPrivate"/> | |||
|
11 | <rejection class="QPenPrivate"/> | |||
|
12 | <rejection class="QGtkStyle"/> | |||
8 | <rejection class="QWindowsCEStyle"/> |
|
13 | <rejection class="QWindowsCEStyle"/> | |
9 | <rejection class="QWindowsMobileStyle"/> |
|
14 | <rejection class="QWindowsMobileStyle"/> | |
10 |
<rejection class="QAbstractUndoItem"/> |
|
15 | <rejection class="QAbstractUndoItem"/> | |
11 | <rejection class="QAccessibleApplication"/> |
|
16 | <rejection class="QAccessibleApplication"/> | |
12 | <rejection class="QBrushData"/> |
|
17 | <rejection class="QBrushData"/> | |
13 | <rejection class="QImageTextKeyLang"/> |
|
18 | <rejection class="QImageTextKeyLang"/> | |
@@ -37,8 +42,8 | |||||
37 | <rejection class="QAccessibleEditableTextInterface"/> |
|
42 | <rejection class="QAccessibleEditableTextInterface"/> | |
38 | <rejection class="QAccessibleSimpleEditableTextInterface"/> |
|
43 | <rejection class="QAccessibleSimpleEditableTextInterface"/> | |
39 | <rejection class="QAccessibleTextInterface"/> |
|
44 | <rejection class="QAccessibleTextInterface"/> | |
40 |
<rejection class="QAccessibleValueInterface"/> |
|
45 | <rejection class="QAccessibleValueInterface"/> | |
41 |
<rejection class="QIconEngineFactoryInterface"/> |
|
46 | <rejection class="QIconEngineFactoryInterface"/> | |
42 | <rejection class="QIconEnginePlugin"/> |
|
47 | <rejection class="QIconEnginePlugin"/> | |
43 | <rejection class="QWidgetItemV2"/> |
|
48 | <rejection class="QWidgetItemV2"/> | |
44 | <rejection class="QAbstractItemDelegate" function-name="operator="/> |
|
49 | <rejection class="QAbstractItemDelegate" function-name="operator="/> | |
@@ -46,7 +51,7 | |||||
46 | <rejection class="QAccessible" function-name="installRootObjectHandler"/> |
|
51 | <rejection class="QAccessible" function-name="installRootObjectHandler"/> | |
47 | <rejection class="QAccessible" function-name="installUpdateHandler"/> |
|
52 | <rejection class="QAccessible" function-name="installUpdateHandler"/> | |
48 | <rejection class="QAccessible" function-name="removeFactory"/> |
|
53 | <rejection class="QAccessible" function-name="removeFactory"/> | |
49 |
<rejection class="QApplication" function-name="compressEvent"/> |
|
54 | <rejection class="QApplication" function-name="compressEvent"/> | |
50 | <rejection class="QBrush" function-name="cleanUp"/> |
|
55 | <rejection class="QBrush" function-name="cleanUp"/> | |
51 | <rejection class="QPictureIO" function-name="defineIOHandler"/> |
|
56 | <rejection class="QPictureIO" function-name="defineIOHandler"/> | |
52 | <rejection class="QPolygon" function-name="putPoints"/> |
|
57 | <rejection class="QPolygon" function-name="putPoints"/> | |
@@ -61,27 +66,43 | |||||
61 | <rejection class="QWidget" function-name="handle"/> |
|
66 | <rejection class="QWidget" function-name="handle"/> | |
62 | <rejection class="QWidget" function-name="styleChange"/> |
|
67 | <rejection class="QWidget" function-name="styleChange"/> | |
63 | <rejection class="QWidget" function-name="internalWinId"/> |
|
68 | <rejection class="QWidget" function-name="internalWinId"/> | |
64 |
<rejection class="QActionGroup" function-name="selected"/> |
|
69 | <rejection class="QActionGroup" function-name="selected"/> | |
65 |
<rejection class="QPaintEngine" function-name="fix_neg_rect"/> |
|
70 | <rejection class="QPaintEngine" function-name="fix_neg_rect"/> | |
66 | <rejection class="QTreeModel" function-name="node"/> |
|
71 | <rejection class="QTreeModel" function-name="node"/> | |
67 | <rejection class="QTreeModel" function-name="initializeNode"/> |
|
72 | <rejection class="QTreeModel" function-name="initializeNode"/> | |
68 | <rejection class="QTreeModel" function-name="queryChildren"/> |
|
73 | <rejection class="QTreeModel" function-name="queryChildren"/> | |
|
74 | <rejection class="QTextObjectInterface"/> | |||
69 | <rejection class="QAccessible" function-name="cast_helper"/> |
|
75 | <rejection class="QAccessible" function-name="cast_helper"/> | |
70 | <rejection class="QAccessible2"/> |
|
76 | <rejection class="QAccessible2"/> | |
71 | <rejection class="QAccessibleInterface" function-name="backgroundColor"/> |
|
77 | <rejection class="QAccessibleInterface" function-name="backgroundColor"/> | |
72 | <rejection class="QAccessibleInterface" function-name="foregroundColor"/> |
|
78 | <rejection class="QAccessibleInterface" function-name="foregroundColor"/> | |
73 | <rejection class="QAccessibleInterface" function-name="textInterface"/> |
|
79 | <rejection class="QAccessibleInterface" function-name="textInterface"/> | |
74 |
<rejection class="QAccessibleInterface" function-name="valueInterface"/> |
|
80 | <rejection class="QAccessibleInterface" function-name="valueInterface"/> | |
75 | <rejection class="QAccessibleInterface" function-name="tableInterface"/> |
|
81 | <rejection class="QAccessibleInterface" function-name="tableInterface"/> | |
76 | <rejection class="QAccessibleInterface" function-name="editableTextInterface"/> |
|
82 | <rejection class="QAccessibleInterface" function-name="editableTextInterface"/> | |
77 | <rejection class="QAccessibleInterface" function-name="cast_helper"/> |
|
83 | <rejection class="QAccessibleInterface" function-name="cast_helper"/> | |
78 | <rejection class="QAccessibleInterfaceEx" function-name="interface_cast"/> |
|
84 | <rejection class="QAccessibleInterfaceEx" function-name="interface_cast"/> | |
79 | <rejection class="QAccessibleBridgePlugin"/> |
|
85 | <rejection class="QAccessibleBridgePlugin"/> | |
80 |
<rejection class="QAccessibleBridgeFactoryInterface"/> |
|
86 | <rejection class="QAccessibleBridgeFactoryInterface"/> | |
81 |
<rejection class="QTabletEvent" field-name="mExtra"/> |
|
87 | <rejection class="QTabletEvent" field-name="mExtra"/> | |
82 | <rejection class="QWidgetItem" field-name="wid"/> |
|
88 | <rejection class="QWidgetItem" field-name="wid"/> | |
83 | <rejection class="QFont" enum-name="ResolveProperties"/> |
|
89 | <rejection class="QFont" enum-name="ResolveProperties"/> | |
|
90 | <rejection class="QGradient" enum-name="InterpolationMode"/> | |||
|
91 | <rejection class="QIconEngineV2::AvailableSizesArgument"/> | |||
|
92 | <rejection class="QIconEngineV2" enum-name="IconEngineHook"/> | |||
|
93 | <rejection class="QGradient" enum-name="InterpolationMode"/> | |||
|
94 | <rejection class="QGradient" function-name="setInterpolationMode"/> | |||
|
95 | <rejection class="QGradient" function-name="interpolationMode"/> | |||
|
96 | <rejection class="QAbstractTextDocumentLayout" function-name="handlerForObject"/> | |||
|
97 | ||||
84 |
|
98 | |||
|
99 | <enum-type name="QStyleOptionTabBarBaseV2::StyleOptionVersion"/> | |||
|
100 | <enum-type name="QTabBar::SelectionBehavior"/> | |||
|
101 | <enum-type name="QTabBar::ButtonPosition"/> | |||
|
102 | <enum-type name="QInputDialog::InputMode"/> | |||
|
103 | <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions"/> | |||
|
104 | <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/> | |||
|
105 | <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/> | |||
85 | <enum-type name="QAbstractItemDelegate::EndEditHint"/> |
|
106 | <enum-type name="QAbstractItemDelegate::EndEditHint"/> | |
86 | <enum-type name="QAbstractItemView::CursorAction"/> |
|
107 | <enum-type name="QAbstractItemView::CursorAction"/> | |
87 | <enum-type name="QAbstractItemView::DragDropMode"/> |
|
108 | <enum-type name="QAbstractItemView::DragDropMode"/> | |
@@ -106,7 +127,7 | |||||
106 | <enum-type name="QAccessible::StateFlag" flags="QAccessible::State"/> |
|
127 | <enum-type name="QAccessible::StateFlag" flags="QAccessible::State"/> | |
107 | <enum-type name="QAccessible::Text"/> |
|
128 | <enum-type name="QAccessible::Text"/> | |
108 | <enum-type name="QDesktopServices::StandardLocation"/> |
|
129 | <enum-type name="QDesktopServices::StandardLocation"/> | |
109 |
<enum-type name="QDirModel::Roles"/> |
|
130 | <enum-type name="QDirModel::Roles"/> | |
110 | <enum-type name="QFont::Capitalization"/> |
|
131 | <enum-type name="QFont::Capitalization"/> | |
111 | <enum-type name="QFont::SpacingType"/> |
|
132 | <enum-type name="QFont::SpacingType"/> | |
112 | <enum-type name="QGraphicsItem::CacheMode"/> |
|
133 | <enum-type name="QGraphicsItem::CacheMode"/> | |
@@ -116,18 +137,20 | |||||
116 | <enum-type name="QFileSystemModel::Roles"/> |
|
137 | <enum-type name="QFileSystemModel::Roles"/> | |
117 | <enum-type name="QFormLayout::FieldGrowthPolicy"/> |
|
138 | <enum-type name="QFormLayout::FieldGrowthPolicy"/> | |
118 | <enum-type name="QFormLayout::FormStyle"/> |
|
139 | <enum-type name="QFormLayout::FormStyle"/> | |
119 |
<enum-type name="QFormLayout::ItemRole"/> |
|
140 | <enum-type name="QFormLayout::ItemRole"/> | |
120 | <enum-type name="QFormLayout::RowWrapPolicy"/> |
|
141 | <enum-type name="QFormLayout::RowWrapPolicy"/> | |
121 | <enum-type name="QGraphicsProxyWidget::enum_1"/> |
|
142 | <enum-type name="QGraphicsProxyWidget::enum_1"/> | |
122 | <enum-type name="QGraphicsWidget::enum_1"/> |
|
143 | <enum-type name="QGraphicsWidget::enum_1"/> | |
123 | <enum-type name="QPlainTextEdit::LineWrapMode"/> |
|
144 | <enum-type name="QPlainTextEdit::LineWrapMode"/> | |
124 | <enum-type name="QPrintPreviewWidget::ViewMode"/> |
|
145 | <enum-type name="QPrintPreviewWidget::ViewMode"/> | |
125 | <enum-type name="QPrintPreviewWidget::ZoomMode"/> |
|
146 | <enum-type name="QPrintPreviewWidget::ZoomMode"/> | |
|
147 | <enum-type name="QStyleOptionTabV3::StyleOptionVersion"/> | |||
|
148 | <enum-type name="QStyleOptionFrameV3::StyleOptionVersion"/> | |||
126 | <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion"/> |
|
149 | <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion"/> | |
127 | <enum-type name="QStyleOptionViewItemV4::ViewItemPosition"/> |
|
150 | <enum-type name="QStyleOptionViewItemV4::ViewItemPosition"/> | |
128 |
|
151 | |||
129 | <enum-type name="QMdiSubWindow::SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/> |
|
152 | <enum-type name="QMdiSubWindow::SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/> | |
130 |
|
|
153 | ||
131 | <enum-type name="QAction::ActionEvent"/> |
|
154 | <enum-type name="QAction::ActionEvent"/> | |
132 | <enum-type name="QAction::MenuRole"/> |
|
155 | <enum-type name="QAction::MenuRole"/> | |
133 | <enum-type name="QApplication::ColorSpec"/> |
|
156 | <enum-type name="QApplication::ColorSpec"/> | |
@@ -136,7 +159,6 | |||||
136 | <enum-type name="QCalendarWidget::SelectionMode"/> |
|
159 | <enum-type name="QCalendarWidget::SelectionMode"/> | |
137 | <enum-type name="QCalendarWidget::VerticalHeaderFormat"/> |
|
160 | <enum-type name="QCalendarWidget::VerticalHeaderFormat"/> | |
138 | <enum-type name="QColor::Spec"/> |
|
161 | <enum-type name="QColor::Spec"/> | |
139 | <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/> |
|
|||
140 | <enum-type name="QColormap::Mode"/> |
|
162 | <enum-type name="QColormap::Mode"/> | |
141 | <enum-type name="QComboBox::InsertPolicy"/> |
|
163 | <enum-type name="QComboBox::InsertPolicy"/> | |
142 | <enum-type name="QComboBox::SizeAdjustPolicy"/> |
|
164 | <enum-type name="QComboBox::SizeAdjustPolicy"/> | |
@@ -159,7 +181,6 | |||||
159 | <enum-type name="QFont::StyleStrategy"/> |
|
181 | <enum-type name="QFont::StyleStrategy"/> | |
160 | <enum-type name="QFont::Weight"/> |
|
182 | <enum-type name="QFont::Weight"/> | |
161 | <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/> |
|
183 | <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/> | |
162 | <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/> |
|
|||
163 | <enum-type name="QFrame::Shadow" extensible="yes"/> |
|
184 | <enum-type name="QFrame::Shadow" extensible="yes"/> | |
164 | <enum-type name="QFrame::Shape"/> |
|
185 | <enum-type name="QFrame::Shape"/> | |
165 | <enum-type name="QFrame::StyleMask"/> |
|
186 | <enum-type name="QFrame::StyleMask"/> | |
@@ -186,7 +207,7 | |||||
186 | <enum-type name="QGraphicsView::DragMode"/> |
|
207 | <enum-type name="QGraphicsView::DragMode"/> | |
187 | <enum-type name="QGraphicsView::OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/> |
|
208 | <enum-type name="QGraphicsView::OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/> | |
188 | <enum-type name="QGraphicsView::ViewportAnchor"/> |
|
209 | <enum-type name="QGraphicsView::ViewportAnchor"/> | |
189 |
<enum-type name="QGraphicsView::ViewportUpdateMode"/> |
|
210 | <enum-type name="QGraphicsView::ViewportUpdateMode"/> | |
190 | <enum-type name="QIcon::Mode"/> |
|
211 | <enum-type name="QIcon::Mode"/> | |
191 | <enum-type name="QIcon::State"/> |
|
212 | <enum-type name="QIcon::State"/> | |
192 | <enum-type name="QImage::Format"/> |
|
213 | <enum-type name="QImage::Format"/> | |
@@ -195,8 +216,6 | |||||
195 | <enum-type name="QImageReader::ImageReaderError"/> |
|
216 | <enum-type name="QImageReader::ImageReaderError"/> | |
196 | <enum-type name="QImageWriter::ImageWriterError"/> |
|
217 | <enum-type name="QImageWriter::ImageWriterError"/> | |
197 | <enum-type name="QInputContext::StandardFormat"/> |
|
218 | <enum-type name="QInputContext::StandardFormat"/> | |
198 | <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions"/> |
|
|||
199 | <enum-type name="QInputDialog::InputMode"/> |
|
|||
200 | <enum-type name="QInputMethodEvent::AttributeType"/> |
|
219 | <enum-type name="QInputMethodEvent::AttributeType"/> | |
201 | <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/> |
|
220 | <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/> | |
202 | <enum-type name="QKeySequence::SequenceFormat"/> |
|
221 | <enum-type name="QKeySequence::SequenceFormat"/> | |
@@ -241,8 +260,7 | |||||
241 | <enum-type name="QPrinter::Unit"/> |
|
260 | <enum-type name="QPrinter::Unit"/> | |
242 | <enum-type name="QPrinter::DuplexMode"/> |
|
261 | <enum-type name="QPrinter::DuplexMode"/> | |
243 | <enum-type name="QProgressBar::Direction"/> |
|
262 | <enum-type name="QProgressBar::Direction"/> | |
244 |
<enum-type name="QRe |
|
263 | <enum-type name="QRegion::RegionType"/> | |
245 | <enum-type name="QRegion::RegionType"/> |
|
|||
246 | <enum-type name="QRubberBand::Shape"/> |
|
264 | <enum-type name="QRubberBand::Shape"/> | |
247 | <enum-type name="QSessionManager::RestartHint"/> |
|
265 | <enum-type name="QSessionManager::RestartHint"/> | |
248 | <enum-type name="QSizePolicy::Policy"/> |
|
266 | <enum-type name="QSizePolicy::Policy"/> | |
@@ -348,8 +366,6 | |||||
348 | <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/> |
|
366 | <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/> | |
349 | <enum-type name="QSystemTrayIcon::ActivationReason"/> |
|
367 | <enum-type name="QSystemTrayIcon::ActivationReason"/> | |
350 | <enum-type name="QSystemTrayIcon::MessageIcon"/> |
|
368 | <enum-type name="QSystemTrayIcon::MessageIcon"/> | |
351 | <enum-type name="QTabBar::ButtonPosition"/> |
|
|||
352 | <enum-type name="QTabBar::SelectionBehavior"/> |
|
|||
353 | <enum-type name="QTabBar::Shape"/> |
|
369 | <enum-type name="QTabBar::Shape"/> | |
354 | <enum-type name="QTabWidget::TabPosition"/> |
|
370 | <enum-type name="QTabWidget::TabPosition"/> | |
355 | <enum-type name="QTabWidget::TabShape"/> |
|
371 | <enum-type name="QTabWidget::TabShape"/> | |
@@ -391,7 +407,7 | |||||
391 | <enum-type name="QStyleOptionToolBoxV2::StyleOptionVersion"/> |
|
407 | <enum-type name="QStyleOptionToolBoxV2::StyleOptionVersion"/> | |
392 | <enum-type name="QStyleOptionToolBoxV2::TabPosition"/> |
|
408 | <enum-type name="QStyleOptionToolBoxV2::TabPosition"/> | |
393 | <enum-type name="QStyleOptionViewItemV3::StyleOptionVersion"/> |
|
409 | <enum-type name="QStyleOptionViewItemV3::StyleOptionVersion"/> | |
394 |
<enum-type name="QTransform::TransformationType"/> |
|
410 | <enum-type name="QTransform::TransformationType"/> | |
395 | <enum-type name="QTreeWidgetItem::ChildIndicatorPolicy"/> |
|
411 | <enum-type name="QTreeWidgetItem::ChildIndicatorPolicy"/> | |
396 | <enum-type name="QWizard::WizardOption" flags="QWizard::WizardOptions"/> |
|
412 | <enum-type name="QWizard::WizardOption" flags="QWizard::WizardOptions"/> | |
397 | <enum-type name="QWizard::WizardPixmap"/> |
|
413 | <enum-type name="QWizard::WizardPixmap"/> | |
@@ -422,12 +438,12 | |||||
422 | <enum-type name="QDialogButtonBox::StandardButton" flags="QDialogButtonBox::StandardButtons"> |
|
438 | <enum-type name="QDialogButtonBox::StandardButton" flags="QDialogButtonBox::StandardButtons"> | |
423 | <reject-enum-value name="FirstButton"/> |
|
439 | <reject-enum-value name="FirstButton"/> | |
424 | <reject-enum-value name="LastButton"/> |
|
440 | <reject-enum-value name="LastButton"/> | |
425 |
<reject-enum-value name="YesAll"/> |
|
441 | <reject-enum-value name="YesAll"/> | |
426 | <reject-enum-value name="NoAll"/> |
|
442 | <reject-enum-value name="NoAll"/> | |
427 |
<reject-enum-value name="Default"/> |
|
443 | <reject-enum-value name="Default"/> | |
428 | <reject-enum-value name="Escape"/> |
|
444 | <reject-enum-value name="Escape"/> | |
429 | <reject-enum-value name="FlagMask"/> |
|
445 | <reject-enum-value name="FlagMask"/> | |
430 |
<reject-enum-value name="ButtonMask"/> |
|
446 | <reject-enum-value name="ButtonMask"/> | |
431 | </enum-type> |
|
447 | </enum-type> | |
432 |
|
448 | |||
433 | <enum-type name="QDockWidget::DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/> |
|
449 | <enum-type name="QDockWidget::DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/> | |
@@ -487,16 +503,34 | |||||
487 | <reject-enum-value name="FirstFontProperty"/> |
|
503 | <reject-enum-value name="FirstFontProperty"/> | |
488 | <reject-enum-value name="LastFontProperty"/> |
|
504 | <reject-enum-value name="LastFontProperty"/> | |
489 | </enum-type> |
|
505 | </enum-type> | |
|
506 | ||||
|
507 | <enum-type name="QAction::Priority"/> | |||
|
508 | <enum-type name="QAction::SoftKeyRole"/> | |||
|
509 | <enum-type name="QGraphicsEffect::ChangeFlag" flags="QGraphicsEffect::ChangeFlags"/> | |||
|
510 | <enum-type name="QGraphicsItem::PanelModality"/> | |||
|
511 | <enum-type name="QPinchGesture::WhatChange" flags="QPinchGesture::WhatChanged"/> | |||
|
512 | <enum-type name="QStyle::RequestSoftwareInputPanel"/> | |||
|
513 | <enum-type name="QSwipeGesture::SwipeDirection"/> | |||
|
514 | <enum-type name="QTouchEvent::DeviceType"/> | |||
490 |
|
515 | |||
|
516 | ||||
|
517 | <value-type name="QPixmapCache::Key"/> | |||
|
518 | <value-type name="QTileRules"/> | |||
|
519 | <value-type name="QVector2D"/> | |||
|
520 | <value-type name="QVector3D"/> | |||
|
521 | <value-type name="QVector4D"/> | |||
|
522 | <value-type name="QTouchEvent::TouchPoint"/> | |||
|
523 | ||||
|
524 | ||||
491 | <value-type name="QTransform"> |
|
525 | <value-type name="QTransform"> | |
492 | <modify-function signature="operator=(QTransform)" remove="all"/> |
|
526 | <modify-function signature="operator=(QTransform)" remove="all"/> | |
493 | <modify-function signature="map(int,int,int*,int*)const" remove="all"/> |
|
527 | <modify-function signature="map(int,int,int*,int*)const" remove="all"/> | |
494 |
<modify-function signature="map( |
|
528 | <modify-function signature="map(double,double,double*,double*)const" remove="all"/> | |
495 |
|
529 | |||
496 |
<modify-function signature="operator*=( |
|
530 | <modify-function signature="operator*=(double)" access="private"/> | |
497 |
<modify-function signature="operator+=( |
|
531 | <modify-function signature="operator+=(double)" access="private"/> | |
498 |
<modify-function signature="operator-=( |
|
532 | <modify-function signature="operator-=(double)" access="private"/> | |
499 |
<modify-function signature="operator/=( |
|
533 | <modify-function signature="operator/=(double)" access="private"/> | |
500 | <modify-function signature="operator*(QTransform)const" rename="multiplied"/> |
|
534 | <modify-function signature="operator*(QTransform)const" rename="multiplied"/> | |
501 | <modify-function signature="operator*=(QTransform)" access="private"/> |
|
535 | <modify-function signature="operator*=(QTransform)" access="private"/> | |
502 |
|
536 | |||
@@ -505,8 +539,8 | |||||
505 | <remove-argument/> |
|
539 | <remove-argument/> | |
506 | </modify-argument> |
|
540 | </modify-argument> | |
507 | </modify-function> |
|
541 | </modify-function> | |
508 |
</value-type> |
|
542 | </value-type> | |
509 |
|
543 | |||
510 | <value-type name="QStyleOption" delete-in-main-thread="yes" polymorphic-base="yes" polymorphic-id-expression="%1->type == QStyleOption::SO_Default"> |
|
544 | <value-type name="QStyleOption" delete-in-main-thread="yes" polymorphic-base="yes" polymorphic-id-expression="%1->type == QStyleOption::SO_Default"> | |
511 | <modify-function signature="operator=(QStyleOption)" remove="all"/> |
|
545 | <modify-function signature="operator=(QStyleOption)" remove="all"/> | |
512 | <modify-function signature="init(const QWidget*)" remove="all"/> <!--### Obsolete in 4.3--> |
|
546 | <modify-function signature="init(const QWidget*)" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -517,62 +551,71 | |||||
517 | <value-type name="QStyleOptionComboBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionComboBox::Type && %1->version == QStyleOptionComboBox::Version"/> |
|
551 | <value-type name="QStyleOptionComboBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionComboBox::Type && %1->version == QStyleOptionComboBox::Version"/> | |
518 | <value-type name="QStyleOptionComplex" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionComplex::Type && %1->version == QStyleOptionComplex::Version"/> |
|
552 | <value-type name="QStyleOptionComplex" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionComplex::Type && %1->version == QStyleOptionComplex::Version"/> | |
519 | <value-type name="QStyleOptionDockWidget" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionDockWidget::Type && %1->version == QStyleOptionDockWidget::Version"/> |
|
553 | <value-type name="QStyleOptionDockWidget" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionDockWidget::Type && %1->version == QStyleOptionDockWidget::Version"/> | |
520 |
<value-type name="QStyleOptionDockWidgetV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionDockWidgetV2::Type && %1->version == QStyleOptionDockWidgetV2::Version"> |
|
554 | <value-type name="QStyleOptionDockWidgetV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionDockWidgetV2::Type && %1->version == QStyleOptionDockWidgetV2::Version"> | |
521 | <modify-function signature="operator=(QStyleOptionDockWidget)" remove="all"/> |
|
555 | <modify-function signature="operator=(QStyleOptionDockWidget)" remove="all"/> | |
522 | </value-type> |
|
556 | </value-type> | |
523 | <value-type name="QStyleOptionFocusRect" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFocusRect::Type && %1->version == QStyleOptionFocusRect::Version"/> |
|
557 | <value-type name="QStyleOptionFocusRect" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFocusRect::Type && %1->version == QStyleOptionFocusRect::Version"/> | |
524 | <value-type name="QStyleOptionFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrame::Type && %1->version == QStyleOptionFrame::Version"/> |
|
558 | <value-type name="QStyleOptionFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrame::Type && %1->version == QStyleOptionFrame::Version"/> | |
525 |
|
559 | |||
526 | <value-type name="QStyleOptionFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrameV2::Type && %1->version == QStyleOptionFrameV2::Version"> |
|
560 | <value-type name="QStyleOptionFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrameV2::Type && %1->version == QStyleOptionFrameV2::Version"> | |
527 | <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/> |
|
561 | <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/> | |
528 |
</value-type> |
|
562 | </value-type> | |
529 |
|
563 | <value-type name="QStyleOptionFrameV3" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionFrameV3::Type && %1->version == QStyleOptionFrameV3::Version"> | ||
|
564 | <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/> | |||
|
565 | </value-type> | |||
|
566 | ||||
530 | <value-type name="QStyleOptionGroupBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionGroupBox::Type && %1->version == QStyleOptionGroupBox::Version"/> |
|
567 | <value-type name="QStyleOptionGroupBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionGroupBox::Type && %1->version == QStyleOptionGroupBox::Version"/> | |
531 | <value-type name="QStyleOptionHeader" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionHeader::Type && %1->version == QStyleOptionHeader::Version"/> |
|
568 | <value-type name="QStyleOptionHeader" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionHeader::Type && %1->version == QStyleOptionHeader::Version"/> | |
532 | <value-type name="QStyleOptionMenuItem" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionMenuItem::Type && %1->version == QStyleOptionMenuItem::Version"/> |
|
569 | <value-type name="QStyleOptionMenuItem" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionMenuItem::Type && %1->version == QStyleOptionMenuItem::Version"/> | |
533 | <value-type name="QStyleOptionProgressBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionProgressBar::Type && %1->version == QStyleOptionProgressBar::Version"/> |
|
570 | <value-type name="QStyleOptionProgressBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionProgressBar::Type && %1->version == QStyleOptionProgressBar::Version"/> | |
534 |
|
571 | |||
535 | <value-type name="QStyleOptionProgressBarV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionProgressBarV2::Type && %1->version == QStyleOptionProgressBarV2::Version"> |
|
572 | <value-type name="QStyleOptionProgressBarV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionProgressBarV2::Type && %1->version == QStyleOptionProgressBarV2::Version"> | |
536 | <modify-function signature="operator=(QStyleOptionProgressBar)" remove="all"/> |
|
573 | <modify-function signature="operator=(QStyleOptionProgressBar)" remove="all"/> | |
537 |
</value-type> |
|
574 | </value-type> | |
538 |
|
575 | |||
539 | <value-type name="QStyleOptionRubberBand" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionRubberBand::Type && %1->version == QStyleOptionRubberBand::Version"/> |
|
576 | <value-type name="QStyleOptionRubberBand" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionRubberBand::Type && %1->version == QStyleOptionRubberBand::Version"/> | |
540 | <value-type name="QStyleOptionSlider" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionSlider::Type && %1->version == QStyleOptionSlider::Version"/> |
|
577 | <value-type name="QStyleOptionSlider" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionSlider::Type && %1->version == QStyleOptionSlider::Version"/> | |
541 | <value-type name="QStyleOptionSpinBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionSpinBox::Type && %1->version == QStyleOptionSpinBox::Version"/> |
|
578 | <value-type name="QStyleOptionSpinBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionSpinBox::Type && %1->version == QStyleOptionSpinBox::Version"/> | |
542 | <value-type name="QStyleOptionTab" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTab::Type && %1->version == QStyleOptionTab::Version"/> |
|
579 | <value-type name="QStyleOptionTab" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTab::Type && %1->version == QStyleOptionTab::Version"/> | |
543 | <value-type name="QStyleOptionTabV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabV2::Type && %1->version == QStyleOptionTabV2::Version"> |
|
580 | <value-type name="QStyleOptionTabV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabV2::Type && %1->version == QStyleOptionTabV2::Version"> | |
544 | <modify-function signature="operator=(const QStyleOptionTab &)" remove="all"/> |
|
581 | <modify-function signature="operator=(const QStyleOptionTab &)" remove="all"/> | |
545 |
</value-type> |
|
582 | </value-type> | |
546 |
<value-type name="QStyleOptionTab |
|
583 | <value-type name="QStyleOptionTabV3" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabV3::Type && %1->version == QStyleOptionTabV3::Version"> | |
|
584 | <modify-function signature="operator=(QStyleOptionTab)" remove="all"/> | |||
|
585 | </value-type> | |||
|
586 | <value-type name="QStyleOptionTabBarBase" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabBarBase::Type && %1->version == QStyleOptionTabBarBase::Version"/> | |||
|
587 | <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabBarBaseV2::Type && %1->version == QStyleOptionTabBarBaseV2::Version"> | |||
|
588 | <modify-function signature="operator=(QStyleOptionTabBarBase)" remove="all"/> | |||
|
589 | </value-type> | |||
547 | <value-type name="QStyleOptionTabWidgetFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabWidgetFrame::Type && %1->version == QStyleOptionTabWidgetFrame::Version"/> |
|
590 | <value-type name="QStyleOptionTabWidgetFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTabWidgetFrame::Type && %1->version == QStyleOptionTabWidgetFrame::Version"/> | |
548 | <value-type name="QStyleOptionTitleBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTitleBar::Type && %1->version == QStyleOptionTitleBar::Version"/> |
|
591 | <value-type name="QStyleOptionTitleBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionTitleBar::Type && %1->version == QStyleOptionTitleBar::Version"/> | |
549 | <value-type name="QStyleOptionToolBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBar::Type && %1->version == QStyleOptionToolBar::Version"/> |
|
592 | <value-type name="QStyleOptionToolBar" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBar::Type && %1->version == QStyleOptionToolBar::Version"/> | |
550 | <value-type name="QStyleOptionToolBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBox::Type && %1->version == QStyleOptionToolBox::Version"/> |
|
593 | <value-type name="QStyleOptionToolBox" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBox::Type && %1->version == QStyleOptionToolBox::Version"/> | |
551 | <value-type name="QStyleOptionToolBoxV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBoxV2::Type && %1->version == QStyleOptionToolBoxV2::Version"> |
|
594 | <value-type name="QStyleOptionToolBoxV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolBoxV2::Type && %1->version == QStyleOptionToolBoxV2::Version"> | |
552 | <modify-function signature="operator=(QStyleOptionToolBox)" remove="all"/> |
|
595 | <modify-function signature="operator=(QStyleOptionToolBox)" remove="all"/> | |
553 |
</value-type> |
|
596 | </value-type> | |
554 | <value-type name="QStyleOptionToolButton" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolButton::Type && %1->version == QStyleOptionToolButton::Version"/> |
|
597 | <value-type name="QStyleOptionToolButton" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionToolButton::Type && %1->version == QStyleOptionToolButton::Version"/> | |
555 |
<value-type name="QStyleOptionViewItem" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItem::Type && %1->version == QStyleOptionViewItem::Version"/> |
|
598 | <value-type name="QStyleOptionViewItem" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItem::Type && %1->version == QStyleOptionViewItem::Version"/> | |
556 |
<value-type name="QStyleOptionViewItemV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV2::Type && %1->version == QStyleOptionViewItemV2::Version"> |
|
599 | <value-type name="QStyleOptionViewItemV2" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV2::Type && %1->version == QStyleOptionViewItemV2::Version"> | |
557 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> |
|
600 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> | |
558 |
</value-type> |
|
601 | </value-type> | |
559 | <value-type name="QStyleOptionViewItemV3" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV3::Type && %1->version == QStyleOptionViewItemV3::Version"> |
|
602 | <value-type name="QStyleOptionViewItemV3" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV3::Type && %1->version == QStyleOptionViewItemV3::Version"> | |
560 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> |
|
603 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> | |
561 |
</value-type> |
|
604 | </value-type> | |
562 | <value-type name="QStyleOptionViewItemV4" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV4::Type && %1->version == QStyleOptionViewItemV4::Version"> |
|
605 | <value-type name="QStyleOptionViewItemV4" delete-in-main-thread="yes" polymorphic-id-expression="%1->type == QStyleOptionViewItemV4::Type && %1->version == QStyleOptionViewItemV4::Version"> | |
563 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> |
|
606 | <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/> | |
564 | </value-type> |
|
607 | </value-type> | |
565 |
<value-type name="QTextFragment" delete-in-main-thread="yes"> |
|
608 | <value-type name="QTextFragment" delete-in-main-thread="yes"> | |
566 | <modify-function signature="operator=(QTextFragment)" remove="all"/> |
|
609 | <modify-function signature="operator=(QTextFragment)" remove="all"/> | |
567 | </value-type> |
|
610 | </value-type> | |
568 |
<value-type name="QBitmap" delete-in-main-thread="yes"> |
|
611 | <value-type name="QBitmap" delete-in-main-thread="yes"> | |
569 | <modify-function signature="operator=(const QPixmap &)" remove="all"/> |
|
612 | <modify-function signature="operator=(const QPixmap &)" remove="all"/> | |
570 | <modify-function signature="QBitmap(QString,const char*)" access="private"> |
|
613 | <modify-function signature="QBitmap(QString,const char*)" access="private"> | |
571 | <modify-argument index="2"> <remove-default-expression/> </modify-argument> |
|
614 | <modify-argument index="2"> <remove-default-expression/> </modify-argument> | |
572 | </modify-function> |
|
615 | </modify-function> | |
573 |
|
616 | |||
574 | <modify-function signature="fromData(QSize,const uchar*,QImage::Format)"> |
|
617 | <modify-function signature="fromData(QSize,const unsigned char*,QImage::Format)"> | |
575 |
<access modifier="private"/> |
|
618 | <access modifier="private"/> | |
576 | <modify-argument index="3"> |
|
619 | <modify-argument index="3"> | |
577 | <remove-default-expression/> |
|
620 | <remove-default-expression/> | |
578 | </modify-argument> |
|
621 | </modify-argument> | |
@@ -615,12 +658,12 | |||||
615 | <value-type name="QLine"/> |
|
658 | <value-type name="QLine"/> | |
616 | <value-type name="QLineF"/> |
|
659 | <value-type name="QLineF"/> | |
617 |
|
660 | |||
618 |
<value-type name="QPainterPath"> |
|
661 | <value-type name="QPainterPath"> | |
619 | <modify-function signature="operator=(QPainterPath)" remove="all"/> |
|
662 | <modify-function signature="operator=(QPainterPath)" remove="all"/> | |
620 | </value-type> |
|
663 | </value-type> | |
621 | <value-type name="QPalette"> |
|
664 | <value-type name="QPalette"> | |
622 | <modify-function signature="operator=(const QPalette&)" remove="all"/> |
|
665 | <modify-function signature="operator=(const QPalette&)" remove="all"/> | |
623 |
|
666 | |||
624 | <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
667 | <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
625 | <modify-function signature="background()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
668 | <modify-function signature="background()const" remove="all"/> <!--### Obsolete in 4.3--> | |
626 | <modify-function signature="foreground()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
669 | <modify-function signature="foreground()const" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -637,7 +680,7 | |||||
637 | <modify-function signature="pictureFormat(QString)"> |
|
680 | <modify-function signature="pictureFormat(QString)"> | |
638 | <remove/> |
|
681 | <remove/> | |
639 | </modify-function> |
|
682 | </modify-function> | |
640 |
|
683 | |||
641 | <modify-function signature="inputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> |
|
684 | <modify-function signature="inputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> | |
642 | <modify-function signature="inputFormats()" remove="all"/> <!--### Obsolete in 4.3--> |
|
685 | <modify-function signature="inputFormats()" remove="all"/> <!--### Obsolete in 4.3--> | |
643 | <modify-function signature="outputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> |
|
686 | <modify-function signature="outputFormatList()" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -715,14 +758,14 | |||||
715 | <value-type name="QTextTableCellFormat" delete-in-main-thread="yes"/> |
|
758 | <value-type name="QTextTableCellFormat" delete-in-main-thread="yes"/> | |
716 | <value-type name="QTextCharFormat" delete-in-main-thread="yes"> |
|
759 | <value-type name="QTextCharFormat" delete-in-main-thread="yes"> | |
717 | <modify-function signature="isValid()const" access="non-final"/> |
|
760 | <modify-function signature="isValid()const" access="non-final"/> | |
718 |
|
761 | |||
719 | <modify-function signature="anchorName()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
762 | <modify-function signature="anchorName()const" remove="all"/> <!--### Obsolete in 4.3--> | |
720 | <modify-function signature="setAnchorName(QString)" remove="all"/> <!--### Obsolete in 4.3--> |
|
763 | <modify-function signature="setAnchorName(QString)" remove="all"/> <!--### Obsolete in 4.3--> | |
721 | </value-type> |
|
764 | </value-type> | |
722 | <value-type name="QTextFormat" delete-in-main-thread="yes"> |
|
765 | <value-type name="QTextFormat" delete-in-main-thread="yes"> | |
723 | <modify-function signature="operator=(QTextFormat)" remove="all"/> |
|
766 | <modify-function signature="operator=(QTextFormat)" remove="all"/> | |
724 | <modify-function signature="isValid()const" access="non-final"/> |
|
767 | <modify-function signature="isValid()const" access="non-final"/> | |
725 |
|
768 | |||
726 |
|
769 | |||
727 | <modify-function signature="setProperty(int,QVector<QTextLength>)" rename="setLengthVectorProperty"/> |
|
770 | <modify-function signature="setProperty(int,QVector<QTextLength>)" rename="setLengthVectorProperty"/> | |
728 | <inject-code class="native" position="constructor"> |
|
771 | <inject-code class="native" position="constructor"> | |
@@ -734,7 +777,7 | |||||
734 | } |
|
777 | } | |
735 | </inject-code> |
|
778 | </inject-code> | |
736 | </value-type> |
|
779 | </value-type> | |
737 |
|
780 | |||
738 | <value-type name="QTextListFormat" delete-in-main-thread="yes"/> |
|
781 | <value-type name="QTextListFormat" delete-in-main-thread="yes"/> | |
739 | <value-type name="QPolygon"> |
|
782 | <value-type name="QPolygon"> | |
740 | <modify-function signature="QPolygon(int, const int *)" remove="all"/> |
|
783 | <modify-function signature="QPolygon(int, const int *)" remove="all"/> | |
@@ -751,7 +794,7 | |||||
751 | <modify-function signature="operator<<(QVector<QPointF>)" remove="all"/> |
|
794 | <modify-function signature="operator<<(QVector<QPointF>)" remove="all"/> | |
752 | </value-type> |
|
795 | </value-type> | |
753 |
|
796 | |||
754 |
<value-type name="QIcon" delete-in-main-thread="yes"> |
|
797 | <value-type name="QIcon" delete-in-main-thread="yes"> | |
755 | <modify-function signature="operator=(QIcon)" remove="all"/> |
|
798 | <modify-function signature="operator=(QIcon)" remove="all"/> | |
756 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
799 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> | |
757 | <modify-function signature="QIcon(QIconEngineV2 *)"> |
|
800 | <modify-function signature="QIcon(QIconEngineV2 *)"> | |
@@ -763,8 +806,8 | |||||
763 | <modify-argument index="1"> |
|
806 | <modify-argument index="1"> | |
764 | <define-ownership class="java" owner="c++"/> |
|
807 | <define-ownership class="java" owner="c++"/> | |
765 | </modify-argument> |
|
808 | </modify-argument> | |
766 |
</modify-function> |
|
809 | </modify-function> | |
767 |
</value-type> |
|
810 | </value-type> | |
768 |
|
811 | |||
769 | <value-type name="QTextFrame::iterator" delete-in-main-thread="yes"> |
|
812 | <value-type name="QTextFrame::iterator" delete-in-main-thread="yes"> | |
770 | <include file-name="QTextFrame" location="global"/> |
|
813 | <include file-name="QTextFrame" location="global"/> | |
@@ -775,7 +818,7 | |||||
775 | <modify-function signature="operator--()" access="private"/> |
|
818 | <modify-function signature="operator--()" access="private"/> | |
776 | </value-type> |
|
819 | </value-type> | |
777 |
|
820 | |||
778 |
<value-type name="QTreeWidgetItemIterator" delete-in-main-thread="yes"> |
|
821 | <value-type name="QTreeWidgetItemIterator" delete-in-main-thread="yes"> | |
779 | <custom-constructor> |
|
822 | <custom-constructor> | |
780 | return new QTreeWidgetItemIterator(*copy); |
|
823 | return new QTreeWidgetItemIterator(*copy); | |
781 | </custom-constructor> |
|
824 | </custom-constructor> | |
@@ -791,10 +834,10 | |||||
791 | <modify-function signature="operator--()" access="private"/> |
|
834 | <modify-function signature="operator--()" access="private"/> | |
792 | <modify-function signature="operator*()const" access="private"/> |
|
835 | <modify-function signature="operator*()const" access="private"/> | |
793 | </value-type> |
|
836 | </value-type> | |
794 |
|
837 | |||
795 | <value-type name="QTextBlock::iterator" delete-in-main-thread="yes"> |
|
838 | <value-type name="QTextBlock::iterator" delete-in-main-thread="yes"> | |
796 | <include file-name="QTextBlock" location="global"/> |
|
839 | <include file-name="QTextBlock" location="global"/> | |
797 |
|
840 | |||
798 | <modify-function signature="operator++()" access="private"/> |
|
841 | <modify-function signature="operator++()" access="private"/> | |
799 | <modify-function signature="operator--()" access="private"/> |
|
842 | <modify-function signature="operator--()" access="private"/> | |
800 | <modify-function signature="operator++(int)" remove="all"/> |
|
843 | <modify-function signature="operator++(int)" remove="all"/> | |
@@ -810,7 +853,7 | |||||
810 | <modify-function signature="operator=(QPixmap)" remove="all"/> |
|
853 | <modify-function signature="operator=(QPixmap)" remove="all"/> | |
811 | <modify-function signature="operator!()const" remove="all"/> |
|
854 | <modify-function signature="operator!()const" remove="all"/> | |
812 | <modify-function signature="QPixmap(const char **)" access="private"/> |
|
855 | <modify-function signature="QPixmap(const char **)" access="private"/> | |
813 |
<modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
856 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> | |
814 |
|
857 | |||
815 | <modify-function signature="loadFromData(const uchar *,uint,const char *,QFlags<Qt::ImageConversionFlag>)" remove="all"/> |
|
858 | <modify-function signature="loadFromData(const uchar *,uint,const char *,QFlags<Qt::ImageConversionFlag>)" remove="all"/> | |
816 |
|
859 | |||
@@ -864,11 +907,11 | |||||
864 | <extra-includes> |
|
907 | <extra-includes> | |
865 | <include file-name="QTextBlock" location="global"/> |
|
908 | <include file-name="QTextBlock" location="global"/> | |
866 | <include file-name="QTextDocumentFragment" location="global"/> |
|
909 | <include file-name="QTextDocumentFragment" location="global"/> | |
867 |
</extra-includes> |
|
910 | </extra-includes> | |
868 | <modify-function signature="operator=(QTextCursor)" remove="all"/> |
|
911 | <modify-function signature="operator=(QTextCursor)" remove="all"/> | |
869 | <modify-function signature="selectedTableCells(int*,int*,int*,int*)const"> |
|
912 | <modify-function signature="selectedTableCells(int*,int*,int*,int*)const"> | |
870 | <access modifier="private"/> |
|
913 | <access modifier="private"/> | |
871 |
</modify-function> |
|
914 | </modify-function> | |
872 | </value-type> |
|
915 | </value-type> | |
873 |
|
916 | |||
874 | <value-type name="QTextLayout::FormatRange"> |
|
917 | <value-type name="QTextLayout::FormatRange"> | |
@@ -884,8 +927,8 | |||||
884 | delete copy; |
|
927 | delete copy; | |
885 | </custom-destructor> |
|
928 | </custom-destructor> | |
886 | </value-type> |
|
929 | </value-type> | |
887 |
|
930 | |||
888 |
<value-type name="QItemSelection" delete-in-main-thread="yes"> |
|
931 | <value-type name="QItemSelection" delete-in-main-thread="yes"> | |
889 |
|
932 | |||
890 | <modify-function signature="operator+(const QList<QItemSelectionRange>&)const" remove="all"/> |
|
933 | <modify-function signature="operator+(const QList<QItemSelectionRange>&)const" remove="all"/> | |
891 | <modify-function signature="operator+=(const QList<QItemSelectionRange>&)" remove="all"/> |
|
934 | <modify-function signature="operator+=(const QList<QItemSelectionRange>&)" remove="all"/> | |
@@ -894,26 +937,30 | |||||
894 | <modify-function signature="operator<<(QItemSelectionRange)" remove="all"/> |
|
937 | <modify-function signature="operator<<(QItemSelectionRange)" remove="all"/> | |
895 | </value-type> |
|
938 | </value-type> | |
896 |
|
939 | |||
|
940 | <value-type name="QMatrix4x4"> | |||
|
941 | <modify-function signature="data()const" remove="all"/> | |||
|
942 | <modify-function signature="operator()(int, int)const" remove="all"/> | |||
|
943 | </value-type> | |||
897 | <value-type name="QMatrix"> |
|
944 | <value-type name="QMatrix"> | |
898 | <extra-includes> |
|
945 | <extra-includes> | |
899 | <include file-name="QPainterPath" location="global"/> |
|
946 | <include file-name="QPainterPath" location="global"/> | |
900 | </extra-includes> |
|
947 | </extra-includes> | |
901 |
|
948 | |||
902 | <modify-function signature="map(int,int,int*,int*)const" remove="all"/> |
|
949 | <modify-function signature="map(int,int,int*,int*)const" remove="all"/> | |
903 |
<modify-function signature="map( |
|
950 | <modify-function signature="map(double,double,double*,double*)const" remove="all"/> | |
904 | <modify-function signature="operator=(QMatrix)" remove="all"/> |
|
951 | <modify-function signature="operator=(QMatrix)" remove="all"/> | |
905 |
|
952 | |||
906 | <modify-function signature="operator*(QMatrix)const" access="private"/> |
|
953 | <modify-function signature="operator*(QMatrix)const" access="private"/> | |
907 | <modify-function signature="operator*=(QMatrix)" access="private"/> |
|
954 | <modify-function signature="operator*=(QMatrix)" access="private"/> | |
908 |
<modify-function signature="rotate( |
|
955 | <modify-function signature="rotate(double)" access="private" rename="rotate_private"/> | |
909 |
<modify-function signature="scale( |
|
956 | <modify-function signature="scale(double,double)" access="private" rename="scale_private"/> | |
910 |
<modify-function signature="shear( |
|
957 | <modify-function signature="shear(double,double)" access="private" rename="shear_private"/> | |
911 |
<modify-function signature="translate( |
|
958 | <modify-function signature="translate(double,double)" access="private" rename="translate_private"/> | |
912 |
|
959 | |||
913 | <modify-function signature="inverted(bool*)const"> |
|
960 | <modify-function signature="inverted(bool*)const"> | |
914 | <access modifier="private"/> |
|
961 | <access modifier="private"/> | |
915 | <modify-argument index="1"> |
|
962 | <modify-argument index="1"> | |
916 |
|
|
963 | <remove-default-expression/> | |
917 | </modify-argument> |
|
964 | </modify-argument> | |
918 | </modify-function> |
|
965 | </modify-function> | |
919 |
|
966 | |||
@@ -922,21 +969,21 | |||||
922 | <replace from="%FUNCTION_NAME" to="rotate"/> |
|
969 | <replace from="%FUNCTION_NAME" to="rotate"/> | |
923 | <replace from="%OUT_TYPE" to="QMatrix"/> |
|
970 | <replace from="%OUT_TYPE" to="QMatrix"/> | |
924 | <replace from="%IN_TYPE" to="double"/> |
|
971 | <replace from="%IN_TYPE" to="double"/> | |
925 |
</insert-template> |
|
972 | </insert-template> | |
926 |
|
973 | |||
927 | <insert-template name="core.private_function_return_self"> |
|
974 | <insert-template name="core.private_function_return_self"> | |
928 | <replace from="%RETURN_TYPE" to="QMatrix"/> |
|
975 | <replace from="%RETURN_TYPE" to="QMatrix"/> | |
929 | <replace from="%FUNCTION_NAME" to="scale"/> |
|
976 | <replace from="%FUNCTION_NAME" to="scale"/> | |
930 | <replace from="%ARGUMENTS" to="double sx, double sy"/> |
|
977 | <replace from="%ARGUMENTS" to="double sx, double sy"/> | |
931 | <replace from="%ARGUMENT_NAMES" to="sx, sy"/> |
|
978 | <replace from="%ARGUMENT_NAMES" to="sx, sy"/> | |
932 |
</insert-template> |
|
979 | </insert-template> | |
933 |
|
980 | |||
934 | <insert-template name="core.private_function_return_self"> |
|
981 | <insert-template name="core.private_function_return_self"> | |
935 | <replace from="%RETURN_TYPE" to="QMatrix"/> |
|
982 | <replace from="%RETURN_TYPE" to="QMatrix"/> | |
936 | <replace from="%FUNCTION_NAME" to="shear"/> |
|
983 | <replace from="%FUNCTION_NAME" to="shear"/> | |
937 | <replace from="%ARGUMENTS" to="double sh, double sv"/> |
|
984 | <replace from="%ARGUMENTS" to="double sh, double sv"/> | |
938 | <replace from="%ARGUMENT_NAMES" to="sh, sv"/> |
|
985 | <replace from="%ARGUMENT_NAMES" to="sh, sv"/> | |
939 |
</insert-template> |
|
986 | </insert-template> | |
940 |
|
987 | |||
941 | <insert-template name="core.private_function_return_self"> |
|
988 | <insert-template name="core.private_function_return_self"> | |
942 | <replace from="%RETURN_TYPE" to="QMatrix"/> |
|
989 | <replace from="%RETURN_TYPE" to="QMatrix"/> | |
@@ -959,10 +1006,10 | |||||
959 | </custom-constructor> |
|
1006 | </custom-constructor> | |
960 | <custom-destructor> |
|
1007 | <custom-destructor> | |
961 | delete copy; |
|
1008 | delete copy; | |
962 |
</custom-destructor> |
|
1009 | </custom-destructor> | |
963 | </value-type> |
|
1010 | </value-type> | |
964 |
|
1011 | |||
965 | <value-type name="QFontInfo" delete-in-main-thread="yes"> |
|
1012 | <value-type name="QFontInfo" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000"> | |
966 | <custom-constructor> |
|
1013 | <custom-constructor> | |
967 | return new QFontInfo(*copy); |
|
1014 | return new QFontInfo(*copy); | |
968 | </custom-constructor> |
|
1015 | </custom-constructor> | |
@@ -970,7 +1017,7 | |||||
970 | delete copy; |
|
1017 | delete copy; | |
971 | </custom-destructor> |
|
1018 | </custom-destructor> | |
972 | <modify-function signature="operator=(QFontInfo)" remove="all"/> |
|
1019 | <modify-function signature="operator=(QFontInfo)" remove="all"/> | |
973 |
|
1020 | |||
974 |
|
1021 | |||
975 | <modify-function signature="QFontInfo(QFontInfo)"> |
|
1022 | <modify-function signature="QFontInfo(QFontInfo)"> | |
976 | <modify-argument index="1"> |
|
1023 | <modify-argument index="1"> | |
@@ -990,7 +1037,7 | |||||
990 | delete copy; |
|
1037 | delete copy; | |
991 | </custom-destructor> |
|
1038 | </custom-destructor> | |
992 | </value-type> |
|
1039 | </value-type> | |
993 |
|
1040 | |||
994 | <value-type name="QPainterPath::Element"> |
|
1041 | <value-type name="QPainterPath::Element"> | |
995 | <modify-field name="x" write="false"/> |
|
1042 | <modify-field name="x" write="false"/> | |
996 | <modify-field name="y" write="false"/> |
|
1043 | <modify-field name="y" write="false"/> | |
@@ -1003,10 +1050,10 | |||||
1003 | <include file-name="QTextEdit" location="global"/> |
|
1050 | <include file-name="QTextEdit" location="global"/> | |
1004 | </value-type> |
|
1051 | </value-type> | |
1005 |
|
1052 | |||
1006 | <value-type name="QFont" delete-in-main-thread="yes"> |
|
1053 | <value-type name="QFont" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000"> | |
1007 | <extra-includes> |
|
1054 | <extra-includes> | |
1008 | <include file-name="QStringList" location="global"/> |
|
1055 | <include file-name="QStringList" location="global"/> | |
1009 |
</extra-includes> |
|
1056 | </extra-includes> | |
1010 | <modify-function signature="operator=(QFont)" remove="all"/> |
|
1057 | <modify-function signature="operator=(QFont)" remove="all"/> | |
1011 | </value-type> |
|
1058 | </value-type> | |
1012 |
|
1059 | |||
@@ -1016,7 +1063,7 | |||||
1016 | </extra-includes> |
|
1063 | </extra-includes> | |
1017 | <modify-function signature="operator=(QTextTableCell)" remove="all"/> |
|
1064 | <modify-function signature="operator=(QTextTableCell)" remove="all"/> | |
1018 | </value-type> |
|
1065 | </value-type> | |
1019 |
|
1066 | |||
1020 | <value-type name="QImage" expense-limit="67108864" expense-cost="height()*bytesPerLine()"> |
|
1067 | <value-type name="QImage" expense-limit="67108864" expense-cost="height()*bytesPerLine()"> | |
1021 | <modify-function signature="QImage(const char *, const char *)"> |
|
1068 | <modify-function signature="QImage(const char *, const char *)"> | |
1022 | <remove/> |
|
1069 | <remove/> | |
@@ -1024,8 +1071,8 | |||||
1024 | <modify-function signature="QImage(const char **)"> |
|
1071 | <modify-function signature="QImage(const char **)"> | |
1025 | <access modifier="private"/> |
|
1072 | <access modifier="private"/> | |
1026 | </modify-function> |
|
1073 | </modify-function> | |
1027 | <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)"> |
|
1074 | <modify-function signature="QImage(const unsigned char*,int,int,int,QImage::Format)"> | |
1028 |
|
|
1075 | <remove/> | |
1029 | </modify-function> |
|
1076 | </modify-function> | |
1030 | <modify-function signature="bits()const"> |
|
1077 | <modify-function signature="bits()const"> | |
1031 | <remove/> |
|
1078 | <remove/> | |
@@ -1033,77 +1080,85 | |||||
1033 | <modify-function signature="scanLine(int)const"> |
|
1080 | <modify-function signature="scanLine(int)const"> | |
1034 | <remove/> |
|
1081 | <remove/> | |
1035 | </modify-function> |
|
1082 | </modify-function> | |
1036 | <modify-function signature="QImage(const uchar *, int, int, QImage::Format)"> |
|
1083 | <modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)"> | |
1037 | <remove/> |
|
1084 | <remove/> | |
1038 | </modify-function> |
|
1085 | </modify-function> | |
1039 |
|
1086 | |||
1040 | <extra-includes> |
|
1087 | <extra-includes> | |
1041 | <include file-name="QStringList" location="global"/> |
|
1088 | <include file-name="QStringList" location="global"/> | |
1042 | <include file-name="QMatrix" location="global"/> |
|
1089 | <include file-name="QMatrix" location="global"/> | |
1043 | </extra-includes> |
|
1090 | </extra-includes> | |
1044 |
|
1091 | <modify-function signature="save(const QString &, const char *, int) const"> | ||
1045 | <modify-function signature="QImage(uchar*,int,int,QImage::Format)"> |
|
1092 | <access modifier="private"/> | |
|
1093 | <rename to="private_save"/> | |||
|
1094 | <modify-argument index="2"> | |||
|
1095 | <remove-default-expression/> | |||
|
1096 | </modify-argument> | |||
|
1097 | <modify-argument index="3"> | |||
|
1098 | <remove-default-expression/> | |||
|
1099 | </modify-argument> | |||
|
1100 | </modify-function> | |||
|
1101 | ||||
|
1102 | <modify-function signature="QImage(unsigned char*,int,int,QImage::Format)"> | |||
1046 | <access modifier="private"/> |
|
1103 | <access modifier="private"/> | |
1047 | </modify-function> |
|
1104 | </modify-function> | |
1048 |
|
1105 | |||
1049 | <!-- |
|
|||
1050 | <modify-function signature="QImage(QString,const char*)"> |
|
1106 | <modify-function signature="QImage(QString,const char*)"> | |
1051 | <access modifier="private"/> |
|
1107 | <access modifier="private"/> | |
1052 | <modify-argument index="2"> |
|
1108 | <modify-argument index="2"> | |
1053 | <remove-default-expression/> |
|
1109 | <remove-default-expression/> | |
1054 | </modify-argument> |
|
1110 | </modify-argument> | |
1055 | </modify-function> |
|
1111 | </modify-function> | |
1056 | --> |
|
1112 | ||
1057 |
|
||||
1058 | <modify-function signature="load(QString,const char*)"> |
|
1113 | <modify-function signature="load(QString,const char*)"> | |
1059 | <access modifier="private"/> |
|
1114 | <access modifier="private"/> | |
1060 | <modify-argument index="2"> |
|
1115 | <modify-argument index="2"> | |
1061 | <remove-default-expression/> |
|
1116 | <remove-default-expression/> | |
1062 | </modify-argument> |
|
1117 | </modify-argument> | |
1063 | </modify-function> |
|
1118 | </modify-function> | |
1064 |
|
1119 | |||
1065 | <modify-function signature="load(QIODevice*,const char*)"> |
|
1120 | <modify-function signature="load(QIODevice*,const char*)"> | |
1066 | <access modifier="private"/> |
|
1121 | <access modifier="private"/> | |
1067 | </modify-function> |
|
1122 | </modify-function> | |
1068 |
|
1123 | |||
1069 | <modify-function signature="loadFromData(const uchar*,int,const char*)"> |
|
1124 | <modify-function signature="loadFromData(const unsigned char*,int,const char*)"> | |
1070 | <access modifier="private"/> |
|
1125 | <access modifier="private"/> | |
1071 | <modify-argument index="2"> |
|
1126 | <modify-argument index="2"> | |
1072 | <remove-default-expression/> |
|
1127 | <remove-default-expression/> | |
1073 | </modify-argument> |
|
1128 | </modify-argument> | |
1074 | <modify-argument index="3"> |
|
1129 | <modify-argument index="3"> | |
1075 | <remove-default-expression/> |
|
1130 | <remove-default-expression/> | |
1076 |
</modify-argument> |
|
1131 | </modify-argument> | |
1077 | </modify-function> |
|
1132 | </modify-function> | |
1078 |
|
1133 | |||
1079 | <modify-function signature="loadFromData(QByteArray,const char*)"> |
|
1134 | <modify-function signature="loadFromData(QByteArray,const char*)"> | |
1080 | <access modifier="private"/> |
|
1135 | <access modifier="private"/> | |
1081 | <modify-argument index="2"> |
|
1136 | <modify-argument index="2"> | |
1082 | <remove-default-expression/> |
|
1137 | <remove-default-expression/> | |
1083 | </modify-argument> |
|
1138 | </modify-argument> | |
1084 | </modify-function> |
|
1139 | </modify-function> | |
1085 |
|
1140 | |||
1086 | <modify-function signature="operator=(QImage)" remove="all"/> |
|
1141 | <modify-function signature="operator=(QImage)" remove="all"/> | |
1087 |
|
1142 | |||
1088 | <modify-function signature="setText(const char*,const char*,QString)"> |
|
1143 | <modify-function signature="setText(const char*,const char*,QString)"> | |
1089 | <remove/> |
|
1144 | <remove/> | |
1090 | </modify-function> |
|
1145 | </modify-function> | |
1091 |
|
1146 | |||
1092 | <modify-function signature="text(const char*,const char*)const"> |
|
1147 | <modify-function signature="text(const char*,const char*)const"> | |
1093 | <remove/> |
|
1148 | <remove/> | |
1094 | </modify-function> |
|
1149 | </modify-function> | |
1095 |
|
1150 | |||
1096 | <modify-function signature="fromData(QByteArray,const char*)"> |
|
1151 | <modify-function signature="fromData(QByteArray,const char*)"> | |
1097 | <access modifier="private"/> |
|
1152 | <access modifier="private"/> | |
1098 | <modify-argument index="2"> |
|
1153 | <modify-argument index="2"> | |
1099 | <remove-default-expression/> |
|
1154 | <remove-default-expression/> | |
1100 | </modify-argument> |
|
1155 | </modify-argument> | |
1101 | </modify-function> |
|
1156 | </modify-function> | |
1102 |
|
1157 | |||
1103 | <modify-function signature="fromData(const uchar*,int,const char*)"> |
|
1158 | <modify-function signature="fromData(const unsigned char*,int,const char*)"> | |
1104 | <remove/> |
|
1159 | <remove/> | |
1105 |
</modify-function> |
|
1160 | </modify-function> | |
1106 |
|
1161 | |||
1107 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1162 | <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1108 | <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1163 | <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1109 |
|
1164 | |||
@@ -1187,27 +1242,27 | |||||
1187 | <modify-function signature="operator=(QColormap)" remove="all"/> |
|
1242 | <modify-function signature="operator=(QColormap)" remove="all"/> | |
1188 | <extra-includes> |
|
1243 | <extra-includes> | |
1189 | <include file-name="QColor" location="global"/> |
|
1244 | <include file-name="QColor" location="global"/> | |
1190 |
</extra-includes> |
|
1245 | </extra-includes> | |
1191 | <custom-constructor> |
|
1246 | <custom-constructor> | |
1192 | return new QColormap(*copy); |
|
1247 | return new QColormap(*copy); | |
1193 | </custom-constructor> |
|
1248 | </custom-constructor> | |
1194 | <custom-destructor> |
|
1249 | <custom-destructor> | |
1195 | delete copy; |
|
1250 | delete copy; | |
1196 |
</custom-destructor> |
|
1251 | </custom-destructor> | |
1197 | </value-type> |
|
1252 | </value-type> | |
1198 |
|
1253 | |||
1199 |
<value-type name="QCursor" delete-in-main-thread="yes"> |
|
1254 | <value-type name="QCursor" delete-in-main-thread="yes"> | |
1200 | <extra-includes> |
|
1255 | <extra-includes> | |
1201 | <include file-name="QPixmap" location="global"/> |
|
1256 | <include file-name="QPixmap" location="global"/> | |
1202 | </extra-includes> |
|
1257 | </extra-includes> | |
1203 | <modify-function signature="operator=(QCursor)" remove="all"/> |
|
1258 | <modify-function signature="operator=(QCursor)" remove="all"/> | |
1204 | </value-type> |
|
1259 | </value-type> | |
1205 |
|
1260 | |||
1206 | <value-type name="QFontDatabase" delete-in-main-thread="yes"> |
|
1261 | <value-type name="QFontDatabase" delete-in-main-thread="yes"> | |
1207 | <extra-includes> |
|
1262 | <extra-includes> | |
1208 | <include file-name="QStringList" location="global"/> |
|
1263 | <include file-name="QStringList" location="global"/> | |
1209 | </extra-includes> |
|
1264 | </extra-includes> | |
1210 |
</value-type> |
|
1265 | </value-type> | |
1211 |
|
1266 | |||
1212 | <value-type name="QPen"> |
|
1267 | <value-type name="QPen"> | |
1213 | <extra-includes> |
|
1268 | <extra-includes> | |
@@ -1215,15 +1270,15 | |||||
1215 | </extra-includes> |
|
1270 | </extra-includes> | |
1216 |
|
1271 | |||
1217 | <modify-function signature="operator=(QPen)" remove="all"/> |
|
1272 | <modify-function signature="operator=(QPen)" remove="all"/> | |
1218 |
</value-type> |
|
1273 | </value-type> | |
1219 |
|
1274 | |||
1220 | <value-type name="QBrush"> |
|
1275 | <value-type name="QBrush"> | |
1221 | <modify-function signature="QBrush(Qt::GlobalColor, Qt::BrushStyle)" remove="all"/> |
|
1276 | <modify-function signature="QBrush(Qt::GlobalColor, Qt::BrushStyle)" remove="all"/> | |
1222 | <modify-function signature="operator=(const QBrush &)" remove="all"/> |
|
1277 | <modify-function signature="operator=(const QBrush &)" remove="all"/> | |
1223 |
|
1278 | |||
1224 | <extra-includes> |
|
1279 | <extra-includes> | |
1225 | <include file-name="QPixmap" location="global"/> |
|
1280 | <include file-name="QPixmap" location="global"/> | |
1226 |
</extra-includes> |
|
1281 | </extra-includes> | |
1227 |
|
1282 | |||
1228 | <modify-function signature="QBrush(QGradient)"> |
|
1283 | <modify-function signature="QBrush(QGradient)"> | |
1229 | <modify-argument index="1"> |
|
1284 | <modify-argument index="1"> | |
@@ -1243,36 +1298,36 | |||||
1243 | <modify-function signature="QColor(const char*)"> |
|
1298 | <modify-function signature="QColor(const char*)"> | |
1244 | <remove/> |
|
1299 | <remove/> | |
1245 | </modify-function> |
|
1300 | </modify-function> | |
1246 |
|
1301 | |||
1247 | <modify-function signature="getCmyk(int*,int*,int*,int*,int*)"> |
|
1302 | <modify-function signature="getCmyk(int*,int*,int*,int*,int*)"> | |
1248 | <remove/> |
|
1303 | <remove/> | |
1249 | </modify-function> |
|
1304 | </modify-function> | |
1250 |
|
1305 | |||
1251 |
<modify-function signature="getCmykF( |
|
1306 | <modify-function signature="getCmykF(double*,double*,double*,double*,double*)"> | |
1252 | <remove/> |
|
1307 | <remove/> | |
1253 | </modify-function> |
|
1308 | </modify-function> | |
1254 |
|
1309 | |||
1255 | <modify-function signature="getHsv(int*,int*,int*,int*)const"> |
|
1310 | <modify-function signature="getHsv(int*,int*,int*,int*)const"> | |
1256 | <remove/> |
|
1311 | <remove/> | |
1257 | </modify-function> |
|
1312 | </modify-function> | |
1258 |
|
1313 | |||
1259 |
<modify-function signature="getHsvF( |
|
1314 | <modify-function signature="getHsvF(double*,double*,double*,double*)const"> | |
1260 | <remove/> |
|
1315 | <remove/> | |
1261 | </modify-function> |
|
1316 | </modify-function> | |
1262 |
|
1317 | |||
1263 | <modify-function signature="getRgb(int*,int*,int*,int*)const"> |
|
1318 | <modify-function signature="getRgb(int*,int*,int*,int*)const"> | |
1264 | <remove/> |
|
1319 | <remove/> | |
1265 | </modify-function> |
|
1320 | </modify-function> | |
1266 |
|
1321 | |||
1267 |
<modify-function signature="getRgbF( |
|
1322 | <modify-function signature="getRgbF(double*,double*,double*,double*)const"> | |
1268 | <remove/> |
|
1323 | <remove/> | |
1269 | </modify-function> |
|
1324 | </modify-function> | |
1270 |
|
1325 | |||
1271 | <modify-function signature="dark(int)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1326 | <modify-function signature="dark(int)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1272 | <modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1327 | <modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1273 | </value-type> |
|
1328 | </value-type> | |
1274 |
|
|
1329 | ||
1275 | <value-type name="QFontMetricsF" delete-in-main-thread="yes"> |
|
1330 | <value-type name="QFontMetricsF" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000"> | |
1276 | <custom-constructor> |
|
1331 | <custom-constructor> | |
1277 | return new QFontMetricsF(*copy); |
|
1332 | return new QFontMetricsF(*copy); | |
1278 | </custom-constructor> |
|
1333 | </custom-constructor> | |
@@ -1284,8 +1339,8 | |||||
1284 | </modify-function> |
|
1339 | </modify-function> | |
1285 | <modify-function signature="operator==(const QFontMetricsF &)"> |
|
1340 | <modify-function signature="operator==(const QFontMetricsF &)"> | |
1286 | <remove/> |
|
1341 | <remove/> | |
1287 |
</modify-function> |
|
1342 | </modify-function> | |
1288 |
|
1343 | |||
1289 | <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const"> |
|
1344 | <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const"> | |
1290 | <access modifier="private"/> |
|
1345 | <access modifier="private"/> | |
1291 | <modify-argument index="4"> |
|
1346 | <modify-argument index="4"> | |
@@ -1293,20 +1348,20 | |||||
1293 | </modify-argument> |
|
1348 | </modify-argument> | |
1294 | <modify-argument index="5"> |
|
1349 | <modify-argument index="5"> | |
1295 | <remove-default-expression/> |
|
1350 | <remove-default-expression/> | |
1296 |
</modify-argument> |
|
1351 | </modify-argument> | |
1297 | </modify-function> |
|
1352 | </modify-function> | |
1298 |
|
1353 | |||
1299 | <modify-function signature="operator=(QFontMetrics)" remove="all"/> |
|
1354 | <modify-function signature="operator=(QFontMetrics)" remove="all"/> | |
1300 | <modify-function signature="operator=(QFontMetricsF)" remove="all"/> |
|
1355 | <modify-function signature="operator=(QFontMetricsF)" remove="all"/> | |
1301 |
|
1356 | |||
1302 | <modify-function signature="size(int,QString,int,int*)const"> |
|
1357 | <modify-function signature="size(int,QString,int,int*)const"> | |
1303 | <access modifier="private"/> |
|
1358 | <access modifier="private"/> | |
1304 | <modify-argument index="3"> |
|
1359 | <modify-argument index="3"> | |
1305 | <remove-default-expression/> |
|
1360 | <remove-default-expression/> | |
1306 |
</modify-argument> |
|
1361 | </modify-argument> | |
1307 | <modify-argument index="4"> |
|
1362 | <modify-argument index="4"> | |
1308 | <remove-default-expression/> |
|
1363 | <remove-default-expression/> | |
1309 |
</modify-argument> |
|
1364 | </modify-argument> | |
1310 | </modify-function> |
|
1365 | </modify-function> | |
1311 |
|
1366 | |||
1312 | <modify-function signature="QFontMetricsF(QFontMetricsF)" remove="all"/> |
|
1367 | <modify-function signature="QFontMetricsF(QFontMetricsF)" remove="all"/> | |
@@ -1316,7 +1371,7 | |||||
1316 | </value-type> |
|
1371 | </value-type> | |
1317 | <value-type name="QTextOption::Tab"/> |
|
1372 | <value-type name="QTextOption::Tab"/> | |
1318 |
|
1373 | |||
1319 | <value-type name="QFontMetrics" delete-in-main-thread="yes"> |
|
1374 | <value-type name="QFontMetrics" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000"> | |
1320 | <custom-constructor> |
|
1375 | <custom-constructor> | |
1321 | return new QFontMetrics(*copy); |
|
1376 | return new QFontMetrics(*copy); | |
1322 | </custom-constructor> |
|
1377 | </custom-constructor> | |
@@ -1328,7 +1383,7 | |||||
1328 | </modify-function> |
|
1383 | </modify-function> | |
1329 | <modify-function signature="operator==(const QFontMetrics &)"> |
|
1384 | <modify-function signature="operator==(const QFontMetrics &)"> | |
1330 | <remove/> |
|
1385 | <remove/> | |
1331 |
</modify-function> |
|
1386 | </modify-function> | |
1332 |
|
1387 | |||
1333 | <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const"> |
|
1388 | <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const"> | |
1334 | <access modifier="private"/> |
|
1389 | <access modifier="private"/> | |
@@ -1337,9 +1392,9 | |||||
1337 | </modify-argument> |
|
1392 | </modify-argument> | |
1338 | <modify-argument index="8"> |
|
1393 | <modify-argument index="8"> | |
1339 | <remove-default-expression/> |
|
1394 | <remove-default-expression/> | |
1340 |
</modify-argument> |
|
1395 | </modify-argument> | |
1341 | </modify-function> |
|
1396 | </modify-function> | |
1342 |
|
1397 | |||
1343 | <modify-function signature="boundingRect(QRect,int,QString,int,int*)const"> |
|
1398 | <modify-function signature="boundingRect(QRect,int,QString,int,int*)const"> | |
1344 | <access modifier="private"/> |
|
1399 | <access modifier="private"/> | |
1345 | <modify-argument index="4"> |
|
1400 | <modify-argument index="4"> | |
@@ -1347,21 +1402,21 | |||||
1347 | </modify-argument> |
|
1402 | </modify-argument> | |
1348 | <modify-argument index="5"> |
|
1403 | <modify-argument index="5"> | |
1349 | <remove-default-expression/> |
|
1404 | <remove-default-expression/> | |
1350 |
</modify-argument> |
|
1405 | </modify-argument> | |
1351 | </modify-function> |
|
1406 | </modify-function> | |
1352 |
|
1407 | |||
1353 | <modify-function signature="operator=(QFontMetrics)" remove="all"/> |
|
1408 | <modify-function signature="operator=(QFontMetrics)" remove="all"/> | |
1354 |
|
1409 | |||
1355 | <modify-function signature="size(int,QString,int,int*)const"> |
|
1410 | <modify-function signature="size(int,QString,int,int*)const"> | |
1356 | <access modifier="private"/> |
|
1411 | <access modifier="private"/> | |
1357 | <modify-argument index="3"> |
|
1412 | <modify-argument index="3"> | |
1358 | <remove-default-expression/> |
|
1413 | <remove-default-expression/> | |
1359 |
</modify-argument> |
|
1414 | </modify-argument> | |
1360 | <modify-argument index="4"> |
|
1415 | <modify-argument index="4"> | |
1361 | <remove-default-expression/> |
|
1416 | <remove-default-expression/> | |
1362 |
</modify-argument> |
|
1417 | </modify-argument> | |
1363 | </modify-function> |
|
1418 | </modify-function> | |
1364 |
|
1419 | |||
1365 |
|
1420 | |||
1366 | <modify-function signature="QFontMetrics(QFontMetrics)" remove="all"/> |
|
1421 | <modify-function signature="QFontMetrics(QFontMetrics)" remove="all"/> | |
1367 | <modify-function signature="operator==(QFontMetrics)const" remove="all"/> |
|
1422 | <modify-function signature="operator==(QFontMetrics)const" remove="all"/> | |
@@ -1379,7 +1434,7 | |||||
1379 | </custom-destructor> |
|
1434 | </custom-destructor> | |
1380 | <modify-function signature="operator==(const QGradient &)"> |
|
1435 | <modify-function signature="operator==(const QGradient &)"> | |
1381 | <remove/> |
|
1436 | <remove/> | |
1382 |
</modify-function> |
|
1437 | </modify-function> | |
1383 | </value-type> |
|
1438 | </value-type> | |
1384 |
|
1439 | |||
1385 | <value-type name="QLinearGradient" polymorphic-id-expression="%1->type() == QGradient::LinearGradient"> |
|
1440 | <value-type name="QLinearGradient" polymorphic-id-expression="%1->type() == QGradient::LinearGradient"> | |
@@ -1393,17 +1448,20 | |||||
1393 | delete copy; |
|
1448 | delete copy; | |
1394 | </custom-destructor> |
|
1449 | </custom-destructor> | |
1395 | </value-type> |
|
1450 | </value-type> | |
1396 |
|
1451 | |||
1397 | <value-type name="QPrinterInfo"> |
|
1452 | <value-type name="QPrinterInfo"> | |
1398 | <modify-function signature="operator=(const QPrinterInfo &)" remove="all"/> |
|
1453 | <modify-function signature="operator=(const QPrinterInfo &)" remove="all"/> | |
1399 | </value-type> |
|
1454 | </value-type> | |
1400 |
|
1455 | |||
|
1456 | <value-type name="QMargins"/> | |||
|
1457 | ||||
1401 | <interface-type name="QLayoutItem"/> |
|
1458 | <interface-type name="QLayoutItem"/> | |
1402 | <interface-type name="QPaintDevice"/> |
|
1459 | <interface-type name="QPaintDevice"/> | |
1403 |
|
1460 | |||
1404 | <interface-type name="QGraphicsItem" delete-in-main-thread="yes"> |
|
1461 | <interface-type name="QGraphicsItem" delete-in-main-thread="yes"> | |
1405 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> |
|
1462 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> | |
1406 |
|
1463 | <modify-function signature="toGraphicsObject() const" remove="all"/> | ||
|
1464 | ||||
1407 | <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)"> |
|
1465 | <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)"> | |
1408 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
1466 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1409 | </modify-function> |
|
1467 | </modify-function> | |
@@ -1475,21 +1533,21 | |||||
1475 | <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)"> |
|
1533 | <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)"> | |
1476 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
1534 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1477 | </modify-function> |
|
1535 | </modify-function> | |
1478 |
|
1536 | |||
1479 |
<modify-function signature="children()const" remove="all"/> |
|
1537 | <modify-function signature="children()const" remove="all"/> | |
1480 | <modify-function signature="installSceneEventFilter(QGraphicsItem *)"> |
|
1538 | <modify-function signature="installSceneEventFilter(QGraphicsItem *)"> | |
1481 | <modify-argument index="1"> |
|
1539 | <modify-argument index="1"> | |
1482 |
<!-- Safe to ignore because items in a scene are memory managed by the scene --> |
|
1540 | <!-- Safe to ignore because items in a scene are memory managed by the scene --> | |
1483 |
<reference-count action="ignore"/> |
|
1541 | <reference-count action="ignore"/> | |
1484 | </modify-argument> |
|
1542 | </modify-argument> | |
1485 | </modify-function> |
|
1543 | </modify-function> | |
1486 | <modify-function signature="removeSceneEventFilter(QGraphicsItem *)"> |
|
1544 | <modify-function signature="removeSceneEventFilter(QGraphicsItem *)"> | |
1487 | <modify-argument index="1"> |
|
1545 | <modify-argument index="1"> | |
1488 |
<!-- Safe to ignore because items in a scene are memory managed by the scene --> |
|
1546 | <!-- Safe to ignore because items in a scene are memory managed by the scene --> | |
1489 |
<reference-count action="ignore"/> |
|
1547 | <reference-count action="ignore"/> | |
1490 | </modify-argument> |
|
1548 | </modify-argument> | |
1491 | </modify-function> |
|
1549 | </modify-function> | |
1492 |
|
1550 | |||
1493 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1551 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1494 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
1552 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
1495 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1553 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -1497,29 +1555,29 | |||||
1497 |
|
1555 | |||
1498 | <modify-function signature="supportsExtension(QGraphicsItem::Extension)const" remove="all"/> |
|
1556 | <modify-function signature="supportsExtension(QGraphicsItem::Extension)const" remove="all"/> | |
1499 | <modify-function signature="setExtension(QGraphicsItem::Extension,QVariant)" remove="all"/> |
|
1557 | <modify-function signature="setExtension(QGraphicsItem::Extension,QVariant)" remove="all"/> | |
1500 |
</interface-type> |
|
1558 | </interface-type> | |
1501 |
|
1559 | |||
1502 | <object-type name="QAbstractGraphicsShapeItem" delete-in-main-thread="yes"> |
|
1560 | <object-type name="QAbstractGraphicsShapeItem" delete-in-main-thread="yes"> | |
1503 | <modify-function signature="QAbstractGraphicsShapeItem(QGraphicsItem*,QGraphicsScene*)"> |
|
1561 | <modify-function signature="QAbstractGraphicsShapeItem(QGraphicsItem*,QGraphicsScene*)"> | |
1504 | <inject-code position="end"> |
|
1562 | <inject-code position="end"> | |
1505 | <argument-map index="1" meta-name="%1"/> |
|
1563 | <argument-map index="1" meta-name="%1"/> | |
1506 | if (%1 != null) disableGarbageCollection(); |
|
1564 | if (%1 != null) disableGarbageCollection(); | |
1507 | </inject-code> |
|
1565 | </inject-code> | |
1508 |
</modify-function> |
|
1566 | </modify-function> | |
1509 |
|
1567 | |||
1510 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1568 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1511 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
1569 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
1512 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1570 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1513 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1571 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
1514 | </object-type> |
|
1572 | </object-type> | |
1515 |
|
1573 | |||
1516 | <object-type name="QAbstractItemView"> |
|
1574 | <object-type name="QAbstractItemView"> | |
1517 | <modify-function signature="update()" remove="all"/> |
|
1575 | <modify-function signature="update()" remove="all"/> | |
1518 | <modify-function signature="horizontalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1576 | <modify-function signature="horizontalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1519 | <modify-function signature="setHorizontalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1577 | <modify-function signature="setHorizontalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3--> | |
1520 | <modify-function signature="setVerticalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1578 | <modify-function signature="setVerticalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3--> | |
1521 | <modify-function signature="verticalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1579 | <modify-function signature="verticalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1522 |
|
1580 | |||
1523 | <modify-function signature="edit(QModelIndex,QAbstractItemView::EditTrigger,QEvent*)"> |
|
1581 | <modify-function signature="edit(QModelIndex,QAbstractItemView::EditTrigger,QEvent*)"> | |
1524 | <modify-argument index="3" invalidate-after-use="yes"/> |
|
1582 | <modify-argument index="3" invalidate-after-use="yes"/> | |
1525 | </modify-function> |
|
1583 | </modify-function> | |
@@ -1534,18 +1592,18 | |||||
1534 | QModelIndex moveCursor(QAbstractItemView::CursorAction, Qt::KeyboardModifiers) |
|
1592 | QModelIndex moveCursor(QAbstractItemView::CursorAction, Qt::KeyboardModifiers) | |
1535 | { return QModelIndex(); } |
|
1593 | { return QModelIndex(); } | |
1536 | </inject-code> |
|
1594 | </inject-code> | |
1537 |
</object-type> |
|
1595 | </object-type> | |
1538 |
|
1596 | |||
1539 | <object-type name="QAbstractPageSetupDialog"/> |
|
1597 | <object-type name="QAbstractPageSetupDialog"/> | |
1540 | <object-type name="QAbstractPrintDialog"/> |
|
1598 | <object-type name="QAbstractPrintDialog"/> | |
1541 | <object-type name="QAbstractSlider"> |
|
1599 | <object-type name="QAbstractSlider"> | |
1542 | <modify-function signature="sliderChange(QAbstractSlider::SliderChange)" remove="all"/> |
|
1600 | <modify-function signature="sliderChange(QAbstractSlider::SliderChange)" remove="all"/> | |
1543 |
</object-type> |
|
1601 | </object-type> | |
1544 | <object-type name="QAbstractTextDocumentLayout"> |
|
1602 | <object-type name="QAbstractTextDocumentLayout"> | |
1545 | <modify-function signature="setPaintDevice(QPaintDevice*)"> |
|
1603 | <modify-function signature="setPaintDevice(QPaintDevice*)"> | |
1546 | <modify-argument index="1"> |
|
1604 | <modify-argument index="1"> | |
1547 | <reference-count action="set" variable-name="__rcPaintDevice"/> |
|
1605 | <reference-count action="set" variable-name="__rcPaintDevice"/> | |
1548 | </modify-argument> |
|
1606 | </modify-argument> | |
1549 | </modify-function> |
|
1607 | </modify-function> | |
1550 |
|
1608 | |||
1551 | <modify-function signature="draw(QPainter*,QAbstractTextDocumentLayout::PaintContext)"> |
|
1609 | <modify-function signature="draw(QPainter*,QAbstractTextDocumentLayout::PaintContext)"> | |
@@ -1569,7 +1627,7 | |||||
1569 | <define-ownership class="java" owner="java"/> |
|
1627 | <define-ownership class="java" owner="java"/> | |
1570 | </modify-argument> |
|
1628 | </modify-argument> | |
1571 | </modify-function> |
|
1629 | </modify-function> | |
1572 |
</object-type> |
|
1630 | </object-type> | |
1573 | <object-type name="QAccessibleBridge"> |
|
1631 | <object-type name="QAccessibleBridge"> | |
1574 | <modify-function signature="setRootObject(QAccessibleInterface *)"> |
|
1632 | <modify-function signature="setRootObject(QAccessibleInterface *)"> | |
1575 | <modify-argument index="1"> |
|
1633 | <modify-argument index="1"> | |
@@ -1579,25 +1637,25 | |||||
1579 | <modify-function signature="notifyAccessibilityUpdate(int,QAccessibleInterface*,int)"> |
|
1637 | <modify-function signature="notifyAccessibilityUpdate(int,QAccessibleInterface*,int)"> | |
1580 | <modify-argument invalidate-after-use="yes" index="2"/> |
|
1638 | <modify-argument invalidate-after-use="yes" index="2"/> | |
1581 | </modify-function> |
|
1639 | </modify-function> | |
1582 |
</object-type> |
|
1640 | </object-type> | |
1583 | <object-type name="QAccessible2Interface"/> |
|
1641 | <object-type name="QAccessible2Interface"/> | |
1584 | <object-type name="QAccessibleTableInterface"> |
|
1642 | <object-type name="QAccessibleTableInterface"> | |
1585 | <modify-function signature="qAccessibleTableCastHelper()" remove="all"/> |
|
1643 | <modify-function signature="qAccessibleTableCastHelper()" remove="all"/> | |
1586 | </object-type> |
|
1644 | </object-type> | |
1587 |
|
1645 | |||
1588 | <object-type name="QAccessibleInterface"> |
|
1646 | <object-type name="QAccessibleInterface"> | |
1589 | <modify-function signature="indexOfChild(const QAccessibleInterface*)const"> |
|
1647 | <modify-function signature="indexOfChild(const QAccessibleInterface*)const"> | |
1590 | <modify-argument invalidate-after-use="yes" index="1"/> |
|
1648 | <modify-argument invalidate-after-use="yes" index="1"/> | |
1591 | </modify-function> |
|
1649 | </modify-function> | |
1592 | <modify-function signature="relationTo(int,const QAccessibleInterface*,int)const"> |
|
1650 | <modify-function signature="relationTo(int,const QAccessibleInterface*,int)const"> | |
1593 | <modify-argument invalidate-after-use="yes" index="2"/> |
|
1651 | <modify-argument invalidate-after-use="yes" index="2"/> | |
1594 |
</modify-function> |
|
1652 | </modify-function> | |
1595 | </object-type> |
|
1653 | </object-type> | |
1596 | <object-type name="QAccessibleInterfaceEx"/> |
|
1654 | <object-type name="QAccessibleInterfaceEx"/> | |
1597 | <object-type name="QAccessibleObject"/> |
|
1655 | <object-type name="QAccessibleObject"/> | |
1598 | <object-type name="QAccessibleObjectEx"/> |
|
1656 | <object-type name="QAccessibleObjectEx"/> | |
1599 | <object-type name="QAccessibleWidget"/> |
|
1657 | <object-type name="QAccessibleWidget"/> | |
1600 |
<object-type name="QAccessibleWidgetEx"/> |
|
1658 | <object-type name="QAccessibleWidgetEx"/> | |
1601 | <object-type name="QActionGroup"/> |
|
1659 | <object-type name="QActionGroup"/> | |
1602 | <object-type name="QCDEStyle"> |
|
1660 | <object-type name="QCDEStyle"> | |
1603 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
1661 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
@@ -1607,14 +1665,14 | |||||
1607 | <access modifier="private"/> |
|
1665 | <access modifier="private"/> | |
1608 | </modify-function> |
|
1666 | </modify-function> | |
1609 | </object-type> |
|
1667 | </object-type> | |
1610 |
<object-type name="QCleanlooksStyle"> |
|
1668 | <object-type name="QCleanlooksStyle"> | |
1611 | <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1669 | <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1612 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
1670 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
1613 |
</object-type> |
|
1671 | </object-type> | |
1614 | <object-type name="QCommonStyle"> |
|
1672 | <object-type name="QCommonStyle"> | |
1615 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1673 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
1616 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
1674 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
1617 |
</object-type> |
|
1675 | </object-type> | |
1618 | <object-type name="QDataWidgetMapper"> |
|
1676 | <object-type name="QDataWidgetMapper"> | |
1619 | <modify-function signature="addMapping(QWidget*,int)"> |
|
1677 | <modify-function signature="addMapping(QWidget*,int)"> | |
1620 | <modify-argument index="1"> |
|
1678 | <modify-argument index="1"> | |
@@ -1655,9 +1713,11 | |||||
1655 | <modify-function signature="exec()" access="non-final"/> |
|
1713 | <modify-function signature="exec()" access="non-final"/> | |
1656 | <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1714 | <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1657 | <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1715 | <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3--> | |
|
1716 | <modify-function signature="open()" virtual-slot="yes"/> | |||
1658 | <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1717 | <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3--> | |
1659 | <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1718 | <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
1660 | </object-type> |
|
1719 | <modify-function signature="setVisible(bool)" allow-as-slot="yes"/> | |
|
1720 | </object-type> | |||
1661 | <object-type name="QDialogButtonBox"> |
|
1721 | <object-type name="QDialogButtonBox"> | |
1662 | <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)"> |
|
1722 | <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)"> | |
1663 | <modify-argument index="1"> |
|
1723 | <modify-argument index="1"> | |
@@ -1713,7 +1773,7 | |||||
1713 | <remove-default-expression/> |
|
1773 | <remove-default-expression/> | |
1714 | </modify-argument> |
|
1774 | </modify-argument> | |
1715 | </modify-function> |
|
1775 | </modify-function> | |
1716 |
|
1776 | |||
1717 | </object-type> |
|
1777 | </object-type> | |
1718 | <object-type name="QFocusFrame"> |
|
1778 | <object-type name="QFocusFrame"> | |
1719 | <modify-function signature="initStyleOption(QStyleOption*)const"> |
|
1779 | <modify-function signature="initStyleOption(QStyleOption*)const"> | |
@@ -1728,7 +1788,7 | |||||
1728 | <insert-template name="gui.init_style_option"> |
|
1788 | <insert-template name="gui.init_style_option"> | |
1729 | <replace from="%TYPE" to="QStyleOption"/> |
|
1789 | <replace from="%TYPE" to="QStyleOption"/> | |
1730 | </insert-template> |
|
1790 | </insert-template> | |
1731 |
</inject-code> |
|
1791 | </inject-code> | |
1732 | </object-type> |
|
1792 | </object-type> | |
1733 | <object-type name="QFontComboBox"/> |
|
1793 | <object-type name="QFontComboBox"/> | |
1734 | <object-type name="QFontDialog"> |
|
1794 | <object-type name="QFontDialog"> | |
@@ -1777,6 +1837,7 | |||||
1777 | </modify-argument> |
|
1837 | </modify-argument> | |
1778 | </modify-function> |
|
1838 | </modify-function> | |
1779 | </object-type> |
|
1839 | </object-type> | |
|
1840 | ||||
1780 | <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/> |
|
1841 | <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/> | |
1781 | <object-type name="QGraphicsItemAnimation"> |
|
1842 | <object-type name="QGraphicsItemAnimation"> | |
1782 | <modify-function signature="setItem(QGraphicsItem*)"> |
|
1843 | <modify-function signature="setItem(QGraphicsItem*)"> | |
@@ -1788,13 +1849,13 | |||||
1788 | <modify-argument index="1"> |
|
1849 | <modify-argument index="1"> | |
1789 | <reference-count action="set" variable-name="__rcTimeLine"/> |
|
1850 | <reference-count action="set" variable-name="__rcTimeLine"/> | |
1790 | </modify-argument> |
|
1851 | </modify-argument> | |
1791 |
</modify-function> |
|
1852 | </modify-function> | |
1792 |
|
1853 | |||
1793 | <extra-includes> |
|
1854 | <extra-includes> | |
1794 | <include file-name="QPair" location="global"/> |
|
1855 | <include file-name="QPair" location="global"/> | |
1795 | </extra-includes> |
|
1856 | </extra-includes> | |
1796 | </object-type> |
|
1857 | </object-type> | |
1797 |
<object-type name="QGraphicsItemGroup" delete-in-main-thread="yes"> |
|
1858 | <object-type name="QGraphicsItemGroup" delete-in-main-thread="yes"> | |
1798 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1859 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1799 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
1860 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
1800 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1861 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -1807,7 +1868,7 | |||||
1807 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
1868 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
1808 | </object-type> |
|
1869 | </object-type> | |
1809 | <object-type name="QGraphicsPathItem" delete-in-main-thread="yes"/> |
|
1870 | <object-type name="QGraphicsPathItem" delete-in-main-thread="yes"/> | |
1810 |
|
1871 | |||
1811 | <object-type name="QGraphicsPixmapItem" delete-in-main-thread="yes"> |
|
1872 | <object-type name="QGraphicsPixmapItem" delete-in-main-thread="yes"> | |
1812 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
1873 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
1813 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
1874 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -1822,16 +1883,16 | |||||
1822 | <modify-function signature="initStyleOption(QStyleOptionHeader*)const"> |
|
1883 | <modify-function signature="initStyleOption(QStyleOptionHeader*)const"> | |
1823 | <access modifier="private"/> |
|
1884 | <access modifier="private"/> | |
1824 | </modify-function> |
|
1885 | </modify-function> | |
1825 |
|
1886 | |||
1826 | <modify-function signature="paintSection(QPainter*,QRect,int)const"> |
|
1887 | <modify-function signature="paintSection(QPainter*,QRect,int)const"> | |
1827 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
1888 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1828 | </modify-function> |
|
1889 | </modify-function> | |
1829 |
|
1890 | |||
1830 | <inject-code> |
|
1891 | <inject-code> | |
1831 | <insert-template name="gui.init_style_option"> |
|
1892 | <insert-template name="gui.init_style_option"> | |
1832 | <replace from="%TYPE" to="QStyleOptionHeader"/> |
|
1893 | <replace from="%TYPE" to="QStyleOptionHeader"/> | |
1833 | </insert-template> |
|
1894 | </insert-template> | |
1834 |
</inject-code> |
|
1895 | </inject-code> | |
1835 | <modify-function signature="setModel(QAbstractItemModel*)"> |
|
1896 | <modify-function signature="setModel(QAbstractItemModel*)"> | |
1836 | <modify-argument index="1"> |
|
1897 | <modify-argument index="1"> | |
1837 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcModel"/> |
|
1898 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcModel"/> | |
@@ -1841,7 +1902,7 | |||||
1841 | <object-type name="QIconEngine"> |
|
1902 | <object-type name="QIconEngine"> | |
1842 | <modify-function signature="paint(QPainter*,QRect,QIcon::Mode,QIcon::State)"> |
|
1903 | <modify-function signature="paint(QPainter*,QRect,QIcon::Mode,QIcon::State)"> | |
1843 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
1904 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1844 |
</modify-function> |
|
1905 | </modify-function> | |
1845 | </object-type> |
|
1906 | </object-type> | |
1846 | <object-type name="QIconEngineV2"> |
|
1907 | <object-type name="QIconEngineV2"> | |
1847 | <modify-function signature="read(QDataStream&)"> |
|
1908 | <modify-function signature="read(QDataStream&)"> | |
@@ -1850,13 +1911,13 | |||||
1850 | <modify-function signature="write(QDataStream&)const"> |
|
1911 | <modify-function signature="write(QDataStream&)const"> | |
1851 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
1912 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1852 | </modify-function> |
|
1913 | </modify-function> | |
1853 |
|
1914 | |||
1854 | <modify-function signature="virtual_hook(int,void*)" remove="all"/> |
|
1915 | <modify-function signature="virtual_hook(int,void*)" remove="all"/> | |
1855 | <modify-function signature="clone()const"> |
|
1916 | <modify-function signature="clone()const"> | |
1856 | <modify-argument index="return"> |
|
1917 | <modify-argument index="return"> | |
1857 | <define-ownership class="shell" owner="c++"/> |
|
1918 | <define-ownership class="shell" owner="c++"/> | |
1858 |
</modify-argument> |
|
1919 | </modify-argument> | |
1859 |
</modify-function> |
|
1920 | </modify-function> | |
1860 | </object-type> |
|
1921 | </object-type> | |
1861 | <object-type name="QImageWriter"> |
|
1922 | <object-type name="QImageWriter"> | |
1862 | <modify-function signature="setDevice(QIODevice*)"> |
|
1923 | <modify-function signature="setDevice(QIODevice*)"> | |
@@ -1869,11 +1930,11 | |||||
1869 | </object-type> |
|
1930 | </object-type> | |
1870 | <object-type name="QInputContextFactory"/> |
|
1931 | <object-type name="QInputContextFactory"/> | |
1871 | <object-type name="QIntValidator"/> |
|
1932 | <object-type name="QIntValidator"/> | |
1872 |
<object-type name="QItemDelegate"> |
|
1933 | <object-type name="QItemDelegate"> | |
1873 | <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const"> |
|
1934 | <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const"> | |
1874 | <remove/> |
|
1935 | <remove/> | |
1875 | </modify-function> |
|
1936 | </modify-function> | |
1876 |
|
1937 | |||
1877 | <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const"> |
|
1938 | <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const"> | |
1878 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
1939 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1879 | </modify-function> |
|
1940 | </modify-function> | |
@@ -1887,7 +1948,7 | |||||
1887 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
1948 | <modify-argument index="1" invalidate-after-use="yes"/> | |
1888 | </modify-function> |
|
1949 | </modify-function> | |
1889 |
|
1950 | |||
1890 |
|
1951 | |||
1891 | <modify-function signature="selected(QPixmap,QPalette,bool)const"> |
|
1952 | <modify-function signature="selected(QPixmap,QPalette,bool)const"> | |
1892 | <remove/> |
|
1953 | <remove/> | |
1893 | </modify-function> |
|
1954 | </modify-function> | |
@@ -1906,7 +1967,7 | |||||
1906 | <reference-count action="ignore"/> |
|
1967 | <reference-count action="ignore"/> | |
1907 | </modify-argument> |
|
1968 | </modify-argument> | |
1908 | </modify-function> |
|
1969 | </modify-function> | |
1909 |
|
1970 | |||
1910 | </object-type> |
|
1971 | </object-type> | |
1911 | <object-type name="QItemEditorCreatorBase"/> |
|
1972 | <object-type name="QItemEditorCreatorBase"/> | |
1912 | <object-type name="QItemEditorFactory"> |
|
1973 | <object-type name="QItemEditorFactory"> | |
@@ -1940,7 +2001,7 | |||||
1940 | <no-null-pointer/> |
|
2001 | <no-null-pointer/> | |
1941 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> |
|
2002 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> | |
1942 | </modify-argument> |
|
2003 | </modify-argument> | |
1943 |
</modify-function> |
|
2004 | </modify-function> | |
1944 | </object-type> |
|
2005 | </object-type> | |
1945 | <object-type name="QMainWindow"> |
|
2006 | <object-type name="QMainWindow"> | |
1946 | <modify-function signature="addDockWidget(Qt::DockWidgetArea,QDockWidget*,Qt::Orientation)"> |
|
2007 | <modify-function signature="addDockWidget(Qt::DockWidgetArea,QDockWidget*,Qt::Orientation)"> | |
@@ -2019,25 +2080,25 | |||||
2019 | <reference-count action="ignore"/> |
|
2080 | <reference-count action="ignore"/> | |
2020 | </modify-argument> |
|
2081 | </modify-argument> | |
2021 | </modify-function> |
|
2082 | </modify-function> | |
2022 |
|
2083 | |||
2023 | <modify-function signature="removeSubWindow(QWidget*)"> |
|
2084 | <modify-function signature="removeSubWindow(QWidget*)"> | |
2024 | <modify-argument index="1"> |
|
2085 | <modify-argument index="1"> | |
2025 | <reference-count action="ignore"/> |
|
2086 | <reference-count action="ignore"/> | |
2026 | </modify-argument> |
|
2087 | </modify-argument> | |
2027 | </modify-function> |
|
2088 | </modify-function> | |
2028 |
|
2089 | |||
2029 | <modify-function signature="setActiveSubWindow(QMdiSubWindow*)"> |
|
2090 | <modify-function signature="setActiveSubWindow(QMdiSubWindow*)"> | |
2030 | <modify-argument index="1"> |
|
2091 | <modify-argument index="1"> | |
2031 | <reference-count action="ignore"/> |
|
2092 | <reference-count action="ignore"/> | |
2032 | </modify-argument> |
|
2093 | </modify-argument> | |
2033 | </modify-function> |
|
2094 | </modify-function> | |
2034 |
|
2095 | |||
2035 | <modify-function signature="setupViewport(QWidget*)"> |
|
2096 | <modify-function signature="setupViewport(QWidget*)"> | |
2036 | <modify-argument index="1"> |
|
2097 | <modify-argument index="1"> | |
2037 | <reference-count action="ignore"/> |
|
2098 | <reference-count action="ignore"/> | |
2038 | </modify-argument> |
|
2099 | </modify-argument> | |
2039 | </modify-function> |
|
2100 | </modify-function> | |
2040 |
|
2101 | |||
2041 | </object-type> |
|
2102 | </object-type> | |
2042 | <object-type name="QMdiSubWindow"> |
|
2103 | <object-type name="QMdiSubWindow"> | |
2043 | <modify-function signature="setSystemMenu(QMenu*)"> |
|
2104 | <modify-function signature="setSystemMenu(QMenu*)"> | |
@@ -2084,26 +2145,26 | |||||
2084 | <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const"> |
|
2145 | <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const"> | |
2085 | <access modifier="private"/> |
|
2146 | <access modifier="private"/> | |
2086 | </modify-function> |
|
2147 | </modify-function> | |
2087 |
|
2148 | |||
2088 | <modify-function signature="addAction(QString,const QObject*,const char*,QKeySequence)"> |
|
2149 | <modify-function signature="addAction(QString,const QObject*,const char*,QKeySequence)"> | |
2089 |
<remove/> |
|
2150 | <remove/> | |
2090 | </modify-function> |
|
2151 | </modify-function> | |
2091 |
|
2152 | |||
2092 | <modify-function signature="addAction(QIcon,QString,const QObject*,const char*,QKeySequence)"> |
|
2153 | <modify-function signature="addAction(QIcon,QString,const QObject*,const char*,QKeySequence)"> | |
2093 | <remove/> |
|
2154 | <remove/> | |
2094 | </modify-function> |
|
2155 | </modify-function> | |
2095 | </object-type> |
|
2156 | </object-type> | |
2096 |
|
2157 | |||
2097 |
<object-type name="QMenuBar"> |
|
2158 | <object-type name="QMenuBar"> | |
2098 | <modify-function signature="addAction(QAction *)" remove="all"/> |
|
2159 | <modify-function signature="addAction(QAction *)" remove="all"/> | |
2099 | <modify-function signature="addAction(QString,const QObject*,const char*)"> |
|
2160 | <modify-function signature="addAction(QString,const QObject*,const char*)"> | |
2100 | <remove/> |
|
2161 | <remove/> | |
2101 | </modify-function> |
|
2162 | </modify-function> | |
2102 |
|
2163 | |||
2103 | <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const"> |
|
2164 | <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const"> | |
2104 | <access modifier="private"/> |
|
2165 | <access modifier="private"/> | |
2105 | </modify-function> |
|
2166 | </modify-function> | |
2106 |
|
2167 | |||
2107 | <modify-function signature="addMenu(QMenu*)"> |
|
2168 | <modify-function signature="addMenu(QMenu*)"> | |
2108 | <modify-argument index="1"> |
|
2169 | <modify-argument index="1"> | |
2109 | <reference-count action="add" variable-name="__rcMenus"/> |
|
2170 | <reference-count action="add" variable-name="__rcMenus"/> | |
@@ -2112,7 +2173,7 | |||||
2112 | <modify-function signature="insertMenu(QAction*,QMenu*)"> |
|
2173 | <modify-function signature="insertMenu(QAction*,QMenu*)"> | |
2113 | <modify-argument index="1"> |
|
2174 | <modify-argument index="1"> | |
2114 | <reference-count action="ignore"/> |
|
2175 | <reference-count action="ignore"/> | |
2115 |
</modify-argument> |
|
2176 | </modify-argument> | |
2116 | <modify-argument index="2"> |
|
2177 | <modify-argument index="2"> | |
2117 | <reference-count action="add" variable-name="__rcMenus"/> |
|
2178 | <reference-count action="add" variable-name="__rcMenus"/> | |
2118 | </modify-argument> |
|
2179 | </modify-argument> | |
@@ -2136,9 +2197,9 | |||||
2136 | <object-type name="QMotifStyle"> |
|
2197 | <object-type name="QMotifStyle"> | |
2137 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2198 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
2138 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
2199 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
2139 |
</object-type> |
|
2200 | </object-type> | |
2140 | <object-type name="QPainterPathStroker"/> |
|
2201 | <object-type name="QPainterPathStroker"/> | |
2141 |
|
|
2202 | ||
2142 | <object-type name="QPictureIO"> |
|
2203 | <object-type name="QPictureIO"> | |
2143 | <modify-function signature="QPictureIO(QIODevice*,const char*)"> |
|
2204 | <modify-function signature="QPictureIO(QIODevice*,const char*)"> | |
2144 | <access modifier="private"/> |
|
2205 | <access modifier="private"/> | |
@@ -2146,35 +2207,35 | |||||
2146 | <reference-count action="set" variable-name="__rcDevice"/> |
|
2207 | <reference-count action="set" variable-name="__rcDevice"/> | |
2147 | </modify-argument> |
|
2208 | </modify-argument> | |
2148 | </modify-function> |
|
2209 | </modify-function> | |
2149 |
|
2210 | |||
2150 | <modify-function signature="setIODevice(QIODevice*)"> |
|
2211 | <modify-function signature="setIODevice(QIODevice*)"> | |
2151 | <modify-argument index="1"> |
|
2212 | <modify-argument index="1"> | |
2152 | <reference-count action="set" variable-name="__rcDevice"/> |
|
2213 | <reference-count action="set" variable-name="__rcDevice"/> | |
2153 | </modify-argument> |
|
2214 | </modify-argument> | |
2154 | </modify-function> |
|
2215 | </modify-function> | |
2155 |
|
2216 | |||
2156 | <modify-function signature="QPictureIO(QString,const char*)"> |
|
2217 | <modify-function signature="QPictureIO(QString,const char*)"> | |
2157 | <access modifier="private"/> |
|
2218 | <access modifier="private"/> | |
2158 | </modify-function> |
|
2219 | </modify-function> | |
2159 |
|
2220 | |||
2160 | <modify-function signature="format()const"> |
|
2221 | <modify-function signature="format()const"> | |
2161 | <access modifier="private"/> |
|
2222 | <access modifier="private"/> | |
2162 | <rename to="format_private"/> |
|
2223 | <rename to="format_private"/> | |
2163 | </modify-function> |
|
2224 | </modify-function> | |
2164 |
|
2225 | |||
2165 | <modify-function signature="parameters()const"> |
|
2226 | <modify-function signature="parameters()const"> | |
2166 | <access modifier="private"/> |
|
2227 | <access modifier="private"/> | |
2167 | <rename to="parameters_private"/> |
|
2228 | <rename to="parameters_private"/> | |
2168 | </modify-function> |
|
2229 | </modify-function> | |
2169 |
|
2230 | |||
2170 | <modify-function signature="setFormat(const char*)"> |
|
2231 | <modify-function signature="setFormat(const char*)"> | |
2171 | <access modifier="private"/> |
|
2232 | <access modifier="private"/> | |
2172 | </modify-function> |
|
2233 | </modify-function> | |
2173 |
|
2234 | |||
2174 | <modify-function signature="setParameters(const char*)"> |
|
2235 | <modify-function signature="setParameters(const char*)"> | |
2175 | <access modifier="private"/> |
|
2236 | <access modifier="private"/> | |
2176 | </modify-function> |
|
2237 | </modify-function> | |
2177 |
|
2238 | |||
2178 |
|
2239 | |||
2179 | <modify-function signature="QPictureIO(QIODevice*,const char*)"> |
|
2240 | <modify-function signature="QPictureIO(QIODevice*,const char*)"> | |
2180 | <modify-argument index="2"> |
|
2241 | <modify-argument index="2"> | |
@@ -2212,12 +2273,13 | |||||
2212 | </modify-argument> |
|
2273 | </modify-argument> | |
2213 | </modify-function> |
|
2274 | </modify-function> | |
2214 | </object-type> |
|
2275 | </object-type> | |
2215 |
|
2276 | |||
2216 | <object-type name="QPixmapCache"> |
|
2277 | <object-type name="QPixmapCache"> | |
2217 | <modify-function signature="find(QString)"> |
|
2278 | <modify-function signature="find(QString)"> | |
2218 | <remove/> |
|
2279 | <remove/> | |
2219 | </modify-function> |
|
2280 | </modify-function> | |
2220 |
|
2281 | <modify-function signature="find(QString,QPixmap*)" remove="all"/> | ||
|
2282 | ||||
2221 | <modify-function signature="find(QString,QPixmap&)"> |
|
2283 | <modify-function signature="find(QString,QPixmap&)"> | |
2222 | <access modifier="private"/> |
|
2284 | <access modifier="private"/> | |
2223 | </modify-function> |
|
2285 | </modify-function> | |
@@ -2225,9 +2287,10 | |||||
2225 | <object-type name="QPlastiqueStyle"> |
|
2287 | <object-type name="QPlastiqueStyle"> | |
2226 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2288 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
2227 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
2289 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
2228 |
<modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/> |
|
2290 | <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/> | |
|
2291 | </object-type> | |||
|
2292 | <object-type name="QPrintDialog"> | |||
2229 | </object-type> |
|
2293 | </object-type> | |
2230 | <object-type name="QPrintDialog"/> |
|
|||
2231 | <object-type name="QPrintEngine"/> |
|
2294 | <object-type name="QPrintEngine"/> | |
2232 | <object-type name="QProgressBar"> |
|
2295 | <object-type name="QProgressBar"> | |
2233 | <modify-function signature="initStyleOption(QStyleOptionProgressBar*)const"> |
|
2296 | <modify-function signature="initStyleOption(QStyleOptionProgressBar*)const"> | |
@@ -2238,21 +2301,20 | |||||
2238 | <modify-function signature="initStyleOption(QStyleOptionButton*)const"> |
|
2301 | <modify-function signature="initStyleOption(QStyleOptionButton*)const"> | |
2239 | <access modifier="private"/> |
|
2302 | <access modifier="private"/> | |
2240 | </modify-function> |
|
2303 | </modify-function> | |
2241 |
|
2304 | |||
2242 | <modify-function signature="setMenu(QMenu*)"> |
|
2305 | <modify-function signature="setMenu(QMenu*)"> | |
2243 | <modify-argument index="1"> |
|
2306 | <modify-argument index="1"> | |
2244 | <reference-count action="set" variable-name="__rcMenu"/> |
|
2307 | <reference-count action="set" variable-name="__rcMenu"/> | |
2245 | </modify-argument> |
|
2308 | </modify-argument> | |
2246 | </modify-function> |
|
2309 | </modify-function> | |
2247 | </object-type> |
|
2310 | </object-type> | |
2248 | <object-type name="QReadWriteLock"/> |
|
|||
2249 | <object-type name="QRegExpValidator"/> |
|
2311 | <object-type name="QRegExpValidator"/> | |
2250 | <object-type name="QScrollArea"> |
|
2312 | <object-type name="QScrollArea"> | |
2251 | <modify-function signature="setWidget(QWidget*)"> |
|
2313 | <modify-function signature="setWidget(QWidget*)"> | |
2252 | <modify-argument index="1"> |
|
2314 | <modify-argument index="1"> | |
2253 | <reference-count action="ignore"/> |
|
2315 | <reference-count action="ignore"/> | |
2254 | </modify-argument> |
|
2316 | </modify-argument> | |
2255 |
</modify-function> |
|
2317 | </modify-function> | |
2256 | </object-type> |
|
2318 | </object-type> | |
2257 | <object-type name="QSessionManager"/> |
|
2319 | <object-type name="QSessionManager"/> | |
2258 | <object-type name="QShortcut"> |
|
2320 | <object-type name="QShortcut"> | |
@@ -2266,11 +2328,11 | |||||
2266 | </modify-argument> |
|
2328 | </modify-argument> | |
2267 | <modify-argument index="5"> |
|
2329 | <modify-argument index="5"> | |
2268 | <remove-default-expression/> |
|
2330 | <remove-default-expression/> | |
2269 |
</modify-argument> |
|
2331 | </modify-argument> | |
2270 |
</modify-function> |
|
2332 | </modify-function> | |
2271 | </object-type> |
|
2333 | </object-type> | |
2272 | <object-type name="QSizeGrip"/> |
|
2334 | <object-type name="QSizeGrip"/> | |
2273 |
<object-type name="QSound"/> |
|
2335 | <object-type name="QSound"/> | |
2274 | <object-type name="QSpacerItem"/> |
|
2336 | <object-type name="QSpacerItem"/> | |
2275 | <object-type name="QStandardItem"> |
|
2337 | <object-type name="QStandardItem"> | |
2276 | <modify-function signature="operator=(QStandardItem)" remove="all"/> |
|
2338 | <modify-function signature="operator=(QStandardItem)" remove="all"/> | |
@@ -2290,7 +2352,7 | |||||
2290 | <modify-function signature="operator=(QStandardItem)" remove="all"/> |
|
2352 | <modify-function signature="operator=(QStandardItem)" remove="all"/> | |
2291 | <modify-function signature="operator<(QStandardItem)const" remove="all"/> |
|
2353 | <modify-function signature="operator<(QStandardItem)const" remove="all"/> | |
2292 | </object-type> |
|
2354 | </object-type> | |
2293 |
<object-type name="QStatusBar"> |
|
2355 | <object-type name="QStatusBar"> | |
2294 | <modify-function signature="addPermanentWidget(QWidget *, int)"> |
|
2356 | <modify-function signature="addPermanentWidget(QWidget *, int)"> | |
2295 | <modify-argument index="1"> |
|
2357 | <modify-argument index="1"> | |
2296 | <reference-count action="ignore"/> |
|
2358 | <reference-count action="ignore"/> | |
@@ -2334,7 +2396,7 | |||||
2334 | <reference-count action="set" variable-name="__rcDocument"/> |
|
2396 | <reference-count action="set" variable-name="__rcDocument"/> | |
2335 | </modify-argument> |
|
2397 | </modify-argument> | |
2336 | </modify-function> |
|
2398 | </modify-function> | |
2337 |
|
2399 | |||
2338 | </object-type> |
|
2400 | </object-type> | |
2339 | <object-type name="QSystemTrayIcon"> |
|
2401 | <object-type name="QSystemTrayIcon"> | |
2340 | <modify-function signature="setContextMenu(QMenu*)"> |
|
2402 | <modify-function signature="setContextMenu(QMenu*)"> | |
@@ -2364,8 +2426,8 | |||||
2364 | <no-null-pointer/> |
|
2426 | <no-null-pointer/> | |
2365 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> |
|
2427 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> | |
2366 | </modify-argument> |
|
2428 | </modify-argument> | |
2367 |
</modify-function> |
|
2429 | </modify-function> | |
2368 |
|
2430 | |||
2369 | <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3--> |
|
2431 | <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3--> | |
2370 | </object-type> |
|
2432 | </object-type> | |
2371 | <object-type name="QTextBlockGroup" delete-in-main-thread="yes"/> |
|
2433 | <object-type name="QTextBlockGroup" delete-in-main-thread="yes"/> | |
@@ -2373,15 +2435,22 | |||||
2373 | <object-type name="QTextItem" delete-in-main-thread="yes"/> |
|
2435 | <object-type name="QTextItem" delete-in-main-thread="yes"/> | |
2374 | <object-type name="QTextList" delete-in-main-thread="yes"> |
|
2436 | <object-type name="QTextList" delete-in-main-thread="yes"> | |
2375 | <modify-function signature="format()const" rename="textListFormat"/> |
|
2437 | <modify-function signature="format()const" rename="textListFormat"/> | |
2376 |
|
2438 | |||
2377 | <modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2439 | <modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3--> | |
2378 | </object-type> |
|
2440 | </object-type> | |
2379 | <object-type name="QTextObject" delete-in-main-thread="yes"/> |
|
2441 | <object-type name="QTextObject" delete-in-main-thread="yes"/> | |
2380 | <object-type name="QTextObjectInterface" delete-in-main-thread="yes"> |
|
2442 | ||
|
2443 | <!-- The original QTextObjectInterface has been rejected and replaced by this, since the original | |||
|
2444 | usage is based on an interface pattern we can't mimic in Java (our users can't implement our | |||
|
2445 | interfaces.) The new class inherits both QObject and QTextObjectInterface, and can be extended | |||
|
2446 | in Java to get a type that can properly be used with registerHandler() in | |||
|
2447 | QAbstractTextDocumentLayout. --> | |||
|
2448 | <object-type name="QtJambiTextObjectInterface" delete-in-main-thread="yes" java-name="QTextObjectInterface"> | |||
2381 | <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)"> |
|
2449 | <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)"> | |
2382 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
2450 | <modify-argument index="1" invalidate-after-use="yes"/> | |
2383 | </modify-function> |
|
2451 | </modify-function> | |
2384 | </object-type> |
|
2452 | </object-type> | |
|
2453 | ||||
2385 | <object-type name="QTimeEdit"/> |
|
2454 | <object-type name="QTimeEdit"/> | |
2386 | <object-type name="QToolBox"> |
|
2455 | <object-type name="QToolBox"> | |
2387 | <modify-function signature="addItem(QWidget*,QString)"> |
|
2456 | <modify-function signature="addItem(QWidget*,QString)"> | |
@@ -2414,7 +2483,7 | |||||
2414 | <modify-function signature="initStyleOption(QStyleOptionToolButton*)const"> |
|
2483 | <modify-function signature="initStyleOption(QStyleOptionToolButton*)const"> | |
2415 | <access modifier="private"/> |
|
2484 | <access modifier="private"/> | |
2416 | </modify-function> |
|
2485 | </modify-function> | |
2417 |
|
2486 | |||
2418 | <modify-function signature="setDefaultAction(QAction *)"> |
|
2487 | <modify-function signature="setDefaultAction(QAction *)"> | |
2419 | <modify-argument index="1"> |
|
2488 | <modify-argument index="1"> | |
2420 | <reference-count action="set" variable-name="__rcDefaultAction"/> |
|
2489 | <reference-count action="set" variable-name="__rcDefaultAction"/> | |
@@ -2428,7 +2497,7 | |||||
2428 | </object-type> |
|
2497 | </object-type> | |
2429 | <object-type name="QToolTip"/> |
|
2498 | <object-type name="QToolTip"/> | |
2430 | <object-type name="QTreeView"> |
|
2499 | <object-type name="QTreeView"> | |
2431 |
|
2500 | |||
2432 | <modify-function signature="drawBranches(QPainter*,QRect,QModelIndex)const"> |
|
2501 | <modify-function signature="drawBranches(QPainter*,QRect,QModelIndex)const"> | |
2433 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
2502 | <modify-argument index="1" invalidate-after-use="yes"/> | |
2434 | </modify-function> |
|
2503 | </modify-function> | |
@@ -2451,8 +2520,8 | |||||
2451 | <no-null-pointer/> |
|
2520 | <no-null-pointer/> | |
2452 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> |
|
2521 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> | |
2453 | </modify-argument> |
|
2522 | </modify-argument> | |
2454 |
</modify-function> |
|
2523 | </modify-function> | |
2455 |
|
2524 | |||
2456 | <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3--> |
|
2525 | <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3--> | |
2457 | </object-type> |
|
2526 | </object-type> | |
2458 | <object-type name="QUndoCommand"> |
|
2527 | <object-type name="QUndoCommand"> | |
@@ -2479,7 +2548,7 | |||||
2479 | </object-type> |
|
2548 | </object-type> | |
2480 |
|
2549 | |||
2481 | <object-type name="QUndoStack"/> |
|
2550 | <object-type name="QUndoStack"/> | |
2482 |
|
|
2551 | ||
2483 | <object-type name="QUndoView"> |
|
2552 | <object-type name="QUndoView"> | |
2484 | <modify-function signature="setGroup(QUndoGroup *)"> |
|
2553 | <modify-function signature="setGroup(QUndoGroup *)"> | |
2485 | <modify-argument index="1"> |
|
2554 | <modify-argument index="1"> | |
@@ -2512,11 +2581,11 | |||||
2512 | </modify-argument> |
|
2581 | </modify-argument> | |
2513 | </modify-function> |
|
2582 | </modify-function> | |
2514 | </object-type> |
|
2583 | </object-type> | |
2515 |
<object-type name="QWidgetItem"/> |
|
2584 | <object-type name="QWidgetItem"/> | |
2516 | <object-type name="QWindowsStyle"> |
|
2585 | <object-type name="QWindowsStyle"> | |
2517 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2586 | <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
2518 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
2587 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
2519 |
</object-type> |
|
2588 | </object-type> | |
2520 | <object-type name="QWorkspace"> |
|
2589 | <object-type name="QWorkspace"> | |
2521 | <modify-function signature="addWindow(QWidget*,QFlags<Qt::WindowType>)"> |
|
2590 | <modify-function signature="addWindow(QWidget*,QFlags<Qt::WindowType>)"> | |
2522 | <modify-argument index="1"> |
|
2591 | <modify-argument index="1"> | |
@@ -2529,39 +2598,39 | |||||
2529 | </modify-argument> |
|
2598 | </modify-argument> | |
2530 | </modify-function> |
|
2599 | </modify-function> | |
2531 | </object-type> |
|
2600 | </object-type> | |
2532 |
|
2601 | |||
2533 | <object-type name="QActionEvent" polymorphic-id-expression="%1->type() == QEvent::ActionAdded || %1->type() == QEvent::ActionRemoved || %1->type() == QEvent::ActionChanged"/> |
|
2602 | <object-type name="QActionEvent" polymorphic-id-expression="%1->type() == QEvent::ActionAdded || %1->type() == QEvent::ActionRemoved || %1->type() == QEvent::ActionChanged"/> | |
2534 | <object-type name="QClipboardEvent" polymorphic-id-expression="%1->type() == QEvent::Clipboard"/> |
|
2603 | <object-type name="QClipboardEvent" polymorphic-id-expression="%1->type() == QEvent::Clipboard"/> | |
2535 |
<object-type name="QCloseEvent" polymorphic-id-expression="%1->type() == QEvent::Close"/> |
|
2604 | <object-type name="QCloseEvent" polymorphic-id-expression="%1->type() == QEvent::Close"/> | |
2536 | <object-type name="QContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::ContextMenu"/> |
|
2605 | <object-type name="QContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::ContextMenu"/> | |
2537 | <object-type name="QDragEnterEvent" polymorphic-id-expression="%1->type() == QEvent::DragEnter"/> |
|
2606 | <object-type name="QDragEnterEvent" polymorphic-id-expression="%1->type() == QEvent::DragEnter"/> | |
2538 | <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1->type() == QEvent::DragLeave"/> |
|
2607 | <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1->type() == QEvent::DragLeave"/> | |
2539 | <object-type name="QDragMoveEvent" polymorphic-id-expression="%1->type() == QEvent::DragMove"> |
|
2608 | <object-type name="QDragMoveEvent" polymorphic-id-expression="%1->type() == QEvent::DragMove"> | |
2540 | <modify-function signature="accept()" remove="all"/> |
|
2609 | <modify-function signature="accept()" remove="all"/> | |
2541 |
<modify-function signature="ignore()" remove="all"/> |
|
2610 | <modify-function signature="ignore()" remove="all"/> | |
2542 |
</object-type> |
|
2611 | </object-type> | |
2543 | <object-type name="QDropEvent" polymorphic-id-expression="%1->type() == QEvent::Drop"> |
|
2612 | <object-type name="QDropEvent" polymorphic-id-expression="%1->type() == QEvent::Drop"> | |
2544 | <modify-function signature="encodedData(const char*)const"> |
|
2613 | <modify-function signature="encodedData(const char*)const"> | |
2545 | <remove/> |
|
2614 | <remove/> | |
2546 | </modify-function> |
|
2615 | </modify-function> | |
2547 |
|
2616 | |||
2548 | <modify-function signature="format(int)const"> |
|
2617 | <modify-function signature="format(int)const"> | |
2549 | <remove/> |
|
2618 | <remove/> | |
2550 | </modify-function> |
|
2619 | </modify-function> | |
2551 |
|
2620 | |||
2552 | <modify-function signature="provides(const char*)const"> |
|
2621 | <modify-function signature="provides(const char*)const"> | |
2553 | <remove/> |
|
2622 | <remove/> | |
2554 | </modify-function> |
|
2623 | </modify-function> | |
2555 |
|
2624 | |||
2556 |
|
2625 | |||
2557 | </object-type> |
|
2626 | </object-type> | |
2558 | <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> |
|
2627 | <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> | |
2559 | <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> |
|
2628 | <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> | |
2560 | <modify-function signature="reason()const"> |
|
2629 | <modify-function signature="reason()const"> | |
2561 | <remove/> |
|
2630 | <remove/> | |
2562 |
</modify-function> |
|
2631 | </modify-function> | |
2563 | </object-type> |
|
2632 | </object-type> | |
2564 |
|
2633 | |||
2565 | <object-type name="QGraphicsSceneContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneContextMenu"/> |
|
2634 | <object-type name="QGraphicsSceneContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneContextMenu"/> | |
2566 | <object-type name="QGraphicsSceneDragDropEvent" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneDragEnter || %1->type() == QEvent::GraphicsSceneDragLeave || %1->type() == QEvent::GraphicsSceneDragMove || %1->type() == QEvent::GraphicsSceneDrop"> |
|
2635 | <object-type name="QGraphicsSceneDragDropEvent" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneDragEnter || %1->type() == QEvent::GraphicsSceneDragLeave || %1->type() == QEvent::GraphicsSceneDragMove || %1->type() == QEvent::GraphicsSceneDrop"> | |
2567 | <modify-function signature="setMimeData(const QMimeData *)"> |
|
2636 | <modify-function signature="setMimeData(const QMimeData *)"> | |
@@ -2593,13 +2662,13 | |||||
2593 | <!-- All these have const overloads that are used instead --> |
|
2662 | <!-- All these have const overloads that are used instead --> | |
2594 | <modify-function signature="isAmbiguous()"> |
|
2663 | <modify-function signature="isAmbiguous()"> | |
2595 | <remove/> |
|
2664 | <remove/> | |
2596 |
</modify-function> |
|
2665 | </modify-function> | |
2597 | <modify-function signature="shortcutId()"> |
|
2666 | <modify-function signature="shortcutId()"> | |
2598 | <remove/> |
|
2667 | <remove/> | |
2599 |
</modify-function> |
|
2668 | </modify-function> | |
2600 | <modify-function signature="key()"> |
|
2669 | <modify-function signature="key()"> | |
2601 | <remove/> |
|
2670 | <remove/> | |
2602 |
</modify-function> |
|
2671 | </modify-function> | |
2603 | </object-type> |
|
2672 | </object-type> | |
2604 | <object-type name="QShowEvent" polymorphic-id-expression="%1->type() == QEvent::Show"/> |
|
2673 | <object-type name="QShowEvent" polymorphic-id-expression="%1->type() == QEvent::Show"/> | |
2605 | <object-type name="QStatusTipEvent" polymorphic-id-expression="%1->type() == QEvent::StatusTip"/> |
|
2674 | <object-type name="QStatusTipEvent" polymorphic-id-expression="%1->type() == QEvent::StatusTip"/> | |
@@ -2609,20 +2678,20 | |||||
2609 | <object-type name="QWheelEvent" polymorphic-id-expression="%1->type() == QEvent::Wheel"/> |
|
2678 | <object-type name="QWheelEvent" polymorphic-id-expression="%1->type() == QEvent::Wheel"/> | |
2610 | <object-type name="QWindowStateChangeEvent" polymorphic-id-expression="%1->type() == QEvent::WindowStateChange"/> |
|
2679 | <object-type name="QWindowStateChangeEvent" polymorphic-id-expression="%1->type() == QEvent::WindowStateChange"/> | |
2611 | <object-type name="QDragResponseEvent" polymorphic-id-expression="%1->type() == QEvent::DragResponse"/> |
|
2680 | <object-type name="QDragResponseEvent" polymorphic-id-expression="%1->type() == QEvent::DragResponse"/> | |
2612 |
<object-type name="QInputEvent"> |
|
2681 | <object-type name="QInputEvent"> | |
2613 | <modify-function signature="modifiers()const" access="non-final"/> |
|
2682 | <modify-function signature="modifiers()const" access="non-final"/> | |
2614 | </object-type> |
|
2683 | </object-type> | |
2615 | <object-type name="QKeyEvent" polymorphic-id-expression="%1->type() == QEvent::KeyPress || %1->type() == QEvent::KeyRelease"/> |
|
2684 | <object-type name="QKeyEvent" polymorphic-id-expression="%1->type() == QEvent::KeyPress || %1->type() == QEvent::KeyRelease"/> | |
2616 | <object-type name="QMouseEvent" polymorphic-id-expression="%1->type() == QEvent::MouseButtonDblClick || %1->type() == QEvent::MouseButtonPress || %1->type() == QEvent::MouseButtonRelease || %1->type() == QEvent::MouseMove"/> |
|
2685 | <object-type name="QMouseEvent" polymorphic-id-expression="%1->type() == QEvent::MouseButtonDblClick || %1->type() == QEvent::MouseButtonPress || %1->type() == QEvent::MouseButtonRelease || %1->type() == QEvent::MouseMove"/> | |
2617 | <object-type name="QPaintEvent" polymorphic-id-expression="%1->type() == QEvent::Paint"/> |
|
2686 | <object-type name="QPaintEvent" polymorphic-id-expression="%1->type() == QEvent::Paint"/> | |
2618 | <object-type name="QAccessibleEvent" polymorphic-id-expression="%1->type() == QEvent::AccessibilityDescription || %1->type() == QEvent::AccessibilityHelp"/> |
|
2687 | <object-type name="QAccessibleEvent" polymorphic-id-expression="%1->type() == QEvent::AccessibilityDescription || %1->type() == QEvent::AccessibilityHelp"/> | |
2619 |
|
2688 | |||
2620 | <object-type name="QAbstractButton"/> |
|
2689 | <object-type name="QAbstractButton"/> | |
2621 |
|
2690 | |||
2622 | <object-type name="QStyle"> |
|
2691 | <object-type name="QStyle"> | |
2623 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> |
|
2692 | <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/> | |
2624 | <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/> |
|
2693 | <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/> | |
2625 |
|
2694 | |||
2626 | <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const"> |
|
2695 | <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const"> | |
2627 | <modify-argument index="3" invalidate-after-use="yes"/> |
|
2696 | <modify-argument index="3" invalidate-after-use="yes"/> | |
2628 | </modify-function> |
|
2697 | </modify-function> | |
@@ -2647,21 +2716,32 | |||||
2647 | </object-type> |
|
2716 | </object-type> | |
2648 |
|
2717 | |||
2649 | <object-type name="QColorDialog"> |
|
2718 | <object-type name="QColorDialog"> | |
|
2719 | ||||
2650 | <modify-function signature="getColor(const QColor &, QWidget *)"> |
|
2720 | <modify-function signature="getColor(const QColor &, QWidget *)"> | |
2651 | <modify-argument index="1"> |
|
2721 | <modify-argument index="1"> | |
2652 |
<replace-default-expression with="QColor.white"/> |
|
2722 | <replace-default-expression with="QColor.white"/> | |
2653 | </modify-argument> |
|
2723 | </modify-argument> | |
2654 | </modify-function> |
|
2724 | </modify-function> | |
2655 | <modify-function signature="getRgba(uint,bool*,QWidget*)"> |
|
2725 | <modify-function signature="getRgba(uint,bool*,QWidget*)"> | |
2656 | <remove/> |
|
2726 | <rename to="getRgba_internal"/> | |
2657 | </modify-function> |
|
2727 | <access modifier="private"/> | |
|
2728 | <modify-argument index="1"> | |||
|
2729 | <remove-default-expression/> | |||
|
2730 | </modify-argument> | |||
|
2731 | <modify-argument index="2"> | |||
|
2732 | <remove-default-expression/> | |||
|
2733 | </modify-argument> | |||
|
2734 | <modify-argument index="3"> | |||
|
2735 | <remove-default-expression/> | |||
|
2736 | </modify-argument> | |||
|
2737 | </modify-function> | |||
2658 | </object-type> |
|
2738 | </object-type> | |
2659 |
|
2739 | |||
2660 |
<object-type name="QLayout"> |
|
2740 | <object-type name="QLayout"> | |
2661 | <modify-function signature="addItem(QLayoutItem*)"> |
|
2741 | <modify-function signature="addItem(QLayoutItem*)"> | |
2662 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
2742 | <modify-argument index="1" invalidate-after-use="yes"/> | |
2663 | </modify-function> |
|
2743 | </modify-function> | |
2664 |
|
2744 | |||
2665 | <modify-function signature="setSpacing(int)" rename="setWidgetSpacing"/> |
|
2745 | <modify-function signature="setSpacing(int)" rename="setWidgetSpacing"/> | |
2666 | <modify-function signature="spacing()const" rename="widgetSpacing"/> |
|
2746 | <modify-function signature="spacing()const" rename="widgetSpacing"/> | |
2667 | <modify-function signature="addWidget(QWidget *)"> |
|
2747 | <modify-function signature="addWidget(QWidget *)"> | |
@@ -2675,14 +2755,14 | |||||
2675 | <no-null-pointer/> |
|
2755 | <no-null-pointer/> | |
2676 | <reference-count variable-name="__rcWidgets" action="add"/> |
|
2756 | <reference-count variable-name="__rcWidgets" action="add"/> | |
2677 | </modify-argument> |
|
2757 | </modify-argument> | |
2678 |
</modify-function> |
|
2758 | </modify-function> | |
2679 | <modify-function signature="removeWidget(QWidget *)"> |
|
2759 | <modify-function signature="removeWidget(QWidget *)"> | |
2680 | <modify-argument index="1"> |
|
2760 | <modify-argument index="1"> | |
2681 | <no-null-pointer/> |
|
2761 | <no-null-pointer/> | |
2682 | <reference-count variable-name="__rcWidgets" action="remove"/> |
|
2762 | <reference-count variable-name="__rcWidgets" action="remove"/> | |
2683 | </modify-argument> |
|
2763 | </modify-argument> | |
2684 | </modify-function> |
|
2764 | </modify-function> | |
2685 |
|
2765 | |||
2686 | <modify-function signature="setAlignment(QWidget*,QFlags<Qt::AlignmentFlag>)"> |
|
2766 | <modify-function signature="setAlignment(QWidget*,QFlags<Qt::AlignmentFlag>)"> | |
2687 | <modify-argument index="1"> |
|
2767 | <modify-argument index="1"> | |
2688 | <reference-count action="ignore"/> |
|
2768 | <reference-count action="ignore"/> | |
@@ -2701,12 +2781,12 | |||||
2701 | <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> |
|
2781 | <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> | |
2702 | <access modifier="private"/> |
|
2782 | <access modifier="private"/> | |
2703 | </modify-function> |
|
2783 | </modify-function> | |
2704 |
|
2784 | |||
2705 | <modify-function signature="margin()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
2785 | <modify-function signature="margin()const" remove="all"/> <!--### Obsolete in 4.3--> | |
2706 | <!-- <modify-function signature="setMargin(int)" remove="all"/> --> <!--### Obsolete in 4.3--> |
|
2786 | <!-- <modify-function signature="setMargin(int)" remove="all"/> --> <!--### Obsolete in 4.3--> | |
2707 | </object-type> |
|
2787 | </object-type> | |
2708 |
|
2788 | |||
2709 |
<object-type name="QStackedLayout"> |
|
2789 | <object-type name="QStackedLayout"> | |
2710 | <modify-function signature="addItem(QLayoutItem *)"> |
|
2790 | <modify-function signature="addItem(QLayoutItem *)"> | |
2711 | <modify-argument index="1"> |
|
2791 | <modify-argument index="1"> | |
2712 | <define-ownership class="java" owner="c++"/> |
|
2792 | <define-ownership class="java" owner="c++"/> | |
@@ -2723,7 +2803,7 | |||||
2723 | <no-null-pointer/> |
|
2803 | <no-null-pointer/> | |
2724 | <reference-count action="add" declare-variable="QLayout" variable-name="__rcWidgets"/> |
|
2804 | <reference-count action="add" declare-variable="QLayout" variable-name="__rcWidgets"/> | |
2725 | </modify-argument> |
|
2805 | </modify-argument> | |
2726 |
</modify-function> |
|
2806 | </modify-function> | |
2727 | <modify-function signature="insertWidget(int,QWidget*)"> |
|
2807 | <modify-function signature="insertWidget(int,QWidget*)"> | |
2728 | <modify-argument index="2"> |
|
2808 | <modify-argument index="2"> | |
2729 | <no-null-pointer/> |
|
2809 | <no-null-pointer/> | |
@@ -2737,13 +2817,13 | |||||
2737 | </modify-argument> |
|
2817 | </modify-argument> | |
2738 | </modify-function> |
|
2818 | </modify-function> | |
2739 | </object-type> |
|
2819 | </object-type> | |
2740 |
|
2820 | |||
2741 |
<object-type name="QBoxLayout"> |
|
2821 | <object-type name="QBoxLayout"> | |
2742 | <modify-function signature="addWidget(QWidget *, int, QFlags<Qt::AlignmentFlag>)"> |
|
2822 | <modify-function signature="addWidget(QWidget *, int, QFlags<Qt::AlignmentFlag>)"> | |
2743 | <modify-argument index="1"> |
|
2823 | <modify-argument index="1"> | |
2744 | <no-null-pointer/> |
|
2824 | <no-null-pointer/> | |
2745 | </modify-argument> |
|
2825 | </modify-argument> | |
2746 |
</modify-function> |
|
2826 | </modify-function> | |
2747 | <modify-function signature="addItem(QLayoutItem *)"> |
|
2827 | <modify-function signature="addItem(QLayoutItem *)"> | |
2748 | <modify-argument index="1"> |
|
2828 | <modify-argument index="1"> | |
2749 | <define-ownership class="java" owner="c++"/> |
|
2829 | <define-ownership class="java" owner="c++"/> | |
@@ -2753,12 +2833,12 | |||||
2753 | <modify-argument index="2"> |
|
2833 | <modify-argument index="2"> | |
2754 | <define-ownership class="java" owner="c++"/> |
|
2834 | <define-ownership class="java" owner="c++"/> | |
2755 | </modify-argument> |
|
2835 | </modify-argument> | |
2756 |
</modify-function> |
|
2836 | </modify-function> | |
2757 | <modify-function signature="insertItem(int, QLayoutItem *)"> |
|
2837 | <modify-function signature="insertItem(int, QLayoutItem *)"> | |
2758 | <modify-argument index="2"> |
|
2838 | <modify-argument index="2"> | |
2759 | <define-ownership class="java" owner="c++"/> |
|
2839 | <define-ownership class="java" owner="c++"/> | |
2760 |
</modify-argument> |
|
2840 | </modify-argument> | |
2761 |
</modify-function> |
|
2841 | </modify-function> | |
2762 | <modify-function signature="addSpacerItem(QSpacerItem*)"> |
|
2842 | <modify-function signature="addSpacerItem(QSpacerItem*)"> | |
2763 | <modify-argument index="1"> |
|
2843 | <modify-argument index="1"> | |
2764 | <define-ownership class="java" owner="c++"/> |
|
2844 | <define-ownership class="java" owner="c++"/> | |
@@ -2769,7 +2849,7 | |||||
2769 | <define-ownership class="java" owner="c++"/> |
|
2849 | <define-ownership class="java" owner="c++"/> | |
2770 | </modify-argument> |
|
2850 | </modify-argument> | |
2771 | </modify-function> |
|
2851 | </modify-function> | |
2772 |
|
2852 | |||
2773 | <modify-function signature="addLayout(QLayout *, int)"> |
|
2853 | <modify-function signature="addLayout(QLayout *, int)"> | |
2774 | <modify-argument index="1"> |
|
2854 | <modify-argument index="1"> | |
2775 | <define-ownership class="java" owner="c++"/> |
|
2855 | <define-ownership class="java" owner="c++"/> | |
@@ -2797,7 +2877,7 | |||||
2797 | </modify-function> |
|
2877 | </modify-function> | |
2798 | </object-type> |
|
2878 | </object-type> | |
2799 |
|
2879 | |||
2800 |
<object-type name="QGridLayout"> |
|
2880 | <object-type name="QGridLayout"> | |
2801 | <modify-function signature="addWidget(QWidget *)" remove="all"/> |
|
2881 | <modify-function signature="addWidget(QWidget *)" remove="all"/> | |
2802 | <modify-function signature="addItem(QLayoutItem *)"> |
|
2882 | <modify-function signature="addItem(QLayoutItem *)"> | |
2803 | <modify-argument index="1"> |
|
2883 | <modify-argument index="1"> | |
@@ -2808,7 +2888,7 | |||||
2808 | <modify-argument index="1"> |
|
2888 | <modify-argument index="1"> | |
2809 | <define-ownership class="java" owner="c++"/> |
|
2889 | <define-ownership class="java" owner="c++"/> | |
2810 | </modify-argument> |
|
2890 | </modify-argument> | |
2811 |
</modify-function> |
|
2891 | </modify-function> | |
2812 | <modify-function signature="addLayout(QLayout *, int, int, QFlags<Qt::AlignmentFlag>)"> |
|
2892 | <modify-function signature="addLayout(QLayout *, int, int, QFlags<Qt::AlignmentFlag>)"> | |
2813 | <modify-argument index="1"> |
|
2893 | <modify-argument index="1"> | |
2814 | <define-ownership class="java" owner="c++"/> |
|
2894 | <define-ownership class="java" owner="c++"/> | |
@@ -2818,7 +2898,7 | |||||
2818 | <modify-argument index="1"> |
|
2898 | <modify-argument index="1"> | |
2819 | <define-ownership class="java" owner="c++"/> |
|
2899 | <define-ownership class="java" owner="c++"/> | |
2820 | </modify-argument> |
|
2900 | </modify-argument> | |
2821 |
</modify-function> |
|
2901 | </modify-function> | |
2822 | <modify-function signature="addWidget(QWidget*,int,int,QFlags<Qt::AlignmentFlag>)"> |
|
2902 | <modify-function signature="addWidget(QWidget*,int,int,QFlags<Qt::AlignmentFlag>)"> | |
2823 | <modify-argument index="1"> |
|
2903 | <modify-argument index="1"> | |
2824 | <reference-count declare-variable="QLayout" action="add" variable-name="__rcWidgets"/> |
|
2904 | <reference-count declare-variable="QLayout" action="add" variable-name="__rcWidgets"/> | |
@@ -2838,12 +2918,17 | |||||
2838 | <access modifier="private"/> |
|
2918 | <access modifier="private"/> | |
2839 | </modify-function> |
|
2919 | </modify-function> | |
2840 | </object-type> |
|
2920 | </object-type> | |
2841 |
|
2921 | |||
2842 | <object-type name="QGraphicsView"> |
|
2922 | <object-type name="QGraphicsView"> | |
2843 | <extra-includes> |
|
2923 | <extra-includes> | |
2844 | <include file-name="QPainterPath" location="global"/> |
|
2924 | <include file-name="QPainterPath" location="global"/> | |
2845 |
<include file-name="QVarLengthArray" location="global"/> |
|
2925 | <include file-name="QVarLengthArray" location="global"/> | |
2846 |
</extra-includes> |
|
2926 | </extra-includes> | |
|
2927 | <modify-function signature="fitInView(const QGraphicsItem *, Qt::AspectRatioMode)"> | |||
|
2928 | <modify-argument index="1"> | |||
|
2929 | <no-null-pointer/> | |||
|
2930 | </modify-argument> | |||
|
2931 | </modify-function> | |||
2847 | <modify-function signature="setupViewport(QWidget *)" access="non-final"/> |
|
2932 | <modify-function signature="setupViewport(QWidget *)" access="non-final"/> | |
2848 | <modify-function signature="setScene(QGraphicsScene*)"> |
|
2933 | <modify-function signature="setScene(QGraphicsScene*)"> | |
2849 | <modify-argument index="1"> |
|
2934 | <modify-argument index="1"> | |
@@ -2855,7 +2940,7 | |||||
2855 | <reference-count action="ignore"/> |
|
2940 | <reference-count action="ignore"/> | |
2856 | </modify-argument> |
|
2941 | </modify-argument> | |
2857 | </modify-function> |
|
2942 | </modify-function> | |
2858 |
|
2943 | |||
2859 | <modify-function signature="drawBackground(QPainter*,QRectF)"> |
|
2944 | <modify-function signature="drawBackground(QPainter*,QRectF)"> | |
2860 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
2945 | <modify-argument index="1" invalidate-after-use="yes"/> | |
2861 | </modify-function> |
|
2946 | </modify-function> | |
@@ -2865,8 +2950,7 | |||||
2865 | <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)"> |
|
2950 | <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)"> | |
2866 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
2951 | <modify-argument index="1" invalidate-after-use="yes"/> | |
2867 | </modify-function> |
|
2952 | </modify-function> | |
2868 |
|
2953 | |||
2869 | <!-- |
|
|||
2870 | <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)"> |
|
2954 | <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)"> | |
2871 | <modify-argument index="2"> |
|
2955 | <modify-argument index="2"> | |
2872 | <remove-argument/> |
|
2956 | <remove-argument/> | |
@@ -2878,8 +2962,8 | |||||
2878 | <replace from="%ARRAY" to="%3"/> |
|
2962 | <replace from="%ARRAY" to="%3"/> | |
2879 | </insert-template> |
|
2963 | </insert-template> | |
2880 | int __length = %out; |
|
2964 | int __length = %out; | |
2881 |
</conversion-rule> |
|
2965 | </conversion-rule> | |
2882 |
</modify-argument> |
|
2966 | </modify-argument> | |
2883 |
|
2967 | |||
2884 | <modify-argument index="3"> |
|
2968 | <modify-argument index="3"> | |
2885 | <replace-type modified-type="com.trolltech.qt.gui.QGraphicsItemInterface[]"/> |
|
2969 | <replace-type modified-type="com.trolltech.qt.gui.QGraphicsItemInterface[]"/> | |
@@ -2887,33 +2971,64 | |||||
2887 | <insert-template name="gui.convert_graphicsitem_array_to_java"> |
|
2971 | <insert-template name="gui.convert_graphicsitem_array_to_java"> | |
2888 | <replace from="%LENGTH" to="%2"/> |
|
2972 | <replace from="%LENGTH" to="%2"/> | |
2889 | </insert-template> |
|
2973 | </insert-template> | |
|
2974 | jobjectArray graphicsItemArrayHolder = %out; | |||
2890 | </conversion-rule> |
|
2975 | </conversion-rule> | |
2891 | <conversion-rule class="native"> |
|
2976 | <conversion-rule class="native"> | |
2892 |
<insert-template name="gui.convert_graphicsitem_array_from_java"/> |
|
2977 | <insert-template name="gui.convert_graphicsitem_array_from_java"/> | |
2893 |
</conversion-rule> |
|
2978 | </conversion-rule> | |
2894 |
</modify-argument> |
|
2979 | </modify-argument> | |
2895 |
|
2980 | |||
2896 | <modify-argument index="4"> |
|
2981 | <modify-argument index="4"> | |
2897 | <replace-type modified-type="com.trolltech.qt.gui.QStyleOptionGraphicsItem[]"/> |
|
2982 | <replace-type modified-type="com.trolltech.qt.gui.QStyleOptionGraphicsItem[]"/> | |
2898 | <conversion-rule class="shell"> |
|
2983 | <conversion-rule class="shell"> | |
2899 | <insert-template name="gui.convert_styleoptiongraphicsitem_array_to_java"> |
|
2984 | <insert-template name="gui.convert_styleoptiongraphicsitem_array_to_java"> | |
2900 | <replace from="%LENGTH" to="%2"/> |
|
2985 | <replace from="%LENGTH" to="%2"/> | |
2901 | </insert-template> |
|
2986 | </insert-template> | |
|
2987 | jobjectArray styleOptionArrayHolder = %out; | |||
2902 | </conversion-rule> |
|
2988 | </conversion-rule> | |
2903 | <conversion-rule class="native"> |
|
2989 | <conversion-rule class="native"> | |
2904 | <insert-template name="gui.convert_styleoptiongraphicsitem_array_from_java"/> |
|
2990 | <insert-template name="gui.convert_styleoptiongraphicsitem_array_from_java"/> | |
2905 |
</conversion-rule> |
|
2991 | </conversion-rule> | |
|
2992 | </modify-argument> | |||
|
2993 | ||||
|
2994 | <modify-argument index="return"> | |||
|
2995 | <conversion-rule class="shell"> | |||
|
2996 | qtjambi_invalidate_array(__jni_env, styleOptionArrayHolder); | |||
|
2997 | qtjambi_invalidate_array(__jni_env, graphicsItemArrayHolder); | |||
|
2998 | </conversion-rule> | |||
2906 | </modify-argument> |
|
2999 | </modify-argument> | |
|
3000 | ||||
2907 | </modify-function> |
|
3001 | </modify-function> | |
2908 | --> |
|
|||
2909 | </object-type> |
|
3002 | </object-type> | |
2910 |
|
3003 | |||
2911 | <object-type name="QInputDialog"> |
|
3004 | <object-type name="QInputDialog"> | |
|
3005 | ||||
|
3006 | <modify-function signature="getInt(QWidget*,QString,QString,int,int,int,int,bool*,QFlags<Qt::WindowType>)"> | |||
|
3007 | <rename to="getInt_private"/> | |||
|
3008 | <access modifier="private"/> | |||
|
3009 | <modify-argument index="4"> | |||
|
3010 | <remove-default-expression/> | |||
|
3011 | </modify-argument> | |||
|
3012 | <modify-argument index="5"> | |||
|
3013 | <remove-default-expression/> | |||
|
3014 | </modify-argument> | |||
|
3015 | <modify-argument index="6"> | |||
|
3016 | <remove-default-expression/> | |||
|
3017 | </modify-argument> | |||
|
3018 | <modify-argument index="7"> | |||
|
3019 | <remove-default-expression/> | |||
|
3020 | </modify-argument> | |||
|
3021 | <modify-argument index="8"> | |||
|
3022 | <remove-default-expression/> | |||
|
3023 | </modify-argument> | |||
|
3024 | <modify-argument index="9"> | |||
|
3025 | <remove-default-expression/> | |||
|
3026 | </modify-argument> | |||
|
3027 | </modify-function> | |||
|
3028 | ||||
2912 | <modify-function signature="getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>)"> |
|
3029 | <modify-function signature="getDouble(QWidget *, const QString &, const QString &, double, double, double, int, bool *, QFlags<Qt::WindowType>)"> | |
2913 | <!-- |
|
|||
2914 | <rename to="getDouble_internal"/> |
|
3030 | <rename to="getDouble_internal"/> | |
2915 | <access modifier="private"/> |
|
3031 | <access modifier="private"/> | |
2916 | --> |
|
|||
2917 | <modify-argument index="4"> |
|
3032 | <modify-argument index="4"> | |
2918 | <remove-default-expression/> |
|
3033 | <remove-default-expression/> | |
2919 | </modify-argument> |
|
3034 | </modify-argument> | |
@@ -2931,14 +3046,12 | |||||
2931 | </modify-argument> |
|
3046 | </modify-argument> | |
2932 | <modify-argument index="9"> |
|
3047 | <modify-argument index="9"> | |
2933 | <remove-default-expression/> |
|
3048 | <remove-default-expression/> | |
2934 |
</modify-argument> |
|
3049 | </modify-argument> | |
2935 | </modify-function> |
|
3050 | </modify-function> | |
2936 |
|
3051 | |||
2937 | <modify-function signature="getInteger(QWidget *, const QString &, const QString &, int, int, int, int, bool *, QFlags<Qt::WindowType>)"> |
|
3052 | <modify-function signature="getInteger(QWidget *, const QString &, const QString &, int, int, int, int, bool *, QFlags<Qt::WindowType>)"> | |
2938 | <!-- |
|
|||
2939 | <rename to="getInteger_internal"/> |
|
3053 | <rename to="getInteger_internal"/> | |
2940 | <access modifier="private"/> |
|
3054 | <access modifier="private"/> | |
2941 | --> |
|
|||
2942 | <modify-argument index="4"> |
|
3055 | <modify-argument index="4"> | |
2943 | <remove-default-expression/> |
|
3056 | <remove-default-expression/> | |
2944 | </modify-argument> |
|
3057 | </modify-argument> | |
@@ -2956,14 +3069,12 | |||||
2956 | </modify-argument> |
|
3069 | </modify-argument> | |
2957 | <modify-argument index="9"> |
|
3070 | <modify-argument index="9"> | |
2958 | <remove-default-expression/> |
|
3071 | <remove-default-expression/> | |
2959 |
</modify-argument> |
|
3072 | </modify-argument> | |
2960 | </modify-function> |
|
3073 | </modify-function> | |
2961 |
|
3074 | |||
2962 | <modify-function signature="getItem(QWidget *, const QString &, const QString &, const QStringList<QString> &, int, bool, bool *, QFlags<Qt::WindowType>)"> |
|
3075 | <modify-function signature="getItem(QWidget *, const QString &, const QString &, const QStringList<QString> &, int, bool, bool *, QFlags<Qt::WindowType>)"> | |
2963 | <!-- |
|
|||
2964 | <rename to="getItem_internal"/> |
|
3076 | <rename to="getItem_internal"/> | |
2965 | <access modifier="private"/> |
|
3077 | <access modifier="private"/> | |
2966 | --> |
|
|||
2967 | <modify-argument index="4"> |
|
3078 | <modify-argument index="4"> | |
2968 | <remove-default-expression/> |
|
3079 | <remove-default-expression/> | |
2969 | </modify-argument> |
|
3080 | </modify-argument> | |
@@ -2980,12 +3091,10 | |||||
2980 | <remove-default-expression/> |
|
3091 | <remove-default-expression/> | |
2981 | </modify-argument> |
|
3092 | </modify-argument> | |
2982 | </modify-function> |
|
3093 | </modify-function> | |
2983 |
|
3094 | |||
2984 | <modify-function signature="getText(QWidget *, const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *, QFlags<Qt::WindowType>)"> |
|
3095 | <modify-function signature="getText(QWidget *, const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *, QFlags<Qt::WindowType>)"> | |
2985 | <!-- |
|
|||
2986 | <rename to="getText_internal"/> |
|
3096 | <rename to="getText_internal"/> | |
2987 | <access modifier="private"/> |
|
3097 | <access modifier="private"/> | |
2988 | --> |
|
|||
2989 | <modify-argument index="4"> |
|
3098 | <modify-argument index="4"> | |
2990 | <remove-default-expression/> |
|
3099 | <remove-default-expression/> | |
2991 | </modify-argument> |
|
3100 | </modify-argument> | |
@@ -3059,13 +3168,13 | |||||
3059 | </modify-argument> |
|
3168 | </modify-argument> | |
3060 | </modify-function> |
|
3169 | </modify-function> | |
3061 | </object-type> |
|
3170 | </object-type> | |
3062 |
|
3171 | |||
3063 |
|
3172 | |||
3064 | <object-type name="QGraphicsScene"> |
|
3173 | <object-type name="QGraphicsScene"> | |
3065 | <extra-includes> |
|
3174 | <extra-includes> | |
3066 | <include file-name="QVarLengthArray" location="global"/> |
|
3175 | <include file-name="QVarLengthArray" location="global"/> | |
3067 | </extra-includes> |
|
3176 | </extra-includes> | |
3068 |
|
3177 | |||
3069 | <modify-function signature="contextMenuEvent(QGraphicsSceneContextMenuEvent*)"> |
|
3178 | <modify-function signature="contextMenuEvent(QGraphicsSceneContextMenuEvent*)"> | |
3070 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
3179 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3071 | </modify-function> |
|
3180 | </modify-function> | |
@@ -3123,7 +3232,7 | |||||
3123 | <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)"> |
|
3232 | <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)"> | |
3124 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
3233 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3125 | </modify-function> |
|
3234 | </modify-function> | |
3126 |
|
3235 | |||
3127 | <modify-function signature="setActiveWindow(QGraphicsWidget*)"> |
|
3236 | <modify-function signature="setActiveWindow(QGraphicsWidget*)"> | |
3128 | <modify-argument index="1"> |
|
3237 | <modify-argument index="1"> | |
3129 | <reference-count action="ignore"/> |
|
3238 | <reference-count action="ignore"/> | |
@@ -3139,7 +3248,7 | |||||
3139 | <modify-argument index="1"> |
|
3248 | <modify-argument index="1"> | |
3140 | <define-ownership class="java" owner="c++"/> |
|
3249 | <define-ownership class="java" owner="c++"/> | |
3141 | </modify-argument> |
|
3250 | </modify-argument> | |
3142 |
</modify-function> |
|
3251 | </modify-function> | |
3143 | <modify-function signature="addEllipse(const QRectF &, const QPen &, const QBrush &)"> |
|
3252 | <modify-function signature="addEllipse(const QRectF &, const QPen &, const QBrush &)"> | |
3144 | <modify-argument index="return"> |
|
3253 | <modify-argument index="return"> | |
3145 | <define-ownership class="java" owner="c++"/> |
|
3254 | <define-ownership class="java" owner="c++"/> | |
@@ -3173,7 +3282,7 | |||||
3173 | <modify-function signature="addText(const QString &, const QFont &)"> |
|
3282 | <modify-function signature="addText(const QString &, const QFont &)"> | |
3174 | <modify-argument index="return"> |
|
3283 | <modify-argument index="return"> | |
3175 | <define-ownership class="java" owner="c++"/> |
|
3284 | <define-ownership class="java" owner="c++"/> | |
3176 |
</modify-argument> |
|
3285 | </modify-argument> | |
3177 | </modify-function> |
|
3286 | </modify-function> | |
3178 | <modify-function signature="addWidget(QWidget*,QFlags<Qt::WindowType>)"> |
|
3287 | <modify-function signature="addWidget(QWidget*,QFlags<Qt::WindowType>)"> | |
3179 | <modify-argument index="return"> |
|
3288 | <modify-argument index="return"> | |
@@ -3200,10 +3309,10 | |||||
3200 | <extra-includes> |
|
3309 | <extra-includes> | |
3201 | <include file-name="QTextCharFormat" location="global"/> |
|
3310 | <include file-name="QTextCharFormat" location="global"/> | |
3202 | </extra-includes> |
|
3311 | </extra-includes> | |
3203 |
|
3312 | |||
3204 | <modify-function signature="isHeaderVisible()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3313 | <modify-function signature="isHeaderVisible()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3205 | <modify-function signature="setHeaderVisible(bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3314 | <modify-function signature="setHeaderVisible(bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
3206 |
|
3315 | |||
3207 | <modify-function signature="paintCell(QPainter*,QRect,QDate)const"> |
|
3316 | <modify-function signature="paintCell(QPainter*,QRect,QDate)const"> | |
3208 | <modify-argument invalidate-after-use="yes" index="1"/> |
|
3317 | <modify-argument invalidate-after-use="yes" index="1"/> | |
3209 | </modify-function> |
|
3318 | </modify-function> | |
@@ -3213,6 +3322,20 | |||||
3213 | </object-type> |
|
3322 | </object-type> | |
3214 |
|
3323 | |||
3215 | <object-type name="QTreeWidget"> |
|
3324 | <object-type name="QTreeWidget"> | |
|
3325 | <modify-function signature="setSelectionModel(QItemSelectionModel*)"> | |||
|
3326 | <modify-argument index="1"> | |||
|
3327 | <no-null-pointer/> | |||
|
3328 | <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/> | |||
|
3329 | </modify-argument> | |||
|
3330 | </modify-function> | |||
|
3331 | <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)"> | |||
|
3332 | <modify-argument index="1"> | |||
|
3333 | <reference-count action="ignore"/> | |||
|
3334 | </modify-argument> | |||
|
3335 | </modify-function> | |||
|
3336 | <modify-function signature="mimeData(const QList<QTreeWidgetItem*>)const"> | |||
|
3337 | <modify-argument index="1" invalidate-after-use="yes"/> | |||
|
3338 | </modify-function> | |||
3216 | <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)"> |
|
3339 | <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)"> | |
3217 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
3340 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3218 | </modify-function> |
|
3341 | </modify-function> | |
@@ -3234,8 +3357,8 | |||||
3234 | <modify-function signature="addTopLevelItems(const QList<QTreeWidgetItem*> &)"> |
|
3357 | <modify-function signature="addTopLevelItems(const QList<QTreeWidgetItem*> &)"> | |
3235 | <modify-argument index="1"> |
|
3358 | <modify-argument index="1"> | |
3236 | <define-ownership class="java" owner="c++"/> |
|
3359 | <define-ownership class="java" owner="c++"/> | |
3237 |
</modify-argument> |
|
3360 | </modify-argument> | |
3238 |
</modify-function> |
|
3361 | </modify-function> | |
3239 | <modify-function signature="insertTopLevelItem(int, QTreeWidgetItem *)"> |
|
3362 | <modify-function signature="insertTopLevelItem(int, QTreeWidgetItem *)"> | |
3240 | <modify-argument index="2"> |
|
3363 | <modify-argument index="2"> | |
3241 | <define-ownership class="java" owner="c++"/> |
|
3364 | <define-ownership class="java" owner="c++"/> | |
@@ -3245,7 +3368,7 | |||||
3245 | <modify-argument index="2"> |
|
3368 | <modify-argument index="2"> | |
3246 | <define-ownership class="java" owner="c++"/> |
|
3369 | <define-ownership class="java" owner="c++"/> | |
3247 | </modify-argument> |
|
3370 | </modify-argument> | |
3248 |
</modify-function> |
|
3371 | </modify-function> | |
3249 | <modify-function signature="setHeaderItem(QTreeWidgetItem *)"> |
|
3372 | <modify-function signature="setHeaderItem(QTreeWidgetItem *)"> | |
3250 | <modify-argument index="1"> |
|
3373 | <modify-argument index="1"> | |
3251 | <define-ownership class="java" owner="c++"/> |
|
3374 | <define-ownership class="java" owner="c++"/> | |
@@ -3256,11 +3379,6 | |||||
3256 | <define-ownership class="java" owner="default"/> |
|
3379 | <define-ownership class="java" owner="default"/> | |
3257 | </modify-argument> |
|
3380 | </modify-argument> | |
3258 | </modify-function> |
|
3381 | </modify-function> | |
3259 | <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)"> |
|
|||
3260 | <modify-argument index="1"> |
|
|||
3261 | <define-ownership class="java" owner="default"/> |
|
|||
3262 | </modify-argument> |
|
|||
3263 | </modify-function> |
|
|||
3264 | <modify-function signature="setCurrentItem(QTreeWidgetItem*,int,QFlags<QItemSelectionModel::SelectionFlag>)"> |
|
3382 | <modify-function signature="setCurrentItem(QTreeWidgetItem*,int,QFlags<QItemSelectionModel::SelectionFlag>)"> | |
3265 | <modify-argument index="1"> |
|
3383 | <modify-argument index="1"> | |
3266 | <reference-count action="ignore"/> |
|
3384 | <reference-count action="ignore"/> | |
@@ -3296,8 +3414,8 | |||||
3296 | <modify-function signature="isItemSelected(const QTreeWidgetItem*)const"> |
|
3414 | <modify-function signature="isItemSelected(const QTreeWidgetItem*)const"> | |
3297 | <remove/> |
|
3415 | <remove/> | |
3298 | </modify-function> |
|
3416 | </modify-function> | |
3299 |
<modify-function signature="setItemSelected(const QTreeWidgetItem*,bool)"> |
|
3417 | <modify-function signature="setItemSelected(const QTreeWidgetItem*,bool)"> | |
3300 |
<remove/> |
|
3418 | <remove/> | |
3301 | </modify-function> |
|
3419 | </modify-function> | |
3302 | <modify-function signature="setItemWidget(QTreeWidgetItem*,int,QWidget*)"> |
|
3420 | <modify-function signature="setItemWidget(QTreeWidgetItem*,int,QWidget*)"> | |
3303 | <modify-argument index="1"> |
|
3421 | <modify-argument index="1"> | |
@@ -3305,19 +3423,19 | |||||
3305 | </modify-argument> |
|
3423 | </modify-argument> | |
3306 | <modify-argument index="3"> |
|
3424 | <modify-argument index="3"> | |
3307 | <reference-count action="ignore"/> |
|
3425 | <reference-count action="ignore"/> | |
3308 |
</modify-argument> |
|
3426 | </modify-argument> | |
3309 | </modify-function> |
|
3427 | </modify-function> | |
3310 | <modify-function signature="setModel(QAbstractItemModel*)"> |
|
3428 | <modify-function signature="setModel(QAbstractItemModel*)"> | |
3311 | <modify-argument index="1"> |
|
3429 | <modify-argument index="1"> | |
3312 | <reference-count action="ignore"/> |
|
3430 | <reference-count action="ignore"/> | |
3313 | </modify-argument> |
|
3431 | </modify-argument> | |
3314 |
</modify-function> |
|
3432 | </modify-function> | |
3315 |
|
3433 | |||
3316 | <modify-function signature="items(const QMimeData*)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3434 | <modify-function signature="items(const QMimeData*)const" remove="all"/> <!--### Obsolete in 4.3--> | |
3317 |
|
3435 | |||
3318 | <modify-function signature="mimeData(const QList<QTreeWidgetItem*>)const" remove="all"/> |
|
3436 | <modify-function signature="mimeData(const QList<QTreeWidgetItem*>)const" remove="all"/> | |
3319 | </object-type> |
|
3437 | </object-type> | |
3320 |
|
3438 | |||
3321 | <object-type name="QAbstractItemDelegate"> |
|
3439 | <object-type name="QAbstractItemDelegate"> | |
3322 | <modify-function signature="setEditorData(QWidget*,QModelIndex)const"> |
|
3440 | <modify-function signature="setEditorData(QWidget*,QModelIndex)const"> | |
3323 | <modify-argument index="1"> |
|
3441 | <modify-argument index="1"> | |
@@ -3333,14 +3451,14 | |||||
3333 | <reference-count action="ignore"/> |
|
3451 | <reference-count action="ignore"/> | |
3334 | </modify-argument> |
|
3452 | </modify-argument> | |
3335 | </modify-function> |
|
3453 | </modify-function> | |
3336 |
|
3454 | |||
3337 | <modify-function signature="paint(QPainter*,QStyleOptionViewItem,QModelIndex)const"> |
|
3455 | <modify-function signature="paint(QPainter*,QStyleOptionViewItem,QModelIndex)const"> | |
3338 |
<modify-argument index="1" invalidate-after-use="yes"/> |
|
3456 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3339 | </modify-function> |
|
3457 | </modify-function> | |
3340 | <modify-function signature="editorEvent(QEvent*,QAbstractItemModel*,QStyleOptionViewItem,QModelIndex)"> |
|
3458 | <modify-function signature="editorEvent(QEvent*,QAbstractItemModel*,QStyleOptionViewItem,QModelIndex)"> | |
3341 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
3459 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3342 | </modify-function> |
|
3460 | </modify-function> | |
3343 |
|
3461 | |||
3344 | <modify-function signature="elidedText(QFontMetrics, int, Qt::TextElideMode, QString)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3462 | <modify-function signature="elidedText(QFontMetrics, int, Qt::TextElideMode, QString)" remove="all"/> <!--### Obsolete in 4.3--> | |
3345 | </object-type> |
|
3463 | </object-type> | |
3346 |
|
3464 | |||
@@ -3350,13 +3468,13 | |||||
3350 | <modify-argument index="return"> |
|
3468 | <modify-argument index="return"> | |
3351 | <define-ownership class="shell" owner="c++"/> |
|
3469 | <define-ownership class="shell" owner="c++"/> | |
3352 | </modify-argument> |
|
3470 | </modify-argument> | |
3353 |
</modify-function> |
|
3471 | </modify-function> | |
3354 |
|
3472 | |||
3355 | <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3473 | <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3356 | <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3474 | <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
3357 | <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3475 | <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
3358 | <modify-function signature="textColor()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3476 | <modify-function signature="textColor()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3359 |
|
3477 | |||
3360 | <modify-function signature="operator<(QTableWidgetItem)const"> |
|
3478 | <modify-function signature="operator<(QTableWidgetItem)const"> | |
3361 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
3479 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3362 | </modify-function> |
|
3480 | </modify-function> | |
@@ -3376,7 +3494,7 | |||||
3376 | </object-type> |
|
3494 | </object-type> | |
3377 |
|
3495 | |||
3378 | <object-type name="QListWidgetItem" delete-in-main-thread="yes"> |
|
3496 | <object-type name="QListWidgetItem" delete-in-main-thread="yes"> | |
3379 |
|
3497 | |||
3380 | <modify-function signature="operator<(QListWidgetItem)const"> |
|
3498 | <modify-function signature="operator<(QListWidgetItem)const"> | |
3381 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
3499 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3382 | </modify-function> |
|
3500 | </modify-function> | |
@@ -3387,7 +3505,7 | |||||
3387 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
3505 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3388 | </modify-function> |
|
3506 | </modify-function> | |
3389 |
|
3507 | |||
3390 |
|
3508 | |||
3391 | <modify-function signature="operator=(const QListWidgetItem&)" remove="all"/> |
|
3509 | <modify-function signature="operator=(const QListWidgetItem&)" remove="all"/> | |
3392 | <modify-function signature="QListWidgetItem(QListWidget *, int)"> |
|
3510 | <modify-function signature="QListWidgetItem(QListWidget *, int)"> | |
3393 | <modify-argument index="this"> |
|
3511 | <modify-argument index="this"> | |
@@ -3398,18 +3516,18 | |||||
3398 | <modify-argument index="this"> |
|
3516 | <modify-argument index="this"> | |
3399 | <define-ownership class="java" owner="c++"/> |
|
3517 | <define-ownership class="java" owner="c++"/> | |
3400 | </modify-argument> |
|
3518 | </modify-argument> | |
3401 |
</modify-function> |
|
3519 | </modify-function> | |
3402 | <modify-function signature="QListWidgetItem(const QIcon &, const QString &, QListWidget *, int)"> |
|
3520 | <modify-function signature="QListWidgetItem(const QIcon &, const QString &, QListWidget *, int)"> | |
3403 | <modify-argument index="this"> |
|
3521 | <modify-argument index="this"> | |
3404 | <define-ownership class="java" owner="c++"/> |
|
3522 | <define-ownership class="java" owner="c++"/> | |
3405 |
</modify-argument> |
|
3523 | </modify-argument> | |
3406 |
</modify-function> |
|
3524 | </modify-function> | |
3407 | <modify-function signature="clone() const"> |
|
3525 | <modify-function signature="clone() const"> | |
3408 | <modify-argument index="return"> |
|
3526 | <modify-argument index="return"> | |
3409 | <define-ownership class="shell" owner="c++"/> |
|
3527 | <define-ownership class="shell" owner="c++"/> | |
3410 | </modify-argument> |
|
3528 | </modify-argument> | |
3411 | </modify-function> |
|
3529 | </modify-function> | |
3412 |
|
3530 | |||
3413 | <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3531 | <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3414 | <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3532 | <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
3415 | <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3533 | <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -3431,24 +3549,24 | |||||
3431 | <argument-map index="1" meta-name="%1"/> |
|
3549 | <argument-map index="1" meta-name="%1"/> | |
3432 | if (%1 != null) disableGarbageCollection(); |
|
3550 | if (%1 != null) disableGarbageCollection(); | |
3433 | </inject-code> |
|
3551 | </inject-code> | |
3434 |
</modify-function> |
|
3552 | </modify-function> | |
3435 | <modify-function signature="QGraphicsTextItem(const QString &,QGraphicsItem*,QGraphicsScene*)"> |
|
3553 | <modify-function signature="QGraphicsTextItem(const QString &,QGraphicsItem*,QGraphicsScene*)"> | |
3436 | <inject-code position="end"> |
|
3554 | <inject-code position="end"> | |
3437 | <argument-map index="2" meta-name="%2"/> |
|
3555 | <argument-map index="2" meta-name="%2"/> | |
3438 | if (%2 != null) disableGarbageCollection(); |
|
3556 | if (%2 != null) disableGarbageCollection(); | |
3439 | </inject-code> |
|
3557 | </inject-code> | |
3440 |
</modify-function> |
|
3558 | </modify-function> | |
3441 | <modify-function signature="setDocument(QTextDocument*)"> |
|
3559 | <modify-function signature="setDocument(QTextDocument*)"> | |
3442 | <modify-argument index="1"> |
|
3560 | <modify-argument index="1"> | |
3443 | <reference-count action="set" variable-name="__rcDocument"/> |
|
3561 | <reference-count action="set" variable-name="__rcDocument"/> | |
3444 | </modify-argument> |
|
3562 | </modify-argument> | |
3445 | </modify-function> |
|
3563 | </modify-function> | |
3446 |
|
3564 | |||
3447 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3565 | <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3448 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> |
|
3566 | <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3--> | |
3449 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3567 | <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3450 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3568 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
3451 |
|
|
3569 | </object-type> | |
3452 |
|
3570 | |||
3453 | <object-type name="QCompleter"> |
|
3571 | <object-type name="QCompleter"> | |
3454 | <modify-function signature="activated(const QModelIndex &)"> |
|
3572 | <modify-function signature="activated(const QModelIndex &)"> | |
@@ -3500,12 +3618,12 | |||||
3500 | <modify-argument index="this"> |
|
3618 | <modify-argument index="this"> | |
3501 | <define-ownership class="java" owner="c++"/> |
|
3619 | <define-ownership class="java" owner="c++"/> | |
3502 | </modify-argument> |
|
3620 | </modify-argument> | |
3503 |
</modify-function> |
|
3621 | </modify-function> | |
3504 | <modify-function signature="QTreeWidgetItem(QTreeWidget *,QTreeWidgetItem *,int)"> |
|
3622 | <modify-function signature="QTreeWidgetItem(QTreeWidget *,QTreeWidgetItem *,int)"> | |
3505 | <modify-argument index="this"> |
|
3623 | <modify-argument index="this"> | |
3506 | <define-ownership class="java" owner="c++"/> |
|
3624 | <define-ownership class="java" owner="c++"/> | |
3507 | </modify-argument> |
|
3625 | </modify-argument> | |
3508 |
</modify-function> |
|
3626 | </modify-function> | |
3509 | <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,int)"> |
|
3627 | <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,int)"> | |
3510 | <modify-argument index="this"> |
|
3628 | <modify-argument index="this"> | |
3511 | <define-ownership class="java" owner="c++"/> |
|
3629 | <define-ownership class="java" owner="c++"/> | |
@@ -3515,12 +3633,12 | |||||
3515 | <modify-argument index="this"> |
|
3633 | <modify-argument index="this"> | |
3516 | <define-ownership class="java" owner="c++"/> |
|
3634 | <define-ownership class="java" owner="c++"/> | |
3517 | </modify-argument> |
|
3635 | </modify-argument> | |
3518 |
</modify-function> |
|
3636 | </modify-function> | |
3519 | <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,QTreeWidgetItem *,int)"> |
|
3637 | <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,QTreeWidgetItem *,int)"> | |
3520 | <modify-argument index="this"> |
|
3638 | <modify-argument index="this"> | |
3521 | <define-ownership class="java" owner="c++"/> |
|
3639 | <define-ownership class="java" owner="c++"/> | |
3522 |
</modify-argument> |
|
3640 | </modify-argument> | |
3523 |
</modify-function> |
|
3641 | </modify-function> | |
3524 | <modify-function signature="clone() const"> |
|
3642 | <modify-function signature="clone() const"> | |
3525 | <modify-argument index="return"> |
|
3643 | <modify-argument index="return"> | |
3526 | <define-ownership class="shell" owner="c++"/> |
|
3644 | <define-ownership class="shell" owner="c++"/> | |
@@ -3535,7 +3653,7 | |||||
3535 | <modify-argument index="1"> |
|
3653 | <modify-argument index="1"> | |
3536 | <define-ownership class="java" owner="c++"/> |
|
3654 | <define-ownership class="java" owner="c++"/> | |
3537 | </modify-argument> |
|
3655 | </modify-argument> | |
3538 |
</modify-function> |
|
3656 | </modify-function> | |
3539 | <modify-function signature="insertChild(int, QTreeWidgetItem *)"> |
|
3657 | <modify-function signature="insertChild(int, QTreeWidgetItem *)"> | |
3540 | <modify-argument index="2"> |
|
3658 | <modify-argument index="2"> | |
3541 | <define-ownership class="java" owner="c++"/> |
|
3659 | <define-ownership class="java" owner="c++"/> | |
@@ -3545,7 +3663,7 | |||||
3545 | <modify-argument index="2"> |
|
3663 | <modify-argument index="2"> | |
3546 | <define-ownership class="java" owner="c++"/> |
|
3664 | <define-ownership class="java" owner="c++"/> | |
3547 | </modify-argument> |
|
3665 | </modify-argument> | |
3548 |
</modify-function> |
|
3666 | </modify-function> | |
3549 | <modify-function signature="removeChild(QTreeWidgetItem*)"> |
|
3667 | <modify-function signature="removeChild(QTreeWidgetItem*)"> | |
3550 | <modify-argument index="1"> |
|
3668 | <modify-argument index="1"> | |
3551 | <define-ownership class="java" owner="default"/> |
|
3669 | <define-ownership class="java" owner="default"/> | |
@@ -3561,7 +3679,7 | |||||
3561 | <define-ownership class="java" owner="default"/> |
|
3679 | <define-ownership class="java" owner="default"/> | |
3562 | </modify-argument> |
|
3680 | </modify-argument> | |
3563 | </modify-function> |
|
3681 | </modify-function> | |
3564 |
|
3682 | |||
3565 | <modify-function signature="backgroundColor(int)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
3683 | <modify-function signature="backgroundColor(int)const" remove="all"/> <!--### Obsolete in 4.3--> | |
3566 | <modify-function signature="setBackgroundColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3684 | <modify-function signature="setBackgroundColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
3567 | <modify-function signature="setTextColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3--> |
|
3685 | <modify-function signature="setTextColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -3575,6 +3693,9 | |||||
3575 | </object-type> |
|
3693 | </object-type> | |
3576 |
|
3694 | |||
3577 | <object-type name="QListWidget"> |
|
3695 | <object-type name="QListWidget"> | |
|
3696 | <modify-function signature="mimeData(const QList<QListWidgetItem *>)const"> | |||
|
3697 | <modify-argument index="1" invalidate-after-use="yes"/> | |||
|
3698 | </modify-function> | |||
3578 | <modify-function signature="addItem(QListWidgetItem *)"> |
|
3699 | <modify-function signature="addItem(QListWidgetItem *)"> | |
3579 | <modify-argument index="1"> |
|
3700 | <modify-argument index="1"> | |
3580 | <define-ownership class="java" owner="c++"/> |
|
3701 | <define-ownership class="java" owner="c++"/> | |
@@ -3583,11 +3704,6 | |||||
3583 | <modify-function signature="insertItem(int, QListWidgetItem *)"> |
|
3704 | <modify-function signature="insertItem(int, QListWidgetItem *)"> | |
3584 | <modify-argument index="2"> |
|
3705 | <modify-argument index="2"> | |
3585 | <define-ownership class="java" owner="c++"/> |
|
3706 | <define-ownership class="java" owner="c++"/> | |
3586 | </modify-argument> |
|
|||
3587 | </modify-function> |
|
|||
3588 | <modify-function signature="removeItemWidget(QListWidgetItem*)"> |
|
|||
3589 | <modify-argument index="1"> |
|
|||
3590 | <define-ownership class="java" owner="default"/> |
|
|||
3591 | </modify-argument> |
|
3707 | </modify-argument> | |
3592 | </modify-function> |
|
3708 | </modify-function> | |
3593 | <modify-function signature="setCurrentItem(QListWidgetItem*)"> |
|
3709 | <modify-function signature="setCurrentItem(QListWidgetItem*)"> | |
@@ -3599,7 +3715,7 | |||||
3599 | <modify-argument index="1"> |
|
3715 | <modify-argument index="1"> | |
3600 | <reference-count action="ignore"/> |
|
3716 | <reference-count action="ignore"/> | |
3601 | </modify-argument> |
|
3717 | </modify-argument> | |
3602 |
</modify-function> |
|
3718 | </modify-function> | |
3603 | <modify-function signature="setItemHidden(const QListWidgetItem*,bool)"> |
|
3719 | <modify-function signature="setItemHidden(const QListWidgetItem*,bool)"> | |
3604 | <remove/> |
|
3720 | <remove/> | |
3605 | </modify-function> |
|
3721 | </modify-function> | |
@@ -3624,7 +3740,12 | |||||
3624 | <modify-argument index="2"> |
|
3740 | <modify-argument index="2"> | |
3625 | <reference-count action="ignore"/> |
|
3741 | <reference-count action="ignore"/> | |
3626 | </modify-argument> |
|
3742 | </modify-argument> | |
3627 |
</modify-function> |
|
3743 | </modify-function> | |
|
3744 | <modify-function signature="removeItemWidget(QListWidgetItem*)"> | |||
|
3745 | <modify-argument index="1"> | |||
|
3746 | <reference-count action="ignore"/> | |||
|
3747 | </modify-argument> | |||
|
3748 | </modify-function> | |||
3628 | <modify-function signature="setModel(QAbstractItemModel*)"> |
|
3749 | <modify-function signature="setModel(QAbstractItemModel*)"> | |
3629 | <modify-argument index="1"> |
|
3750 | <modify-argument index="1"> | |
3630 | <reference-count action="ignore"/> |
|
3751 | <reference-count action="ignore"/> | |
@@ -3639,8 +3760,8 | |||||
3639 | <extra-includes> |
|
3760 | <extra-includes> | |
3640 | <include file-name="QIcon" location="global"/> |
|
3761 | <include file-name="QIcon" location="global"/> | |
3641 | <include file-name="QMessageBox" location="global"/> |
|
3762 | <include file-name="QMessageBox" location="global"/> | |
3642 |
</extra-includes> |
|
3763 | </extra-includes> | |
3643 |
|
3764 | |||
3644 | <modify-function signature="actionEvent(QActionEvent*)"> |
|
3765 | <modify-function signature="actionEvent(QActionEvent*)"> | |
3645 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
3766 | <modify-argument index="1" invalidate-after-use="yes"/> | |
3646 | </modify-function> |
|
3767 | </modify-function> | |
@@ -3726,8 +3847,7 | |||||
3726 | <remove-default-expression/> |
|
3847 | <remove-default-expression/> | |
3727 | </modify-argument> |
|
3848 | </modify-argument> | |
3728 | </modify-function> |
|
3849 | </modify-function> | |
3729 |
|
3850 | |||
3730 | <!-- |
|
|||
3731 | <inject-code class="native"> |
|
3851 | <inject-code class="native"> | |
3732 | extern "C" JNIEXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_com_trolltech_qt_gui_QWidget__1_1qt_1QMessageBox_1setWindowTitle) |
|
3852 | extern "C" JNIEXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_com_trolltech_qt_gui_QWidget__1_1qt_1QMessageBox_1setWindowTitle) | |
3733 | (JNIEnv *__jni_env, |
|
3853 | (JNIEnv *__jni_env, | |
@@ -3743,7 +3863,7 | |||||
3743 | Q_ASSERT(__qt_this); |
|
3863 | Q_ASSERT(__qt_this); | |
3744 | __qt_this->setWindowTitle((const QString& )__qt_title0); |
|
3864 | __qt_this->setWindowTitle((const QString& )__qt_title0); | |
3745 | QTJAMBI_DEBUG_TRACE("(native) -> leaving: QMessageBox::setWindowTitle(const QString & title)"); |
|
3865 | QTJAMBI_DEBUG_TRACE("(native) -> leaving: QMessageBox::setWindowTitle(const QString & title)"); | |
3746 |
} |
|
3866 | } | |
3747 | </inject-code> |
|
3867 | </inject-code> | |
3748 |
|
3868 | |||
3749 | <inject-code class="native"> |
|
3869 | <inject-code class="native"> | |
@@ -3764,18 +3884,17 | |||||
3764 | QTJAMBI_DEBUG_TRACE("(native) -> leaving: QMessageBox::setWindowModality(Qt::WindowModality modality)"); |
|
3884 | QTJAMBI_DEBUG_TRACE("(native) -> leaving: QMessageBox::setWindowModality(Qt::WindowModality modality)"); | |
3765 | } |
|
3885 | } | |
3766 | </inject-code> |
|
3886 | </inject-code> | |
3767 | --> |
|
3887 | ||
3768 |
|
||||
3769 | <modify-function signature="render(QPaintDevice *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"> |
|
3888 | <modify-function signature="render(QPaintDevice *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"> | |
3770 | <modify-argument index="4"> |
|
3889 | <modify-argument index="4"> | |
3771 | <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/> |
|
3890 | <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/> | |
3772 | </modify-argument> |
|
3891 | </modify-argument> | |
3773 |
</modify-function> |
|
3892 | </modify-function> | |
3774 | <modify-function signature="render(QPainter *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"> |
|
3893 | <modify-function signature="render(QPainter *, const QPoint &, const QRegion &, QFlags<QWidget::RenderFlag>)"> | |
3775 | <modify-argument index="4"> |
|
3894 | <modify-argument index="4"> | |
3776 | <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/> |
|
3895 | <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/> | |
3777 | </modify-argument> |
|
3896 | </modify-argument> | |
3778 |
</modify-function> |
|
3897 | </modify-function> | |
3779 | <modify-function signature="setFocusProxy(QWidget*)"> |
|
3898 | <modify-function signature="setFocusProxy(QWidget*)"> | |
3780 | <modify-argument index="1"> |
|
3899 | <modify-argument index="1"> | |
3781 | <reference-count action="set" variable-name="__rcFocusProxy"/> |
|
3900 | <reference-count action="set" variable-name="__rcFocusProxy"/> | |
@@ -3813,12 +3932,12 | |||||
3813 | </modify-argument> |
|
3932 | </modify-argument> | |
3814 | <modify-argument index="2"> |
|
3933 | <modify-argument index="2"> | |
3815 | <reference-count action="ignore"/> |
|
3934 | <reference-count action="ignore"/> | |
3816 |
</modify-argument> |
|
3935 | </modify-argument> | |
3817 |
</modify-function> |
|
3936 | </modify-function> | |
3818 | <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> |
|
3937 | <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> | |
3819 | <access modifier="private"/> |
|
3938 | <access modifier="private"/> | |
3820 | </modify-function> |
|
3939 | </modify-function> | |
3821 |
|
3940 | |||
3822 | <modify-function signature="addAction(QAction *)"> |
|
3941 | <modify-function signature="addAction(QAction *)"> | |
3823 | <modify-argument index="1"> |
|
3942 | <modify-argument index="1"> | |
3824 | <reference-count action="add" variable-name="__rcActions"/> |
|
3943 | <reference-count action="add" variable-name="__rcActions"/> | |
@@ -3865,8 +3984,10 | |||||
3865 | </object-type> |
|
3984 | </object-type> | |
3866 |
|
3985 | |||
3867 | <object-type name="QMessageBox"> |
|
3986 | <object-type name="QMessageBox"> | |
|
3987 | ||||
|
3988 | ||||
3868 | <modify-function signature="setWindowTitle(const QString &)" remove="all"/> |
|
3989 | <modify-function signature="setWindowTitle(const QString &)" remove="all"/> | |
3869 |
<modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/> |
|
3990 | <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/> | |
3870 | <extra-includes> |
|
3991 | <extra-includes> | |
3871 | <include file-name="QPixmap" location="global"/> |
|
3992 | <include file-name="QPixmap" location="global"/> | |
3872 | </extra-includes> |
|
3993 | </extra-includes> | |
@@ -3890,7 +4011,7 | |||||
3890 | <reference-count action="ignore"/> |
|
4011 | <reference-count action="ignore"/> | |
3891 | </modify-argument> |
|
4012 | </modify-argument> | |
3892 | </modify-function> |
|
4013 | </modify-function> | |
3893 |
|
4014 | |||
3894 | <modify-function signature="QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4015 | <modify-function signature="QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> <!--### Obsolete in 4.3--> | |
3895 | <modify-function signature="buttonText(int)const" remove="all"/> <!--### Obsolete in 4.3--> |
|
4016 | <modify-function signature="buttonText(int)const" remove="all"/> <!--### Obsolete in 4.3--> | |
3896 | <modify-function signature="setButtonText(int, QString)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4017 | <modify-function signature="setButtonText(int, QString)" remove="all"/> <!--### Obsolete in 4.3--> | |
@@ -3922,13 +4043,13 | |||||
3922 | <object-type name="QTextFrame" delete-in-main-thread="yes"> |
|
4043 | <object-type name="QTextFrame" delete-in-main-thread="yes"> | |
3923 | <extra-includes> |
|
4044 | <extra-includes> | |
3924 | <include file-name="QTextCursor" location="global"/> |
|
4045 | <include file-name="QTextCursor" location="global"/> | |
3925 |
</extra-includes> |
|
4046 | </extra-includes> | |
3926 | </object-type> |
|
4047 | </object-type> | |
3927 |
|
4048 | |||
3928 | <object-type name="QImageIOHandler"> |
|
4049 | <object-type name="QImageIOHandler"> | |
3929 | <extra-includes> |
|
4050 | <extra-includes> | |
3930 | <include file-name="QRect" location="global"/> |
|
4051 | <include file-name="QRect" location="global"/> | |
3931 |
</extra-includes> |
|
4052 | </extra-includes> | |
3932 | <modify-function signature="setFormat(const QByteArray &)const"> |
|
4053 | <modify-function signature="setFormat(const QByteArray &)const"> | |
3933 | <remove/> |
|
4054 | <remove/> | |
3934 | </modify-function> |
|
4055 | </modify-function> | |
@@ -3937,18 +4058,17 | |||||
3937 | <reference-count action="set" variable-name="__rcDevice"/> |
|
4058 | <reference-count action="set" variable-name="__rcDevice"/> | |
3938 | </modify-argument> |
|
4059 | </modify-argument> | |
3939 | </modify-function> |
|
4060 | </modify-function> | |
3940 | <!-- |
|
|||
3941 | <modify-function signature="read(QImage*)"> |
|
4061 | <modify-function signature="read(QImage*)"> | |
3942 | <modify-argument index="1"> |
|
4062 | <modify-argument index="1"> | |
3943 | <replace-type modified-type="com.trolltech.qt.gui.QImage"/> |
|
4063 | <replace-type modified-type="com.trolltech.qt.gui.QImage"/> | |
3944 | <conversion-rule class="shell"> |
|
4064 | <conversion-rule class="shell"> | |
3945 | jobject %out = qtjambi_from_object(__jni_env, %in, "QImage", "com/trolltech/qt/gui/", false); |
|
4065 | jobject %out = qtjambi_from_object(__jni_env, %in, "QImage", "com/trolltech/qt/gui/", false); | |
3946 |
|
4066 | |||
3947 |
QtJambiLink *__link = %out != 0 ? QtJambiLink::findLink(__jni_env, %out) : 0; |
|
4067 | QtJambiLink *__link = %out != 0 ? QtJambiLink::findLink(__jni_env, %out) : 0; | |
3948 |
</conversion-rule> |
|
4068 | </conversion-rule> | |
3949 | <conversion-rule class="native"> |
|
4069 | <conversion-rule class="native"> | |
3950 | QImage *%out = (QImage *) qtjambi_to_object(__jni_env, %in); |
|
4070 | QImage *%out = (QImage *) qtjambi_to_object(__jni_env, %in); | |
3951 |
</conversion-rule> |
|
4071 | </conversion-rule> | |
3952 | </modify-argument> |
|
4072 | </modify-argument> | |
3953 | <modify-argument index="0"> |
|
4073 | <modify-argument index="0"> | |
3954 | <conversion-rule class="shell"> |
|
4074 | <conversion-rule class="shell"> | |
@@ -3956,20 +4076,19 | |||||
3956 | if (__link != 0) __link->resetObject(__jni_env); |
|
4076 | if (__link != 0) __link->resetObject(__jni_env); | |
3957 | bool %out = (bool) %in; |
|
4077 | bool %out = (bool) %in; | |
3958 | </conversion-rule> |
|
4078 | </conversion-rule> | |
3959 |
</modify-argument> |
|
4079 | </modify-argument> | |
3960 |
</modify-function> |
|
4080 | </modify-function> | |
3961 | --> |
|
4081 | ||
3962 |
|
||||
3963 | <modify-function signature="name()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
4082 | <modify-function signature="name()const" remove="all"/> <!--### Obsolete in 4.3--> | |
3964 | </object-type> |
|
4083 | </object-type> | |
3965 |
|
4084 | |||
3966 | <object-type name="QProxyModel"> |
|
4085 | <object-type name="QProxyModel"> | |
3967 | <modify-function signature="parent()const" remove="all"/> |
|
4086 | <modify-function signature="parent()const" remove="all"/> | |
3968 | <extra-includes> |
|
4087 | <extra-includes> | |
3969 | <include file-name="QPixmap" location="global"/> |
|
4088 | <include file-name="QPixmap" location="global"/> | |
3970 | <include file-name="QStringList" location="global"/> |
|
4089 | <include file-name="QStringList" location="global"/> | |
3971 | <include file-name="QSize" location="global"/> |
|
4090 | <include file-name="QSize" location="global"/> | |
3972 |
</extra-includes> |
|
4091 | </extra-includes> | |
3973 | <modify-function signature="setModel(QAbstractItemModel*)"> |
|
4092 | <modify-function signature="setModel(QAbstractItemModel*)"> | |
3974 | <modify-argument index="1"> |
|
4093 | <modify-argument index="1"> | |
3975 | <reference-count action="set" variable-name="__rcModel"/> |
|
4094 | <reference-count action="set" variable-name="__rcModel"/> | |
@@ -3977,14 +4096,14 | |||||
3977 | </modify-function> |
|
4096 | </modify-function> | |
3978 | </object-type> |
|
4097 | </object-type> | |
3979 |
|
4098 | |||
3980 |
<object-type name="QImageReader"> |
|
4099 | <object-type name="QImageReader"> | |
3981 | <extra-includes> |
|
4100 | <extra-includes> | |
3982 | <include file-name="QColor" location="global"/> |
|
4101 | <include file-name="QColor" location="global"/> | |
3983 | <include file-name="QRect" location="global"/> |
|
4102 | <include file-name="QRect" location="global"/> | |
3984 | <include file-name="QSize" location="global"/> |
|
4103 | <include file-name="QSize" location="global"/> | |
3985 | <include file-name="QStringList" location="global"/> |
|
4104 | <include file-name="QStringList" location="global"/> | |
3986 | <include file-name="QImage" location="global"/> |
|
4105 | <include file-name="QImage" location="global"/> | |
3987 |
</extra-includes> |
|
4106 | </extra-includes> | |
3988 | <modify-function signature="read(QImage*) "> |
|
4107 | <modify-function signature="read(QImage*) "> | |
3989 | <remove/> |
|
4108 | <remove/> | |
3990 | </modify-function> |
|
4109 | </modify-function> | |
@@ -3992,9 +4111,9 | |||||
3992 | <modify-argument index="1"> |
|
4111 | <modify-argument index="1"> | |
3993 | <reference-count action="set" variable-name="__rcDevice"/> |
|
4112 | <reference-count action="set" variable-name="__rcDevice"/> | |
3994 | </modify-argument> |
|
4113 | </modify-argument> | |
3995 |
</modify-function> |
|
4114 | </modify-function> | |
3996 | </object-type> |
|
4115 | </object-type> | |
3997 |
|
4116 | |||
3998 | <object-type name="QMovie"> |
|
4117 | <object-type name="QMovie"> | |
3999 | <extra-includes> |
|
4118 | <extra-includes> | |
4000 | <include file-name="QColor" location="global"/> |
|
4119 | <include file-name="QColor" location="global"/> | |
@@ -4002,7 +4121,7 | |||||
4002 | <include file-name="QPixmap" location="global"/> |
|
4121 | <include file-name="QPixmap" location="global"/> | |
4003 | <include file-name="QRect" location="global"/> |
|
4122 | <include file-name="QRect" location="global"/> | |
4004 | <include file-name="QSize" location="global"/> |
|
4123 | <include file-name="QSize" location="global"/> | |
4005 |
</extra-includes> |
|
4124 | </extra-includes> | |
4006 | <modify-function signature="cacheMode()"> |
|
4125 | <modify-function signature="cacheMode()"> | |
4007 | <remove/> |
|
4126 | <remove/> | |
4008 | </modify-function> |
|
4127 | </modify-function> | |
@@ -4012,9 +4131,8 | |||||
4012 | </modify-argument> |
|
4131 | </modify-argument> | |
4013 | </modify-function> |
|
4132 | </modify-function> | |
4014 | </object-type> |
|
4133 | </object-type> | |
4015 |
|
4134 | |||
4016 | <object-type name="QPageSetupDialog"> |
|
4135 | <object-type name="QPageSetupDialog"/> | |
4017 | </object-type> |
|
|||
4018 |
|
4136 | |||
4019 | <object-type name="QTabWidget"> |
|
4137 | <object-type name="QTabWidget"> | |
4020 | <modify-function signature="initStyleOption(QStyleOptionTabWidgetFrame*)const"> |
|
4138 | <modify-function signature="initStyleOption(QStyleOptionTabWidgetFrame*)const"> | |
@@ -4024,7 +4142,7 | |||||
4024 | <insert-template name="gui.init_style_option"> |
|
4142 | <insert-template name="gui.init_style_option"> | |
4025 | <replace from="%TYPE" to="QStyleOptionTabWidgetFrame"/> |
|
4143 | <replace from="%TYPE" to="QStyleOptionTabWidgetFrame"/> | |
4026 | </insert-template> |
|
4144 | </insert-template> | |
4027 |
</inject-code> |
|
4145 | </inject-code> | |
4028 | <modify-function signature="addTab(QWidget*,QIcon,QString)"> |
|
4146 | <modify-function signature="addTab(QWidget*,QIcon,QString)"> | |
4029 | <modify-argument index="1"> |
|
4147 | <modify-argument index="1"> | |
4030 | <reference-count action="ignore"/> |
|
4148 | <reference-count action="ignore"/> | |
@@ -4065,25 +4183,25 | |||||
4065 | <extra-includes> |
|
4183 | <extra-includes> | |
4066 | <include file-name="QPoint" location="global"/> |
|
4184 | <include file-name="QPoint" location="global"/> | |
4067 | <include file-name="QPixmap" location="global"/> |
|
4185 | <include file-name="QPixmap" location="global"/> | |
4068 |
</extra-includes> |
|
4186 | </extra-includes> | |
4069 | <modify-function signature="setMimeData(QMimeData*)"> |
|
4187 | <modify-function signature="setMimeData(QMimeData*)"> | |
4070 | <modify-argument index="1"> |
|
4188 | <modify-argument index="1"> | |
4071 | <define-ownership class="java" owner="c++"/> |
|
4189 | <define-ownership class="java" owner="c++"/> | |
4072 | </modify-argument> |
|
4190 | </modify-argument> | |
4073 |
</modify-function> |
|
4191 | </modify-function> | |
4074 |
|
4192 | |||
4075 | <modify-function signature="start(QFlags<Qt::DropAction>)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4193 | <modify-function signature="start(QFlags<Qt::DropAction>)" remove="all"/> <!--### Obsolete in 4.3--> | |
4076 | </object-type> |
|
4194 | </object-type> | |
4077 |
|
4195 | |||
4078 | <object-type name="QDateTimeEdit"> |
|
4196 | <object-type name="QDateTimeEdit"> | |
4079 | <modify-function signature="initStyleOption(QStyleOptionSpinBox*)const" access="private" rename="initDateTimeEditStyleOption"/> |
|
4197 | <modify-function signature="initStyleOption(QStyleOptionSpinBox*)const" access="private" rename="initDateTimeEditStyleOption"/> | |
4080 | <modify-function signature="setCalendarWidget(QCalendarWidget*)"> |
|
4198 | <modify-function signature="setCalendarWidget(QCalendarWidget*)"> | |
4081 | <modify-argument index="1"> |
|
4199 | <modify-argument index="1"> | |
4082 |
<!-- Safe to ignore because widget is reparented --> |
|
4200 | <!-- Safe to ignore because widget is reparented --> | |
4083 |
<reference-count action="ignore"/> |
|
4201 | <reference-count action="ignore"/> | |
4084 | </modify-argument> |
|
4202 | </modify-argument> | |
4085 | </modify-function> |
|
4203 | </modify-function> | |
4086 |
|
4204 | |||
4087 | </object-type> |
|
4205 | </object-type> | |
4088 |
|
4206 | |||
4089 | <object-type name="QSortFilterProxyModel"> |
|
4207 | <object-type name="QSortFilterProxyModel"> | |
@@ -4092,14 +4210,14 | |||||
4092 | <include file-name="QItemSelection" location="global"/> |
|
4210 | <include file-name="QItemSelection" location="global"/> | |
4093 | <include file-name="QStringList" location="global"/> |
|
4211 | <include file-name="QStringList" location="global"/> | |
4094 | <include file-name="QSize" location="global"/> |
|
4212 | <include file-name="QSize" location="global"/> | |
4095 |
</extra-includes> |
|
4213 | </extra-includes> | |
4096 |
|
4214 | |||
4097 | <modify-function signature="setSourceModel(QAbstractItemModel *)"> |
|
4215 | <modify-function signature="setSourceModel(QAbstractItemModel *)"> | |
4098 | <modify-argument index="1"> |
|
4216 | <modify-argument index="1"> | |
4099 | <reference-count action="set" variable-name="__rcSourceModel"/> |
|
4217 | <reference-count action="set" variable-name="__rcSourceModel"/> | |
4100 | </modify-argument> |
|
4218 | </modify-argument> | |
4101 | </modify-function> |
|
4219 | </modify-function> | |
4102 |
|
4220 | |||
4103 | <modify-function signature="clear()" remove="all"/> <!--### Obsolete in 4.3--> |
|
4221 | <modify-function signature="clear()" remove="all"/> <!--### Obsolete in 4.3--> | |
4104 | <modify-function signature="filterChanged()" remove="all"/> <!--### Obsolete in 4.3--> |
|
4222 | <modify-function signature="filterChanged()" remove="all"/> <!--### Obsolete in 4.3--> | |
4105 | </object-type> |
|
4223 | </object-type> | |
@@ -4113,7 +4231,7 | |||||
4113 | <object-type name="QInputContext"> |
|
4231 | <object-type name="QInputContext"> | |
4114 | <extra-includes> |
|
4232 | <extra-includes> | |
4115 | <include file-name="QTextFormat" location="global"/> |
|
4233 | <include file-name="QTextFormat" location="global"/> | |
4116 |
</extra-includes> |
|
4234 | </extra-includes> | |
4117 | <modify-function signature="setFocusWidget(QWidget*)"> |
|
4235 | <modify-function signature="setFocusWidget(QWidget*)"> | |
4118 | <remove/> |
|
4236 | <remove/> | |
4119 | </modify-function> |
|
4237 | </modify-function> | |
@@ -4125,8 +4243,9 | |||||
4125 | </modify-function> |
|
4243 | </modify-function> | |
4126 |
|
4244 | |||
4127 | </object-type> |
|
4245 | </object-type> | |
4128 |
|
4246 | |||
4129 | <object-type name="QProgressDialog"> |
|
4247 | <object-type name="QProgressDialog"> | |
|
4248 | ||||
4130 | <modify-function signature="setBar(QProgressBar*)"> |
|
4249 | <modify-function signature="setBar(QProgressBar*)"> | |
4131 | <modify-argument index="1"> |
|
4250 | <modify-argument index="1"> | |
4132 | <define-ownership class="java" owner="c++"/> |
|
4251 | <define-ownership class="java" owner="c++"/> | |
@@ -4144,7 +4263,7 | |||||
4144 | <reference-count action="ignore"/> |
|
4263 | <reference-count action="ignore"/> | |
4145 | </modify-argument> |
|
4264 | </modify-argument> | |
4146 | </modify-function> |
|
4265 | </modify-function> | |
4147 |
|
4266 | |||
4148 | </object-type> |
|
4267 | </object-type> | |
4149 |
|
4268 | |||
4150 | <object-type name="QLabel"> |
|
4269 | <object-type name="QLabel"> | |
@@ -4152,7 +4271,7 | |||||
4152 | <access modifier="private"/> |
|
4271 | <access modifier="private"/> | |
4153 | <rename to="picture_private"/> |
|
4272 | <rename to="picture_private"/> | |
4154 | </modify-function> |
|
4273 | </modify-function> | |
4155 |
|
4274 | |||
4156 | <modify-function signature="setBuddy(QWidget *)"> |
|
4275 | <modify-function signature="setBuddy(QWidget *)"> | |
4157 | <modify-argument index="1"> |
|
4276 | <modify-argument index="1"> | |
4158 | <reference-count action="set" variable-name="__rcBuddy"/> |
|
4277 | <reference-count action="set" variable-name="__rcBuddy"/> | |
@@ -4165,7 +4284,7 | |||||
4165 | </modify-function> |
|
4284 | </modify-function> | |
4166 | <modify-function signature="pixmap()const"> |
|
4285 | <modify-function signature="pixmap()const"> | |
4167 | <access modifier="private"/> |
|
4286 | <access modifier="private"/> | |
4168 |
<rename to="pixmap_private"/> |
|
4287 | <rename to="pixmap_private"/> | |
4169 | </modify-function> |
|
4288 | </modify-function> | |
4170 | </object-type> |
|
4289 | </object-type> | |
4171 |
|
4290 | |||
@@ -4173,7 +4292,7 | |||||
4173 | <extra-includes> |
|
4292 | <extra-includes> | |
4174 | <include file-name="QUrl" location="global"/> |
|
4293 | <include file-name="QUrl" location="global"/> | |
4175 | </extra-includes> |
|
4294 | </extra-includes> | |
4176 | <!-- |
|
4295 | ||
4177 | <modify-function signature="getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> |
|
4296 | <modify-function signature="getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> | |
4178 | <access modifier="private"/> |
|
4297 | <access modifier="private"/> | |
4179 | <modify-argument index="1"> |
|
4298 | <modify-argument index="1"> | |
@@ -4193,9 +4312,9 | |||||
4193 | </modify-argument> |
|
4312 | </modify-argument> | |
4194 | <modify-argument index="6"> |
|
4313 | <modify-argument index="6"> | |
4195 | <remove-default-expression/> |
|
4314 | <remove-default-expression/> | |
4196 |
</modify-argument> |
|
4315 | </modify-argument> | |
4197 | </modify-function> |
|
4316 | </modify-function> | |
4198 |
|
4317 | |||
4199 | <modify-function signature="getOpenFileNames(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> |
|
4318 | <modify-function signature="getOpenFileNames(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> | |
4200 | <access modifier="private"/> |
|
4319 | <access modifier="private"/> | |
4201 | <modify-argument index="1"> |
|
4320 | <modify-argument index="1"> | |
@@ -4215,9 +4334,9 | |||||
4215 | </modify-argument> |
|
4334 | </modify-argument> | |
4216 | <modify-argument index="6"> |
|
4335 | <modify-argument index="6"> | |
4217 | <remove-default-expression/> |
|
4336 | <remove-default-expression/> | |
4218 |
</modify-argument> |
|
4337 | </modify-argument> | |
4219 | </modify-function> |
|
4338 | </modify-function> | |
4220 |
|
4339 | |||
4221 | <modify-function signature="getSaveFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> |
|
4340 | <modify-function signature="getSaveFileName(QWidget*,QString,QString,QString,QString*,QFlags<QFileDialog::Option>)"> | |
4222 | <access modifier="private"/> |
|
4341 | <access modifier="private"/> | |
4223 | <modify-argument index="1"> |
|
4342 | <modify-argument index="1"> | |
@@ -4237,29 +4356,28 | |||||
4237 | </modify-argument> |
|
4356 | </modify-argument> | |
4238 | <modify-argument index="6"> |
|
4357 | <modify-argument index="6"> | |
4239 | <remove-default-expression/> |
|
4358 | <remove-default-expression/> | |
4240 |
</modify-argument> |
|
4359 | </modify-argument> | |
4241 | </modify-function> |
|
4360 | </modify-function> | |
4242 | --> |
|
4361 | ||
4243 |
|
||||
4244 | <modify-function signature="setIconProvider(QFileIconProvider*)"> |
|
4362 | <modify-function signature="setIconProvider(QFileIconProvider*)"> | |
4245 | <modify-argument index="1"> |
|
4363 | <modify-argument index="1"> | |
4246 | <reference-count action="set" variable-name="__rcIconProvider"/> |
|
4364 | <reference-count action="set" variable-name="__rcIconProvider"/> | |
4247 | </modify-argument> |
|
4365 | </modify-argument> | |
4248 | </modify-function> |
|
4366 | </modify-function> | |
4249 |
|
4367 | |||
4250 | <modify-function signature="setItemDelegate(QAbstractItemDelegate*)"> |
|
4368 | <modify-function signature="setItemDelegate(QAbstractItemDelegate*)"> | |
4251 | <modify-argument index="1"> |
|
4369 | <modify-argument index="1"> | |
4252 | <reference-count action="set" variable-name="__rcItemDelegate"/> |
|
4370 | <reference-count action="set" variable-name="__rcItemDelegate"/> | |
4253 | </modify-argument> |
|
4371 | </modify-argument> | |
4254 | </modify-function> |
|
4372 | </modify-function> | |
4255 |
|
4373 | |||
4256 | <modify-function signature="setProxyModel(QAbstractProxyModel*)"> |
|
4374 | <modify-function signature="setProxyModel(QAbstractProxyModel*)"> | |
4257 | <modify-argument index="1"> |
|
4375 | <modify-argument index="1"> | |
4258 | <!-- Reparented --> |
|
4376 | <!-- Reparented --> | |
4259 | <reference-count action="ignore"/> |
|
4377 | <reference-count action="ignore"/> | |
4260 | </modify-argument> |
|
4378 | </modify-argument> | |
4261 | </modify-function> |
|
4379 | </modify-function> | |
4262 |
|
4380 | |||
4263 | </object-type> |
|
4381 | </object-type> | |
4264 |
|
4382 | |||
4265 | <object-type name="QErrorMessage"/> |
|
4383 | <object-type name="QErrorMessage"/> | |
@@ -4267,10 +4385,15 | |||||
4267 | <object-type name="QTabBar"> |
|
4385 | <object-type name="QTabBar"> | |
4268 | <extra-includes> |
|
4386 | <extra-includes> | |
4269 | <include file-name="QIcon" location="global"/> |
|
4387 | <include file-name="QIcon" location="global"/> | |
4270 |
</extra-includes> |
|
4388 | </extra-includes> | |
4271 | <modify-function signature="initStyleOption(QStyleOptionTab*,int)const"> |
|
4389 | <modify-function signature="initStyleOption(QStyleOptionTab*,int)const"> | |
4272 | <access modifier="private"/> |
|
4390 | <access modifier="private"/> | |
4273 | </modify-function> |
|
4391 | </modify-function> | |
|
4392 | <modify-function signature="setTabButton(int,QTabBar::ButtonPosition,QWidget*)"> | |||
|
4393 | <modify-argument index="3"> | |||
|
4394 | <reference-count action="ignore"/> | |||
|
4395 | </modify-argument> | |||
|
4396 | </modify-function> | |||
4274 | </object-type> |
|
4397 | </object-type> | |
4275 |
|
4398 | |||
4276 | <object-type name="QStandardItemModel"> |
|
4399 | <object-type name="QStandardItemModel"> | |
@@ -4280,8 +4403,8 | |||||
4280 | <extra-includes> |
|
4403 | <extra-includes> | |
4281 | <include file-name="QStringList" location="global"/> |
|
4404 | <include file-name="QStringList" location="global"/> | |
4282 | <include file-name="QSize" location="global"/> |
|
4405 | <include file-name="QSize" location="global"/> | |
4283 |
</extra-includes> |
|
4406 | </extra-includes> | |
4284 |
|
4407 | |||
4285 | <modify-function signature="appendColumn(const QList<QStandardItem *>&)"> |
|
4408 | <modify-function signature="appendColumn(const QList<QStandardItem *>&)"> | |
4286 | <modify-argument index="1"> |
|
4409 | <modify-argument index="1"> | |
4287 | <define-ownership class="java" owner="c++"/> |
|
4410 | <define-ownership class="java" owner="c++"/> | |
@@ -4296,22 +4419,22 | |||||
4296 | <modify-argument index="return"> |
|
4419 | <modify-argument index="return"> | |
4297 | <define-ownership class="java" owner="default"/> |
|
4420 | <define-ownership class="java" owner="default"/> | |
4298 | </modify-argument> |
|
4421 | </modify-argument> | |
4299 |
</modify-function> |
|
4422 | </modify-function> | |
4300 | <modify-function signature="takeHorizontalHeaderItem(int)"> |
|
4423 | <modify-function signature="takeHorizontalHeaderItem(int)"> | |
4301 | <modify-argument index="return"> |
|
4424 | <modify-argument index="return"> | |
4302 | <define-ownership class="java" owner="default"/> |
|
4425 | <define-ownership class="java" owner="default"/> | |
4303 | </modify-argument> |
|
4426 | </modify-argument> | |
4304 |
</modify-function> |
|
4427 | </modify-function> | |
4305 | <modify-function signature="takeVerticalHeaderItem(int)"> |
|
4428 | <modify-function signature="takeVerticalHeaderItem(int)"> | |
4306 | <modify-argument index="return"> |
|
4429 | <modify-argument index="return"> | |
4307 | <define-ownership class="java" owner="default"/> |
|
4430 | <define-ownership class="java" owner="default"/> | |
4308 | </modify-argument> |
|
4431 | </modify-argument> | |
4309 |
</modify-function> |
|
4432 | </modify-function> | |
4310 | <modify-function signature="takeItem(int,int)"> |
|
4433 | <modify-function signature="takeItem(int,int)"> | |
4311 | <modify-argument index="return"> |
|
4434 | <modify-argument index="return"> | |
4312 | <define-ownership class="java" owner="default"/> |
|
4435 | <define-ownership class="java" owner="default"/> | |
4313 | </modify-argument> |
|
4436 | </modify-argument> | |
4314 |
</modify-function> |
|
4437 | </modify-function> | |
4315 | <modify-function signature="appendRow(const QList<QStandardItem *>&)"> |
|
4438 | <modify-function signature="appendRow(const QList<QStandardItem *>&)"> | |
4316 | <modify-argument index="1"> |
|
4439 | <modify-argument index="1"> | |
4317 | <define-ownership class="java" owner="c++"/> |
|
4440 | <define-ownership class="java" owner="c++"/> | |
@@ -4320,7 +4443,7 | |||||
4320 | <modify-function signature="appendRow(QStandardItem *)"> |
|
4443 | <modify-function signature="appendRow(QStandardItem *)"> | |
4321 | <modify-argument index="1"> |
|
4444 | <modify-argument index="1"> | |
4322 | <define-ownership class="java" owner="c++"/> |
|
4445 | <define-ownership class="java" owner="c++"/> | |
4323 |
</modify-argument> |
|
4446 | </modify-argument> | |
4324 | </modify-function> |
|
4447 | </modify-function> | |
4325 | <modify-function signature="insertColumn(int, const QList<QStandardItem *>&)"> |
|
4448 | <modify-function signature="insertColumn(int, const QList<QStandardItem *>&)"> | |
4326 | <modify-argument index="2"> |
|
4449 | <modify-argument index="2"> | |
@@ -4335,7 +4458,7 | |||||
4335 | <modify-function signature="insertRow(int, QStandardItem *)"> |
|
4458 | <modify-function signature="insertRow(int, QStandardItem *)"> | |
4336 | <modify-argument index="2"> |
|
4459 | <modify-argument index="2"> | |
4337 | <define-ownership class="java" owner="c++"/> |
|
4460 | <define-ownership class="java" owner="c++"/> | |
4338 |
</modify-argument> |
|
4461 | </modify-argument> | |
4339 | </modify-function> |
|
4462 | </modify-function> | |
4340 | <modify-function signature="setHorizontalHeaderItem(int, QStandardItem *)"> |
|
4463 | <modify-function signature="setHorizontalHeaderItem(int, QStandardItem *)"> | |
4341 | <modify-argument index="2"> |
|
4464 | <modify-argument index="2"> | |
@@ -4356,12 +4479,12 | |||||
4356 | <modify-argument index="1"> |
|
4479 | <modify-argument index="1"> | |
4357 | <define-ownership class="java" owner="c++"/> |
|
4480 | <define-ownership class="java" owner="c++"/> | |
4358 | </modify-argument> |
|
4481 | </modify-argument> | |
4359 |
</modify-function> |
|
4482 | </modify-function> | |
4360 | <modify-function signature="setVerticalHeaderItem(int, QStandardItem *)"> |
|
4483 | <modify-function signature="setVerticalHeaderItem(int, QStandardItem *)"> | |
4361 | <modify-argument index="2"> |
|
4484 | <modify-argument index="2"> | |
4362 | <define-ownership class="java" owner="c++"/> |
|
4485 | <define-ownership class="java" owner="c++"/> | |
4363 | </modify-argument> |
|
4486 | </modify-argument> | |
4364 |
</modify-function> |
|
4487 | </modify-function> | |
4365 | </object-type> |
|
4488 | </object-type> | |
4366 |
|
4489 | |||
4367 | <object-type name="QRadioButton"> |
|
4490 | <object-type name="QRadioButton"> | |
@@ -4380,7 +4503,7 | |||||
4380 | <extra-includes> |
|
4503 | <extra-includes> | |
4381 | <include file-name="QImage" location="global"/> |
|
4504 | <include file-name="QImage" location="global"/> | |
4382 | <include file-name="QPixmap" location="global"/> |
|
4505 | <include file-name="QPixmap" location="global"/> | |
4383 |
</extra-includes> |
|
4506 | </extra-includes> | |
4384 | <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)"> |
|
4507 | <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)"> | |
4385 | <modify-argument index="1"> |
|
4508 | <modify-argument index="1"> | |
4386 | <define-ownership class="java" owner="c++"/> |
|
4509 | <define-ownership class="java" owner="c++"/> | |
@@ -4392,11 +4515,11 | |||||
4392 | <remove-default-expression/> |
|
4515 | <remove-default-expression/> | |
4393 | </modify-argument> |
|
4516 | </modify-argument> | |
4394 | </modify-function> |
|
4517 | </modify-function> | |
4395 |
|
4518 | |||
4396 | </object-type> |
|
4519 | </object-type> | |
4397 |
|
4520 | |||
4398 | <object-type name="QAbstractScrollArea"> |
|
4521 | <object-type name="QAbstractScrollArea"> | |
4399 |
<modify-function signature="setupViewport(QWidget *)" access="non-final"/> |
|
4522 | <modify-function signature="setupViewport(QWidget *)" access="non-final"/> | |
4400 | <modify-function signature="addScrollBarWidget(QWidget*,QFlags<Qt::AlignmentFlag>)"> |
|
4523 | <modify-function signature="addScrollBarWidget(QWidget*,QFlags<Qt::AlignmentFlag>)"> | |
4401 | <modify-argument index="1"> |
|
4524 | <modify-argument index="1"> | |
4402 | <reference-count action="ignore"/> |
|
4525 | <reference-count action="ignore"/> | |
@@ -4412,35 +4535,35 | |||||
4412 | <reference-count action="ignore"/> |
|
4535 | <reference-count action="ignore"/> | |
4413 | </modify-argument> |
|
4536 | </modify-argument> | |
4414 | </modify-function> |
|
4537 | </modify-function> | |
4415 |
|
4538 | |||
4416 | <modify-function signature="setVerticalScrollBar(QScrollBar*)"> |
|
4539 | <modify-function signature="setVerticalScrollBar(QScrollBar*)"> | |
4417 | <modify-argument index="1"> |
|
4540 | <modify-argument index="1"> | |
4418 | <reference-count action="ignore"/> |
|
4541 | <reference-count action="ignore"/> | |
4419 | </modify-argument> |
|
4542 | </modify-argument> | |
4420 | </modify-function> |
|
4543 | </modify-function> | |
4421 |
|
4544 | |||
4422 | <modify-function signature="setViewport(QWidget*)"> |
|
4545 | <modify-function signature="setViewport(QWidget*)"> | |
4423 | <modify-argument index="1"> |
|
4546 | <modify-argument index="1"> | |
4424 | <reference-count action="ignore"/> |
|
4547 | <reference-count action="ignore"/> | |
4425 | </modify-argument> |
|
4548 | </modify-argument> | |
4426 | </modify-function> |
|
4549 | </modify-function> | |
4427 |
|
4550 | |||
4428 | <modify-function signature="setupViewport(QWidget*)"> |
|
4551 | <modify-function signature="setupViewport(QWidget*)"> | |
4429 | <modify-argument index="1"> |
|
4552 | <modify-argument index="1"> | |
4430 | <reference-count action="ignore"/> |
|
4553 | <reference-count action="ignore"/> | |
4431 | </modify-argument> |
|
4554 | </modify-argument> | |
4432 | </modify-function> |
|
4555 | </modify-function> | |
4433 |
|
4556 | |||
4434 | <modify-function signature="viewportEvent(QEvent*)"> |
|
4557 | <modify-function signature="viewportEvent(QEvent*)"> | |
4435 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
4558 | <modify-argument index="1" invalidate-after-use="yes"/> | |
4436 | </modify-function> |
|
4559 | </modify-function> | |
4437 |
|
4560 | |||
4438 | </object-type> |
|
4561 | </object-type> | |
4439 |
|
4562 | |||
4440 | <object-type name="QPaintEngineState"> |
|
4563 | <object-type name="QPaintEngineState"> | |
4441 | <extra-includes> |
|
4564 | <extra-includes> | |
4442 | <include file-name="QPainterPath" location="global"/> |
|
4565 | <include file-name="QPainterPath" location="global"/> | |
4443 |
</extra-includes> |
|
4566 | </extra-includes> | |
4444 | </object-type> |
|
4567 | </object-type> | |
4445 |
|
4568 | |||
4446 | <object-type name="QRubberBand"> |
|
4569 | <object-type name="QRubberBand"> | |
@@ -4458,12 +4581,15 | |||||
4458 | <object-type name="QTextLayout"> |
|
4581 | <object-type name="QTextLayout"> | |
4459 | <extra-includes> |
|
4582 | <extra-includes> | |
4460 | <include file-name="QTextOption" location="global"/> |
|
4583 | <include file-name="QTextOption" location="global"/> | |
4461 |
</extra-includes> |
|
4584 | </extra-includes> | |
4462 |
</object-type> |
|
4585 | </object-type> | |
4463 |
|
4586 | |||
4464 | <object-type name="QTableWidget"> |
|
4587 | <object-type name="QTableWidget"> | |
|
4588 | <modify-function signature="mimeData(const QList<QTableWidgetItem*>)const"> | |||
|
4589 | <modify-argument index="1" invalidate-after-use="yes"/> | |||
|
4590 | </modify-function> | |||
4465 | <modify-function signature="isSortingEnabled()const" remove="all"/> |
|
4591 | <modify-function signature="isSortingEnabled()const" remove="all"/> | |
4466 |
<modify-function signature="setSortingEnabled(bool)" remove="all"/> |
|
4592 | <modify-function signature="setSortingEnabled(bool)" remove="all"/> | |
4467 | <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)"> |
|
4593 | <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)"> | |
4468 | <modify-argument index="2"> |
|
4594 | <modify-argument index="2"> | |
4469 | <define-ownership class="java" owner="c++"/> |
|
4595 | <define-ownership class="java" owner="c++"/> | |
@@ -4473,7 +4599,7 | |||||
4473 | <modify-argument index="3"> |
|
4599 | <modify-argument index="3"> | |
4474 | <define-ownership class="java" owner="c++"/> |
|
4600 | <define-ownership class="java" owner="c++"/> | |
4475 | </modify-argument> |
|
4601 | </modify-argument> | |
4476 |
</modify-function> |
|
4602 | </modify-function> | |
4477 | <modify-function signature="takeHorizontalHeaderItem(int)"> |
|
4603 | <modify-function signature="takeHorizontalHeaderItem(int)"> | |
4478 | <modify-argument index="return"> |
|
4604 | <modify-argument index="return"> | |
4479 | <define-ownership class="java" owner="default"/> |
|
4605 | <define-ownership class="java" owner="default"/> | |
@@ -4483,22 +4609,22 | |||||
4483 | <modify-argument index="return"> |
|
4609 | <modify-argument index="return"> | |
4484 | <define-ownership class="java" owner="default"/> |
|
4610 | <define-ownership class="java" owner="default"/> | |
4485 | </modify-argument> |
|
4611 | </modify-argument> | |
4486 |
</modify-function> |
|
4612 | </modify-function> | |
4487 | <modify-function signature="takeItem(int,int)"> |
|
4613 | <modify-function signature="takeItem(int,int)"> | |
4488 | <modify-argument index="return"> |
|
4614 | <modify-argument index="return"> | |
4489 | <define-ownership class="java" owner="default"/> |
|
4615 | <define-ownership class="java" owner="default"/> | |
4490 | </modify-argument> |
|
4616 | </modify-argument> | |
4491 |
</modify-function> |
|
4617 | </modify-function> | |
4492 | <modify-function signature="setItemPrototype(const QTableWidgetItem *)"> |
|
4618 | <modify-function signature="setItemPrototype(const QTableWidgetItem *)"> | |
4493 | <modify-argument index="1"> |
|
4619 | <modify-argument index="1"> | |
4494 | <define-ownership class="java" owner="c++"/> |
|
4620 | <define-ownership class="java" owner="c++"/> | |
4495 | </modify-argument> |
|
4621 | </modify-argument> | |
4496 |
</modify-function> |
|
4622 | </modify-function> | |
4497 | <modify-function signature="setVerticalHeaderItem(int, QTableWidgetItem *)"> |
|
4623 | <modify-function signature="setVerticalHeaderItem(int, QTableWidgetItem *)"> | |
4498 | <modify-argument index="2"> |
|
4624 | <modify-argument index="2"> | |
4499 | <define-ownership class="java" owner="c++"/> |
|
4625 | <define-ownership class="java" owner="c++"/> | |
4500 | </modify-argument> |
|
4626 | </modify-argument> | |
4501 |
</modify-function> |
|
4627 | </modify-function> | |
4502 | <modify-function signature="setCellWidget(int,int,QWidget*)"> |
|
4628 | <modify-function signature="setCellWidget(int,int,QWidget*)"> | |
4503 | <modify-argument index="3"> |
|
4629 | <modify-argument index="3"> | |
4504 | <reference-count action="ignore"/> |
|
4630 | <reference-count action="ignore"/> | |
@@ -4533,23 +4659,36 | |||||
4533 | <include file-name="QTextBlock" location="global"/> |
|
4659 | <include file-name="QTextBlock" location="global"/> | |
4534 | <include file-name="QTextFormat" location="global"/> |
|
4660 | <include file-name="QTextFormat" location="global"/> | |
4535 | <include file-name="QTextCursor" location="global"/> |
|
4661 | <include file-name="QTextCursor" location="global"/> | |
4536 |
</extra-includes> |
|
4662 | </extra-includes> | |
4537 | <modify-function signature="redo(QTextCursor*)"> |
|
4663 | <modify-function signature="redo(QTextCursor*)"> | |
4538 |
<access modifier="private"/> |
|
4664 | <access modifier="private"/> | |
4539 | </modify-function> |
|
4665 | </modify-function> | |
4540 | <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)"> |
|
4666 | <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)"> | |
4541 | <modify-argument index="1"> |
|
4667 | <modify-argument index="1"> | |
4542 | <define-ownership class="java" owner="c++"/> |
|
4668 | <define-ownership class="java" owner="c++"/> | |
4543 | </modify-argument> |
|
4669 | </modify-argument> | |
4544 | </modify-function> |
|
4670 | </modify-function> | |
4545 |
|
4671 | |||
4546 | <modify-function signature="undo(QTextCursor*)"> |
|
4672 | <modify-function signature="undo(QTextCursor*)"> | |
4547 |
<access modifier="private"/> |
|
4673 | <access modifier="private"/> | |
|
4674 | </modify-function> | |||
|
4675 | </object-type> | |||
|
4676 | ||||
|
4677 | <object-type name="QTextDocumentWriter"> | |||
|
4678 | <modify-function signature="setCodec(QTextCodec*)"> | |||
|
4679 | <modify-argument index="1"> | |||
|
4680 | <reference-count action="set" variable-name="__rcCodec"/> | |||
|
4681 | </modify-argument> | |||
|
4682 | </modify-function> | |||
|
4683 | <modify-function signature="setDevice(QIODevice*)"> | |||
|
4684 | <modify-argument index="1"> | |||
|
4685 | <reference-count action="set" variable-name="__rcDevice"/> | |||
|
4686 | </modify-argument> | |||
4548 | </modify-function> |
|
4687 | </modify-function> | |
4549 | </object-type> |
|
4688 | </object-type> | |
4550 |
|
4689 | |||
4551 | <object-type name="QSplitter"> |
|
4690 | <object-type name="QSplitter"> | |
4552 |
|
4691 | |||
4553 | <modify-function signature="getRange(int,int*,int*)const"> |
|
4692 | <modify-function signature="getRange(int,int*,int*)const"> | |
4554 | <access modifier="private"/> |
|
4693 | <access modifier="private"/> | |
4555 | </modify-function> |
|
4694 | </modify-function> | |
@@ -4564,7 +4703,7 | |||||
4564 | </modify-argument> |
|
4703 | </modify-argument> | |
4565 | </modify-function> |
|
4704 | </modify-function> | |
4566 | </object-type> |
|
4705 | </object-type> | |
4567 |
|
4706 | |||
4568 | <object-type name="QGroupBox"> |
|
4707 | <object-type name="QGroupBox"> | |
4569 | <modify-function signature="initStyleOption(QStyleOptionGroupBox*)const"> |
|
4708 | <modify-function signature="initStyleOption(QStyleOptionGroupBox*)const"> | |
4570 | <access modifier="private"/> |
|
4709 | <access modifier="private"/> | |
@@ -4618,9 +4757,9 | |||||
4618 | </modify-argument> |
|
4757 | </modify-argument> | |
4619 | </modify-function> |
|
4758 | </modify-function> | |
4620 | </object-type> |
|
4759 | </object-type> | |
4621 |
|
4760 | |||
4622 | <object-type name="QLCDNumber"/> |
|
4761 | <object-type name="QLCDNumber"/> | |
4623 |
|
4762 | |||
4624 | <object-type name="QSplashScreen"> |
|
4763 | <object-type name="QSplashScreen"> | |
4625 | <modify-function signature="showMessage(const QString &, int, const QColor &)"> |
|
4764 | <modify-function signature="showMessage(const QString &, int, const QColor &)"> | |
4626 | <modify-argument index="3"> |
|
4765 | <modify-argument index="3"> | |
@@ -4632,7 +4771,7 | |||||
4632 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
4771 | <modify-argument index="1" invalidate-after-use="yes"/> | |
4633 | </modify-function> |
|
4772 | </modify-function> | |
4634 | </object-type> |
|
4773 | </object-type> | |
4635 |
|
4774 | |||
4636 | <object-type name="QDockWidget"> |
|
4775 | <object-type name="QDockWidget"> | |
4637 | <modify-function signature="initStyleOption(QStyleOptionDockWidget*)const"> |
|
4776 | <modify-function signature="initStyleOption(QStyleOptionDockWidget*)const"> | |
4638 | <access modifier="private"/> |
|
4777 | <access modifier="private"/> | |
@@ -4641,7 +4780,7 | |||||
4641 | <insert-template name="gui.init_style_option"> |
|
4780 | <insert-template name="gui.init_style_option"> | |
4642 | <replace from="%TYPE" to="QStyleOptionDockWidget"/> |
|
4781 | <replace from="%TYPE" to="QStyleOptionDockWidget"/> | |
4643 | </insert-template> |
|
4782 | </insert-template> | |
4644 |
</inject-code> |
|
4783 | </inject-code> | |
4645 | <modify-function signature="setTitleBarWidget(QWidget*)"> |
|
4784 | <modify-function signature="setTitleBarWidget(QWidget*)"> | |
4646 | <modify-argument index="1"> |
|
4785 | <modify-argument index="1"> | |
4647 | <reference-count action="ignore"/> |
|
4786 | <reference-count action="ignore"/> | |
@@ -4660,13 +4799,13 | |||||
4660 | <include file-name="QStringList" location="global"/> |
|
4799 | <include file-name="QStringList" location="global"/> | |
4661 | <include file-name="QSize" location="global"/> |
|
4800 | <include file-name="QSize" location="global"/> | |
4662 | </extra-includes> |
|
4801 | </extra-includes> | |
4663 |
|
4802 | |||
4664 | <modify-function signature="setSourceModel(QAbstractItemModel *)"> |
|
4803 | <modify-function signature="setSourceModel(QAbstractItemModel *)"> | |
4665 | <modify-argument index="1"> |
|
4804 | <modify-argument index="1"> | |
4666 | <reference-count action="set" variable-name="__rcSourceModel"/> |
|
4805 | <reference-count action="set" variable-name="__rcSourceModel"/> | |
4667 | </modify-argument> |
|
4806 | </modify-argument> | |
4668 | </modify-function> |
|
4807 | </modify-function> | |
4669 |
|
4808 | |||
4670 | </object-type> |
|
4809 | </object-type> | |
4671 |
|
4810 | |||
4672 | <object-type name="QDesktopWidget"> |
|
4811 | <object-type name="QDesktopWidget"> | |
@@ -4687,20 +4826,20 | |||||
4687 | <object-type name="QSpinBox"> |
|
4826 | <object-type name="QSpinBox"> | |
4688 | <modify-function signature="valueChanged(const QString &)"> |
|
4827 | <modify-function signature="valueChanged(const QString &)"> | |
4689 | <rename to="valueStringChanged"/> |
|
4828 | <rename to="valueStringChanged"/> | |
4690 |
</modify-function> |
|
4829 | </modify-function> | |
4691 |
</object-type> |
|
4830 | </object-type> | |
4692 |
|
4831 | |||
4693 | <object-type name="QTextBrowser"> |
|
4832 | <object-type name="QTextBrowser"> | |
4694 | <modify-function signature="highlighted(const QString &)"> |
|
4833 | <modify-function signature="highlighted(const QString &)"> | |
4695 | <rename to="highlightedString"/> |
|
4834 | <rename to="highlightedString"/> | |
4696 | </modify-function> |
|
4835 | </modify-function> | |
4697 | </object-type> |
|
4836 | </object-type> | |
4698 |
|
4837 | |||
4699 | <object-type name="QDoubleSpinBox"> |
|
4838 | <object-type name="QDoubleSpinBox"> | |
4700 | <modify-function signature="valueChanged(const QString &)"> |
|
4839 | <modify-function signature="valueChanged(const QString &)"> | |
4701 | <rename to="valueStringChanged"/> |
|
4840 | <rename to="valueStringChanged"/> | |
4702 | </modify-function> |
|
4841 | </modify-function> | |
4703 |
</object-type> |
|
4842 | </object-type> | |
4704 |
|
4843 | |||
4705 | <object-type name="QButtonGroup"> |
|
4844 | <object-type name="QButtonGroup"> | |
4706 | <modify-function signature="buttonClicked(int)"> |
|
4845 | <modify-function signature="buttonClicked(int)"> | |
@@ -4723,21 +4862,21 | |||||
4723 | <reference-count action="add" variable-name="__rcButtons"/> |
|
4862 | <reference-count action="add" variable-name="__rcButtons"/> | |
4724 | <no-null-pointer/> |
|
4863 | <no-null-pointer/> | |
4725 | </modify-argument> |
|
4864 | </modify-argument> | |
4726 |
</modify-function> |
|
4865 | </modify-function> | |
4727 | <modify-function signature="removeButton(QAbstractButton *)"> |
|
4866 | <modify-function signature="removeButton(QAbstractButton *)"> | |
4728 | <modify-argument index="1"> |
|
4867 | <modify-argument index="1"> | |
4729 | <reference-count action="remove" variable-name="__rcButtons"/> |
|
4868 | <reference-count action="remove" variable-name="__rcButtons"/> | |
4730 | <no-null-pointer/> |
|
4869 | <no-null-pointer/> | |
4731 | </modify-argument> |
|
4870 | </modify-argument> | |
4732 |
</modify-function> |
|
4871 | </modify-function> | |
4733 | <modify-function signature="setId(QAbstractButton *,int)"> |
|
4872 | <modify-function signature="setId(QAbstractButton *,int)"> | |
4734 | <modify-argument index="1"> |
|
4873 | <modify-argument index="1"> | |
4735 | <reference-count action="ignore"/> |
|
4874 | <reference-count action="ignore"/> | |
4736 | </modify-argument> |
|
4875 | </modify-argument> | |
4737 | </modify-function> |
|
4876 | </modify-function> | |
4738 | </object-type> |
|
4877 | </object-type> | |
4739 |
|
4878 | |||
4740 |
<object-type name="QToolBar"> |
|
4879 | <object-type name="QToolBar"> | |
4741 | <modify-function signature="addAction(QAction *)" remove="all"/> |
|
4880 | <modify-function signature="addAction(QAction *)" remove="all"/> | |
4742 | <modify-function signature="initStyleOption(QStyleOptionToolBar*)const"> |
|
4881 | <modify-function signature="initStyleOption(QStyleOptionToolBar*)const"> | |
4743 | <access modifier="private"/> |
|
4882 | <access modifier="private"/> | |
@@ -4752,11 +4891,11 | |||||
4752 | <modify-argument index="1"> |
|
4891 | <modify-argument index="1"> | |
4753 | <define-ownership class="java" owner="c++"/> |
|
4892 | <define-ownership class="java" owner="c++"/> | |
4754 | </modify-argument> |
|
4893 | </modify-argument> | |
4755 |
</modify-function> |
|
4894 | </modify-function> | |
4756 | <modify-function signature="insertWidget(QAction*,QWidget*)"> |
|
4895 | <modify-function signature="insertWidget(QAction*,QWidget*)"> | |
4757 | <modify-argument index="1"> |
|
4896 | <modify-argument index="1"> | |
4758 | <reference-count action="ignore"/> |
|
4897 | <reference-count action="ignore"/> | |
4759 |
</modify-argument> |
|
4898 | </modify-argument> | |
4760 | <modify-argument index="2"> |
|
4899 | <modify-argument index="2"> | |
4761 | <define-ownership class="java" owner="c++"/> |
|
4900 | <define-ownership class="java" owner="c++"/> | |
4762 | </modify-argument> |
|
4901 | </modify-argument> | |
@@ -4767,9 +4906,9 | |||||
4767 | </modify-argument> |
|
4906 | </modify-argument> | |
4768 | </modify-function> |
|
4907 | </modify-function> | |
4769 | </object-type> |
|
4908 | </object-type> | |
4770 |
|
4909 | |||
4771 | <object-type name="QPaintEngine"> |
|
4910 | <object-type name="QPaintEngine"> | |
4772 |
|
4911 | |||
4773 | <modify-function signature="begin(QPaintDevice*)"> |
|
4912 | <modify-function signature="begin(QPaintDevice*)"> | |
4774 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
4913 | <modify-argument index="1" invalidate-after-use="yes"/> | |
4775 | </modify-function> |
|
4914 | </modify-function> | |
@@ -4784,13 +4923,20 | |||||
4784 | <include file-name="QVarLengthArray" location="global"/> |
|
4923 | <include file-name="QVarLengthArray" location="global"/> | |
4785 | </extra-includes> |
|
4924 | </extra-includes> | |
4786 | <modify-function signature="setPaintDevice(QPaintDevice*)"> |
|
4925 | <modify-function signature="setPaintDevice(QPaintDevice*)"> | |
4787 |
<remove/> |
|
4926 | <remove/> | |
4788 | </modify-function> |
|
4927 | </modify-function> | |
4789 | <modify-field name="state" read="false" write="false"/> |
|
4928 | <modify-field name="state" read="false" write="false"/> | |
4790 | </object-type> |
|
4929 | </object-type> | |
4791 |
|
4930 | |||
4792 |
<object-type name="Q |
|
4931 | <object-type name="QAbstractTableModel"> | |
4793 |
|
4932 | <extra-includes> | ||
|
4933 | <include file-name="QStringList" location="global"/> | |||
|
4934 | <include file-name="QSize" location="global"/> | |||
|
4935 | </extra-includes> | |||
|
4936 | </object-type> | |||
|
4937 | ||||
|
4938 | <object-type name="QGuiSignalMapper"/> | |||
|
4939 | ||||
4794 | <object-type name="QComboBox"> |
|
4940 | <object-type name="QComboBox"> | |
4795 | <modify-function signature="initStyleOption(QStyleOptionComboBox*)const"> |
|
4941 | <modify-function signature="initStyleOption(QStyleOptionComboBox*)const"> | |
4796 | <access modifier="private"/> |
|
4942 | <access modifier="private"/> | |
@@ -4816,7 +4962,7 | |||||
4816 | <no-null-pointer/> |
|
4962 | <no-null-pointer/> | |
4817 | <!-- Safe to ignore because combo box reparents view --> |
|
4963 | <!-- Safe to ignore because combo box reparents view --> | |
4818 | <reference-count action="ignore"/> |
|
4964 | <reference-count action="ignore"/> | |
4819 |
</modify-argument> |
|
4965 | </modify-argument> | |
4820 | </modify-function> |
|
4966 | </modify-function> | |
4821 | <modify-function signature="setLineEdit(QLineEdit *)"> |
|
4967 | <modify-function signature="setLineEdit(QLineEdit *)"> | |
4822 | <modify-argument index="1"> |
|
4968 | <modify-argument index="1"> | |
@@ -4835,9 +4981,9 | |||||
4835 | <insert-template name="gui.init_style_option"> |
|
4981 | <insert-template name="gui.init_style_option"> | |
4836 | <replace from="%TYPE" to="QStyleOptionComboBox"/> |
|
4982 | <replace from="%TYPE" to="QStyleOptionComboBox"/> | |
4837 | </insert-template> |
|
4983 | </insert-template> | |
4838 |
</inject-code> |
|
4984 | </inject-code> | |
4839 | <modify-function signature="activated(int)">> |
|
4985 | <modify-function signature="activated(int)">> | |
4840 |
<rename to="activatedIndex"/> |
|
4986 | <rename to="activatedIndex"/> | |
4841 | </modify-function> |
|
4987 | </modify-function> | |
4842 | <modify-function signature="currentIndexChanged(const QString &)"> |
|
4988 | <modify-function signature="currentIndexChanged(const QString &)"> | |
4843 | <rename to="currentStringChanged"/> |
|
4989 | <rename to="currentStringChanged"/> | |
@@ -4845,13 +4991,13 | |||||
4845 | <modify-function signature="highlighted(int)"> |
|
4991 | <modify-function signature="highlighted(int)"> | |
4846 | <rename to="highlightedIndex"/> |
|
4992 | <rename to="highlightedIndex"/> | |
4847 | </modify-function> |
|
4993 | </modify-function> | |
4848 |
|
4994 | |||
4849 | <modify-function signature="autoCompletion()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
4995 | <modify-function signature="autoCompletion()const" remove="all"/> <!--### Obsolete in 4.3--> | |
4850 | <modify-function signature="autoCompletionCaseSensitivity()const" remove="all"/> <!--### Obsolete in 4.3--> |
|
4996 | <modify-function signature="autoCompletionCaseSensitivity()const" remove="all"/> <!--### Obsolete in 4.3--> | |
4851 | <modify-function signature="setAutoCompletion(bool)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4997 | <modify-function signature="setAutoCompletion(bool)" remove="all"/> <!--### Obsolete in 4.3--> | |
4852 | <modify-function signature="setAutoCompletionCaseSensitivity(Qt::CaseSensitivity)" remove="all"/> <!--### Obsolete in 4.3--> |
|
4998 | <modify-function signature="setAutoCompletionCaseSensitivity(Qt::CaseSensitivity)" remove="all"/> <!--### Obsolete in 4.3--> | |
4853 |
</object-type> |
|
4999 | </object-type> | |
4854 |
|
|
5000 | ||
4855 | <object-type name="QTextEdit"> |
|
5001 | <object-type name="QTextEdit"> | |
4856 | <extra-includes> |
|
5002 | <extra-includes> | |
4857 | <include file-name="QTextCursor" location="global"/> |
|
5003 | <include file-name="QTextCursor" location="global"/> | |
@@ -4889,7 +5035,7 | |||||
4889 | <reference-count action="set" variable-name="__rcMenu"/> |
|
5035 | <reference-count action="set" variable-name="__rcMenu"/> | |
4890 | </modify-argument> |
|
5036 | </modify-argument> | |
4891 | </modify-function> |
|
5037 | </modify-function> | |
4892 |
|
5038 | |||
4893 | </object-type> |
|
5039 | </object-type> | |
4894 |
|
5040 | |||
4895 | <object-type name="QPainter"> |
|
5041 | <object-type name="QPainter"> | |
@@ -4898,18 +5044,18 | |||||
4898 | <include file-name="QPainterPath" location="global"/> |
|
5044 | <include file-name="QPainterPath" location="global"/> | |
4899 | <include file-name="QPixmap" location="global"/> |
|
5045 | <include file-name="QPixmap" location="global"/> | |
4900 | </extra-includes> |
|
5046 | </extra-includes> | |
4901 |
|
5047 | |||
4902 | <modify-function signature="drawText(const QPointF &, const QString &, int, int)" remove="all"/> |
|
5048 | <modify-function signature="drawText(const QPointF &, const QString &, int, int)" remove="all"/> | |
4903 |
|
5049 | |||
4904 | <modify-function signature="drawConvexPolygon(const QPoint *, int)"> |
|
5050 | <modify-function signature="drawConvexPolygon(const QPoint *, int)"> | |
4905 | <remove/> |
|
5051 | <remove/> | |
4906 | </modify-function> |
|
5052 | </modify-function> | |
4907 | <modify-function signature="drawConvexPolygon(const QPointF *, int)"> |
|
5053 | <modify-function signature="drawConvexPolygon(const QPointF *, int)"> | |
4908 | <remove/> |
|
5054 | <remove/> | |
4909 |
</modify-function> |
|
5055 | </modify-function> | |
4910 | <modify-function signature="drawLines(const QLine *, int)"> |
|
5056 | <modify-function signature="drawLines(const QLine *, int)"> | |
4911 | <remove/> |
|
5057 | <remove/> | |
4912 |
</modify-function> |
|
5058 | </modify-function> | |
4913 | <modify-function signature="drawLines(const QLineF *, int)"> |
|
5059 | <modify-function signature="drawLines(const QLineF *, int)"> | |
4914 | <remove/> |
|
5060 | <remove/> | |
4915 | </modify-function> |
|
5061 | </modify-function> | |
@@ -4924,28 +5070,28 | |||||
4924 | </modify-function> |
|
5070 | </modify-function> | |
4925 | <modify-function signature="drawPoints(const QPointF *, int)"> |
|
5071 | <modify-function signature="drawPoints(const QPointF *, int)"> | |
4926 | <remove/> |
|
5072 | <remove/> | |
4927 |
</modify-function> |
|
5073 | </modify-function> | |
4928 | <modify-function signature="drawPolygon(const QPoint *, int, Qt::FillRule)"> |
|
5074 | <modify-function signature="drawPolygon(const QPoint *, int, Qt::FillRule)"> | |
4929 | <remove/> |
|
5075 | <remove/> | |
4930 | </modify-function> |
|
5076 | </modify-function> | |
4931 | <modify-function signature="drawPolygon(const QPointF *, int, Qt::FillRule)"> |
|
5077 | <modify-function signature="drawPolygon(const QPointF *, int, Qt::FillRule)"> | |
4932 | <remove/> |
|
5078 | <remove/> | |
4933 |
</modify-function> |
|
5079 | </modify-function> | |
4934 | <modify-function signature="drawPolyline(const QPoint *, int)"> |
|
5080 | <modify-function signature="drawPolyline(const QPoint *, int)"> | |
4935 | <remove/> |
|
5081 | <remove/> | |
4936 | </modify-function> |
|
5082 | </modify-function> | |
4937 | <modify-function signature="drawPolyline(const QPointF *, int)"> |
|
5083 | <modify-function signature="drawPolyline(const QPointF *, int)"> | |
4938 | <remove/> |
|
5084 | <remove/> | |
4939 |
</modify-function> |
|
5085 | </modify-function> | |
4940 | <modify-function signature="drawRects(const QRect *, int)"> |
|
5086 | <modify-function signature="drawRects(const QRect *, int)"> | |
4941 | <remove/> |
|
5087 | <remove/> | |
4942 | </modify-function> |
|
5088 | </modify-function> | |
4943 | <modify-function signature="drawRects(const QRectF *, int)"> |
|
5089 | <modify-function signature="drawRects(const QRectF *, int)"> | |
4944 | <remove/> |
|
5090 | <remove/> | |
4945 |
</modify-function> |
|
5091 | </modify-function> | |
4946 | <modify-function signature="drawLines(const QVector<QPoint> &)"> |
|
5092 | <modify-function signature="drawLines(const QVector<QPoint> &)"> | |
4947 | <rename to="drawLinesFromPoints"/> |
|
5093 | <rename to="drawLinesFromPoints"/> | |
4948 |
</modify-function> |
|
5094 | </modify-function> | |
4949 | <modify-function signature="drawLines(const QVector<QPointF> &)"> |
|
5095 | <modify-function signature="drawLines(const QVector<QPointF> &)"> | |
4950 | <rename to="drawLinesFromPointsF"/> |
|
5096 | <rename to="drawLinesFromPointsF"/> | |
4951 | </modify-function> |
|
5097 | </modify-function> | |
@@ -4954,23 +5100,23 | |||||
4954 | </modify-function> |
|
5100 | </modify-function> | |
4955 | <modify-function signature="drawRects(const QVector<QRectF> &)"> |
|
5101 | <modify-function signature="drawRects(const QVector<QRectF> &)"> | |
4956 | <rename to="drawRectsF"/> |
|
5102 | <rename to="drawRectsF"/> | |
4957 |
</modify-function> |
|
5103 | </modify-function> | |
4958 |
|
5104 | |||
4959 | <modify-function signature="QPainter(QPaintDevice *)"> |
|
5105 | <modify-function signature="QPainter(QPaintDevice *)"> | |
4960 | <modify-argument index="1"> |
|
5106 | <modify-argument index="1"> | |
4961 | <no-null-pointer/> |
|
5107 | <no-null-pointer/> | |
4962 | </modify-argument> |
|
5108 | </modify-argument> | |
4963 |
</modify-function> |
|
5109 | </modify-function> | |
4964 | <modify-function signature="begin(QPaintDevice *)"> |
|
5110 | <modify-function signature="begin(QPaintDevice *)"> | |
4965 | <modify-argument index="1"> |
|
5111 | <modify-argument index="1"> | |
4966 | <no-null-pointer/> |
|
5112 | <no-null-pointer/> | |
4967 | </modify-argument> |
|
5113 | </modify-argument> | |
4968 |
</modify-function> |
|
5114 | </modify-function> | |
4969 | <modify-function signature="initFrom(const QWidget *)"> |
|
5115 | <modify-function signature="initFrom(const QWidget *)"> | |
4970 | <modify-argument index="1"> |
|
5116 | <modify-argument index="1"> | |
4971 | <no-null-pointer/> |
|
5117 | <no-null-pointer/> | |
4972 | </modify-argument> |
|
5118 | </modify-argument> | |
4973 |
</modify-function> |
|
5119 | </modify-function> | |
4974 | <modify-function signature="setRedirected(const QPaintDevice *, QPaintDevice *, const QPoint &)"> |
|
5120 | <modify-function signature="setRedirected(const QPaintDevice *, QPaintDevice *, const QPoint &)"> | |
4975 | <modify-argument index="1"> |
|
5121 | <modify-argument index="1"> | |
4976 | <no-null-pointer/> |
|
5122 | <no-null-pointer/> | |
@@ -4981,28 +5127,28 | |||||
4981 | <no-null-pointer/> |
|
5127 | <no-null-pointer/> | |
4982 | </modify-argument> |
|
5128 | </modify-argument> | |
4983 | </modify-function> |
|
5129 | </modify-function> | |
4984 |
|
5130 | |||
4985 | <modify-function signature="drawText(QRect,int,QString,QRect*)"> |
|
5131 | <modify-function signature="drawText(QRect,int,QString,QRect*)"> | |
4986 | <access modifier="private"/> |
|
5132 | <access modifier="private"/> | |
4987 | <modify-argument index="4"> |
|
5133 | <modify-argument index="4"> | |
4988 | <remove-default-expression/> |
|
5134 | <remove-default-expression/> | |
4989 |
</modify-argument> |
|
5135 | </modify-argument> | |
4990 | </modify-function> |
|
5136 | </modify-function> | |
4991 |
|
5137 | |||
4992 | <modify-function signature="drawText(QRectF,int,QString,QRectF*)"> |
|
5138 | <modify-function signature="drawText(QRectF,int,QString,QRectF*)"> | |
4993 | <access modifier="private"/> |
|
5139 | <access modifier="private"/> | |
4994 | <modify-argument index="4"> |
|
5140 | <modify-argument index="4"> | |
4995 | <remove-default-expression/> |
|
5141 | <remove-default-expression/> | |
4996 |
</modify-argument> |
|
5142 | </modify-argument> | |
4997 | </modify-function> |
|
5143 | </modify-function> | |
4998 |
|
5144 | |||
4999 | <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)"> |
|
5145 | <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)"> | |
5000 | <access modifier="private"/> |
|
5146 | <access modifier="private"/> | |
5001 | <modify-argument index="7"> |
|
5147 | <modify-argument index="7"> | |
5002 | <remove-default-expression/> |
|
5148 | <remove-default-expression/> | |
5003 | </modify-argument> |
|
5149 | </modify-argument> | |
5004 | </modify-function> |
|
5150 | </modify-function> | |
5005 |
|
5151 | |||
5006 | <modify-function signature="redirected(const QPaintDevice*,QPoint*)"> |
|
5152 | <modify-function signature="redirected(const QPaintDevice*,QPoint*)"> | |
5007 | <access modifier="private"/> |
|
5153 | <access modifier="private"/> | |
5008 | <modify-argument index="2"> |
|
5154 | <modify-argument index="2"> | |
@@ -5029,8 +5175,8 | |||||
5029 | </conversion-rule> |
|
5175 | </conversion-rule> | |
5030 | </modify-argument> |
|
5176 | </modify-argument> | |
5031 | </modify-function> |
|
5177 | </modify-function> | |
5032 |
</object-type> |
|
5178 | </object-type> | |
5033 |
|
5179 | |||
5034 | <object-type name="QApplication"> |
|
5180 | <object-type name="QApplication"> | |
5035 | <extra-includes> |
|
5181 | <extra-includes> | |
5036 | <include file-name="QBasicTimer" location="global"/> |
|
5182 | <include file-name="QBasicTimer" location="global"/> | |
@@ -5039,18 +5185,18 | |||||
5039 | <include file-name="QPalette" location="global"/> |
|
5185 | <include file-name="QPalette" location="global"/> | |
5040 | <include file-name="QIcon" location="global"/> |
|
5186 | <include file-name="QIcon" location="global"/> | |
5041 | <include file-name="QLocale" location="global"/> |
|
5187 | <include file-name="QLocale" location="global"/> | |
5042 |
</extra-includes> |
|
5188 | </extra-includes> | |
5043 |
|
5189 | |||
5044 | <modify-function signature="QApplication(int &, char **, int)"> |
|
5190 | <modify-function signature="QApplication(int &, char **, int)"> | |
5045 | <access modifier="private"/> |
|
5191 | <access modifier="private"/> | |
5046 |
</modify-function> |
|
5192 | </modify-function> | |
5047 | <modify-function signature="QApplication(int &, char **, QApplication::Type, int)"> |
|
5193 | <modify-function signature="QApplication(int &, char **, QApplication::Type, int)"> | |
5048 |
|
|
5194 | <remove/> | |
5049 | </modify-function> |
|
5195 | </modify-function> | |
5050 | <modify-function signature="QApplication(int &, char **, bool, int)"> |
|
5196 | <modify-function signature="QApplication(int &, char **, bool, int)"> | |
5051 |
|
|
5197 | <remove/> | |
5052 | </modify-function> |
|
5198 | </modify-function> | |
5053 |
|
5199 | |||
5054 | <modify-function signature="font(const char*)"> |
|
5200 | <modify-function signature="font(const char*)"> | |
5055 | <remove/> |
|
5201 | <remove/> | |
5056 | </modify-function> |
|
5202 | </modify-function> | |
@@ -5060,7 +5206,7 | |||||
5060 | <remove-default-expression/> |
|
5206 | <remove-default-expression/> | |
5061 | </modify-argument> |
|
5207 | </modify-argument> | |
5062 | </modify-function> |
|
5208 | </modify-function> | |
5063 |
|
5209 | |||
5064 | <modify-function signature="palette(const char*)"> |
|
5210 | <modify-function signature="palette(const char*)"> | |
5065 | <remove/> |
|
5211 | <remove/> | |
5066 | </modify-function> |
|
5212 | </modify-function> | |
@@ -5070,12 +5216,12 | |||||
5070 | <remove-default-expression/> |
|
5216 | <remove-default-expression/> | |
5071 | </modify-argument> |
|
5217 | </modify-argument> | |
5072 | </modify-function> |
|
5218 | </modify-function> | |
5073 |
|
5219 | |||
5074 | <modify-function signature="overrideCursor()"> |
|
5220 | <modify-function signature="overrideCursor()"> | |
5075 | <access modifier="private"/> |
|
5221 | <access modifier="private"/> | |
5076 | <rename to="overrideCursor_private"/> |
|
5222 | <rename to="overrideCursor_private"/> | |
5077 | </modify-function> |
|
5223 | </modify-function> | |
5078 |
|
5224 | |||
5079 | <modify-function signature="setInputContext(QInputContext*)"> |
|
5225 | <modify-function signature="setInputContext(QInputContext*)"> | |
5080 | <modify-argument index="1"> |
|
5226 | <modify-argument index="1"> | |
5081 | <define-ownership class="java" owner="c++"/> |
|
5227 | <define-ownership class="java" owner="c++"/> | |
@@ -5115,7 +5261,11 | |||||
5115 | </modify-argument> |
|
5261 | </modify-argument> | |
5116 | </modify-function> |
|
5262 | </modify-function> | |
5117 | </object-type> |
|
5263 | </object-type> | |
5118 |
|
5264 | |||
|
5265 | <object-type name="QMouseEventTransition"/> | |||
|
5266 | <object-type name="QKeyEventTransition"/> | |||
|
5267 | <value-type name="QQuaternion"/> | |||
|
5268 | ||||
5119 | <object-type name="QCommandLinkButton"/> |
|
5269 | <object-type name="QCommandLinkButton"/> | |
5120 | <object-type name="QFileSystemModel"> |
|
5270 | <object-type name="QFileSystemModel"> | |
5121 | <modify-function signature="setIconProvider(QFileIconProvider*)"> |
|
5271 | <modify-function signature="setIconProvider(QFileIconProvider*)"> | |
@@ -5123,7 +5273,7 | |||||
5123 | <reference-count action="set" variable-name="__rcIconProvider"/> |
|
5273 | <reference-count action="set" variable-name="__rcIconProvider"/> | |
5124 | </modify-argument> |
|
5274 | </modify-argument> | |
5125 | </modify-function> |
|
5275 | </modify-function> | |
5126 |
</object-type> |
|
5276 | </object-type> | |
5127 | <object-type name="QFormLayout"> |
|
5277 | <object-type name="QFormLayout"> | |
5128 | <modify-function signature="addRow(QWidget*,QWidget*)"> |
|
5278 | <modify-function signature="addRow(QWidget*,QWidget*)"> | |
5129 | <modify-argument index="1"> |
|
5279 | <modify-argument index="1"> | |
@@ -5140,11 +5290,11 | |||||
5140 | </modify-function> |
|
5290 | </modify-function> | |
5141 | <modify-function signature="addRow(QWidget*,QLayout*)"> |
|
5291 | <modify-function signature="addRow(QWidget*,QLayout*)"> | |
5142 | <modify-argument index="1"> |
|
5292 | <modify-argument index="1"> | |
5143 |
<reference-count action="ignore"/> |
|
5293 | <reference-count action="ignore"/> | |
5144 | </modify-argument> |
|
5294 | </modify-argument> | |
5145 | <modify-argument index="2"> |
|
5295 | <modify-argument index="2"> | |
5146 |
<reference-count action="ignore"/> |
|
5296 | <reference-count action="ignore"/> | |
5147 |
</modify-argument> |
|
5297 | </modify-argument> | |
5148 | </modify-function> |
|
5298 | </modify-function> | |
5149 |
|
5299 | |||
5150 | <modify-function signature="addRow(QWidget*)"> |
|
5300 | <modify-function signature="addRow(QWidget*)"> | |
@@ -5173,7 +5323,7 | |||||
5173 | </modify-argument> |
|
5323 | </modify-argument> | |
5174 | <modify-argument index="3"> |
|
5324 | <modify-argument index="3"> | |
5175 | <reference-count action="ignore"/> |
|
5325 | <reference-count action="ignore"/> | |
5176 |
</modify-argument> |
|
5326 | </modify-argument> | |
5177 | </modify-function> |
|
5327 | </modify-function> | |
5178 | <modify-function signature="insertRow(int,QWidget*,QWidget*)"> |
|
5328 | <modify-function signature="insertRow(int,QWidget*,QWidget*)"> | |
5179 | <modify-argument index="2"> |
|
5329 | <modify-argument index="2"> | |
@@ -5181,32 +5331,32 | |||||
5181 | </modify-argument> |
|
5331 | </modify-argument> | |
5182 | <modify-argument index="3"> |
|
5332 | <modify-argument index="3"> | |
5183 | <reference-count action="ignore"/> |
|
5333 | <reference-count action="ignore"/> | |
5184 |
</modify-argument> |
|
5334 | </modify-argument> | |
5185 | </modify-function> |
|
5335 | </modify-function> | |
5186 | <modify-function signature="insertRow(int,QWidget*)"> |
|
5336 | <modify-function signature="insertRow(int,QWidget*)"> | |
5187 | <modify-argument index="2"> |
|
5337 | <modify-argument index="2"> | |
5188 | <reference-count action="ignore"/> |
|
5338 | <reference-count action="ignore"/> | |
5189 |
</modify-argument> |
|
5339 | </modify-argument> | |
5190 | </modify-function> |
|
5340 | </modify-function> | |
5191 | <modify-function signature="insertRow(int,QString,QLayout*)"> |
|
5341 | <modify-function signature="insertRow(int,QString,QLayout*)"> | |
5192 | <modify-argument index="3"> |
|
5342 | <modify-argument index="3"> | |
5193 | <reference-count action="ignore"/> |
|
5343 | <reference-count action="ignore"/> | |
5194 |
</modify-argument> |
|
5344 | </modify-argument> | |
5195 | </modify-function> |
|
5345 | </modify-function> | |
5196 | <modify-function signature="insertRow(int,QString,QWidget*)"> |
|
5346 | <modify-function signature="insertRow(int,QString,QWidget*)"> | |
5197 | <modify-argument index="3"> |
|
5347 | <modify-argument index="3"> | |
5198 | <reference-count action="ignore"/> |
|
5348 | <reference-count action="ignore"/> | |
5199 |
</modify-argument> |
|
5349 | </modify-argument> | |
5200 |
</modify-function> |
|
5350 | </modify-function> | |
5201 | <modify-function signature="setLayout(int,QFormLayout::ItemRole,QLayout*)"> |
|
5351 | <modify-function signature="setLayout(int,QFormLayout::ItemRole,QLayout*)"> | |
5202 | <modify-argument index="3"> |
|
5352 | <modify-argument index="3"> | |
5203 | <reference-count action="ignore"/> |
|
5353 | <reference-count action="ignore"/> | |
5204 |
</modify-argument> |
|
5354 | </modify-argument> | |
5205 | </modify-function> |
|
5355 | </modify-function> | |
5206 | <modify-function signature="setWidget(int,QFormLayout::ItemRole,QWidget*)"> |
|
5356 | <modify-function signature="setWidget(int,QFormLayout::ItemRole,QWidget*)"> | |
5207 | <modify-argument index="3"> |
|
5357 | <modify-argument index="3"> | |
5208 | <reference-count action="ignore"/> |
|
5358 | <reference-count action="ignore"/> | |
5209 |
</modify-argument> |
|
5359 | </modify-argument> | |
5210 | </modify-function> |
|
5360 | </modify-function> | |
5211 | <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)" access="private" rename="setItem_private"> |
|
5361 | <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)" access="private" rename="setItem_private"> | |
5212 | <modify-argument index="3"> |
|
5362 | <modify-argument index="3"> | |
@@ -5216,7 +5366,7 | |||||
5216 | <modify-function signature="addItem(QLayoutItem*)"> |
|
5366 | <modify-function signature="addItem(QLayoutItem*)"> | |
5217 | <modify-argument index="1"> |
|
5367 | <modify-argument index="1"> | |
5218 | <define-ownership class="java" owner="c++"/> |
|
5368 | <define-ownership class="java" owner="c++"/> | |
5219 |
</modify-argument> |
|
5369 | </modify-argument> | |
5220 | </modify-function> |
|
5370 | </modify-function> | |
5221 | </object-type> |
|
5371 | </object-type> | |
5222 | <object-type name="QGraphicsGridLayout" delete-in-main-thread="yes"> |
|
5372 | <object-type name="QGraphicsGridLayout" delete-in-main-thread="yes"> | |
@@ -5235,9 +5385,9 | |||||
5235 | <reference-count action="ignore"/> |
|
5385 | <reference-count action="ignore"/> | |
5236 | </modify-argument> |
|
5386 | </modify-argument> | |
5237 | </modify-function> |
|
5387 | </modify-function> | |
5238 |
</object-type> |
|
5388 | </object-type> | |
5239 | <object-type name="QGraphicsLayout" delete-in-main-thread="yes"> |
|
5389 | <object-type name="QGraphicsLayout" delete-in-main-thread="yes"> | |
5240 |
|
5390 | |||
5241 | <modify-function signature="widgetEvent(QEvent*)"> |
|
5391 | <modify-function signature="widgetEvent(QEvent*)"> | |
5242 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
5392 | <modify-argument index="1" invalidate-after-use="yes"/> | |
5243 | </modify-function> |
|
5393 | </modify-function> | |
@@ -5246,13 +5396,23 | |||||
5246 | <reference-count action="set" variable-name="__rcParentLayoutItem"/> |
|
5396 | <reference-count action="set" variable-name="__rcParentLayoutItem"/> | |
5247 | </modify-argument> |
|
5397 | </modify-argument> | |
5248 | </modify-function> |
|
5398 | </modify-function> | |
5249 | </object-type> |
|
5399 | <modify-function signature="setGraphicsItem(QGraphicsItem*)"> | |
|
5400 | <modify-argument index="1"> | |||
|
5401 | <reference-count action="set" variable-name="__rcItem"/> | |||
|
5402 | </modify-argument> | |||
|
5403 | </modify-function> | |||
|
5404 | </object-type> | |||
5250 | <interface-type name="QGraphicsLayoutItem" delete-in-main-thread="yes"> |
|
5405 | <interface-type name="QGraphicsLayoutItem" delete-in-main-thread="yes"> | |
5251 | <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)"> |
|
5406 | <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)"> | |
5252 | <modify-argument index="1"> |
|
5407 | <modify-argument index="1"> | |
5253 | <reference-count action="set" variable-name="__rcParentLayoutItem"/> |
|
5408 | <reference-count action="set" variable-name="__rcParentLayoutItem"/> | |
5254 | </modify-argument> |
|
5409 | </modify-argument> | |
5255 |
</modify-function> |
|
5410 | </modify-function> | |
|
5411 | <modify-function signature="setGraphicsItem(QGraphicsItem*)"> | |||
|
5412 | <modify-argument index="1"> | |||
|
5413 | <reference-count action="set" variable-name="__rcItem"/> | |||
|
5414 | </modify-argument> | |||
|
5415 | </modify-function> | |||
5256 | </interface-type> |
|
5416 | </interface-type> | |
5257 | <object-type name="QGraphicsLinearLayout" delete-in-main-thread="yes"> |
|
5417 | <object-type name="QGraphicsLinearLayout" delete-in-main-thread="yes"> | |
5258 | <modify-function signature="addItem(QGraphicsLayoutItem*)"> |
|
5418 | <modify-function signature="addItem(QGraphicsLayoutItem*)"> | |
@@ -5280,7 +5440,7 | |||||
5280 | <reference-count action="ignore"/> |
|
5440 | <reference-count action="ignore"/> | |
5281 | </modify-argument> |
|
5441 | </modify-argument> | |
5282 | </modify-function> |
|
5442 | </modify-function> | |
5283 |
</object-type> |
|
5443 | </object-type> | |
5284 | <object-type name="QGraphicsProxyWidget"/> <!-- a QObject so main-thread delete redundant --> |
|
5444 | <object-type name="QGraphicsProxyWidget"/> <!-- a QObject so main-thread delete redundant --> | |
5285 | <object-type name="QGraphicsWidget"> <!-- a QObject so main-thread delete redundant --> |
|
5445 | <object-type name="QGraphicsWidget"> <!-- a QObject so main-thread delete redundant --> | |
5286 | <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi --> |
|
5446 | <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi --> | |
@@ -5290,7 +5450,29 | |||||
5290 | <reference-count action="set" variable-name="__rcLayout"/> |
|
5450 | <reference-count action="set" variable-name="__rcLayout"/> | |
5291 | </modify-argument> |
|
5451 | </modify-argument> | |
5292 | </modify-function> |
|
5452 | </modify-function> | |
5293 |
|
5453 | |||
|
5454 | <modify-function signature="addAction(QAction*)"> | |||
|
5455 | <modify-argument index="1"> | |||
|
5456 | <reference-count action="add" variable-name="__rcActions"/> | |||
|
5457 | </modify-argument> | |||
|
5458 | </modify-function> | |||
|
5459 | <modify-function signature="insertAction(QAction*,QAction*)"> | |||
|
5460 | <modify-argument index="2"> | |||
|
5461 | <reference-count action="add" variable-name="__rcActions"/> | |||
|
5462 | </modify-argument> | |||
|
5463 | </modify-function> | |||
|
5464 | <modify-function signature="insertActions(QAction*,QList<QAction*>)"> | |||
|
5465 | <modify-argument index="2"> | |||
|
5466 | <reference-count action="add" variable-name="__rcActions"/> | |||
|
5467 | </modify-argument> | |||
|
5468 | </modify-function> | |||
|
5469 | <modify-function signature="removeAction(QAction*)"> | |||
|
5470 | <modify-argument index="1"> | |||
|
5471 | <reference-count action="remove" variable-name="__rcActions"/> | |||
|
5472 | </modify-argument> | |||
|
5473 | </modify-function> | |||
|
5474 | ||||
|
5475 | ||||
5294 | <modify-function signature="changeEvent(QEvent*)"> |
|
5476 | <modify-function signature="changeEvent(QEvent*)"> | |
5295 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
5477 | <modify-argument index="1" invalidate-after-use="yes"/> | |
5296 | </modify-function> |
|
5478 | </modify-function> | |
@@ -5327,7 +5509,7 | |||||
5327 | <modify-function signature="windowFrameEvent(QEvent*)"> |
|
5509 | <modify-function signature="windowFrameEvent(QEvent*)"> | |
5328 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
5510 | <modify-argument index="1" invalidate-after-use="yes"/> | |
5329 | </modify-function> |
|
5511 | </modify-function> | |
5330 |
|
5512 | |||
5331 | <modify-function signature="setStyle(QStyle*)"> |
|
5513 | <modify-function signature="setStyle(QStyle*)"> | |
5332 | <modify-argument index="1"> |
|
5514 | <modify-argument index="1"> | |
5333 | <reference-count action="set" variable-name="__rcStyle"/> |
|
5515 | <reference-count action="set" variable-name="__rcStyle"/> | |
@@ -5339,14 +5521,14 | |||||
5339 | </modify-argument> |
|
5521 | </modify-argument> | |
5340 | <modify-argument index="2"> |
|
5522 | <modify-argument index="2"> | |
5341 | <reference-count action="ignore"/> |
|
5523 | <reference-count action="ignore"/> | |
5342 |
</modify-argument> |
|
5524 | </modify-argument> | |
5343 | </modify-function> |
|
5525 | </modify-function> | |
5344 | </object-type> |
|
5526 | </object-type> | |
5345 | <object-type name="QPlainTextDocumentLayout"/> |
|
5527 | <object-type name="QPlainTextDocumentLayout"/> | |
5346 | <object-type name="QPlainTextEdit"> |
|
5528 | <object-type name="QPlainTextEdit"> | |
5347 | <modify-function signature="setDocument(QTextDocument*)"> |
|
5529 | <modify-function signature="setDocument(QTextDocument*)"> | |
5348 | <modify-argument index="1"> |
|
5530 | <modify-argument index="1"> | |
5349 |
<reference-count action="set" variable-name="__rcDocument"/> |
|
5531 | <reference-count action="set" variable-name="__rcDocument"/> | |
5350 | </modify-argument> |
|
5532 | </modify-argument> | |
5351 | </modify-function> |
|
5533 | </modify-function> | |
5352 | <modify-function signature="insertFromMimeData(const QMimeData*)"> |
|
5534 | <modify-function signature="insertFromMimeData(const QMimeData*)"> | |
@@ -5355,7 +5537,8 | |||||
5355 | </modify-argument> |
|
5537 | </modify-argument> | |
5356 | </modify-function> |
|
5538 | </modify-function> | |
5357 | </object-type> |
|
5539 | </object-type> | |
5358 |
<object-type name="QPrintPreviewDialog" |
|
5540 | <object-type name="QPrintPreviewDialog"> | |
|
5541 | </object-type> | |||
5359 | <object-type name="QPrintPreviewWidget"/> |
|
5542 | <object-type name="QPrintPreviewWidget"/> | |
5360 | <object-type name="QStyledItemDelegate"> |
|
5543 | <object-type name="QStyledItemDelegate"> | |
5361 | <modify-function signature="setItemEditorFactory(QItemEditorFactory*)"> |
|
5544 | <modify-function signature="setItemEditorFactory(QItemEditorFactory*)"> | |
@@ -5372,42 +5555,101 | |||||
5372 | <modify-argument index="1"> |
|
5555 | <modify-argument index="1"> | |
5373 | <reference-count action="ignore"/> |
|
5556 | <reference-count action="ignore"/> | |
5374 | </modify-argument> |
|
5557 | </modify-argument> | |
5375 |
</modify-function> |
|
5558 | </modify-function> | |
5376 | </object-type> |
|
5559 | </object-type> | |
5377 |
|
5560 | |||
5378 | <interface-type name="QAccessibleFactoryInterface" java-name="QAbstractAccessibleFactory"/> |
|
5561 | <interface-type name="QAccessibleFactoryInterface" java-name="QAbstractAccessibleFactory"/> | |
5379 | <interface-type name="QIconEngineFactoryInterfaceV2" java-name="QAbstractIconEngineFactoryV2"/> |
|
5562 | <interface-type name="QIconEngineFactoryInterfaceV2" java-name="QAbstractIconEngineFactoryV2"/> | |
5380 |
<interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory"/> |
|
5563 | <interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory"/> | |
5381 | <interface-type name="QInputContextFactoryInterface" java-name="QAbstractInputContextFactory"/> |
|
5564 | <interface-type name="QInputContextFactoryInterface" java-name="QAbstractInputContextFactory"/> | |
5382 | <interface-type name="QStyleFactoryInterface" java-name="QAbstractStyleFactory"/> |
|
5565 | <interface-type name="QStyleFactoryInterface" java-name="QAbstractStyleFactory"/> | |
|
5566 | <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory"/> | |||
5383 | <interface-type name="QPictureFormatInterface" java-name="QAbstractPictureFormat"/> |
|
5567 | <interface-type name="QPictureFormatInterface" java-name="QAbstractPictureFormat"/> | |
5384 |
|
5568 | |||
5385 | <object-type name="QIconEnginePluginV2"/> |
|
5569 | <object-type name="QIconEnginePluginV2"/> | |
5386 |
<object-type name="QAccessiblePlugin"/> |
|
5570 | <object-type name="QAccessiblePlugin"/> | |
5387 | <object-type name="QImageIOPlugin"/> |
|
5571 | <object-type name="QImageIOPlugin"/> | |
5388 | <object-type name="QInputContextPlugin"/> |
|
5572 | <object-type name="QInputContextPlugin"/> | |
5389 | <object-type name="QPictureFormatPlugin"/> |
|
5573 | <object-type name="QPictureFormatPlugin"/> | |
5390 | <object-type name="QStylePlugin"/> |
|
5574 | <object-type name="QStylePlugin"/> | |
5391 |
|
5575 | <object-type name="QTextCodecPlugin"/> | ||
|
5576 | <object-type name="QGesture"/> | |||
|
5577 | <object-type name="QGraphicsAnchorLayout"/> | |||
|
5578 | <object-type name="QGraphicsAnchor"/> | |||
|
5579 | <object-type name="QGraphicsEffect"/> | |||
|
5580 | <object-type name="QGraphicsObject"> | |||
|
5581 | <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi --> | |||
|
5582 | <modify-function signature="children()const" remove="all"/> | |||
|
5583 | </object-type> | |||
|
5584 | <object-type name="QGraphicsOpacityEffect"/> | |||
|
5585 | <object-type name="QGraphicsPixelizeEffect"/> | |||
|
5586 | <object-type name="QGraphicsRotation"/> | |||
|
5587 | <object-type name="QGraphicsScale"/> | |||
|
5588 | <object-type name="QGraphicsTransform"/> | |||
|
5589 | <object-type name="QPanGesture"/> | |||
|
5590 | <object-type name="QPinchGesture"/> | |||
|
5591 | <object-type name="QProxyStyle"/> | |||
|
5592 | <object-type name="QSwipeGesture"/> | |||
|
5593 | <object-type name="QTouchEvent" polymorphic-id-expression="%1->type() == QEvent::TouchBegin || %1->type() == QEvent::TouchUpdate || %1->type() == QEvent::TouchEnd"/> | |||
|
5594 | ||||
|
5595 | <!-- Inefficient hash codes --> | |||
|
5596 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5597 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextTableCell' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5598 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextOption_Tab' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5599 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextLength' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5600 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5601 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5602 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextCursor' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5603 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath_Element' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5604 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5605 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QItemSelection' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5606 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QKeySequence' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5607 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizePolicy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5608 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFragment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5609 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetrics' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5610 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGradient' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5611 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetricsF' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5612 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5613 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QEasingCurve' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5614 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGenericMatrix' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5615 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMatrix4x4' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5616 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMargins' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5617 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPixmapCache_Key' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5618 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector4D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5619 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QQuaternion' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5620 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector2D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5621 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector3D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
5622 | ||||
|
5623 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QPanGesture'"/> | |||
|
5624 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'event(QEvent * event)' in 'QPanGesture'"/> | |||
|
5625 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QSwipeGesture'"/> | |||
|
5626 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QPinchGesture'"/> | |||
|
5627 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'event(QEvent * event)' in 'QPinchGesture'"/> | |||
|
5628 | ||||
|
5629 | <!-- Intentional omissions. See explanation for QtJambiTextObjectInterface class in typesystem and headers. --> | |||
|
5630 | <suppress-warning text="WARNING(MetaJavaBuilder) :: class 'QTextObjectInterface' inherits from unknown base class 'QTextObjectInterface'"/> | |||
|
5631 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown interface for 'QTextObjectInterface': 'QTextObjectInterfaceInterface'"/> | |||
|
5632 | ||||
|
5633 | <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QPixmapFilter' inherits from polymorphic class 'QPixmapFilter', but has no polymorphic id set"/> | |||
5392 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'"/> |
|
5634 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'"/> | |
5393 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/> |
|
5635 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&'"/> | |
5394 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/> |
|
5636 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/> | |
5395 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private const\*'"/> |
|
5637 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private const\*'"/> | |
5396 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextEngine\*'"/> |
|
5638 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextEngine\*'"/> | |
5397 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QFontEngine\*'"/> |
|
5639 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QFontEngine\*'"/> | |
5398 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPixmap::Type'"/> |
|
5640 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPixmap::Type'"/> | |
5399 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QInputDialog::Type'"/> |
|
5641 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QInputDialog::Type'"/> | |
5400 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextFrameLayoutData\*'"/> |
|
5642 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextFrameLayoutData\*'"/> | |
5401 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractUndoItem\*'"/> |
|
5643 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractUndoItem\*'"/> | |
5402 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*QImageTextKeyLang*'"/> |
|
5644 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*QImageTextKeyLang*'"/> | |
5403 | <suppress-warning text="WARNING(MetaJavaBuilder) :: non-public function '*' in interface '*'"/> |
|
5645 | <suppress-warning text="WARNING(MetaJavaBuilder) :: non-public function '*' in interface '*'"/> | |
5404 | <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/> |
|
5646 | <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/> | |
5405 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/> |
|
5647 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/> | |
5406 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVector<FormatRange>()' of argument in function '*', class '*'"/> |
|
5648 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVector<FormatRange>()' of argument in function '*', class '*'"/> | |
5407 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVariantList()' of argument in function '*', class '*'"/> |
|
5649 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVariantList()' of argument in function '*', class '*'"/> | |
5408 |
<suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> |
|
5650 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> | |
5409 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QTextLayout::QTextLayout', unmatched parameter type 'QTextEngine*'"/> |
|
5651 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QTextLayout::QTextLayout', unmatched parameter type 'QTextEngine*'"/> | |
5410 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"/> |
|
5652 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"/> | |
5411 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFileDialog::QFileDialog', unmatched parameter type 'QFileDialogArgs const&'"/> |
|
5653 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFileDialog::QFileDialog', unmatched parameter type 'QFileDialogArgs const&'"/> | |
5412 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '0., 0., 1000000000., 1000000000.' of argument in function 'update', class 'QAbstractTextDocumentLayout'"/> |
|
5654 | <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '0., 0., 1000000000., 1000000000.' of argument in function 'update', class 'QAbstractTextDocumentLayout'"/> | |
5413 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWidget::windowSurface', unmatched return type 'QWindowSurface*'"/> |
|
5655 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWidget::windowSurface', unmatched return type 'QWindowSurface*'"/> | |
@@ -5419,40 +5661,12 | |||||
5419 | <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QInputEvent' inherits from polymorphic class 'QEvent', but has no polymorphic id set"/> |
|
5661 | <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QInputEvent' inherits from polymorphic class 'QEvent', but has no polymorphic id set"/> | |
5420 | <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenu' but not both"/> |
|
5662 | <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenu' but not both"/> | |
5421 | <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenuBar' but not both"/> |
|
5663 | <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenuBar' but not both"/> | |
5422 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QBrush' has equals operators but no qHash() function"/> |
|
5664 | ||
5423 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function"/> |
|
|||
5424 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegion' has equals operators but no qHash() function"/> |
|
|||
5425 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPolygon' has equals operators but no qHash() function"/> |
|
|||
5426 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextTableCell' has equals operators but no qHash() function"/> |
|
|||
5427 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextLength' has equals operators but no qHash() function"/> |
|
|||
5428 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPalette' has equals operators but no qHash() function"/> |
|
|||
5429 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock_iterator' has equals operators but no qHash() function"/> |
|
|||
5430 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock' has equals operators but no qHash() function"/> |
|
|||
5431 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextCursor' has equals operators but no qHash() function"/> |
|
|||
5432 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFont' has equals operators but no qHash() function"/> |
|
|||
5433 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMatrix' has equals operators but no qHash() function"/> |
|
|||
5434 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPen' has equals operators but no qHash() function"/> |
|
|||
5435 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QColor' has equals operators but no qHash() function"/> |
|
|||
5436 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTransform' has equals operators but no qHash() function"/> |
|
|||
5437 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath_Element' has equals operators but no qHash() function"/> |
|
|||
5438 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath' has equals operators but no qHash() function"/> |
|
|||
5439 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QItemSelection' has equals operators but no qHash() function"/> |
|
|||
5440 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QKeySequence' has equals operators but no qHash() function"/> |
|
|||
5441 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLine' has equals operators but no qHash() function"/> |
|
|||
5442 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPolygonF' has equals operators but no qHash() function"/> |
|
|||
5443 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizePolicy' has equals operators but no qHash() function"/> |
|
|||
5444 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFragment' has equals operators but no qHash() function"/> |
|
|||
5445 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetrics' has equals operators but no qHash() function"/> |
|
|||
5446 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGradient' has equals operators but no qHash() function"/> |
|
|||
5447 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetricsF' has equals operators but no qHash() function"/> |
|
|||
5448 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFormat' has equals operators but no qHash() function"/> |
|
|||
5449 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLineF' has equals operators but no qHash() function"/> |
|
|||
5450 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QImage' has equals operators but no qHash() function"/> |
|
|||
5451 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function"/> |
|
|||
5452 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function"/> |
|
|||
5453 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::pixmapData', unmatched return type 'QPixmapData*'"/> |
|
5665 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::pixmapData', unmatched return type 'QPixmapData*'"/> | |
5454 | <suppress-warning text="WARNING(MetaJavaBuilder) :: object type 'QAccessible' extended by interface type 'QAbstractAccessibleFactory'. The resulting API will be less expressive than the original."/> |
|
5666 | <suppress-warning text="WARNING(MetaJavaBuilder) :: object type 'QAccessible' extended by interface type 'QAbstractAccessibleFactory'. The resulting API will be less expressive than the original."/> | |
5455 |
|
5667 | |||
5456 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: |
|
5668 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles"/> | |
|
5669 | ||||
|
5670 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QtSharedPointer' does not have a type entry"/> | |||
5457 |
|
5671 | |||
5458 | </typesystem> |
|
5672 | </typesystem> |
@@ -2,11 +2,14 | |||||
2 | <namespace-type name="QSsl"> |
|
2 | <namespace-type name="QSsl"> | |
3 | <include file-name="qssl.h" location="global" /> |
|
3 | <include file-name="qssl.h" location="global" /> | |
4 | </namespace-type> |
|
4 | </namespace-type> | |
5 |
|
5 | |||
|
6 | <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities" /> | |||
6 | <enum-type name="QAbstractSocket::NetworkLayerProtocol" /> |
|
7 | <enum-type name="QAbstractSocket::NetworkLayerProtocol" /> | |
|
8 | <enum-type name="QNetworkProxyQuery::QueryType" /> | |||
7 | <enum-type name="QAbstractSocket::SocketError" /> |
|
9 | <enum-type name="QAbstractSocket::SocketError" /> | |
8 | <enum-type name="QAbstractSocket::SocketState" /> |
|
10 | <enum-type name="QAbstractSocket::SocketState" /> | |
9 | <enum-type name="QAbstractSocket::SocketType" /> |
|
11 | <enum-type name="QAbstractSocket::SocketType" /> | |
|
12 | <enum-type name="QAbstractSocket::SocketOption" /> | |||
10 | <enum-type name="QFtp::Command" /> |
|
13 | <enum-type name="QFtp::Command" /> | |
11 | <enum-type name="QFtp::Error" /> |
|
14 | <enum-type name="QFtp::Error" /> | |
12 | <enum-type name="QFtp::State" /> |
|
15 | <enum-type name="QFtp::State" /> | |
@@ -17,12 +20,10 | |||||
17 | <enum-type name="QHttp::State" /> |
|
20 | <enum-type name="QHttp::State" /> | |
18 | <enum-type name="QHttp::ConnectionMode" /> |
|
21 | <enum-type name="QHttp::ConnectionMode" /> | |
19 | <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags" /> |
|
22 | <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags" /> | |
20 | <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities" /> |
|
|||
21 | <enum-type name="QNetworkProxy::ProxyType" /> |
|
23 | <enum-type name="QNetworkProxy::ProxyType" /> | |
22 | <enum-type name="QNetworkProxyQuery::QueryType" /> |
|
|||
23 | <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode" /> |
|
24 | <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode" /> | |
24 | <enum-type name="QUrlInfo::PermissionSpec" /> |
|
25 | <enum-type name="QUrlInfo::PermissionSpec" /> | |
25 |
<enum-type name="QHostInfo::HostInfoError" /> |
|
26 | <enum-type name="QHostInfo::HostInfoError" /> | |
26 | <enum-type name="QSsl::KeyType" /> |
|
27 | <enum-type name="QSsl::KeyType" /> | |
27 | <enum-type name="QSsl::EncodingFormat" /> |
|
28 | <enum-type name="QSsl::EncodingFormat" /> | |
28 | <enum-type name="QSsl::KeyAlgorithm"/> |
|
29 | <enum-type name="QSsl::KeyAlgorithm"/> | |
@@ -37,19 +38,42 | |||||
37 | <enum-type name="QNetworkRequest::CacheLoadControl" /> |
|
38 | <enum-type name="QNetworkRequest::CacheLoadControl" /> | |
38 | <enum-type name="QNetworkRequest::KnownHeaders" /> |
|
39 | <enum-type name="QNetworkRequest::KnownHeaders" /> | |
39 |
|
40 | |||
40 | <object-type name="QAbstractNetworkCache"> |
|
41 | <object-type name="QAbstractNetworkCache" /> | |
|
42 | <object-type name="QNetworkDiskCache"> | |||
|
43 | <modify-function signature="insert(QIODevice*)"> | |||
|
44 | <modify-argument index="1"> | |||
|
45 | <reference-count action="ignore" /> <!-- function only has effect on devices retrieved using prepare() --> | |||
|
46 | </modify-argument> | |||
|
47 | </modify-function> | |||
41 | </object-type> |
|
48 | </object-type> | |
|
49 | <value-type name="QNetworkCacheMetaData"> | |||
|
50 | <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all" /> | |||
|
51 | </value-type> | |||
42 |
|
52 | |||
43 |
<object-type name="Q |
|
53 | <object-type name="QNetworkProxyFactory"> | |
|
54 | <modify-function signature="setApplicationProxyFactory(QNetworkProxyFactory*)"> | |||
|
55 | <modify-argument index="1"> | |||
|
56 | <define-ownership class="java" owner="c++" /> | |||
|
57 | </modify-argument> | |||
|
58 | </modify-function> | |||
|
59 | </object-type> | |||
|
60 | <value-type name="QNetworkProxyQuery" > | |||
|
61 | <modify-function signature="operator=(QNetworkProxyQuery)" remove="all" /> | |||
|
62 | </value-type> | |||
|
63 | ||||
|
64 | <object-type name="QAbstractSocket"> | |||
|
65 | <modify-function signature="setSocketOption(QAbstractSocket::SocketOption, const QVariant)" remove="all" /> | |||
|
66 | <modify-function signature="socketOption(QAbstractSocket::SocketOption)" remove="all"/> | |||
|
67 | </object-type> | |||
44 | <object-type name="QFtp" /> |
|
68 | <object-type name="QFtp" /> | |
45 |
|
69 | |||
46 | <object-type name="QHttp"> |
|
70 | <object-type name="QHttp"> | |
47 | <modify-function signature="closeConnection()" remove="all"/> |
|
71 | <modify-function signature="closeConnection()" remove="all"/> | |
48 | </object-type> |
|
72 | </object-type> | |
49 | <object-type name="QTcpServer" /> |
|
73 | <object-type name="QTcpServer" /> | |
50 |
<object-type name="QTcpSocket" /> |
|
74 | <object-type name="QTcpSocket" /> | |
51 | <object-type name="QUdpSocket" /> |
|
75 | <object-type name="QUdpSocket" /> | |
52 |
|
76 | |||
53 | <object-type name="QHttpHeader"> |
|
77 | <object-type name="QHttpHeader"> | |
54 | <modify-function signature="operator=(QHttpHeader)" remove="all"/> |
|
78 | <modify-function signature="operator=(QHttpHeader)" remove="all"/> | |
55 | </object-type> |
|
79 | </object-type> | |
@@ -61,6 +85,16 | |||||
61 | <define-ownership class="java" owner="c++" /> |
|
85 | <define-ownership class="java" owner="c++" /> | |
62 | </modify-argument> |
|
86 | </modify-argument> | |
63 | </modify-function> |
|
87 | </modify-function> | |
|
88 | <modify-function signature="setCache(QAbstractNetworkCache*)"> | |||
|
89 | <modify-argument index="1"> | |||
|
90 | <reference-count action="ignore" /> | |||
|
91 | </modify-argument> | |||
|
92 | </modify-function> | |||
|
93 | <modify-function signature="setProxyFactory(QNetworkProxyFactory*)"> | |||
|
94 | <modify-argument index="1"> | |||
|
95 | <define-ownership class="java" owner="c++" /> | |||
|
96 | </modify-argument> | |||
|
97 | </modify-function> | |||
64 | </object-type> |
|
98 | </object-type> | |
65 | <object-type name="QNetworkCookieJar" /> |
|
99 | <object-type name="QNetworkCookieJar" /> | |
66 | <object-type name="QNetworkReply" /> |
|
100 | <object-type name="QNetworkReply" /> | |
@@ -70,11 +104,11 | |||||
70 | <modify-function signature="setAddress(unsigned char*)" remove="all"/> |
|
104 | <modify-function signature="setAddress(unsigned char*)" remove="all"/> | |
71 | <modify-function signature="operator=(QString)" remove="all"/> |
|
105 | <modify-function signature="operator=(QString)" remove="all"/> | |
72 | <modify-function signature="operator=(QHostAddress)" remove="all"/> |
|
106 | <modify-function signature="operator=(QHostAddress)" remove="all"/> | |
73 |
</value-type> |
|
107 | </value-type> | |
74 |
|
108 | |||
75 | <value-type name="QHostInfo"> |
|
109 | <value-type name="QHostInfo"> | |
76 | <modify-function signature="operator=(QHostInfo)" remove="all"/> |
|
110 | <modify-function signature="operator=(QHostInfo)" remove="all"/> | |
77 |
<modify-function signature="lookupHost(QString,QObject*,const char*)" access="private" /> |
|
111 | <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private" /> | |
78 | </value-type> |
|
112 | </value-type> | |
79 |
|
113 | |||
80 | <value-type name="QHttpRequestHeader"> |
|
114 | <value-type name="QHttpRequestHeader"> | |
@@ -88,29 +122,15 | |||||
88 | <value-type name="QNetworkAddressEntry"> |
|
122 | <value-type name="QNetworkAddressEntry"> | |
89 | <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/> |
|
123 | <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/> | |
90 | </value-type> |
|
124 | </value-type> | |
91 |
|
||||
92 | <value-type name="QNetworkCacheMetaData"> |
|
|||
93 | <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all"/> |
|
|||
94 | <extra-includes> |
|
|||
95 | <include file-name="QDateTime" location="global"/> |
|
|||
96 | </extra-includes> |
|
|||
97 | </value-type> |
|
|||
98 |
|
125 | |||
99 | <value-type name="QNetworkInterface"> |
|
126 | <value-type name="QNetworkInterface"> | |
100 | <modify-function signature="operator=(QNetworkInterface)" remove="all"/> |
|
127 | <modify-function signature="operator=(QNetworkInterface)" remove="all"/> | |
101 | </value-type> |
|
128 | </value-type> | |
102 |
|
129 | |||
103 | <value-type name="QNetworkProxy"> |
|
130 | <value-type name="QNetworkProxy"> | |
104 | <modify-function signature="operator=(QNetworkProxy)" remove="all"/> |
|
131 | <modify-function signature="operator=(QNetworkProxy)" remove="all"/> | |
105 | </value-type> |
|
132 | </value-type> | |
106 |
|
133 | |||
107 | <object-type name="QNetworkProxyFactory"> |
|
|||
108 | </object-type> |
|
|||
109 |
|
||||
110 | <value-type name="QNetworkProxyQuery"> |
|
|||
111 | <modify-function signature="operator=(QNetworkProxyQuery)" remove="all"/> |
|
|||
112 | </value-type> |
|
|||
113 |
|
||||
114 | <value-type name="QUrlInfo"> |
|
134 | <value-type name="QUrlInfo"> | |
115 | <modify-function signature="operator=(QUrlInfo)" remove="all"/> |
|
135 | <modify-function signature="operator=(QUrlInfo)" remove="all"/> | |
116 | </value-type> |
|
136 | </value-type> | |
@@ -121,9 +141,9 | |||||
121 | </modify-function> |
|
141 | </modify-function> | |
122 | <modify-function signature="operator[](int)"> |
|
142 | <modify-function signature="operator[](int)"> | |
123 | <remove/> |
|
143 | <remove/> | |
124 |
</modify-function> |
|
144 | </modify-function> | |
125 | </value-type> |
|
145 | </value-type> | |
126 |
|
146 | |||
127 | <value-type name="QAuthenticator"> |
|
147 | <value-type name="QAuthenticator"> | |
128 | <modify-function signature="operator=(QAuthenticator)" remove="all"/> |
|
148 | <modify-function signature="operator=(QAuthenticator)" remove="all"/> | |
129 | </value-type> |
|
149 | </value-type> | |
@@ -146,17 +166,18 | |||||
146 | <value-type name="QSslConfiguration" /> |
|
166 | <value-type name="QSslConfiguration" /> | |
147 |
|
167 | |||
148 | <object-type name="QSslSocket" /> |
|
168 | <object-type name="QSslSocket" /> | |
149 |
|
169 | |||
150 | <suppress-warning text="*unmatched parameter type 'sockaddr const*" /> |
|
170 | <suppress-warning text="*unmatched parameter type 'sockaddr const*" /> | |
151 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function" /> |
|
171 | ||
152 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
172 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
153 |
|
173 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCacheMetaData' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | ||
154 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
174 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxyQuery' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
155 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
175 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkAddressEntry' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
156 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
176 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
157 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
177 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
158 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
178 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |
159 |
|
179 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | ||
|
180 | ||||
160 | <!-- For people building without SSL support --> |
|
181 | <!-- For people building without SSL support --> | |
161 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared" /> |
|
182 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared" /> | |
162 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslError' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
183 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslError' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
@@ -168,6 +189,6 | |||||
168 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslCertificate' for enum 'SubjectInfo' is not declared"/> |
|
189 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslCertificate' for enum 'SubjectInfo' is not declared"/> | |
169 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslConfiguration' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
190 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslConfiguration' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
170 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslSocket' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
191 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslSocket' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
171 |
<!-- --> |
|
192 | <!-- --> | |
172 |
|
193 | |||
173 | </typesystem> |
|
194 | </typesystem> |
@@ -3,11 +3,14 | |||||
3 | <namespace-type name="QSsl"> |
|
3 | <namespace-type name="QSsl"> | |
4 | <include file-name="qssl.h" location="global"/> |
|
4 | <include file-name="qssl.h" location="global"/> | |
5 | </namespace-type> |
|
5 | </namespace-type> | |
6 |
|
6 | |||
|
7 | <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/> | |||
7 | <enum-type name="QAbstractSocket::NetworkLayerProtocol"/> |
|
8 | <enum-type name="QAbstractSocket::NetworkLayerProtocol"/> | |
|
9 | <enum-type name="QNetworkProxyQuery::QueryType"/> | |||
8 | <enum-type name="QAbstractSocket::SocketError"/> |
|
10 | <enum-type name="QAbstractSocket::SocketError"/> | |
9 | <enum-type name="QAbstractSocket::SocketState"/> |
|
11 | <enum-type name="QAbstractSocket::SocketState"/> | |
10 | <enum-type name="QAbstractSocket::SocketType"/> |
|
12 | <enum-type name="QAbstractSocket::SocketType"/> | |
|
13 | <enum-type name="QAbstractSocket::SocketOption"/> | |||
11 | <enum-type name="QFtp::Command"/> |
|
14 | <enum-type name="QFtp::Command"/> | |
12 | <enum-type name="QFtp::Error"/> |
|
15 | <enum-type name="QFtp::Error"/> | |
13 | <enum-type name="QFtp::State"/> |
|
16 | <enum-type name="QFtp::State"/> | |
@@ -18,12 +21,10 | |||||
18 | <enum-type name="QHttp::State"/> |
|
21 | <enum-type name="QHttp::State"/> | |
19 | <enum-type name="QHttp::ConnectionMode"/> |
|
22 | <enum-type name="QHttp::ConnectionMode"/> | |
20 | <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/> |
|
23 | <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/> | |
21 | <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/> |
|
|||
22 | <enum-type name="QNetworkProxy::ProxyType"/> |
|
24 | <enum-type name="QNetworkProxy::ProxyType"/> | |
23 | <enum-type name="QNetworkProxyQuery::QueryType"/> |
|
|||
24 | <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode"/> |
|
25 | <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode"/> | |
25 | <enum-type name="QUrlInfo::PermissionSpec"/> |
|
26 | <enum-type name="QUrlInfo::PermissionSpec"/> | |
26 |
<enum-type name="QHostInfo::HostInfoError"/> |
|
27 | <enum-type name="QHostInfo::HostInfoError"/> | |
27 | <enum-type name="QSsl::KeyType"/> |
|
28 | <enum-type name="QSsl::KeyType"/> | |
28 | <enum-type name="QSsl::EncodingFormat"/> |
|
29 | <enum-type name="QSsl::EncodingFormat"/> | |
29 | <enum-type name="QSsl::KeyAlgorithm"/> |
|
30 | <enum-type name="QSsl::KeyAlgorithm"/> | |
@@ -38,10 +39,33 | |||||
38 | <enum-type name="QNetworkRequest::CacheLoadControl"/> |
|
39 | <enum-type name="QNetworkRequest::CacheLoadControl"/> | |
39 | <enum-type name="QNetworkRequest::KnownHeaders"/> |
|
40 | <enum-type name="QNetworkRequest::KnownHeaders"/> | |
40 |
|
41 | |||
41 | <object-type name="QAbstractNetworkCache"> |
|
42 | <object-type name="QAbstractNetworkCache"/> | |
|
43 | <object-type name="QNetworkDiskCache"> | |||
|
44 | <modify-function signature="insert(QIODevice*)"> | |||
|
45 | <modify-argument index="1"> | |||
|
46 | <reference-count action="ignore"/> <!-- function only has effect on devices retrieved using prepare() --> | |||
|
47 | </modify-argument> | |||
|
48 | </modify-function> | |||
42 | </object-type> |
|
49 | </object-type> | |
|
50 | <value-type name="QNetworkCacheMetaData"> | |||
|
51 | <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all"/> | |||
|
52 | </value-type> | |||
43 |
|
53 | |||
44 |
<object-type name="Q |
|
54 | <object-type name="QNetworkProxyFactory"> | |
|
55 | <modify-function signature="setApplicationProxyFactory(QNetworkProxyFactory*)"> | |||
|
56 | <modify-argument index="1"> | |||
|
57 | <define-ownership class="java" owner="c++"/> | |||
|
58 | </modify-argument> | |||
|
59 | </modify-function> | |||
|
60 | </object-type> | |||
|
61 | <value-type name="QNetworkProxyQuery"> | |||
|
62 | <modify-function signature="operator=(QNetworkProxyQuery)" remove="all"/> | |||
|
63 | </value-type> | |||
|
64 | ||||
|
65 | <object-type name="QAbstractSocket"> | |||
|
66 | <modify-function signature="setSocketOption(QAbstractSocket::SocketOption, const QVariant)" remove="all"/> | |||
|
67 | <modify-function signature="socketOption(QAbstractSocket::SocketOption)" remove="all"/> | |||
|
68 | </object-type> | |||
45 | <object-type name="QFtp"/> |
|
69 | <object-type name="QFtp"/> | |
46 |
|
70 | |||
47 | <object-type name="QHttp"> |
|
71 | <object-type name="QHttp"> | |
@@ -54,11 +78,11 | |||||
54 | </modify-argument> |
|
78 | </modify-argument> | |
55 | </modify-function> |
|
79 | </modify-function> | |
56 | </object-type> |
|
80 | </object-type> | |
57 |
<object-type name="QTcpSocket"/> |
|
81 | <object-type name="QTcpSocket"/> | |
58 | <object-type name="QUdpSocket"> |
|
82 | <object-type name="QUdpSocket"> | |
59 | <modify-function signature="writeDatagram(const char*,qint64,QHostAddress,unsigned short)" remove="all"/> |
|
83 | <modify-function signature="writeDatagram(const char*,qint64,QHostAddress,unsigned short)" remove="all"/> | |
60 | </object-type> |
|
84 | </object-type> | |
61 |
|
85 | |||
62 | <object-type name="QHttpHeader"> |
|
86 | <object-type name="QHttpHeader"> | |
63 | <modify-function signature="operator=(QHttpHeader)" remove="all"/> |
|
87 | <modify-function signature="operator=(QHttpHeader)" remove="all"/> | |
64 |
|
88 | |||
@@ -78,6 +102,16 | |||||
78 | <define-ownership class="java" owner="c++"/> |
|
102 | <define-ownership class="java" owner="c++"/> | |
79 | </modify-argument> |
|
103 | </modify-argument> | |
80 | </modify-function> |
|
104 | </modify-function> | |
|
105 | <modify-function signature="setCache(QAbstractNetworkCache*)"> | |||
|
106 | <modify-argument index="1"> | |||
|
107 | <reference-count action="ignore"/> | |||
|
108 | </modify-argument> | |||
|
109 | </modify-function> | |||
|
110 | <modify-function signature="setProxyFactory(QNetworkProxyFactory*)"> | |||
|
111 | <modify-argument index="1"> | |||
|
112 | <define-ownership class="java" owner="c++"/> | |||
|
113 | </modify-argument> | |||
|
114 | </modify-function> | |||
81 | </object-type> |
|
115 | </object-type> | |
82 | <object-type name="QNetworkCookieJar"/> |
|
116 | <object-type name="QNetworkCookieJar"/> | |
83 | <object-type name="QNetworkReply"/> |
|
117 | <object-type name="QNetworkReply"/> | |
@@ -87,11 +121,11 | |||||
87 | <modify-function signature="setAddress(unsigned char*)" remove="all"/> |
|
121 | <modify-function signature="setAddress(unsigned char*)" remove="all"/> | |
88 | <modify-function signature="operator=(QString)" remove="all"/> |
|
122 | <modify-function signature="operator=(QString)" remove="all"/> | |
89 | <modify-function signature="operator=(QHostAddress)" remove="all"/> |
|
123 | <modify-function signature="operator=(QHostAddress)" remove="all"/> | |
90 |
</value-type> |
|
124 | </value-type> | |
91 |
|
125 | |||
92 | <value-type name="QHostInfo"> |
|
126 | <value-type name="QHostInfo"> | |
93 | <modify-function signature="operator=(QHostInfo)" remove="all"/> |
|
127 | <modify-function signature="operator=(QHostInfo)" remove="all"/> | |
94 |
<modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/> |
|
128 | <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/> | |
95 |
|
129 | |||
96 | <modify-function signature="lookupHost(QString,QObject*,const char*)"> |
|
130 | <modify-function signature="lookupHost(QString,QObject*,const char*)"> | |
97 | <modify-argument index="3"> |
|
131 | <modify-argument index="3"> | |
@@ -114,29 +148,15 | |||||
114 | <value-type name="QNetworkAddressEntry"> |
|
148 | <value-type name="QNetworkAddressEntry"> | |
115 | <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/> |
|
149 | <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/> | |
116 | </value-type> |
|
150 | </value-type> | |
117 |
|
||||
118 | <value-type name="QNetworkCacheMetaData"> |
|
|||
119 | <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all"/> |
|
|||
120 | <extra-includes> |
|
|||
121 | <include file-name="QDateTime" location="global"/> |
|
|||
122 | </extra-includes> |
|
|||
123 | </value-type> |
|
|||
124 |
|
151 | |||
125 | <value-type name="QNetworkInterface"> |
|
152 | <value-type name="QNetworkInterface"> | |
126 | <modify-function signature="operator=(QNetworkInterface)" remove="all"/> |
|
153 | <modify-function signature="operator=(QNetworkInterface)" remove="all"/> | |
127 | </value-type> |
|
154 | </value-type> | |
128 |
|
155 | |||
129 | <value-type name="QNetworkProxy"> |
|
156 | <value-type name="QNetworkProxy"> | |
130 | <modify-function signature="operator=(QNetworkProxy)" remove="all"/> |
|
157 | <modify-function signature="operator=(QNetworkProxy)" remove="all"/> | |
131 | </value-type> |
|
158 | </value-type> | |
132 |
|
159 | |||
133 | <object-type name="QNetworkProxyFactory"> |
|
|||
134 | </object-type> |
|
|||
135 |
|
||||
136 | <value-type name="QNetworkProxyQuery"> |
|
|||
137 | <modify-function signature="operator=(QNetworkProxyQuery)" remove="all"/> |
|
|||
138 | </value-type> |
|
|||
139 |
|
||||
140 | <value-type name="QUrlInfo"> |
|
160 | <value-type name="QUrlInfo"> | |
141 | <modify-function signature="operator=(QUrlInfo)" remove="all"/> |
|
161 | <modify-function signature="operator=(QUrlInfo)" remove="all"/> | |
142 | </value-type> |
|
162 | </value-type> | |
@@ -147,9 +167,9 | |||||
147 | </modify-function> |
|
167 | </modify-function> | |
148 | <modify-function signature="operator[](int)"> |
|
168 | <modify-function signature="operator[](int)"> | |
149 | <remove/> |
|
169 | <remove/> | |
150 |
</modify-function> |
|
170 | </modify-function> | |
151 | </value-type> |
|
171 | </value-type> | |
152 |
|
172 | |||
153 | <value-type name="QAuthenticator"> |
|
173 | <value-type name="QAuthenticator"> | |
154 | <modify-function signature="operator=(QAuthenticator)" remove="all"/> |
|
174 | <modify-function signature="operator=(QAuthenticator)" remove="all"/> | |
155 | </value-type> |
|
175 | </value-type> | |
@@ -180,17 +200,18 | |||||
180 | <value-type name="QSslConfiguration"/> |
|
200 | <value-type name="QSslConfiguration"/> | |
181 |
|
201 | |||
182 | <object-type name="QSslSocket"/> |
|
202 | <object-type name="QSslSocket"/> | |
183 |
|
203 | |||
184 | <suppress-warning text="*unmatched parameter type 'sockaddr const*"/> |
|
204 | <suppress-warning text="*unmatched parameter type 'sockaddr const*"/> | |
185 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function"/> |
|
205 | ||
186 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
206 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
187 |
|
207 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCacheMetaData' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | ||
188 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
208 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxyQuery' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
189 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
209 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkAddressEntry' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
190 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
210 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
191 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
211 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
192 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Q |
|
212 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |
193 |
|
213 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | ||
|
214 | ||||
194 | <!-- For people building without SSL support --> |
|
215 | <!-- For people building without SSL support --> | |
195 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared"/> |
|
216 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared"/> | |
196 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslError' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
217 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslError' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
@@ -202,6 +223,6 | |||||
202 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslCertificate' for enum 'SubjectInfo' is not declared"/> |
|
223 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslCertificate' for enum 'SubjectInfo' is not declared"/> | |
203 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslConfiguration' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
224 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslConfiguration' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
204 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslSocket' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
225 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslSocket' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
205 |
<!-- --> |
|
226 | <!-- --> | |
206 |
|
227 | |||
207 | </typesystem> |
|
228 | </typesystem> |
@@ -1,16 +1,19 | |||||
1 | <?xml-stylesheet type="text/xsl" href="merge.xsl"?> |
|
1 | <?xml-stylesheet type="text/xsl" href="merge.xsl"?> | |
2 | <typesystem> |
|
2 | <typesystem> | |
3 | <rejection class="QGLColormap::QGLColormapData" /> |
|
3 | <rejection class="QGLColormap::QGLColormapData" /> | |
4 |
<rejection class="QGLWidget" function-name="setMouseTracking"/> |
|
4 | <rejection class="QGLWidget" function-name="setMouseTracking"/> | |
5 |
|
5 | |||
6 | <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions"/> |
|
6 | <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions"/> | |
7 | <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/> |
|
7 | <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/> | |
8 | <enum-type name="QGLFramebufferObject::Attachment" /> |
|
8 | <enum-type name="QGLFramebufferObject::Attachment" /> | |
|
9 | <enum-type name="QGLContext::BindOption" flags="QGLContext::BindOptions" /> | |||
|
10 | <enum-type name="QGLShader::ShaderTypeBit" flags="QGLShader::ShaderType"/> | |||
|
11 | ||||
9 |
|
12 | |||
10 | <namespace-type name="QGL"> |
|
13 | <namespace-type name="QGL"> | |
11 | <include file-name="qgl.h" location="global"/> |
|
14 | <include file-name="qgl.h" location="global"/> | |
12 | </namespace-type> |
|
15 | </namespace-type> | |
13 |
|
16 | |||
14 | <value-type name="QGLColormap"> |
|
17 | <value-type name="QGLColormap"> | |
15 | <modify-function signature="operator=(QGLColormap)" remove="all"/> |
|
18 | <modify-function signature="operator=(QGLColormap)" remove="all"/> | |
16 |
|
19 | |||
@@ -18,23 +21,49 | |||||
18 | <access modifier="private" /> |
|
21 | <access modifier="private" /> | |
19 | </modify-function> |
|
22 | </modify-function> | |
20 | </value-type> |
|
23 | </value-type> | |
21 |
|
24 | |||
22 | <value-type name="QGLFormat"> |
|
25 | <value-type name="QGLFormat"> | |
23 | <modify-function signature="operator=(QGLFormat)" remove="all"/> |
|
26 | <modify-function signature="operator=(QGLFormat)" remove="all"/> | |
24 | </value-type> |
|
27 | </value-type> | |
25 |
|
28 | |||
26 | <object-type name="QGLContext"> |
|
29 | <value-type name="QGLFramebufferObjectFormat" /> | |
27 |
|
30 | <object-type name="QGLShader" /> | ||
|
31 | <object-type name="QGLShaderProgram"> | |||
|
32 | <!-- Should be disambiguated later by fixing the native pointer API --> | |||
|
33 | <modify-function signature="setAttributeArray(int, const QVector2D *, int)" rename="setAttributeArray_QVector2D" /> | |||
|
34 | <modify-function signature="setAttributeArray(int, const QVector3D *, int)" rename="setAttributeArray_QVector3D" /> | |||
|
35 | <modify-function signature="setAttributeArray(int, const QVector4D *, int)" rename="setAttributeArray_QVector4D" /> | |||
|
36 | <modify-function signature="setAttributeArray(const char *, const QVector2D *, int)" rename="setAttributeArray_QVector2D" /> | |||
|
37 | <modify-function signature="setAttributeArray(const char *, const QVector3D *, int)" rename="setAttributeArray_QVector3D" /> | |||
|
38 | <modify-function signature="setAttributeArray(const char *, const QVector4D *, int)" rename="setAttributeArray_QVector4D" /> | |||
|
39 | <modify-function signature="setUniformValueArray(int, const GLint *, int)" rename="setUniformValueArray_int" /> | |||
|
40 | <modify-function signature="setUniformValueArray(int, const GLuint *, int)" rename="setUniformValueArray_uint" /> | |||
|
41 | <modify-function signature="setUniformValueArray(int, const QVector2D *, int)" rename="setUniformValueArray_QVector2D" /> | |||
|
42 | <modify-function signature="setUniformValueArray(int, const QVector3D *, int)" rename="setUniformValueArray_QVector3D" /> | |||
|
43 | <modify-function signature="setUniformValueArray(int, const QVector4D *, int)" rename="setUniformValueArray_QVector4D" /> | |||
|
44 | ||||
|
45 | <modify-function signature="setUniformValueArray(const char*, const GLint *, int)" rename="setUniformValueArray_int" /> | |||
|
46 | <modify-function signature="setUniformValueArray(const char*, const GLuint *, int)" remove="all" /> | |||
|
47 | <modify-function signature="setUniformValueArray(const char*, const QVector2D *, int)" rename="setUniformValueArray_QVector2D" /> | |||
|
48 | <modify-function signature="setUniformValueArray(const char*, const QVector3D *, int)" rename="setUniformValueArray_QVector3D" /> | |||
|
49 | <modify-function signature="setUniformValueArray(const char*, const QVector4D *, int)" rename="setUniformValueArray_QVector4D" /> | |||
|
50 | <modify-function signature="setUniformValue(int, GLuint)" remove="all" /> | |||
|
51 | <modify-function signature="setUniformValue(const char*, GLuint)" remove="all" /> | |||
|
52 | <modify-function signature="setUniformValue(int, Array)" remove="all" /> | |||
|
53 | <modify-function signature="setUniformValue(const char*, Array)" remove="all" /> | |||
|
54 | </object-type> | |||
|
55 | <object-type name="QGLContext"> | |||
|
56 | ||||
28 | <modify-function signature="chooseContext(const QGLContext*)"> |
|
57 | <modify-function signature="chooseContext(const QGLContext*)"> | |
29 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
58 | <modify-argument index="1" invalidate-after-use="yes" /> | |
30 | </modify-function> |
|
59 | </modify-function> | |
31 | <modify-function signature="create(const QGLContext*)"> |
|
60 | <modify-function signature="create(const QGLContext*)"> | |
32 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
61 | <modify-argument index="1" invalidate-after-use="yes" /> | |
33 | </modify-function> |
|
62 | </modify-function> | |
34 |
|
63 | |||
35 | <modify-function signature="getProcAddress(QString)const"> |
|
64 | <modify-function signature="getProcAddress(QString)const"> | |
36 | <remove /> |
|
65 | <remove /> | |
37 |
</modify-function> |
|
66 | </modify-function> | |
38 | <modify-field name="currentCtx" read="false" write="false" /> |
|
67 | <modify-field name="currentCtx" read="false" write="false" /> | |
39 | <modify-function signature="setDevice(QPaintDevice*)"> |
|
68 | <modify-function signature="setDevice(QPaintDevice*)"> | |
40 | <remove /> |
|
69 | <remove /> | |
@@ -57,13 +86,14 | |||||
57 | </modify-function> |
|
86 | </modify-function> | |
58 | <modify-function signature="fontDisplayListBase(QFont, int)" remove="all"/> |
|
87 | <modify-function signature="fontDisplayListBase(QFont, int)" remove="all"/> | |
59 | <modify-function signature="setFormat(QGLFormat)" remove="all"/> |
|
88 | <modify-function signature="setFormat(QGLFormat)" remove="all"/> | |
60 |
</object-type> |
|
89 | </object-type> | |
61 |
|
90 | |||
|
91 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
92 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFramebufferObjectFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
62 |
|
93 | |||
63 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QGLColormap::QGLColormapData\*'" /> |
|
94 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QGLColormap::QGLColormapData\*'" /> | |
64 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" /> |
|
95 | <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" /> | |
65 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'" /> |
|
96 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'" /> | |
66 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'" /> |
|
97 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'" /> | |
67 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFormat' has equals operators but no qHash() function" /> |
|
98 | ||
68 |
|
||||
69 | </typesystem> |
|
99 | </typesystem> |
@@ -1,16 +1,19 | |||||
1 | <?xml version="1.0"?> |
|
1 | <?xml version="1.0"?> | |
2 | <typesystem package="com.trolltech.qt.opengl"><rejection class="QGL"/><rejection class="QGLFormat"/> |
|
2 | <typesystem package="com.trolltech.qt.opengl"><rejection class="QGL"/><rejection class="QGLFormat"/> | |
3 | <rejection class="QGLColormap::QGLColormapData"/> |
|
3 | <rejection class="QGLColormap::QGLColormapData"/> | |
4 |
<rejection class="QGLWidget" function-name="setMouseTracking"/> |
|
4 | <rejection class="QGLWidget" function-name="setMouseTracking"/> | |
5 |
|
5 | |||
6 | <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions"/> |
|
6 | <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions"/> | |
7 | <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/> |
|
7 | <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/> | |
8 | <enum-type name="QGLFramebufferObject::Attachment"/> |
|
8 | <enum-type name="QGLFramebufferObject::Attachment"/> | |
|
9 | <enum-type name="QGLContext::BindOption" flags="QGLContext::BindOptions"/> | |||
|
10 | <enum-type name="QGLShader::ShaderTypeBit" flags="QGLShader::ShaderType"/> | |||
|
11 | ||||
9 |
|
12 | |||
10 | <namespace-type name="QGL"> |
|
13 | <namespace-type name="QGL"> | |
11 | <include file-name="qgl.h" location="global"/> |
|
14 | <include file-name="qgl.h" location="global"/> | |
12 | </namespace-type> |
|
15 | </namespace-type> | |
13 |
|
16 | |||
14 | <value-type name="QGLColormap"> |
|
17 | <value-type name="QGLColormap"> | |
15 | <modify-function signature="operator=(QGLColormap)" remove="all"/> |
|
18 | <modify-function signature="operator=(QGLColormap)" remove="all"/> | |
16 |
|
19 | |||
@@ -18,23 +21,49 | |||||
18 | <access modifier="private"/> |
|
21 | <access modifier="private"/> | |
19 | </modify-function> |
|
22 | </modify-function> | |
20 | </value-type> |
|
23 | </value-type> | |
21 |
|
24 | |||
22 | <value-type name="QGLFormat"> |
|
25 | <value-type name="QGLFormat"> | |
23 | <modify-function signature="operator=(QGLFormat)" remove="all"/> |
|
26 | <modify-function signature="operator=(QGLFormat)" remove="all"/> | |
24 | </value-type> |
|
27 | </value-type> | |
25 |
|
28 | |||
26 | <object-type name="QGLContext"> |
|
29 | <value-type name="QGLFramebufferObjectFormat"/> | |
27 |
|
30 | <object-type name="QGLShader"/> | ||
|
31 | <object-type name="QGLShaderProgram"> | |||
|
32 | <!-- Should be disambiguated later by fixing the native pointer API --> | |||
|
33 | <modify-function signature="setAttributeArray(int, const QVector2D *, int)" rename="setAttributeArray_QVector2D"/> | |||
|
34 | <modify-function signature="setAttributeArray(int, const QVector3D *, int)" rename="setAttributeArray_QVector3D"/> | |||
|
35 | <modify-function signature="setAttributeArray(int, const QVector4D *, int)" rename="setAttributeArray_QVector4D"/> | |||
|
36 | <modify-function signature="setAttributeArray(const char *, const QVector2D *, int)" rename="setAttributeArray_QVector2D"/> | |||
|
37 | <modify-function signature="setAttributeArray(const char *, const QVector3D *, int)" rename="setAttributeArray_QVector3D"/> | |||
|
38 | <modify-function signature="setAttributeArray(const char *, const QVector4D *, int)" rename="setAttributeArray_QVector4D"/> | |||
|
39 | <modify-function signature="setUniformValueArray(int, const GLint *, int)" rename="setUniformValueArray_int"/> | |||
|
40 | <modify-function signature="setUniformValueArray(int, const GLuint *, int)" rename="setUniformValueArray_uint"/> | |||
|
41 | <modify-function signature="setUniformValueArray(int, const QVector2D *, int)" rename="setUniformValueArray_QVector2D"/> | |||
|
42 | <modify-function signature="setUniformValueArray(int, const QVector3D *, int)" rename="setUniformValueArray_QVector3D"/> | |||
|
43 | <modify-function signature="setUniformValueArray(int, const QVector4D *, int)" rename="setUniformValueArray_QVector4D"/> | |||
|
44 | ||||
|
45 | <modify-function signature="setUniformValueArray(const char*, const GLint *, int)" rename="setUniformValueArray_int"/> | |||
|
46 | <modify-function signature="setUniformValueArray(const char*, const GLuint *, int)" remove="all"/> | |||
|
47 | <modify-function signature="setUniformValueArray(const char*, const QVector2D *, int)" rename="setUniformValueArray_QVector2D"/> | |||
|
48 | <modify-function signature="setUniformValueArray(const char*, const QVector3D *, int)" rename="setUniformValueArray_QVector3D"/> | |||
|
49 | <modify-function signature="setUniformValueArray(const char*, const QVector4D *, int)" rename="setUniformValueArray_QVector4D"/> | |||
|
50 | <modify-function signature="setUniformValue(int, GLuint)" remove="all"/> | |||
|
51 | <modify-function signature="setUniformValue(const char*, GLuint)" remove="all"/> | |||
|
52 | <modify-function signature="setUniformValue(int, Array)" remove="all"/> | |||
|
53 | <modify-function signature="setUniformValue(const char*, Array)" remove="all"/> | |||
|
54 | </object-type> | |||
|
55 | <object-type name="QGLContext"> | |||
|
56 | ||||
28 | <modify-function signature="chooseContext(const QGLContext*)"> |
|
57 | <modify-function signature="chooseContext(const QGLContext*)"> | |
29 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
58 | <modify-argument index="1" invalidate-after-use="yes"/> | |
30 | </modify-function> |
|
59 | </modify-function> | |
31 | <modify-function signature="create(const QGLContext*)"> |
|
60 | <modify-function signature="create(const QGLContext*)"> | |
32 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
61 | <modify-argument index="1" invalidate-after-use="yes"/> | |
33 | </modify-function> |
|
62 | </modify-function> | |
34 |
|
63 | |||
35 | <modify-function signature="getProcAddress(QString)const"> |
|
64 | <modify-function signature="getProcAddress(QString)const"> | |
36 | <remove/> |
|
65 | <remove/> | |
37 |
</modify-function> |
|
66 | </modify-function> | |
38 | <modify-field name="currentCtx" read="false" write="false"/> |
|
67 | <modify-field name="currentCtx" read="false" write="false"/> | |
39 | <modify-function signature="setDevice(QPaintDevice*)"> |
|
68 | <modify-function signature="setDevice(QPaintDevice*)"> | |
40 | <remove/> |
|
69 | <remove/> | |
@@ -57,13 +86,14 | |||||
57 | </modify-function> |
|
86 | </modify-function> | |
58 | <modify-function signature="fontDisplayListBase(QFont, int)" remove="all"/> |
|
87 | <modify-function signature="fontDisplayListBase(QFont, int)" remove="all"/> | |
59 | <modify-function signature="setFormat(QGLFormat)" remove="all"/> |
|
88 | <modify-function signature="setFormat(QGLFormat)" remove="all"/> | |
60 |
</object-type> |
|
89 | </object-type> | |
61 |
|
90 | |||
|
91 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
92 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFramebufferObjectFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
62 |
|
93 | |||
63 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QGLColormap::QGLColormapData\*'"/> |
|
94 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QGLColormap::QGLColormapData\*'"/> | |
64 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/> |
|
95 | <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/> | |
65 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/> |
|
96 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/> | |
66 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> |
|
97 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> | |
67 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFormat' has equals operators but no qHash() function"/> |
|
98 | ||
68 |
|
||||
69 | </typesystem> |
|
99 | </typesystem> |
@@ -1,6 +1,6 | |||||
1 | <?xml version="1.0"?> |
|
1 | <?xml version="1.0"?> | |
2 | <typesystem> |
|
2 | <typesystem> | |
3 |
|
3 | |||
4 | <rejection class="Phonon::ObjectDescriptionData" /> |
|
4 | <rejection class="Phonon::ObjectDescriptionData" /> | |
5 | <rejection class="Phonon::ObjectDescriptionModelData" /> |
|
5 | <rejection class="Phonon::ObjectDescriptionModelData" /> | |
6 | <rejection class="Phonon::MediaNodeDestructionHandler" /> |
|
6 | <rejection class="Phonon::MediaNodeDestructionHandler" /> | |
@@ -9,19 +9,15 | |||||
9 | <rejection class="Phonon::Factory" /> |
|
9 | <rejection class="Phonon::Factory" /> | |
10 | <rejection class="Phonon::Experimental" /> |
|
10 | <rejection class="Phonon::Experimental" /> | |
11 | <rejection class="Phonon::ObjectDescriptionModel" /> |
|
11 | <rejection class="Phonon::ObjectDescriptionModel" /> | |
12 | <rejection class="AudioOutputAdaptor" /> |
|
12 | <rejection class="Phonon::BackendCapabilities::Notifier" /> | |
|
13 | <rejection class="AudioOutputAdaptor" /> | |||
13 | <rejection class="*" field-name="k_ptr" /> |
|
14 | <rejection class="*" field-name="k_ptr" /> | |
14 |
|
||||
15 | <rejection class="Phonon::AudioOutputInterface40" /> |
|
15 | <rejection class="Phonon::AudioOutputInterface40" /> | |
16 | <rejection class="Phonon::AudioOutputInterface42" /> |
|
16 | <rejection class="Phonon::AudioOutputInterface42" /> | |
17 | <rejection class="Phonon::AudioOutputInterface" /> |
|
|||
18 |
|
17 | |||
19 | <namespace-type name="Phonon" /> |
|
18 | <namespace-type name="Phonon" /> | |
20 | <namespace-type name="Phonon::BackendCapabilities" java-name="BackendCapabilities" /> |
|
19 | <namespace-type name="Phonon::BackendCapabilities" java-name="BackendCapabilities" /> | |
21 |
|
20 | |||
22 | <!-- ### causes moc-related linker error --> |
|
|||
23 | <!-- <object-type name="Phonon::BackendCapabilities::Notifier" java-name="Notifier" /> --> |
|
|||
24 |
|
||||
25 | <enum-type name="Phonon::Category"> |
|
21 | <enum-type name="Phonon::Category"> | |
26 | <reject-enum-value name="LastCategory" /> |
|
22 | <reject-enum-value name="LastCategory" /> | |
27 | </enum-type> |
|
23 | </enum-type> | |
@@ -32,7 +28,7 | |||||
32 | <enum-type name="Phonon::MetaData" /> |
|
28 | <enum-type name="Phonon::MetaData" /> | |
33 | <enum-type name="Phonon::ObjectDescriptionType" /> |
|
29 | <enum-type name="Phonon::ObjectDescriptionType" /> | |
34 | <enum-type name="Phonon::State" /> |
|
30 | <enum-type name="Phonon::State" /> | |
35 |
|
31 | |||
36 | <enum-type name="Phonon::AddonInterface::AngleCommand" /> |
|
32 | <enum-type name="Phonon::AddonInterface::AngleCommand" /> | |
37 | <enum-type name="Phonon::AddonInterface::ChapterCommand" /> |
|
33 | <enum-type name="Phonon::AddonInterface::ChapterCommand" /> | |
38 | <enum-type name="Phonon::AddonInterface::Interface" /> |
|
34 | <enum-type name="Phonon::AddonInterface::Interface" /> | |
@@ -44,16 +40,14 | |||||
44 | <enum-type name="Phonon::MediaSource::Type" /> |
|
40 | <enum-type name="Phonon::MediaSource::Type" /> | |
45 | <enum-type name="Phonon::VideoWidget::AspectRatio" /> |
|
41 | <enum-type name="Phonon::VideoWidget::AspectRatio" /> | |
46 | <enum-type name="Phonon::VideoWidget::ScaleMode" /> |
|
42 | <enum-type name="Phonon::VideoWidget::ScaleMode" /> | |
47 |
<enum-type name="Phonon::VolumeFaderEffect::FadeCurve" /> |
|
43 | <enum-type name="Phonon::VolumeFaderEffect::FadeCurve" /> | |
48 |
|
44 | |||
49 | <interface-type name="Phonon::AbstractVideoOutput" java-name="AbstractVideoOutput" /> |
|
45 | <interface-type name="Phonon::AbstractVideoOutput" java-name="AbstractVideoOutput" /> | |
50 | <interface-type name="Phonon::AddonInterface" java-name="AbstractAddon" /> |
|
46 | <interface-type name="Phonon::AddonInterface" java-name="AbstractAddon" /> | |
51 | <!-- ### causes compile error with Qt 4.5, the functions in the class aren't picked up by the typesystem --> |
|
|||
52 | <!-- <interface-type name="Phonon::AudioOutputInterface" java-name="AudioOutputInterface" /> --> |
|
|||
53 | <interface-type name="Phonon::BackendInterface" java-name="AbstractBackend" /> |
|
47 | <interface-type name="Phonon::BackendInterface" java-name="AbstractBackend" /> | |
54 | <interface-type name="Phonon::EffectInterface" java-name="AbstractEffect" /> |
|
48 | <interface-type name="Phonon::EffectInterface" java-name="AbstractEffect" /> | |
55 | <interface-type name="Phonon::MediaNode" java-name="MediaNode" /> |
|
49 | <interface-type name="Phonon::MediaNode" java-name="MediaNode" /> | |
56 |
|
50 | |||
57 | <interface-type name="Phonon::MediaObjectInterface" java-name="AbstractMediaObject" /> |
|
51 | <interface-type name="Phonon::MediaObjectInterface" java-name="AbstractMediaObject" /> | |
58 | <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin" /> |
|
52 | <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin" /> | |
59 | <interface-type name="Phonon::StreamInterface" java-name="AbstractStream" /> |
|
53 | <interface-type name="Phonon::StreamInterface" java-name="AbstractStream" /> | |
@@ -88,7 +82,7 | |||||
88 | <modify-argument index="2"> |
|
82 | <modify-argument index="2"> | |
89 | <reference-count action="ignore" /> |
|
83 | <reference-count action="ignore" /> | |
90 | </modify-argument> |
|
84 | </modify-argument> | |
91 |
</modify-function> |
|
85 | </modify-function> | |
92 | <modify-function signature="removeEffect(Phonon::Effect*)"> |
|
86 | <modify-function signature="removeEffect(Phonon::Effect*)"> | |
93 | <modify-argument index="1"> |
|
87 | <modify-argument index="1"> | |
94 | <reference-count action="remove" variable-name="__rcEffects" /> |
|
88 | <reference-count action="remove" variable-name="__rcEffects" /> | |
@@ -98,9 +92,6 | |||||
98 | <value-type name="Phonon::ObjectDescription" generate="no" /> |
|
92 | <value-type name="Phonon::ObjectDescription" generate="no" /> | |
99 | <value-type name="Phonon::EffectDescription" java-name="EffectDescription" /> |
|
93 | <value-type name="Phonon::EffectDescription" java-name="EffectDescription" /> | |
100 | <value-type name="Phonon::AudioOutputDevice" java-name="AudioOutputDevice" /> |
|
94 | <value-type name="Phonon::AudioOutputDevice" java-name="AudioOutputDevice" /> | |
101 | <value-type name="Phonon::AudioChannelDescription" java-name="AudioChannelDescription" /> |
|
|||
102 | <value-type name="Phonon::SubtitleDescription" java-name="SubtitleDescription" /> |
|
|||
103 | <value-type name="Phonon::AudioCaptureDevice" java-name="AudioCaptureDevice" /> |
|
|||
104 |
|
95 | |||
105 | <object-type name="Phonon::AbstractAudioOutput" java-name="AbstractAudioOutput" /> |
|
96 | <object-type name="Phonon::AbstractAudioOutput" java-name="AbstractAudioOutput" /> | |
106 | <object-type name="Phonon::AbstractMediaStream" java-name="AbstractMediaStream" /> |
|
97 | <object-type name="Phonon::AbstractMediaStream" java-name="AbstractMediaStream" /> | |
@@ -108,7 +99,7 | |||||
108 | <object-type name="Phonon::Effect" java-name="Effect" /> |
|
99 | <object-type name="Phonon::Effect" java-name="Effect" /> | |
109 | <object-type name="Phonon::EffectWidget" java-name="EffectWidget" /> |
|
100 | <object-type name="Phonon::EffectWidget" java-name="EffectWidget" /> | |
110 | <object-type name="Phonon::MediaController" java-name="MediaController" /> |
|
101 | <object-type name="Phonon::MediaController" java-name="MediaController" /> | |
111 |
<object-type name="Phonon::MediaObject" java-name="MediaObject"> |
|
102 | <object-type name="Phonon::MediaObject" java-name="MediaObject"> | |
112 | <modify-function signature="enqueue(const QList<QUrl> &)" rename="enqueueUrls" /> |
|
103 | <modify-function signature="enqueue(const QList<QUrl> &)" rename="enqueueUrls" /> | |
113 | <modify-function signature="setQueue(const QList<QUrl> &)" rename="setQueueToUrls" /> |
|
104 | <modify-function signature="setQueue(const QList<QUrl> &)" rename="setQueueToUrls" /> | |
114 | </object-type> |
|
105 | </object-type> | |
@@ -129,19 +120,28 | |||||
129 | </modify-argument> |
|
120 | </modify-argument> | |
130 | </modify-function> |
|
121 | </modify-function> | |
131 | </object-type> |
|
122 | </object-type> | |
|
123 | ||||
|
124 | <value-type name="Phonon::AudioChannelDescription" java-name="AudioChannelDescription" /> | |||
|
125 | <value-type name="Phonon::SubtitleDescription" java-name="SubtitleDescription" /> | |||
|
126 | <value-type name="Phonon::AudioCaptureDevice" java-name="AudioCaptureDevice" /> | |||
132 |
|
127 | |||
|
128 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'MediaSource' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
129 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Path' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
130 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Phonon_ObjectDescription' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
131 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'EffectParameter' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
132 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'EffectDescription' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
133 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'SubtitleDescription' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
134 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'AudioCaptureDevice' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
135 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'AudioOutputDevice' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
136 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'AudioChannelDescription' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
137 | ||||
133 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Final class 'AbstractAudioOutput' set to non-final, as it is extended by other classes" /> |
|
138 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Final class 'AbstractAudioOutput' set to non-final, as it is extended by other classes" /> | |
134 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QDBus' does not have a type entry" /> |
|
139 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QDBus' does not have a type entry" /> | |
135 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'create(const QString & name)' in 'QTextCodecPlugin'" /> |
|
140 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'create(const QString & name)' in 'QTextCodecPlugin'" /> | |
136 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'keys() const' in 'QTextCodecPlugin'" /> |
|
141 | <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'keys() const' in 'QTextCodecPlugin'" /> | |
137 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'MediaSource' has equals operators but no qHash() function" /> |
|
|||
138 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Path' has equals operators but no qHash() function" /> |
|
|||
139 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'EffectParameter' has equals operators but no qHash() function" /> |
|
|||
140 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Phonon_ObjectDescription' has equals operators but no qHash() function" /> |
|
|||
141 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'EffectDescription' has equals operators but no qHash() function" /> |
|
|||
142 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'AudioOutputDevice' has equals operators but no qHash() function" /> |
|
|||
143 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::operator<<', unmatched return type 'QDebug'" /> |
|
142 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::operator<<', unmatched return type 'QDebug'" /> | |
144 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::ObjectDescription::ObjectDescription', unmatched parameter type 'QExplicitlySharedDataPointer<ObjectDescriptionData> const&'" /> |
|
143 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::ObjectDescription::ObjectDescription', unmatched parameter type 'QExplicitlySharedDataPointer<ObjectDescriptionData> const&'" /> | |
|
144 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::BackendCapabilities::notifier', unmatched return type 'Phonon::BackendCapabilities::Notifier*'" /> | |||
145 |
|
145 | |||
146 |
|
146 | |||
147 |
|
147 | |||
@@ -200,6 +200,8 | |||||
200 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::AbstractVideoOutput' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
200 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::AbstractVideoOutput' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
201 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::EffectWidget' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
201 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::EffectWidget' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
202 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::VolumeFaderInterface' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
202 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::VolumeFaderInterface' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
|
203 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.phonon.AbstractAddon' for enum 'AudioChannelCommand' is not declared"/> | |||
|
204 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.phonon.AbstractAddon' for enum 'SubtitleCommand' is not declared"/> | |||
|
205 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::qHash', unmatched return type ''" /> | |||
203 |
|
206 | |||
204 |
|
||||
205 | </typesystem> |
|
207 | </typesystem> |
@@ -6,7 +6,7 | |||||
6 | <namespace-type name="QSql"> |
|
6 | <namespace-type name="QSql"> | |
7 | <include file-name="qsql.h" location="global" /> |
|
7 | <include file-name="qsql.h" location="global" /> | |
8 | </namespace-type> |
|
8 | </namespace-type> | |
9 |
|
9 | |||
10 | <value-type name="QSqlDatabase"> |
|
10 | <value-type name="QSqlDatabase"> | |
11 | <extra-includes> |
|
11 | <extra-includes> | |
12 | <include file-name="QSqlQuery" location="global" /> |
|
12 | <include file-name="QSqlQuery" location="global" /> | |
@@ -15,9 +15,9 | |||||
15 | <include file-name="QSqlRecord" location="global" /> |
|
15 | <include file-name="QSqlRecord" location="global" /> | |
16 | <include file-name="QStringList" location="global" /> |
|
16 | <include file-name="QStringList" location="global" /> | |
17 | <include file-name="QSize" location="global" /> |
|
17 | <include file-name="QSize" location="global" /> | |
18 |
</extra-includes> |
|
18 | </extra-includes> | |
19 | <modify-function signature="operator=(QSqlDatabase)" remove="all"/> |
|
19 | <modify-function signature="operator=(QSqlDatabase)" remove="all"/> | |
20 |
</value-type> |
|
20 | </value-type> | |
21 |
|
21 | |||
22 | <value-type name="QSqlQuery"> |
|
22 | <value-type name="QSqlQuery"> | |
23 | <extra-includes> |
|
23 | <extra-includes> | |
@@ -25,9 +25,9 | |||||
25 | <include file-name="QSqlRecord" location="global" /> |
|
25 | <include file-name="QSqlRecord" location="global" /> | |
26 | <include file-name="QStringList" location="global" /> |
|
26 | <include file-name="QStringList" location="global" /> | |
27 | <include file-name="QSize" location="global" /> |
|
27 | <include file-name="QSize" location="global" /> | |
28 |
</extra-includes> |
|
28 | </extra-includes> | |
29 | <modify-function signature="operator=(QSqlQuery)" remove="all"/> |
|
29 | <modify-function signature="operator=(QSqlQuery)" remove="all"/> | |
30 |
</value-type> |
|
30 | </value-type> | |
31 |
|
31 | |||
32 | <value-type name="QSqlRecord"> |
|
32 | <value-type name="QSqlRecord"> | |
33 | <extra-includes> |
|
33 | <extra-includes> | |
@@ -41,7 +41,7 | |||||
41 | <modify-function signature="operator=(QSqlError)" remove="all"/> |
|
41 | <modify-function signature="operator=(QSqlError)" remove="all"/> | |
42 | </value-type> |
|
42 | </value-type> | |
43 |
|
43 | |||
44 |
<value-type name="QSqlIndex"> |
|
44 | <value-type name="QSqlIndex"> | |
45 | <modify-function signature="operator=(QSqlIndex)" remove="all"/> |
|
45 | <modify-function signature="operator=(QSqlIndex)" remove="all"/> | |
46 | </value-type> |
|
46 | </value-type> | |
47 |
|
47 | |||
@@ -49,9 +49,9 | |||||
49 |
|
49 | |||
50 | <value-type name="QSqlField"> |
|
50 | <value-type name="QSqlField"> | |
51 | <modify-function signature="operator=(QSqlField)" remove="all"/> |
|
51 | <modify-function signature="operator=(QSqlField)" remove="all"/> | |
52 |
</value-type> |
|
52 | </value-type> | |
53 |
|
53 | |||
54 |
<object-type name="QSqlDriver"> |
|
54 | <object-type name="QSqlDriver"> | |
55 | <extra-includes> |
|
55 | <extra-includes> | |
56 | <include file-name="QSqlQuery" location="global" /> |
|
56 | <include file-name="QSqlQuery" location="global" /> | |
57 | <include file-name="QSqlError" location="global" /> |
|
57 | <include file-name="QSqlError" location="global" /> | |
@@ -59,10 +59,10 | |||||
59 | <include file-name="QSqlRecord" location="global" /> |
|
59 | <include file-name="QSqlRecord" location="global" /> | |
60 | <include file-name="QStringList" location="global" /> |
|
60 | <include file-name="QStringList" location="global" /> | |
61 | <include file-name="QSize" location="global" /> |
|
61 | <include file-name="QSize" location="global" /> | |
62 |
</extra-includes> |
|
62 | </extra-includes> | |
63 |
</object-type> |
|
63 | </object-type> | |
64 |
|
64 | |||
65 |
<object-type name="QSqlQueryModel"> |
|
65 | <object-type name="QSqlQueryModel"> | |
66 | <modify-function signature="indexInQuery(QModelIndex)const" access="non-final"/> |
|
66 | <modify-function signature="indexInQuery(QModelIndex)const" access="non-final"/> | |
67 | <modify-function signature="setQuery(QSqlQuery)" access="non-final"/> |
|
67 | <modify-function signature="setQuery(QSqlQuery)" access="non-final"/> | |
68 | <extra-includes> |
|
68 | <extra-includes> | |
@@ -71,13 +71,13 | |||||
71 | <include file-name="QSqlRecord" location="global" /> |
|
71 | <include file-name="QSqlRecord" location="global" /> | |
72 | <include file-name="QStringList" location="global" /> |
|
72 | <include file-name="QStringList" location="global" /> | |
73 | <include file-name="QSize" location="global" /> |
|
73 | <include file-name="QSize" location="global" /> | |
74 |
</extra-includes> |
|
74 | </extra-includes> | |
75 |
</object-type> |
|
75 | </object-type> | |
76 | <object-type name="QSqlRelationalTableModel"> |
|
76 | <object-type name="QSqlRelationalTableModel"> | |
77 | <extra-includes> |
|
77 | <extra-includes> | |
78 | <include file-name="QStringList" location="global" /> |
|
78 | <include file-name="QStringList" location="global" /> | |
79 | <include file-name="QSize" location="global" /> |
|
79 | <include file-name="QSize" location="global" /> | |
80 |
</extra-includes> |
|
80 | </extra-includes> | |
81 | </object-type> |
|
81 | </object-type> | |
82 | <object-type name="QSqlResult"> |
|
82 | <object-type name="QSqlResult"> | |
83 | <extra-includes> |
|
83 | <extra-includes> | |
@@ -90,21 +90,21 | |||||
90 | <modify-function signature="virtual_hook(int,void*)"> |
|
90 | <modify-function signature="virtual_hook(int,void*)"> | |
91 | <remove /> |
|
91 | <remove /> | |
92 | </modify-function> |
|
92 | </modify-function> | |
93 |
|
93 | |||
94 | </object-type> |
|
94 | </object-type> | |
95 |
<object-type name="QSqlTableModel"> |
|
95 | <object-type name="QSqlTableModel"> | |
96 | <extra-includes> |
|
96 | <extra-includes> | |
97 | <include file-name="QSqlIndex" location="global" /> |
|
97 | <include file-name="QSqlIndex" location="global" /> | |
98 | <include file-name="QStringList" location="global" /> |
|
98 | <include file-name="QStringList" location="global" /> | |
99 | <include file-name="QSize" location="global" /> |
|
99 | <include file-name="QSize" location="global" /> | |
100 |
</extra-includes> |
|
100 | </extra-includes> | |
101 |
</object-type> |
|
101 | </object-type> | |
102 | <object-type name="QSqlDriverCreatorBase"> |
|
102 | <object-type name="QSqlDriverCreatorBase"> | |
103 | <extra-includes> |
|
103 | <extra-includes> | |
104 | <include file-name="QSqlDriver" location="global" /> |
|
104 | <include file-name="QSqlDriver" location="global" /> | |
105 |
</extra-includes> |
|
105 | </extra-includes> | |
106 | </object-type> |
|
106 | </object-type> | |
107 |
|
107 | |||
108 | <enum-type name="QSql::Location" /> |
|
108 | <enum-type name="QSql::Location" /> | |
109 | <enum-type name="QSql::ParamTypeFlag" flags="QSql::ParamType" /> |
|
109 | <enum-type name="QSql::ParamTypeFlag" flags="QSql::ParamType" /> | |
110 | <enum-type name="QSql::TableType" /> |
|
110 | <enum-type name="QSql::TableType" /> | |
@@ -119,10 +119,11 | |||||
119 | <enum-type name="QSqlResult::VirtualHookOperation" /> |
|
119 | <enum-type name="QSqlResult::VirtualHookOperation" /> | |
120 | <enum-type name="QSqlTableModel::EditStrategy" /> |
|
120 | <enum-type name="QSqlTableModel::EditStrategy" /> | |
121 |
|
121 | |||
|
122 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlField' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
123 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlRecord' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
124 | ||||
122 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'" /> |
|
125 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'" /> | |
123 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" /> |
|
126 | <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" /> | |
124 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'" /> |
|
127 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'" /> | |
125 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlField' has equals operators but no qHash() function" /> |
|
|||
126 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlRecord' has equals operators but no qHash() function" /> |
|
|||
127 |
|
128 | |||
128 | </typesystem> |
|
129 | </typesystem> |
@@ -7,7 +7,7 | |||||
7 | <namespace-type name="QSql"> |
|
7 | <namespace-type name="QSql"> | |
8 | <include file-name="qsql.h" location="global"/> |
|
8 | <include file-name="qsql.h" location="global"/> | |
9 | </namespace-type> |
|
9 | </namespace-type> | |
10 |
|
10 | |||
11 | <value-type name="QSqlDatabase"> |
|
11 | <value-type name="QSqlDatabase"> | |
12 | <extra-includes> |
|
12 | <extra-includes> | |
13 | <include file-name="QSqlQuery" location="global"/> |
|
13 | <include file-name="QSqlQuery" location="global"/> | |
@@ -16,9 +16,9 | |||||
16 | <include file-name="QSqlRecord" location="global"/> |
|
16 | <include file-name="QSqlRecord" location="global"/> | |
17 | <include file-name="QStringList" location="global"/> |
|
17 | <include file-name="QStringList" location="global"/> | |
18 | <include file-name="QSize" location="global"/> |
|
18 | <include file-name="QSize" location="global"/> | |
19 |
</extra-includes> |
|
19 | </extra-includes> | |
20 | <modify-function signature="operator=(QSqlDatabase)" remove="all"/> |
|
20 | <modify-function signature="operator=(QSqlDatabase)" remove="all"/> | |
21 |
</value-type> |
|
21 | </value-type> | |
22 |
|
22 | |||
23 | <value-type name="QSqlQuery"> |
|
23 | <value-type name="QSqlQuery"> | |
24 | <extra-includes> |
|
24 | <extra-includes> | |
@@ -26,9 +26,9 | |||||
26 | <include file-name="QSqlRecord" location="global"/> |
|
26 | <include file-name="QSqlRecord" location="global"/> | |
27 | <include file-name="QStringList" location="global"/> |
|
27 | <include file-name="QStringList" location="global"/> | |
28 | <include file-name="QSize" location="global"/> |
|
28 | <include file-name="QSize" location="global"/> | |
29 |
</extra-includes> |
|
29 | </extra-includes> | |
30 | <modify-function signature="operator=(QSqlQuery)" remove="all"/> |
|
30 | <modify-function signature="operator=(QSqlQuery)" remove="all"/> | |
31 |
</value-type> |
|
31 | </value-type> | |
32 |
|
32 | |||
33 | <value-type name="QSqlRecord"> |
|
33 | <value-type name="QSqlRecord"> | |
34 | <extra-includes> |
|
34 | <extra-includes> | |
@@ -42,7 +42,7 | |||||
42 | <modify-function signature="operator=(QSqlError)" remove="all"/> |
|
42 | <modify-function signature="operator=(QSqlError)" remove="all"/> | |
43 | </value-type> |
|
43 | </value-type> | |
44 |
|
44 | |||
45 |
<value-type name="QSqlIndex"> |
|
45 | <value-type name="QSqlIndex"> | |
46 | <modify-function signature="operator=(QSqlIndex)" remove="all"/> |
|
46 | <modify-function signature="operator=(QSqlIndex)" remove="all"/> | |
47 | </value-type> |
|
47 | </value-type> | |
48 |
|
48 | |||
@@ -50,9 +50,9 | |||||
50 |
|
50 | |||
51 | <value-type name="QSqlField"> |
|
51 | <value-type name="QSqlField"> | |
52 | <modify-function signature="operator=(QSqlField)" remove="all"/> |
|
52 | <modify-function signature="operator=(QSqlField)" remove="all"/> | |
53 |
</value-type> |
|
53 | </value-type> | |
54 |
|
54 | |||
55 |
<object-type name="QSqlDriver"> |
|
55 | <object-type name="QSqlDriver"> | |
56 | <extra-includes> |
|
56 | <extra-includes> | |
57 | <include file-name="QSqlQuery" location="global"/> |
|
57 | <include file-name="QSqlQuery" location="global"/> | |
58 | <include file-name="QSqlError" location="global"/> |
|
58 | <include file-name="QSqlError" location="global"/> | |
@@ -60,10 +60,10 | |||||
60 | <include file-name="QSqlRecord" location="global"/> |
|
60 | <include file-name="QSqlRecord" location="global"/> | |
61 | <include file-name="QStringList" location="global"/> |
|
61 | <include file-name="QStringList" location="global"/> | |
62 | <include file-name="QSize" location="global"/> |
|
62 | <include file-name="QSize" location="global"/> | |
63 |
</extra-includes> |
|
63 | </extra-includes> | |
64 |
</object-type> |
|
64 | </object-type> | |
65 |
|
65 | |||
66 |
<object-type name="QSqlQueryModel"> |
|
66 | <object-type name="QSqlQueryModel"> | |
67 | <modify-function signature="indexInQuery(QModelIndex)const" access="non-final"/> |
|
67 | <modify-function signature="indexInQuery(QModelIndex)const" access="non-final"/> | |
68 | <modify-function signature="setQuery(QSqlQuery)" access="non-final"/> |
|
68 | <modify-function signature="setQuery(QSqlQuery)" access="non-final"/> | |
69 | <extra-includes> |
|
69 | <extra-includes> | |
@@ -72,13 +72,13 | |||||
72 | <include file-name="QSqlRecord" location="global"/> |
|
72 | <include file-name="QSqlRecord" location="global"/> | |
73 | <include file-name="QStringList" location="global"/> |
|
73 | <include file-name="QStringList" location="global"/> | |
74 | <include file-name="QSize" location="global"/> |
|
74 | <include file-name="QSize" location="global"/> | |
75 |
</extra-includes> |
|
75 | </extra-includes> | |
76 |
</object-type> |
|
76 | </object-type> | |
77 | <object-type name="QSqlRelationalTableModel"> |
|
77 | <object-type name="QSqlRelationalTableModel"> | |
78 | <extra-includes> |
|
78 | <extra-includes> | |
79 | <include file-name="QStringList" location="global"/> |
|
79 | <include file-name="QStringList" location="global"/> | |
80 | <include file-name="QSize" location="global"/> |
|
80 | <include file-name="QSize" location="global"/> | |
81 |
</extra-includes> |
|
81 | </extra-includes> | |
82 | </object-type> |
|
82 | </object-type> | |
83 | <object-type name="QSqlResult"> |
|
83 | <object-type name="QSqlResult"> | |
84 | <extra-includes> |
|
84 | <extra-includes> | |
@@ -91,21 +91,21 | |||||
91 | <modify-function signature="virtual_hook(int,void*)"> |
|
91 | <modify-function signature="virtual_hook(int,void*)"> | |
92 | <remove/> |
|
92 | <remove/> | |
93 | </modify-function> |
|
93 | </modify-function> | |
94 |
|
94 | |||
95 | </object-type> |
|
95 | </object-type> | |
96 |
<object-type name="QSqlTableModel"> |
|
96 | <object-type name="QSqlTableModel"> | |
97 | <extra-includes> |
|
97 | <extra-includes> | |
98 | <include file-name="QSqlIndex" location="global"/> |
|
98 | <include file-name="QSqlIndex" location="global"/> | |
99 | <include file-name="QStringList" location="global"/> |
|
99 | <include file-name="QStringList" location="global"/> | |
100 | <include file-name="QSize" location="global"/> |
|
100 | <include file-name="QSize" location="global"/> | |
101 |
</extra-includes> |
|
101 | </extra-includes> | |
102 |
</object-type> |
|
102 | </object-type> | |
103 | <object-type name="QSqlDriverCreatorBase"> |
|
103 | <object-type name="QSqlDriverCreatorBase"> | |
104 | <extra-includes> |
|
104 | <extra-includes> | |
105 | <include file-name="QSqlDriver" location="global"/> |
|
105 | <include file-name="QSqlDriver" location="global"/> | |
106 |
</extra-includes> |
|
106 | </extra-includes> | |
107 | </object-type> |
|
107 | </object-type> | |
108 |
|
108 | |||
109 | <enum-type name="QSql::Location"/> |
|
109 | <enum-type name="QSql::Location"/> | |
110 | <enum-type name="QSql::ParamTypeFlag" flags="QSql::ParamType"/> |
|
110 | <enum-type name="QSql::ParamTypeFlag" flags="QSql::ParamType"/> | |
111 | <enum-type name="QSql::TableType"/> |
|
111 | <enum-type name="QSql::TableType"/> | |
@@ -120,10 +120,11 | |||||
120 | <enum-type name="QSqlResult::VirtualHookOperation"/> |
|
120 | <enum-type name="QSqlResult::VirtualHookOperation"/> | |
121 | <enum-type name="QSqlTableModel::EditStrategy"/> |
|
121 | <enum-type name="QSqlTableModel::EditStrategy"/> | |
122 |
|
122 | |||
|
123 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlField' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
124 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlRecord' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
125 | ||||
123 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> |
|
126 | <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/> | |
124 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/> |
|
127 | <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/> | |
125 |
<suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/> |
|
128 | <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/> | |
126 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlField' has equals operators but no qHash() function"/> |
|
|||
127 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlRecord' has equals operators but no qHash() function"/> |
|
|||
128 |
|
129 | |||
129 | </typesystem> |
|
130 | </typesystem> |
@@ -2,23 +2,23 | |||||
2 | <namespace-type name="QSvg" /> |
|
2 | <namespace-type name="QSvg" /> | |
3 |
|
3 | |||
4 | <enum-type name="QGraphicsSvgItem::enum_1"/> |
|
4 | <enum-type name="QGraphicsSvgItem::enum_1"/> | |
5 |
|
5 | |||
6 | <object-type name="QSvgRenderer"> |
|
6 | <object-type name="QSvgRenderer"> | |
7 | <extra-includes> |
|
7 | <extra-includes> | |
8 | <include file-name="QRectF" location="global" /> |
|
8 | <include file-name="QRectF" location="global" /> | |
9 | <include file-name="QMatrix" location="global" /> |
|
9 | <include file-name="QMatrix" location="global" /> | |
10 | <include file-name="QSize" location="global" /> |
|
10 | <include file-name="QSize" location="global" /> | |
11 | <include file-name="QByteArray" location="global" /> |
|
11 | <include file-name="QByteArray" location="global" /> | |
12 |
</extra-includes> |
|
12 | </extra-includes> | |
13 |
</object-type> |
|
13 | </object-type> | |
14 |
|
14 | |||
15 | <object-type name="QSvgWidget"> |
|
15 | <object-type name="QSvgWidget"> | |
16 | <extra-includes> |
|
16 | <extra-includes> | |
17 | <include file-name="QByteArray" location="global" /> |
|
17 | <include file-name="QByteArray" location="global" /> | |
18 | <include file-name="QSvgRenderer" location="global" /> |
|
18 | <include file-name="QSvgRenderer" location="global" /> | |
19 | <include file-name="QSize" location="global" /> |
|
19 | <include file-name="QSize" location="global" /> | |
20 |
</extra-includes> |
|
20 | </extra-includes> | |
21 |
</object-type> |
|
21 | </object-type> | |
22 |
|
22 | |||
23 | <object-type name="QSvgGenerator"> |
|
23 | <object-type name="QSvgGenerator"> | |
24 | <modify-function signature="setOutputDevice(QIODevice*)"> |
|
24 | <modify-function signature="setOutputDevice(QIODevice*)"> | |
@@ -33,12 +33,12 | |||||
33 | <include file-name="QGraphicsItem" location="global" /> |
|
33 | <include file-name="QGraphicsItem" location="global" /> | |
34 | <include file-name="QSvgRenderer" location="global" /> |
|
34 | <include file-name="QSvgRenderer" location="global" /> | |
35 | <include file-name="QSize" location="global" /> |
|
35 | <include file-name="QSize" location="global" /> | |
36 |
</extra-includes> |
|
36 | </extra-includes> | |
37 |
|
37 | |||
38 | <modify-function signature="matrix()const" remove="all"/> |
|
38 | <modify-function signature="matrix()const" remove="all"/> | |
39 | <modify-function signature="resetMatrix()" remove="all"/> |
|
39 | <modify-function signature="resetMatrix()" remove="all"/> | |
40 | <modify-function signature="sceneMatrix()const" remove="all"/> |
|
40 | <modify-function signature="sceneMatrix()const" remove="all"/> | |
41 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> |
|
41 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> | |
42 |
|
|
42 | </object-type> | |
43 |
|
43 | |||
44 | </typesystem> |
|
44 | </typesystem> |
@@ -3,23 +3,23 | |||||
3 | <namespace-type name="QSvg"/> |
|
3 | <namespace-type name="QSvg"/> | |
4 |
|
4 | |||
5 | <enum-type name="QGraphicsSvgItem::enum_1"/> |
|
5 | <enum-type name="QGraphicsSvgItem::enum_1"/> | |
6 |
|
6 | |||
7 | <object-type name="QSvgRenderer"> |
|
7 | <object-type name="QSvgRenderer"> | |
8 | <extra-includes> |
|
8 | <extra-includes> | |
9 | <include file-name="QRectF" location="global"/> |
|
9 | <include file-name="QRectF" location="global"/> | |
10 | <include file-name="QMatrix" location="global"/> |
|
10 | <include file-name="QMatrix" location="global"/> | |
11 | <include file-name="QSize" location="global"/> |
|
11 | <include file-name="QSize" location="global"/> | |
12 | <include file-name="QByteArray" location="global"/> |
|
12 | <include file-name="QByteArray" location="global"/> | |
13 |
</extra-includes> |
|
13 | </extra-includes> | |
14 |
</object-type> |
|
14 | </object-type> | |
15 |
|
15 | |||
16 | <object-type name="QSvgWidget"> |
|
16 | <object-type name="QSvgWidget"> | |
17 | <extra-includes> |
|
17 | <extra-includes> | |
18 | <include file-name="QByteArray" location="global"/> |
|
18 | <include file-name="QByteArray" location="global"/> | |
19 | <include file-name="QSvgRenderer" location="global"/> |
|
19 | <include file-name="QSvgRenderer" location="global"/> | |
20 | <include file-name="QSize" location="global"/> |
|
20 | <include file-name="QSize" location="global"/> | |
21 |
</extra-includes> |
|
21 | </extra-includes> | |
22 |
</object-type> |
|
22 | </object-type> | |
23 |
|
23 | |||
24 | <object-type name="QSvgGenerator"> |
|
24 | <object-type name="QSvgGenerator"> | |
25 | <modify-function signature="setOutputDevice(QIODevice*)"> |
|
25 | <modify-function signature="setOutputDevice(QIODevice*)"> | |
@@ -34,12 +34,12 | |||||
34 | <include file-name="QGraphicsItem" location="global"/> |
|
34 | <include file-name="QGraphicsItem" location="global"/> | |
35 | <include file-name="QSvgRenderer" location="global"/> |
|
35 | <include file-name="QSvgRenderer" location="global"/> | |
36 | <include file-name="QSize" location="global"/> |
|
36 | <include file-name="QSize" location="global"/> | |
37 |
</extra-includes> |
|
37 | </extra-includes> | |
38 |
|
38 | |||
39 | <modify-function signature="matrix()const" remove="all"/> |
|
39 | <modify-function signature="matrix()const" remove="all"/> | |
40 | <modify-function signature="resetMatrix()" remove="all"/> |
|
40 | <modify-function signature="resetMatrix()" remove="all"/> | |
41 | <modify-function signature="sceneMatrix()const" remove="all"/> |
|
41 | <modify-function signature="sceneMatrix()const" remove="all"/> | |
42 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> |
|
42 | <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> | |
43 |
|
|
43 | </object-type> | |
44 |
|
44 | |||
45 | </typesystem> |
|
45 | </typesystem> |
@@ -5,15 +5,24 | |||||
5 | <enum-type name="QWebSettings::FontFamily"/> |
|
5 | <enum-type name="QWebSettings::FontFamily"/> | |
6 | <enum-type name="QWebSettings::FontSize"/> |
|
6 | <enum-type name="QWebSettings::FontSize"/> | |
7 | <enum-type name="QWebSettings::WebGraphic"/> |
|
7 | <enum-type name="QWebSettings::WebGraphic"/> | |
8 |
<enum-type name="QWebSettings::WebAttribute" |
|
8 | <enum-type name="QWebSettings::WebAttribute"> | |
9 | <enum-type name="QWebPage::Extension"/> |
|
9 | <reject-enum-value name="LocalStorageEnabled" /> | |
|
10 | </enum-type> | |||
|
11 | <enum-type name="QWebPage::Extension" /> | |||
10 | <enum-type name="QWebPage::NavigationType"/> |
|
12 | <enum-type name="QWebPage::NavigationType"/> | |
11 | <enum-type name="QWebPage::WebAction"/> |
|
13 | <enum-type name="QWebPage::WebAction"/> | |
12 | <enum-type name="QWebPage::WebWindowType"/> |
|
14 | <enum-type name="QWebPage::WebWindowType"/> | |
13 | <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags" /> |
|
15 | <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags" /> | |
14 | <enum-type name="QWebPage::LinkDelegationPolicy" /> |
|
16 | <enum-type name="QWebPage::LinkDelegationPolicy" /> | |
15 | <enum-type name="QWebPluginFactory::Extension"/> |
|
17 | <enum-type name="QWebPluginFactory::Extension" /> | |
16 |
|
18 | <enum-type name="QWebElement::StyleResolveStrategy" /> | ||
|
19 | <enum-type name="QWebHistory::HistoryStateVersion"> | |||
|
20 | <reject-enum-value name="DefaultHistoryVersion" /> | |||
|
21 | </enum-type> | |||
|
22 | <enum-type name="QWebPage::ErrorDomain" /> | |||
|
23 | ||||
|
24 | ||||
|
25 | <object-type name="QGraphicsWebView" /> | |||
17 | <object-type name="QWebView"> |
|
26 | <object-type name="QWebView"> | |
18 | <modify-function signature="setPage(QWebPage*)"> |
|
27 | <modify-function signature="setPage(QWebPage*)"> | |
19 | <modify-argument index="1"> |
|
28 | <modify-argument index="1"> | |
@@ -28,30 +37,102 | |||||
28 | </modify-argument> |
|
37 | </modify-argument> | |
29 | </modify-function> |
|
38 | </modify-function> | |
30 | </object-type> |
|
39 | </object-type> | |
31 |
<object-type name="QWeb |
|
40 | <object-type name="QWebPage::ExtensionOption" /> | |
|
41 | <object-type name="QWebPage::ChooseMultipleFilesExtensionOption" /> | |||
|
42 | <object-type name="QWebPage::ExtensionReturn" /> | |||
|
43 | <object-type name="QWebPage::ChooseMultipleFilesExtensionReturn" /> | |||
|
44 | <object-type name="QWebHistory"> | |||
|
45 | <modify-function signature="saveState(QWebHistory::HistoryStateVersion)const"> | |||
|
46 | <modify-argument index="1"><remove-default-expression /></modify-argument> | |||
|
47 | </modify-function> | |||
|
48 | </object-type> | |||
32 | <object-type name="QWebSettings"/> |
|
49 | <object-type name="QWebSettings"/> | |
33 |
<object-type name="QWebPage" |
|
50 | <object-type name="QWebPage"> | |
|
51 | <modify-function signature="javaScriptPrompt(QWebFrame*,QString,QString,QString*)"> | |||
|
52 | <access modifier="private"/> | |||
|
53 | </modify-function> | |||
|
54 | <modify-function signature="setView(QWidget*)"> | |||
|
55 | <modify-argument index="1"> | |||
|
56 | <reference-count action="set" variable-name="__rcView"/> | |||
|
57 | </modify-argument> | |||
|
58 | </modify-function> | |||
|
59 | <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)"> | |||
|
60 | <modify-argument index="1"> | |||
|
61 | <define-ownership class="java" owner="c++"/> | |||
|
62 | </modify-argument> | |||
|
63 | </modify-function> | |||
|
64 | </object-type> | |||
34 |
|
65 | |||
35 | <value-type name="QWebHitTestResult"> |
|
66 | <value-type name="QWebHitTestResult"> | |
36 | <modify-function signature="operator=(QWebHitTestResult)" remove="all" /> |
|
67 | <modify-function signature="operator=(QWebHitTestResult)" remove="all" /> | |
37 | </value-type> |
|
68 | </value-type> | |
38 |
|
69 | |||
39 | <value-type name="QWebHistoryItem"> |
|
70 | <value-type name="QWebHistoryItem"> | |
|
71 | <custom-constructor> | |||
|
72 | return new QWebHistoryItem(*copy); | |||
|
73 | </custom-constructor> | |||
|
74 | <custom-destructor> | |||
|
75 | delete copy; | |||
|
76 | </custom-destructor> | |||
40 | <modify-function signature="operator=(QWebHistoryItem)" remove="all"/> |
|
77 | <modify-function signature="operator=(QWebHistoryItem)" remove="all"/> | |
41 | </value-type> |
|
78 | </value-type> | |
42 |
|
79 | |||
43 | <object-type name="QWebHistoryInterface"> |
|
80 | <object-type name="QWebHistoryInterface"> | |
|
81 | <modify-function signature="setDefaultInterface(QWebHistoryInterface*)"> | |||
|
82 | <modify-argument index="1"> | |||
|
83 | <reference-count action="set" variable-name="__rcInterface"/> | |||
|
84 | </modify-argument> | |||
|
85 | </modify-function> | |||
44 | </object-type> |
|
86 | </object-type> | |
45 |
|
87 | |||
46 | <object-type name="QWebPluginFactory"> |
|
88 | <object-type name="QWebPluginFactory" /> | |
47 | </object-type> |
|
89 | <object-type name="QWebPluginDatabase" /> | |
48 | <value-type name="QWebPluginFactory::Plugin" generate="no"> |
|
90 | <object-type name="QWebInspector" /> | |
|
91 | ||||
|
92 | <value-type name="QWebPluginInfo" /> | |||
|
93 | <value-type name="QWebElement" /> | |||
|
94 | <value-type name="QWebPluginFactory::Plugin" /> | |||
|
95 | <value-type name="QWebPluginFactory::MimeType" /> | |||
|
96 | <value-type name="QWebSecurityOrigin"> | |||
|
97 | <custom-constructor> | |||
|
98 | return new QWebSecurityOrigin(*copy); | |||
|
99 | </custom-constructor> | |||
|
100 | <custom-destructor> | |||
|
101 | delete copy; | |||
|
102 | </custom-destructor> | |||
|
103 | </value-type> | |||
|
104 | <value-type name="QWebDatabase"> | |||
|
105 | <custom-constructor> | |||
|
106 | return new QWebDatabase(*copy); | |||
|
107 | </custom-constructor> | |||
|
108 | <custom-destructor> | |||
|
109 | delete copy; | |||
|
110 | </custom-destructor> | |||
49 | </value-type> |
|
111 | </value-type> | |
|
112 | <object-type name="QWebPluginFactory::ExtensionOption" /> | |||
|
113 | <object-type name="QWebPluginFactory::ExtensionReturn" /> | |||
|
114 | <object-type name="QWebPage::ErrorPageExtensionOption" /> | |||
|
115 | <object-type name="QWebPage::ErrorPageExtensionReturn" /> | |||
50 |
|
116 | |||
51 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::QWebFrame', unmatched parameter type 'QWebFrameData*'" /> |
|
117 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::QWebFrame', unmatched parameter type 'QWebFrameData*'" /> | |
52 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebSettings::QWebSettings', unmatched parameter type 'WebCore::Settings*'" /> |
|
118 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebSettings::QWebSettings', unmatched parameter type 'WebCore::Settings*'" /> | |
|
119 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebPluginInfo::QWebPluginInfo', unmatched parameter type 'WebCore::PluginPackage*'" /> | |||
|
120 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::enclosingElement', unmatched parameter type 'WebCore::Node*'" /> | |||
|
121 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::QWebElement', unmatched parameter type 'WebCore::Node*'" /> | |||
|
122 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::QWebElement', unmatched parameter type 'WebCore::Element*'" /> | |||
|
123 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping field 'QWebPluginFactory_Plugin::mimeTypes' with unmatched type 'QList<MimeType>'" /> | |||
|
124 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebPluginInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
125 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebPluginFactory_MimeType' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
126 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebElement' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
53 |
|
127 | |||
54 | <!-- Needed to avoid warnings on compilers that don't support webkit --> |
|
128 | <!-- Needed to avoid warnings on compilers that don't support webkit --> | |
|
129 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::Plugin' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
130 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::ExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
131 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::MimeType' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
132 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'Extension' is not declared" /> | |||
|
133 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::ExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
134 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPluginFactory' for enum 'Extension' is not declared" /> | |||
|
135 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
55 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'NavigationRequestResponse' is not declared" /> |
|
136 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'NavigationRequestResponse' is not declared" /> | |
56 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'WebAttribute' is not declared" /> |
|
137 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'WebAttribute' is not declared" /> | |
57 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSettings' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
138 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSettings' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
@@ -66,11 +147,17 | |||||
66 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHistory' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
147 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHistory' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
67 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebView' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
148 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebView' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
68 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
149 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
69 |
|
||||
70 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHitTestResult' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> |
|
150 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHitTestResult' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |
71 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'FindFlag' is not declared" /> |
|
151 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'FindFlag' is not declared" /> | |
72 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'LinkDelegationPolicy' is not declared" /> |
|
152 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'LinkDelegationPolicy' is not declared" /> | |
73 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'FontFamily' is not declared" /> |
|
153 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'FontFamily' is not declared" /> | |
74 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'WebWindowType' is not declared" /> |
|
154 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'WebWindowType' is not declared" /> | |
75 |
|
155 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::addToJavaScriptWindowObject', unmatched parameter type 'QScriptEngine::ValueOwnership'" /> | ||
|
156 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebDatabase' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
157 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
158 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
159 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ChooseMultipleFilesExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
160 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSecurityOrigin' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
161 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ChooseMultipleFilesExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> | |||
|
162 | ||||
76 | </typesystem> |
|
163 | </typesystem> |
@@ -5,7 +5,9 | |||||
5 | <enum-type name="QWebSettings::FontFamily"/> |
|
5 | <enum-type name="QWebSettings::FontFamily"/> | |
6 | <enum-type name="QWebSettings::FontSize"/> |
|
6 | <enum-type name="QWebSettings::FontSize"/> | |
7 | <enum-type name="QWebSettings::WebGraphic"/> |
|
7 | <enum-type name="QWebSettings::WebGraphic"/> | |
8 |
<enum-type name="QWebSettings::WebAttribute" |
|
8 | <enum-type name="QWebSettings::WebAttribute"> | |
|
9 | <reject-enum-value name="LocalStorageEnabled"/> | |||
|
10 | </enum-type> | |||
9 | <enum-type name="QWebPage::Extension"/> |
|
11 | <enum-type name="QWebPage::Extension"/> | |
10 | <enum-type name="QWebPage::NavigationType"/> |
|
12 | <enum-type name="QWebPage::NavigationType"/> | |
11 | <enum-type name="QWebPage::WebAction"/> |
|
13 | <enum-type name="QWebPage::WebAction"/> | |
@@ -13,7 +15,14 | |||||
13 | <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags"/> |
|
15 | <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags"/> | |
14 | <enum-type name="QWebPage::LinkDelegationPolicy"/> |
|
16 | <enum-type name="QWebPage::LinkDelegationPolicy"/> | |
15 | <enum-type name="QWebPluginFactory::Extension"/> |
|
17 | <enum-type name="QWebPluginFactory::Extension"/> | |
16 |
|
18 | <enum-type name="QWebElement::StyleResolveStrategy"/> | ||
|
19 | <enum-type name="QWebHistory::HistoryStateVersion"> | |||
|
20 | <reject-enum-value name="DefaultHistoryVersion"/> | |||
|
21 | </enum-type> | |||
|
22 | <enum-type name="QWebPage::ErrorDomain"/> | |||
|
23 | ||||
|
24 | ||||
|
25 | <object-type name="QGraphicsWebView"/> | |||
17 | <object-type name="QWebView"> |
|
26 | <object-type name="QWebView"> | |
18 | <modify-function signature="setPage(QWebPage*)"> |
|
27 | <modify-function signature="setPage(QWebPage*)"> | |
19 | <modify-argument index="1"> |
|
28 | <modify-argument index="1"> | |
@@ -28,30 +37,102 | |||||
28 | </modify-argument> |
|
37 | </modify-argument> | |
29 | </modify-function> |
|
38 | </modify-function> | |
30 | </object-type> |
|
39 | </object-type> | |
31 |
<object-type name="QWeb |
|
40 | <object-type name="QWebPage::ExtensionOption"/> | |
|
41 | <object-type name="QWebPage::ChooseMultipleFilesExtensionOption"/> | |||
|
42 | <object-type name="QWebPage::ExtensionReturn"/> | |||
|
43 | <object-type name="QWebPage::ChooseMultipleFilesExtensionReturn"/> | |||
|
44 | <object-type name="QWebHistory"> | |||
|
45 | <modify-function signature="saveState(QWebHistory::HistoryStateVersion)const"> | |||
|
46 | <modify-argument index="1"><remove-default-expression/></modify-argument> | |||
|
47 | </modify-function> | |||
|
48 | </object-type> | |||
32 | <object-type name="QWebSettings"/> |
|
49 | <object-type name="QWebSettings"/> | |
33 |
<object-type name="QWebPage" |
|
50 | <object-type name="QWebPage"> | |
|
51 | <modify-function signature="javaScriptPrompt(QWebFrame*,QString,QString,QString*)"> | |||
|
52 | <access modifier="private"/> | |||
|
53 | </modify-function> | |||
|
54 | <modify-function signature="setView(QWidget*)"> | |||
|
55 | <modify-argument index="1"> | |||
|
56 | <reference-count action="set" variable-name="__rcView"/> | |||
|
57 | </modify-argument> | |||
|
58 | </modify-function> | |||
|
59 | <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)"> | |||
|
60 | <modify-argument index="1"> | |||
|
61 | <define-ownership class="java" owner="c++"/> | |||
|
62 | </modify-argument> | |||
|
63 | </modify-function> | |||
|
64 | </object-type> | |||
34 |
|
65 | |||
35 | <value-type name="QWebHitTestResult"> |
|
66 | <value-type name="QWebHitTestResult"> | |
36 | <modify-function signature="operator=(QWebHitTestResult)" remove="all"/> |
|
67 | <modify-function signature="operator=(QWebHitTestResult)" remove="all"/> | |
37 | </value-type> |
|
68 | </value-type> | |
38 |
|
69 | |||
39 | <value-type name="QWebHistoryItem"> |
|
70 | <value-type name="QWebHistoryItem"> | |
|
71 | <custom-constructor> | |||
|
72 | return new QWebHistoryItem(*copy); | |||
|
73 | </custom-constructor> | |||
|
74 | <custom-destructor> | |||
|
75 | delete copy; | |||
|
76 | </custom-destructor> | |||
40 | <modify-function signature="operator=(QWebHistoryItem)" remove="all"/> |
|
77 | <modify-function signature="operator=(QWebHistoryItem)" remove="all"/> | |
41 | </value-type> |
|
78 | </value-type> | |
42 |
|
79 | |||
43 | <object-type name="QWebHistoryInterface"> |
|
80 | <object-type name="QWebHistoryInterface"> | |
|
81 | <modify-function signature="setDefaultInterface(QWebHistoryInterface*)"> | |||
|
82 | <modify-argument index="1"> | |||
|
83 | <reference-count action="set" variable-name="__rcInterface"/> | |||
|
84 | </modify-argument> | |||
|
85 | </modify-function> | |||
44 | </object-type> |
|
86 | </object-type> | |
45 |
|
87 | |||
46 | <object-type name="QWebPluginFactory"> |
|
88 | <object-type name="QWebPluginFactory"/> | |
47 | </object-type> |
|
89 | <object-type name="QWebPluginDatabase"/> | |
48 | <value-type name="QWebPluginFactory::Plugin" generate="no"> |
|
90 | <object-type name="QWebInspector"/> | |
|
91 | ||||
|
92 | <value-type name="QWebPluginInfo"/> | |||
|
93 | <value-type name="QWebElement"/> | |||
|
94 | <value-type name="QWebPluginFactory::Plugin"/> | |||
|
95 | <value-type name="QWebPluginFactory::MimeType"/> | |||
|
96 | <value-type name="QWebSecurityOrigin"> | |||
|
97 | <custom-constructor> | |||
|
98 | return new QWebSecurityOrigin(*copy); | |||
|
99 | </custom-constructor> | |||
|
100 | <custom-destructor> | |||
|
101 | delete copy; | |||
|
102 | </custom-destructor> | |||
|
103 | </value-type> | |||
|
104 | <value-type name="QWebDatabase"> | |||
|
105 | <custom-constructor> | |||
|
106 | return new QWebDatabase(*copy); | |||
|
107 | </custom-constructor> | |||
|
108 | <custom-destructor> | |||
|
109 | delete copy; | |||
|
110 | </custom-destructor> | |||
49 | </value-type> |
|
111 | </value-type> | |
|
112 | <object-type name="QWebPluginFactory::ExtensionOption"/> | |||
|
113 | <object-type name="QWebPluginFactory::ExtensionReturn"/> | |||
|
114 | <object-type name="QWebPage::ErrorPageExtensionOption"/> | |||
|
115 | <object-type name="QWebPage::ErrorPageExtensionReturn"/> | |||
50 |
|
116 | |||
51 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::QWebFrame', unmatched parameter type 'QWebFrameData*'"/> |
|
117 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::QWebFrame', unmatched parameter type 'QWebFrameData*'"/> | |
52 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebSettings::QWebSettings', unmatched parameter type 'WebCore::Settings*'"/> |
|
118 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebSettings::QWebSettings', unmatched parameter type 'WebCore::Settings*'"/> | |
|
119 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebPluginInfo::QWebPluginInfo', unmatched parameter type 'WebCore::PluginPackage*'"/> | |||
|
120 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::enclosingElement', unmatched parameter type 'WebCore::Node*'"/> | |||
|
121 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::QWebElement', unmatched parameter type 'WebCore::Node*'"/> | |||
|
122 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::QWebElement', unmatched parameter type 'WebCore::Element*'"/> | |||
|
123 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping field 'QWebPluginFactory_Plugin::mimeTypes' with unmatched type 'QList<MimeType>'"/> | |||
|
124 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebPluginInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
125 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebPluginFactory_MimeType' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
126 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebElement' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
53 |
|
127 | |||
54 | <!-- Needed to avoid warnings on compilers that don't support webkit --> |
|
128 | <!-- Needed to avoid warnings on compilers that don't support webkit --> | |
|
129 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::Plugin' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
130 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::ExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
131 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::MimeType' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
132 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'Extension' is not declared"/> | |||
|
133 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::ExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
134 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPluginFactory' for enum 'Extension' is not declared"/> | |||
|
135 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
55 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'NavigationRequestResponse' is not declared"/> |
|
136 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'NavigationRequestResponse' is not declared"/> | |
56 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'WebAttribute' is not declared"/> |
|
137 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'WebAttribute' is not declared"/> | |
57 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSettings' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
138 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSettings' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
@@ -66,11 +147,17 | |||||
66 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHistory' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
147 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHistory' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
67 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebView' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
148 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebView' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
68 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
149 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
69 |
|
||||
70 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHitTestResult' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
150 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHitTestResult' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
71 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'FindFlag' is not declared"/> |
|
151 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'FindFlag' is not declared"/> | |
72 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'LinkDelegationPolicy' is not declared"/> |
|
152 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'LinkDelegationPolicy' is not declared"/> | |
73 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'FontFamily' is not declared"/> |
|
153 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'FontFamily' is not declared"/> | |
74 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'WebWindowType' is not declared"/> |
|
154 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'WebWindowType' is not declared"/> | |
75 |
|
155 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::addToJavaScriptWindowObject', unmatched parameter type 'QScriptEngine::ValueOwnership'"/> | ||
|
156 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebDatabase' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
157 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
158 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
159 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ChooseMultipleFilesExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
160 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSecurityOrigin' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
161 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ChooseMultipleFilesExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
|
162 | ||||
76 | </typesystem> |
|
163 | </typesystem> |
@@ -1,20 +1,20 | |||||
1 | <?xml-stylesheet type="text/xsl" href="merge.xsl"?> |
|
1 | <?xml-stylesheet type="text/xsl" href="merge.xsl"?> | |
2 | <typesystem> |
|
2 | <typesystem> | |
3 | <rejection class="QXmlAttributes::Attribute" /> |
|
3 | <rejection class="QXmlAttributes::Attribute" /> | |
4 |
<rejection class="QDomNode" field-name="impl" /> |
|
4 | <rejection class="QDomNode" field-name="impl" /> | |
5 |
|
5 | |||
6 | <enum-type name="QDomNode::NodeType" /> |
|
6 | <enum-type name="QDomNode::NodeType" /> | |
7 | <enum-type name="QDomNode::EncodingPolicy" /> |
|
7 | <enum-type name="QDomNode::EncodingPolicy" /> | |
8 | <enum-type name="QDomImplementation::InvalidDataPolicy" /> |
|
8 | <enum-type name="QDomImplementation::InvalidDataPolicy" /> | |
9 | <!-- |
|
|||
10 | <enum-type name="QXmlStreamReader::Error" /> |
|
9 | <enum-type name="QXmlStreamReader::Error" /> | |
11 | <enum-type name="QXmlStreamReader::TokenType" /> |
|
10 | <enum-type name="QXmlStreamReader::TokenType" /> | |
12 | --> |
|
11 | <enum-type name="QXmlStreamReader::ReadElementTextBehaviour" /> | |
|
12 | ||||
13 |
|
13 | |||
14 | <value-type name="QDomAttr"> |
|
14 | <value-type name="QDomAttr"> | |
15 | <modify-function signature="operator=(QDomAttr)" remove="all"/> |
|
15 | <modify-function signature="operator=(QDomAttr)" remove="all"/> | |
16 | <modify-function signature="nodeType()const" remove="all"/> |
|
16 | <modify-function signature="nodeType()const" remove="all"/> | |
17 |
</value-type> |
|
17 | </value-type> | |
18 |
|
18 | |||
19 | <value-type name="QDomCDATASection"> |
|
19 | <value-type name="QDomCDATASection"> | |
20 | <modify-function signature="operator=(QDomCDATASection)" remove="all"/> |
|
20 | <modify-function signature="operator=(QDomCDATASection)" remove="all"/> | |
@@ -39,20 +39,25 | |||||
39 | <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)"> |
|
39 | <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)"> | |
40 | <modify-argument index="1"> |
|
40 | <modify-argument index="1"> | |
41 | <reference-count action="set" variable-name="__rcContent" /> |
|
41 | <reference-count action="set" variable-name="__rcContent" /> | |
42 |
</modify-argument> |
|
42 | </modify-argument> | |
43 | </modify-function> |
|
43 | </modify-function> | |
44 |
|
44 | |||
45 |
|
||||
46 | <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)"> |
|
45 | <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)"> | |
47 | <modify-argument index="1"> |
|
46 | <modify-argument index="1"> | |
48 | <reference-count action="set" variable-name="__rcContent" /> |
|
47 | <reference-count action="set" variable-name="__rcContent" /> | |
49 | </modify-argument> |
|
48 | </modify-argument> | |
50 | </modify-function> |
|
49 | </modify-function> | |
|
50 | ||||
|
51 | <modify-function signature="setContent(QXmlInputSource*,bool,QString*,int*,int*)"> | |||
|
52 | <modify-argument index="1"> | |||
|
53 | <reference-count action="set" variable-name="__rcContent" /> | |||
|
54 | </modify-argument> | |||
|
55 | </modify-function> | |||
51 |
|
56 | |||
52 | <modify-function signature="setContent(QIODevice*,QString*,int*,int*)"> |
|
57 | <modify-function signature="setContent(QIODevice*,QString*,int*,int*)"> | |
53 | <modify-argument index="1"> |
|
58 | <modify-argument index="1"> | |
54 | <reference-count action="set" variable-name="__rcContent" /> |
|
59 | <reference-count action="set" variable-name="__rcContent" /> | |
55 |
</modify-argument> |
|
60 | </modify-argument> | |
56 | </modify-function> |
|
61 | </modify-function> | |
57 |
|
62 | |||
58 | </value-type> |
|
63 | </value-type> | |
@@ -111,7 +116,6 | |||||
111 |
|
116 | |||
112 | <value-type name="QXmlParseException" /> |
|
117 | <value-type name="QXmlParseException" /> | |
113 |
|
118 | |||
114 | <!-- |
|
|||
115 | <value-type name="QXmlStreamAttribute"> |
|
119 | <value-type name="QXmlStreamAttribute"> | |
116 | <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/> |
|
120 | <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/> | |
117 | </value-type> |
|
121 | </value-type> | |
@@ -127,13 +131,16 | |||||
127 |
|
131 | |||
128 | <modify-function signature="value(const QString &, const QLatin1String &)const"> |
|
132 | <modify-function signature="value(const QString &, const QLatin1String &)const"> | |
129 | <remove /> |
|
133 | <remove /> | |
130 |
</modify-function> |
|
134 | </modify-function> | |
131 | <modify-function signature="value(const QLatin1String &, const QLatin1String &)const"> |
|
135 | <modify-function signature="value(const QLatin1String &, const QLatin1String &)const"> | |
132 | <remove /> |
|
136 | <remove /> | |
133 |
</modify-function> |
|
137 | </modify-function> | |
134 | <modify-function signature="value(const QLatin1String &)const"> |
|
138 | <modify-function signature="value(const QLatin1String &)const"> | |
135 |
<remove /> |
|
139 | <remove /> | |
136 |
</modify-function> |
|
140 | </modify-function> | |
|
141 | <modify-function signature="hasAttribute(const QLatin1String &)const"> | |||
|
142 | <remove /> | |||
|
143 | </modify-function> | |||
137 | </value-type> |
|
144 | </value-type> | |
138 |
|
145 | |||
139 | <value-type name="QXmlStreamNamespaceDeclaration"> |
|
146 | <value-type name="QXmlStreamNamespaceDeclaration"> | |
@@ -147,9 +154,8 | |||||
147 | <value-type name="QXmlStreamEntityDeclaration"> |
|
154 | <value-type name="QXmlStreamEntityDeclaration"> | |
148 | <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/> |
|
155 | <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/> | |
149 | </value-type> |
|
156 | </value-type> | |
150 | --> |
|
157 | ||
151 |
|
158 | <value-type name="QXmlAttributes"> | ||
152 | <value-type name="QXmlAttributes"> |
|
|||
153 | <modify-function signature="index(const QLatin1String&) const"> |
|
159 | <modify-function signature="index(const QLatin1String&) const"> | |
154 | <remove/> |
|
160 | <remove/> | |
155 | </modify-function> |
|
161 | </modify-function> | |
@@ -162,39 +168,39 | |||||
162 | <custom-constructor> |
|
168 | <custom-constructor> | |
163 | QXmlNamespaceSupport *clone = new QXmlNamespaceSupport; |
|
169 | QXmlNamespaceSupport *clone = new QXmlNamespaceSupport; | |
164 | clone->setPrefix("", copy->uri("")); |
|
170 | clone->setPrefix("", copy->uri("")); | |
165 |
|
171 | |||
166 | QStringList prefixes = copy->prefixes(); |
|
172 | QStringList prefixes = copy->prefixes(); | |
167 |
for (int i=0; i<prefixes.size(); ++i) |
|
173 | for (int i=0; i<prefixes.size(); ++i) | |
168 | clone->setPrefix(prefixes.at(i), copy->uri(prefixes.at(i))); |
|
174 | clone->setPrefix(prefixes.at(i), copy->uri(prefixes.at(i))); | |
169 |
|
175 | |||
170 | return clone; |
|
176 | return clone; | |
171 | </custom-constructor> |
|
177 | </custom-constructor> | |
172 | <custom-destructor> |
|
178 | <custom-destructor> | |
173 | delete (QXmlNamespaceSupport *)copy; |
|
179 | delete (QXmlNamespaceSupport *)copy; | |
174 |
</custom-destructor> |
|
180 | </custom-destructor> | |
|
181 | ||||
175 |
|
182 | |||
176 |
|
||||
177 | </value-type> |
|
183 | </value-type> | |
178 |
|
184 | |||
179 | <value-type name="QDomElement"> |
|
185 | <value-type name="QDomElement"> | |
180 | <modify-function signature="nodeType()const" remove="all"/> |
|
186 | <modify-function signature="nodeType()const" remove="all"/> | |
181 | <modify-function signature="operator=(QDomElement)" remove="all"/> |
|
187 | <modify-function signature="operator=(QDomElement)" remove="all"/> | |
182 |
|
188 | |||
183 | <modify-function signature="setAttribute(const QString &, unsigned int)"> |
|
189 | <modify-function signature="setAttribute(const QString &, unsigned int)"> | |
184 | <remove /> |
|
190 | <remove /> | |
185 | </modify-function> |
|
191 | </modify-function> | |
186 |
<modify-function signature="setAttribute(const QString &, |
|
192 | <modify-function signature="setAttribute(const QString &, unsigned long long)"> | |
187 | <remove /> |
|
193 | <remove /> | |
188 |
</modify-function> |
|
194 | </modify-function> | |
189 | <modify-function signature="setAttributeNS(const QString, const QString &, unsigned int)"> |
|
195 | <modify-function signature="setAttributeNS(const QString, const QString &, unsigned int)"> | |
190 | <remove /> |
|
196 | <remove /> | |
191 | </modify-function> |
|
197 | </modify-function> | |
192 |
<modify-function signature="setAttributeNS(const QString, const QString &, |
|
198 | <modify-function signature="setAttributeNS(const QString, const QString &, unsigned long long)"> | |
193 | <remove /> |
|
199 | <remove /> | |
194 |
</modify-function> |
|
200 | </modify-function> | |
195 |
|
201 | |||
196 | </value-type> |
|
202 | </value-type> | |
197 |
|
203 | |||
198 | <interface-type name="QXmlContentHandler"> |
|
204 | <interface-type name="QXmlContentHandler"> | |
199 | <modify-function signature="setDocumentLocator(QXmlLocator*)"> |
|
205 | <modify-function signature="setDocumentLocator(QXmlLocator*)"> | |
200 | <modify-argument index="1"> |
|
206 | <modify-argument index="1"> | |
@@ -207,21 +213,21 | |||||
207 | <interface-type name="QXmlEntityResolver" /> |
|
213 | <interface-type name="QXmlEntityResolver" /> | |
208 | <interface-type name="QXmlErrorHandler" /> |
|
214 | <interface-type name="QXmlErrorHandler" /> | |
209 | <interface-type name="QXmlLexicalHandler" /> |
|
215 | <interface-type name="QXmlLexicalHandler" /> | |
210 |
|
216 | |||
211 | <object-type name="QXmlDefaultHandler"> |
|
217 | <object-type name="QXmlDefaultHandler"> | |
212 | <modify-function signature="setDocumentLocator(QXmlLocator*)"> |
|
218 | <modify-function signature="setDocumentLocator(QXmlLocator*)"> | |
213 | <modify-argument index="1"> |
|
219 | <modify-argument index="1"> | |
214 | <define-ownership class="shell" owner="c++" /> |
|
220 | <define-ownership class="shell" owner="c++" /> | |
215 | </modify-argument> |
|
221 | </modify-argument> | |
216 |
</modify-function> |
|
222 | </modify-function> | |
217 | </object-type> |
|
223 | </object-type> | |
218 | <object-type name="QXmlInputSource" /> |
|
224 | <object-type name="QXmlInputSource" /> | |
219 |
<object-type name="QXmlLocator" /> |
|
225 | <object-type name="QXmlLocator" /> | |
220 | <object-type name="QXmlSimpleReader"> |
|
226 | <object-type name="QXmlSimpleReader"> | |
221 | <modify-function signature="parse(const QXmlInputSource*,bool)"> |
|
227 | <modify-function signature="parse(const QXmlInputSource*,bool)"> | |
222 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
228 | <modify-argument index="1" invalidate-after-use="yes" /> | |
223 | </modify-function> |
|
229 | </modify-function> | |
224 |
|
230 | |||
225 | <modify-function signature="setContentHandler(QXmlContentHandler*)"> |
|
231 | <modify-function signature="setContentHandler(QXmlContentHandler*)"> | |
226 | <modify-argument index="1"> |
|
232 | <modify-argument index="1"> | |
227 | <reference-count action="set" variable-name="__rcContentHandler" /> |
|
233 | <reference-count action="set" variable-name="__rcContentHandler" /> | |
@@ -254,7 +260,6 | |||||
254 | </modify-function> |
|
260 | </modify-function> | |
255 | </object-type> |
|
261 | </object-type> | |
256 |
|
262 | |||
257 | <!-- |
|
|||
258 | <object-type name="QXmlStreamReader"> |
|
263 | <object-type name="QXmlStreamReader"> | |
259 | <modify-function signature="QXmlStreamReader(const char*)" remove="all" /> |
|
264 | <modify-function signature="QXmlStreamReader(const char*)" remove="all" /> | |
260 | <modify-function signature="addData(const char*)" remove="all" /> |
|
265 | <modify-function signature="addData(const char*)" remove="all" /> | |
@@ -262,19 +267,28 | |||||
262 | <modify-argument index="1"> |
|
267 | <modify-argument index="1"> | |
263 | <reference-count action="set" variable-name="__rcEntityResolver" /> |
|
268 | <reference-count action="set" variable-name="__rcEntityResolver" /> | |
264 | </modify-argument> |
|
269 | </modify-argument> | |
265 |
</modify-function> |
|
270 | </modify-function> | |
266 | </object-type> |
|
271 | </object-type> | |
267 | <object-type name="QXmlStreamWriter"> |
|
272 | <object-type name="QXmlStreamWriter"> | |
268 | <modify-function signature="QXmlStreamWriter(QString *)"> |
|
273 | <modify-function signature="QXmlStreamWriter(QString *)"> | |
269 | <remove /> |
|
274 | <remove /> | |
270 | </modify-function> |
|
275 | </modify-function> | |
271 | </object-type> |
|
276 | </object-type> | |
272 | --> |
|
277 | ||
273 |
|
||||
274 | <object-type name="QXmlReader"> |
|
278 | <object-type name="QXmlReader"> | |
275 | <modify-function signature="parse(const QXmlInputSource*)"> |
|
279 | <modify-function signature="parse(const QXmlInputSource*)"> | |
276 | <modify-argument index="1" invalidate-after-use="yes" /> |
|
280 | <modify-argument index="1" invalidate-after-use="yes" /> | |
277 | </modify-function> |
|
281 | </modify-function> | |
278 |
</object-type> |
|
282 | </object-type> | |
279 |
|
283 | |||
|
284 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNodeList' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
285 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamNamespaceDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
286 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNamedNodeMap' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
287 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamNotationDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
288 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNode' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
289 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomImplementation' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
290 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamAttribute' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
291 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamAttributes' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
292 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamEntityDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." /> | |||
|
293 | ||||
280 | </typesystem> |
|
294 | </typesystem> |
@@ -1,20 +1,20 | |||||
1 | <?xml version="1.0"?> |
|
1 | <?xml version="1.0"?> | |
2 | <typesystem package="com.trolltech.qt.xml"><rejection class="QXmlNamespaceSupport"/> |
|
2 | <typesystem package="com.trolltech.qt.xml"><rejection class="QXmlNamespaceSupport"/> | |
3 | <rejection class="QXmlAttributes::Attribute"/> |
|
3 | <rejection class="QXmlAttributes::Attribute"/> | |
4 |
<rejection class="QDomNode" field-name="impl"/> |
|
4 | <rejection class="QDomNode" field-name="impl"/> | |
5 |
|
5 | |||
6 | <enum-type name="QDomNode::NodeType"/> |
|
6 | <enum-type name="QDomNode::NodeType"/> | |
7 | <enum-type name="QDomNode::EncodingPolicy"/> |
|
7 | <enum-type name="QDomNode::EncodingPolicy"/> | |
8 | <enum-type name="QDomImplementation::InvalidDataPolicy"/> |
|
8 | <enum-type name="QDomImplementation::InvalidDataPolicy"/> | |
9 | <!-- |
|
9 | <enum-type name="QXmlStreamReader::Error"/> | |
10 |
<enum-type name="QXmlStreamReader:: |
|
10 | <enum-type name="QXmlStreamReader::TokenType"/> | |
11 |
<enum-type name="QXmlStreamReader:: |
|
11 | <enum-type name="QXmlStreamReader::ReadElementTextBehaviour"/> | |
12 | --> |
|
12 | ||
13 |
|
13 | |||
14 | <value-type name="QDomAttr"> |
|
14 | <value-type name="QDomAttr"> | |
15 | <modify-function signature="operator=(QDomAttr)" remove="all"/> |
|
15 | <modify-function signature="operator=(QDomAttr)" remove="all"/> | |
16 | <modify-function signature="nodeType()const" remove="all"/> |
|
16 | <modify-function signature="nodeType()const" remove="all"/> | |
17 |
</value-type> |
|
17 | </value-type> | |
18 |
|
18 | |||
19 | <value-type name="QDomCDATASection"> |
|
19 | <value-type name="QDomCDATASection"> | |
20 | <modify-function signature="operator=(QDomCDATASection)" remove="all"/> |
|
20 | <modify-function signature="operator=(QDomCDATASection)" remove="all"/> | |
@@ -39,20 +39,25 | |||||
39 | <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)"> |
|
39 | <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)"> | |
40 | <modify-argument index="1"> |
|
40 | <modify-argument index="1"> | |
41 | <reference-count action="set" variable-name="__rcContent"/> |
|
41 | <reference-count action="set" variable-name="__rcContent"/> | |
42 |
</modify-argument> |
|
42 | </modify-argument> | |
43 | </modify-function> |
|
43 | </modify-function> | |
44 |
|
44 | |||
45 |
|
||||
46 | <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)"> |
|
45 | <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)"> | |
47 | <modify-argument index="1"> |
|
46 | <modify-argument index="1"> | |
48 | <reference-count action="set" variable-name="__rcContent"/> |
|
47 | <reference-count action="set" variable-name="__rcContent"/> | |
49 | </modify-argument> |
|
48 | </modify-argument> | |
50 | </modify-function> |
|
49 | </modify-function> | |
|
50 | ||||
|
51 | <modify-function signature="setContent(QXmlInputSource*,bool,QString*,int*,int*)"> | |||
|
52 | <modify-argument index="1"> | |||
|
53 | <reference-count action="set" variable-name="__rcContent"/> | |||
|
54 | </modify-argument> | |||
|
55 | </modify-function> | |||
51 |
|
56 | |||
52 | <modify-function signature="setContent(QIODevice*,QString*,int*,int*)"> |
|
57 | <modify-function signature="setContent(QIODevice*,QString*,int*,int*)"> | |
53 | <modify-argument index="1"> |
|
58 | <modify-argument index="1"> | |
54 | <reference-count action="set" variable-name="__rcContent"/> |
|
59 | <reference-count action="set" variable-name="__rcContent"/> | |
55 |
</modify-argument> |
|
60 | </modify-argument> | |
56 | </modify-function> |
|
61 | </modify-function> | |
57 |
|
62 | |||
58 | </value-type> |
|
63 | </value-type> | |
@@ -129,14 +134,13 | |||||
129 |
|
134 | |||
130 | <value-type name="QXmlParseException"/> |
|
135 | <value-type name="QXmlParseException"/> | |
131 |
|
136 | |||
132 | <!-- |
|
|||
133 | <value-type name="QXmlStreamAttribute"> |
|
137 | <value-type name="QXmlStreamAttribute"> | |
134 | <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/> |
|
138 | <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/> | |
135 | </value-type> |
|
139 | </value-type> | |
136 |
|
140 | |||
137 | <value-type name="QXmlStreamAttributes"> |
|
141 | <value-type name="QXmlStreamAttributes"> | |
138 |
<modify-function signature="operator+(QVector<QXmlStreamAttribute |
|
142 | <modify-function signature="operator+(QVector<QXmlStreamAttribute>)const" remove="all"/> | |
139 |
<modify-function signature="operator<<(QVector<QXmlStreamAttribute |
|
143 | <modify-function signature="operator<<(QVector<QXmlStreamAttribute>)" remove="all"/> | |
140 | <modify-function signature="operator<<(QXmlStreamAttribute)" remove="all"/> |
|
144 | <modify-function signature="operator<<(QXmlStreamAttribute)" remove="all"/> | |
141 | <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/> |
|
145 | <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/> | |
142 | <modify-function signature="pop_back()" remove="all"/> |
|
146 | <modify-function signature="pop_back()" remove="all"/> | |
@@ -144,14 +148,17 | |||||
144 | <modify-function signature="pop_front()" remove="all"/> |
|
148 | <modify-function signature="pop_front()" remove="all"/> | |
145 |
|
149 | |||
146 | <modify-function signature="value(const QString &, const QLatin1String &)const"> |
|
150 | <modify-function signature="value(const QString &, const QLatin1String &)const"> | |
147 |
<remove |
|
151 | <remove/> | |
148 |
</modify-function> |
|
152 | </modify-function> | |
149 | <modify-function signature="value(const QLatin1String &, const QLatin1String &)const"> |
|
153 | <modify-function signature="value(const QLatin1String &, const QLatin1String &)const"> | |
150 |
<remove |
|
154 | <remove/> | |
151 |
</modify-function> |
|
155 | </modify-function> | |
152 | <modify-function signature="value(const QLatin1String &)const"> |
|
156 | <modify-function signature="value(const QLatin1String &)const"> | |
153 |
<remove |
|
157 | <remove/> | |
154 |
</modify-function> |
|
158 | </modify-function> | |
|
159 | <modify-function signature="hasAttribute(const QLatin1String &)const"> | |||
|
160 | <remove/> | |||
|
161 | </modify-function> | |||
155 | </value-type> |
|
162 | </value-type> | |
156 |
|
163 | |||
157 | <value-type name="QXmlStreamNamespaceDeclaration"> |
|
164 | <value-type name="QXmlStreamNamespaceDeclaration"> | |
@@ -165,9 +172,8 | |||||
165 | <value-type name="QXmlStreamEntityDeclaration"> |
|
172 | <value-type name="QXmlStreamEntityDeclaration"> | |
166 | <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/> |
|
173 | <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/> | |
167 | </value-type> |
|
174 | </value-type> | |
168 | --> |
|
175 | ||
169 |
|
176 | <value-type name="QXmlAttributes"> | ||
170 | <value-type name="QXmlAttributes"> |
|
|||
171 | <modify-function signature="index(const QLatin1String&) const"> |
|
177 | <modify-function signature="index(const QLatin1String&) const"> | |
172 | <remove/> |
|
178 | <remove/> | |
173 | </modify-function> |
|
179 | </modify-function> | |
@@ -180,39 +186,39 | |||||
180 | <custom-constructor> |
|
186 | <custom-constructor> | |
181 | QXmlNamespaceSupport *clone = new QXmlNamespaceSupport; |
|
187 | QXmlNamespaceSupport *clone = new QXmlNamespaceSupport; | |
182 | clone->setPrefix("", copy->uri("")); |
|
188 | clone->setPrefix("", copy->uri("")); | |
183 |
|
189 | |||
184 | QStringList prefixes = copy->prefixes(); |
|
190 | QStringList prefixes = copy->prefixes(); | |
185 |
for (int i=0; i<prefixes.size(); ++i) |
|
191 | for (int i=0; i<prefixes.size(); ++i) | |
186 | clone->setPrefix(prefixes.at(i), copy->uri(prefixes.at(i))); |
|
192 | clone->setPrefix(prefixes.at(i), copy->uri(prefixes.at(i))); | |
187 |
|
193 | |||
188 | return clone; |
|
194 | return clone; | |
189 | </custom-constructor> |
|
195 | </custom-constructor> | |
190 | <custom-destructor> |
|
196 | <custom-destructor> | |
191 | delete (QXmlNamespaceSupport *)copy; |
|
197 | delete (QXmlNamespaceSupport *)copy; | |
192 |
</custom-destructor> |
|
198 | </custom-destructor> | |
|
199 | ||||
193 |
|
200 | |||
194 |
|
||||
195 | </value-type> |
|
201 | </value-type> | |
196 |
|
202 | |||
197 | <value-type name="QDomElement"> |
|
203 | <value-type name="QDomElement"> | |
198 | <modify-function signature="nodeType()const" remove="all"/> |
|
204 | <modify-function signature="nodeType()const" remove="all"/> | |
199 | <modify-function signature="operator=(QDomElement)" remove="all"/> |
|
205 | <modify-function signature="operator=(QDomElement)" remove="all"/> | |
200 |
|
206 | |||
201 | <modify-function signature="setAttribute(const QString &, unsigned int)"> |
|
207 | <modify-function signature="setAttribute(const QString &, unsigned int)"> | |
202 | <remove/> |
|
208 | <remove/> | |
203 | </modify-function> |
|
209 | </modify-function> | |
204 |
<modify-function signature="setAttribute(const QString &, |
|
210 | <modify-function signature="setAttribute(const QString &, unsigned long long)"> | |
205 | <remove/> |
|
211 | <remove/> | |
206 |
</modify-function> |
|
212 | </modify-function> | |
207 | <modify-function signature="setAttributeNS(const QString, const QString &, unsigned int)"> |
|
213 | <modify-function signature="setAttributeNS(const QString, const QString &, unsigned int)"> | |
208 | <remove/> |
|
214 | <remove/> | |
209 | </modify-function> |
|
215 | </modify-function> | |
210 |
<modify-function signature="setAttributeNS(const QString, const QString &, |
|
216 | <modify-function signature="setAttributeNS(const QString, const QString &, unsigned long long)"> | |
211 | <remove/> |
|
217 | <remove/> | |
212 |
</modify-function> |
|
218 | </modify-function> | |
213 |
|
219 | |||
214 | </value-type> |
|
220 | </value-type> | |
215 |
|
221 | |||
216 | <interface-type name="QXmlContentHandler"> |
|
222 | <interface-type name="QXmlContentHandler"> | |
217 | <modify-function signature="setDocumentLocator(QXmlLocator*)"> |
|
223 | <modify-function signature="setDocumentLocator(QXmlLocator*)"> | |
218 | <modify-argument index="1"> |
|
224 | <modify-argument index="1"> | |
@@ -225,21 +231,21 | |||||
225 | <interface-type name="QXmlEntityResolver"/> |
|
231 | <interface-type name="QXmlEntityResolver"/> | |
226 | <interface-type name="QXmlErrorHandler"/> |
|
232 | <interface-type name="QXmlErrorHandler"/> | |
227 | <interface-type name="QXmlLexicalHandler"/> |
|
233 | <interface-type name="QXmlLexicalHandler"/> | |
228 |
|
234 | |||
229 | <object-type name="QXmlDefaultHandler"> |
|
235 | <object-type name="QXmlDefaultHandler"> | |
230 | <modify-function signature="setDocumentLocator(QXmlLocator*)"> |
|
236 | <modify-function signature="setDocumentLocator(QXmlLocator*)"> | |
231 | <modify-argument index="1"> |
|
237 | <modify-argument index="1"> | |
232 | <define-ownership class="shell" owner="c++"/> |
|
238 | <define-ownership class="shell" owner="c++"/> | |
233 | </modify-argument> |
|
239 | </modify-argument> | |
234 |
</modify-function> |
|
240 | </modify-function> | |
235 | </object-type> |
|
241 | </object-type> | |
236 | <object-type name="QXmlInputSource"/> |
|
242 | <object-type name="QXmlInputSource"/> | |
237 |
<object-type name="QXmlLocator"/> |
|
243 | <object-type name="QXmlLocator"/> | |
238 | <object-type name="QXmlSimpleReader"> |
|
244 | <object-type name="QXmlSimpleReader"> | |
239 | <modify-function signature="parse(const QXmlInputSource*,bool)"> |
|
245 | <modify-function signature="parse(const QXmlInputSource*,bool)"> | |
240 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
246 | <modify-argument index="1" invalidate-after-use="yes"/> | |
241 | </modify-function> |
|
247 | </modify-function> | |
242 |
|
248 | |||
243 | <modify-function signature="setContentHandler(QXmlContentHandler*)"> |
|
249 | <modify-function signature="setContentHandler(QXmlContentHandler*)"> | |
244 | <modify-argument index="1"> |
|
250 | <modify-argument index="1"> | |
245 | <reference-count action="set" variable-name="__rcContentHandler"/> |
|
251 | <reference-count action="set" variable-name="__rcContentHandler"/> | |
@@ -272,23 +278,21 | |||||
272 | </modify-function> |
|
278 | </modify-function> | |
273 | </object-type> |
|
279 | </object-type> | |
274 |
|
280 | |||
275 | <!-- |
|
|||
276 | <object-type name="QXmlStreamReader"> |
|
281 | <object-type name="QXmlStreamReader"> | |
277 |
<modify-function signature="QXmlStreamReader(const char*)" remove="all" |
|
282 | <modify-function signature="QXmlStreamReader(const char*)" remove="all"/> | |
278 |
<modify-function signature="addData(const char*)" remove="all" |
|
283 | <modify-function signature="addData(const char*)" remove="all"/> | |
279 | <modify-function signature="setEntityResolver(QXmlStreamEntityResolver*)"> |
|
284 | <modify-function signature="setEntityResolver(QXmlStreamEntityResolver*)"> | |
280 | <modify-argument index="1"> |
|
285 | <modify-argument index="1"> | |
281 |
<reference-count action="set" variable-name="__rcEntityResolver" |
|
286 | <reference-count action="set" variable-name="__rcEntityResolver"/> | |
282 | </modify-argument> |
|
287 | </modify-argument> | |
283 |
</modify-function> |
|
288 | </modify-function> | |
284 | </object-type> |
|
289 | </object-type> | |
285 | <object-type name="QXmlStreamWriter"> |
|
290 | <object-type name="QXmlStreamWriter"> | |
286 | <modify-function signature="QXmlStreamWriter(QString *)"> |
|
291 | <modify-function signature="QXmlStreamWriter(QString *)"> | |
287 |
<remove |
|
292 | <remove/> | |
288 | </modify-function> |
|
293 | </modify-function> | |
289 | </object-type> |
|
294 | </object-type> | |
290 | --> |
|
295 | ||
291 |
|
||||
292 | <object-type name="QXmlReader"> |
|
296 | <object-type name="QXmlReader"> | |
293 | <modify-function signature="parse(const QXmlInputSource*)"> |
|
297 | <modify-function signature="parse(const QXmlInputSource*)"> | |
294 | <modify-argument index="1" invalidate-after-use="yes"/> |
|
298 | <modify-argument index="1" invalidate-after-use="yes"/> | |
@@ -304,6 +308,16 | |||||
304 | <remove-argument/> |
|
308 | <remove-argument/> | |
305 | </modify-argument> |
|
309 | </modify-argument> | |
306 | </modify-function> |
|
310 | </modify-function> | |
307 |
</object-type> |
|
311 | </object-type> | |
308 |
|
312 | |||
|
313 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNodeList' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
314 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamNamespaceDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
315 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNamedNodeMap' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
316 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamNotationDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
317 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNode' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
318 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomImplementation' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
319 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamAttribute' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
320 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamAttributes' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
321 | <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamEntityDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/> | |||
|
322 | ||||
309 | </typesystem> |
|
323 | </typesystem> |
@@ -2,11 +2,14 | |||||
2 | <typesystem> |
|
2 | <typesystem> | |
3 |
|
3 | |||
4 |
|
4 | |||
|
5 | <namespace-type name="QPatternist"/> | |||
|
6 | <namespace-type name="QPatternistSDK"/> | |||
|
7 | ||||
5 | <enum-type name="QXmlNodeModelIndex::NodeKind"/> |
|
8 | <enum-type name="QXmlNodeModelIndex::NodeKind"/> | |
6 | <enum-type name="QXmlNodeModelIndex::DocumentOrder"/> |
|
9 | <enum-type name="QXmlNodeModelIndex::DocumentOrder"/> | |
7 |
<enum-type name="QXmlNodeModel |
|
10 | <enum-type name="QAbstractXmlNodeModel::NodeCopySetting"/> | |
8 | <enum-type name="QXmlQuery::QueryLanguage"/> |
|
|||
9 | <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/> |
|
11 | <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/> | |
|
12 | <enum-type name="QXmlQuery::QueryLanguage" /> | |||
10 |
|
13 | |||
11 | <object-type name="QAbstractMessageHandler"> |
|
14 | <object-type name="QAbstractMessageHandler"> | |
12 | <modify-function signature="QAbstractMessageHandler(QObject*)" remove="all" /> |
|
15 | <modify-function signature="QAbstractMessageHandler(QObject*)" remove="all" /> | |
@@ -15,29 +18,33 | |||||
15 | <object-type name="QAbstractXmlForwardIterator"/> |
|
18 | <object-type name="QAbstractXmlForwardIterator"/> | |
16 |
|
19 | |||
17 | <rejection class="QPatternist::NodeIndexStorage" /> |
|
20 | <rejection class="QPatternist::NodeIndexStorage" /> | |
18 |
|
21 | <rejection class="QAbstractXmlNodeModel" function-name="mapToItem" /> | ||
19 | <rejection class="QAbstractXmlNodeModel" enum-name="NodeCopySetting"/> |
|
|||
20 | <rejection class="QAbstractXmlNodeModel" function-name="mapToSequence" /> |
|
22 | <rejection class="QAbstractXmlNodeModel" function-name="mapToSequence" /> | |
21 | <rejection class="QAbstractXmlNodeModel" function-name="sequencedTypedValue" /> |
|
23 | <rejection class="QAbstractXmlNodeModel" function-name="sequencedTypedValue" /> | |
22 | <rejection class="QAbstractXmlNodeModel" function-name="sendNamespaces" /> |
|
24 | <rejection class="QAbstractXmlNodeModel" function-name="sendNamespaces" /> | |
23 | <rejection class="QAbstractXmlNodeModel" function-name="iterate" /> |
|
25 | <rejection class="QAbstractXmlNodeModel" function-name="iterate" /> | |
24 | <rejection class="QAbstractXmlNodeModel" function-name="copyNodeTo" /> |
|
26 | <rejection class="QAbstractXmlNodeModel" function-name="copyNodeTo" /> | |
25 | <rejection class="QAbstractXmlNodeModel" function-name="type" /> |
|
27 | <rejection class="QAbstractXmlNodeModel" function-name="type" /> | |
26 | <rejection class="QAbstractXmlNodeModel" function-name="isDeepEqual" /> |
|
|||
27 | <rejection class="QAbstractXmlNodeModel" function-name="namespaceForPrefix" /> |
|
|||
28 | <object-type name="QAbstractXmlNodeModel"> |
|
28 | <object-type name="QAbstractXmlNodeModel"> | |
|
29 | <modify-function signature="QAbstractXmlNodeModel()" remove="all" /> | |||
|
30 | <modify-function signature="namespaceForPrefix(QXmlNodeModelIndex,short) const" | |||
|
31 | remove="all" /> | |||
|
32 | <modify-function signature="isDeepEqual(QXmlNodeModelIndex,QXmlNodeModelIndex) const" | |||
|
33 | remove="all" /> | |||
29 | </object-type> |
|
34 | </object-type> | |
30 |
|
35 | |||
31 | <rejection class="QAbstractXmlReceiver" function-name="item" /> |
|
36 | <rejection class="QAbstractXmlReceiver" function-name="item" /> | |
32 | <rejection class="QAbstractXmlReceiver" function-name="sendAsNode" /> |
|
37 | <rejection class="QAbstractXmlReceiver" function-name="sendAsNode" /> | |
33 |
< |
|
38 | <value-type name="QAbstractXmlReceiver"> | |
34 |
</ |
|
39 | </value-type> | |
35 |
|
40 | |||
36 | <object-type name="QSimpleXmlNodeModel" /> |
|
41 | <object-type name="QSimpleXmlNodeModel" /> | |
37 |
|
42 | |||
38 | <value-type name="QSourceLocation"> |
|
43 | <value-type name="QSourceLocation"> | |
39 | <modify-function signature="operator=(QSourceLocation)" remove="all" /> |
|
44 | <modify-function signature="operator=(QSourceLocation)" remove="all" /> | |
40 | </value-type> |
|
45 | </value-type> | |
|
46 | <value-type name="QXmlSchema" /> | |||
|
47 | <object-type name="QXmlSchemaValidator" /> | |||
41 |
|
48 | |||
42 | <rejection class="QXmlFormatter" function-name="item" /> |
|
49 | <rejection class="QXmlFormatter" function-name="item" /> | |
43 | <object-type name="QXmlFormatter"> |
|
50 | <object-type name="QXmlFormatter"> | |
@@ -49,8 +56,18 | |||||
49 | </value-type> |
|
56 | </value-type> | |
50 |
|
57 | |||
51 | <value-type name="QXmlName"> |
|
58 | <value-type name="QXmlName"> | |
|
59 | <modify-function signature="QXmlName(QXmlNamePool&,QString,QString,QString)" access="private"> | |||
|
60 | <modify-argument index="3"> | |||
|
61 | <remove-default-expression /> | |||
|
62 | </modify-argument> | |||
|
63 | <modify-argument index="4"> | |||
|
64 | <remove-default-expression /> | |||
|
65 | </modify-argument> | |||
|
66 | </modify-function> | |||
|
67 | ||||
52 | <modify-function signature="operator=(QXmlName)" remove="all" /> |
|
68 | <modify-function signature="operator=(QXmlName)" remove="all" /> | |
53 |
<modify-function signature="QXmlName(short,short,short)" |
|
69 | <modify-function signature="QXmlName(short,short,short)" | |
|
70 | remove="all" /> | |||
54 | <modify-function signature="localName()const" remove="all" /> |
|
71 | <modify-function signature="localName()const" remove="all" /> | |
55 | <modify-function signature="prefix()const" remove="all" /> |
|
72 | <modify-function signature="prefix()const" remove="all" /> | |
56 | <modify-function signature="hasPrefix()const" remove="all" /> |
|
73 | <modify-function signature="hasPrefix()const" remove="all" /> | |
@@ -71,6 +88,7 | |||||
71 | <rejection class="QXmlNodeModelIndex" function-name="sendNamespaces" /> |
|
88 | <rejection class="QXmlNodeModelIndex" function-name="sendNamespaces" /> | |
72 | <rejection class="QXmlNodeModelIndex" function-name="iterate" /> |
|
89 | <rejection class="QXmlNodeModelIndex" function-name="iterate" /> | |
73 | <rejection class="QXmlNodeModelIndex" function-name="type" /> |
|
90 | <rejection class="QXmlNodeModelIndex" function-name="type" /> | |
|
91 | <rejection class="QXmlNodeModelIndex" enum-name="Axis" /> | |||
74 | <value-type name="QXmlNodeModelIndex"> |
|
92 | <value-type name="QXmlNodeModelIndex"> | |
75 | <modify-function signature="name() const" remove="all" /> |
|
93 | <modify-function signature="name() const" remove="all" /> | |
76 | <modify-function signature="root() const" remove="all" /> |
|
94 | <modify-function signature="root() const" remove="all" /> | |
@@ -87,7 +105,20 | |||||
87 | <modify-function signature="internalPointer()const" remove="all" /> |
|
105 | <modify-function signature="internalPointer()const" remove="all" /> | |
88 | </value-type> |
|
106 | </value-type> | |
89 |
|
107 | |||
90 |
<value-type name="QXml |
|
108 | <value-type name="QXmlSerializerPointer"/> | |
|
109 | ||||
|
110 | <object-type name="QXmlQuery"> | |||
|
111 | <modify-function signature="setFocus(QIODevice*)"> | |||
|
112 | <modify-argument index="1"> | |||
|
113 | <reference-count action="set" variable-name="__rcFocusDevice" /> | |||
|
114 | </modify-argument> | |||
|
115 | </modify-function> | |||
|
116 | <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)"> | |||
|
117 | <modify-argument index="1"> | |||
|
118 | <reference-count action="set" variable-name="__rcNetworkAccessManager" /> | |||
|
119 | </modify-argument> | |||
|
120 | </modify-function> | |||
|
121 | <modify-function signature="evaluateTo(QAbstractXmlReceiver *)const" remove="all" /> | |||
91 | <modify-function signature="evaluateTo(QStringList<QString>*)const" remove="all" /> |
|
122 | <modify-function signature="evaluateTo(QStringList<QString>*)const" remove="all" /> | |
92 | <modify-function signature="setMessageHandler(QAbstractMessageHandler*)"> |
|
123 | <modify-function signature="setMessageHandler(QAbstractMessageHandler*)"> | |
93 | <modify-argument index="1"> |
|
124 | <modify-argument index="1"> | |
@@ -104,24 +135,40 | |||||
104 | <reference-count action="set" variable-name="__rcUriResolver" /> |
|
135 | <reference-count action="set" variable-name="__rcUriResolver" /> | |
105 | </modify-argument> |
|
136 | </modify-argument> | |
106 | </modify-function> |
|
137 | </modify-function> | |
107 |
</ |
|
138 | </object-type> | |
108 | <object-type name="QXmlResultItems"/> |
|
139 | <object-type name="QXmlResultItems"/> | |
109 |
|
140 | |||
110 | <rejection class="QXmlSerializer" function-name="item" /> |
|
141 | <rejection class="QXmlSerializer" function-name="item" /> | |
111 | <object-type name="QXmlSerializer"> |
|
142 | <object-type name="QXmlSerializer"> | |
|
143 | <modify-function signature="atDocumentRoot()const" remove="all" /> | |||
|
144 | <modify-function signature="startContent()" remove="all" /> | |||
|
145 | <modify-function signature="writeEscaped(QString)" remove="all" /> | |||
|
146 | <modify-function signature="writeEscapedAttribute(QString)" remove="all" /> | |||
|
147 | <modify-function signature="write(QString)" remove="all" /> | |||
|
148 | <modify-function signature="write(QXmlName)" remove="all" /> | |||
|
149 | <modify-function signature="write(const char *)" remove="all" /> | |||
|
150 | <modify-function signature="isBindingInScope(QXmlName)const" remove="all" /> | |||
|
151 | <modify-function signature="setCodec(const QTextCodec *)"> | |||
|
152 | <modify-argument index="1"> | |||
|
153 | <reference-count action="set" variable-name="__rcCodec" /> | |||
|
154 | </modify-argument> | |||
|
155 | </modify-function> | |||
112 | </object-type> |
|
156 | </object-type> | |
113 |
|
157 | |||
114 |
|
158 | |||
115 |
|
159 | |||
116 | <suppress-warning text="WARNING(MetaJavaBuilder) :: horribly broken type ''"/> |
|
160 | <suppress-warning text="WARNING(MetaJavaBuilder) :: horribly broken type ''"/> | |
|
161 | <suppress-warning text="WARNING(MetaJavaBuilder) :: template baseclass 'QExplicitlySharedDataPointer<QXmlSerializer>' of 'QXmlSerializerPointer' is not known" /> | |||
117 |
|
162 | |||
118 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlItem::QXmlItem', unmatched parameter type 'QPatternist::Item const&'" /> |
|
163 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlItem::QXmlItem', unmatched parameter type 'QPatternist::Item const&'" /> | |
119 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::sequencedTypedValue', unmatched return type 'QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QPatternist::Item>>"/> |
|
164 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::sequencedTypedValue', unmatched return type 'QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QPatternist::Item>>"/> | |
|
165 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNamePool::QXmlNamePool', unmatched parameter type 'QPatternist::NamePool*'" /> | |||
120 |
|
166 | |||
121 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::QXmlNodeModelIndex', unmatched parameter type 'QPatternist::NodeIndexStorage const&'" /> |
|
167 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::QXmlNodeModelIndex', unmatched parameter type 'QPatternist::NodeIndexStorage const&'" /> | |
122 |
|
168 | |||
123 | <!-- To avoid warnings when running the generator on systems without XML patterns --> |
|
169 | <!-- To avoid warnings when running the generator on systems without XML patterns --> | |
124 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSimpleXmlNodeModel' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
170 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSimpleXmlNodeModel' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
|
171 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlSerializerPointer' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
125 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSourceLocation' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
172 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSourceLocation' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
126 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlFormatter' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
173 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlFormatter' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
127 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QAbstractUriResolver' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
174 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QAbstractUriResolver' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
@@ -139,5 +186,5 | |||||
139 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlNodeModelIndex' for enum 'NodeKind' is not declared"/> |
|
186 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlNodeModelIndex' for enum 'NodeKind' is not declared"/> | |
140 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QAbstractXmlNodeModel' for enum 'SimpleAxis' is not declared"/> |
|
187 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QAbstractXmlNodeModel' for enum 'SimpleAxis' is not declared"/> | |
141 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlNamePool' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
188 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlNamePool' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
142 |
|
189 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlQuery' for enum 'QueryLanguage' is not declared" /> | ||
143 | </typesystem> |
|
190 | </typesystem> |
@@ -2,11 +2,14 | |||||
2 | <typesystem package="com.trolltech.qt.xmlpatterns"><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: ForwardAxis in QXmlNodeModelIndex::Axis"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: ReverseAxis in QXmlNodeModelIndex::Axis"/> |
|
2 | <typesystem package="com.trolltech.qt.xmlpatterns"><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: ForwardAxis in QXmlNodeModelIndex::Axis"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: ReverseAxis in QXmlNodeModelIndex::Axis"/> | |
3 |
|
3 | |||
4 |
|
4 | |||
|
5 | <namespace-type name="QPatternist"/> | |||
|
6 | <namespace-type name="QPatternistSDK"/> | |||
|
7 | ||||
5 | <enum-type name="QXmlNodeModelIndex::NodeKind"/> |
|
8 | <enum-type name="QXmlNodeModelIndex::NodeKind"/> | |
6 | <enum-type name="QXmlNodeModelIndex::DocumentOrder"/> |
|
9 | <enum-type name="QXmlNodeModelIndex::DocumentOrder"/> | |
7 |
<enum-type name="QXmlNodeModel |
|
10 | <enum-type name="QAbstractXmlNodeModel::NodeCopySetting"/> | |
8 | <enum-type name="QXmlQuery::QueryLanguage"/> |
|
|||
9 | <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/> |
|
11 | <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/> | |
|
12 | <enum-type name="QXmlQuery::QueryLanguage"/> | |||
10 |
|
13 | |||
11 | <object-type name="QAbstractMessageHandler"> |
|
14 | <object-type name="QAbstractMessageHandler"> | |
12 | <modify-function signature="QAbstractMessageHandler(QObject*)" remove="all"/> |
|
15 | <modify-function signature="QAbstractMessageHandler(QObject*)" remove="all"/> | |
@@ -15,29 +18,31 | |||||
15 | <object-type name="QAbstractXmlForwardIterator"/> |
|
18 | <object-type name="QAbstractXmlForwardIterator"/> | |
16 |
|
19 | |||
17 | <rejection class="QPatternist::NodeIndexStorage"/> |
|
20 | <rejection class="QPatternist::NodeIndexStorage"/> | |
18 |
|
21 | <rejection class="QAbstractXmlNodeModel" function-name="mapToItem"/> | ||
19 | <rejection class="QAbstractXmlNodeModel" enum-name="NodeCopySetting"/> |
|
|||
20 | <rejection class="QAbstractXmlNodeModel" function-name="mapToSequence"/> |
|
22 | <rejection class="QAbstractXmlNodeModel" function-name="mapToSequence"/> | |
21 | <rejection class="QAbstractXmlNodeModel" function-name="sequencedTypedValue"/> |
|
23 | <rejection class="QAbstractXmlNodeModel" function-name="sequencedTypedValue"/> | |
22 | <rejection class="QAbstractXmlNodeModel" function-name="sendNamespaces"/> |
|
24 | <rejection class="QAbstractXmlNodeModel" function-name="sendNamespaces"/> | |
23 | <rejection class="QAbstractXmlNodeModel" function-name="iterate"/> |
|
25 | <rejection class="QAbstractXmlNodeModel" function-name="iterate"/> | |
24 | <rejection class="QAbstractXmlNodeModel" function-name="copyNodeTo"/> |
|
26 | <rejection class="QAbstractXmlNodeModel" function-name="copyNodeTo"/> | |
25 | <rejection class="QAbstractXmlNodeModel" function-name="type"/> |
|
27 | <rejection class="QAbstractXmlNodeModel" function-name="type"/> | |
26 | <rejection class="QAbstractXmlNodeModel" function-name="isDeepEqual"/> |
|
|||
27 | <rejection class="QAbstractXmlNodeModel" function-name="namespaceForPrefix"/> |
|
|||
28 | <object-type name="QAbstractXmlNodeModel"> |
|
28 | <object-type name="QAbstractXmlNodeModel"> | |
|
29 | <modify-function signature="QAbstractXmlNodeModel()" remove="all"/> | |||
|
30 | <modify-function signature="namespaceForPrefix(QXmlNodeModelIndex,short) const" remove="all"/> | |||
|
31 | <modify-function signature="isDeepEqual(QXmlNodeModelIndex,QXmlNodeModelIndex) const" remove="all"/> | |||
29 | </object-type> |
|
32 | </object-type> | |
30 |
|
33 | |||
31 | <rejection class="QAbstractXmlReceiver" function-name="item"/> |
|
34 | <rejection class="QAbstractXmlReceiver" function-name="item"/> | |
32 | <rejection class="QAbstractXmlReceiver" function-name="sendAsNode"/> |
|
35 | <rejection class="QAbstractXmlReceiver" function-name="sendAsNode"/> | |
33 |
< |
|
36 | <value-type name="QAbstractXmlReceiver"> | |
34 |
</ |
|
37 | </value-type> | |
35 |
|
38 | |||
36 | <object-type name="QSimpleXmlNodeModel"/> |
|
39 | <object-type name="QSimpleXmlNodeModel"/> | |
37 |
|
40 | |||
38 | <value-type name="QSourceLocation"> |
|
41 | <value-type name="QSourceLocation"> | |
39 | <modify-function signature="operator=(QSourceLocation)" remove="all"/> |
|
42 | <modify-function signature="operator=(QSourceLocation)" remove="all"/> | |
40 | </value-type> |
|
43 | </value-type> | |
|
44 | <value-type name="QXmlSchema"/> | |||
|
45 | <object-type name="QXmlSchemaValidator"/> | |||
41 |
|
46 | |||
42 | <rejection class="QXmlFormatter" function-name="item"/> |
|
47 | <rejection class="QXmlFormatter" function-name="item"/> | |
43 | <object-type name="QXmlFormatter"> |
|
48 | <object-type name="QXmlFormatter"> | |
@@ -49,6 +54,15 | |||||
49 | </value-type> |
|
54 | </value-type> | |
50 |
|
55 | |||
51 | <value-type name="QXmlName"> |
|
56 | <value-type name="QXmlName"> | |
|
57 | <modify-function signature="QXmlName(QXmlNamePool&,QString,QString,QString)" access="private"> | |||
|
58 | <modify-argument index="3"> | |||
|
59 | <remove-default-expression/> | |||
|
60 | </modify-argument> | |||
|
61 | <modify-argument index="4"> | |||
|
62 | <remove-default-expression/> | |||
|
63 | </modify-argument> | |||
|
64 | </modify-function> | |||
|
65 | ||||
52 | <modify-function signature="operator=(QXmlName)" remove="all"/> |
|
66 | <modify-function signature="operator=(QXmlName)" remove="all"/> | |
53 | <modify-function signature="QXmlName(short,short,short)" remove="all"/> |
|
67 | <modify-function signature="QXmlName(short,short,short)" remove="all"/> | |
54 | <modify-function signature="localName()const" remove="all"/> |
|
68 | <modify-function signature="localName()const" remove="all"/> | |
@@ -71,6 +85,7 | |||||
71 | <rejection class="QXmlNodeModelIndex" function-name="sendNamespaces"/> |
|
85 | <rejection class="QXmlNodeModelIndex" function-name="sendNamespaces"/> | |
72 | <rejection class="QXmlNodeModelIndex" function-name="iterate"/> |
|
86 | <rejection class="QXmlNodeModelIndex" function-name="iterate"/> | |
73 | <rejection class="QXmlNodeModelIndex" function-name="type"/> |
|
87 | <rejection class="QXmlNodeModelIndex" function-name="type"/> | |
|
88 | <rejection class="QXmlNodeModelIndex" enum-name="Axis"/> | |||
74 | <value-type name="QXmlNodeModelIndex"> |
|
89 | <value-type name="QXmlNodeModelIndex"> | |
75 | <modify-function signature="name() const" remove="all"/> |
|
90 | <modify-function signature="name() const" remove="all"/> | |
76 | <modify-function signature="root() const" remove="all"/> |
|
91 | <modify-function signature="root() const" remove="all"/> | |
@@ -87,7 +102,20 | |||||
87 | <modify-function signature="internalPointer()const" remove="all"/> |
|
102 | <modify-function signature="internalPointer()const" remove="all"/> | |
88 | </value-type> |
|
103 | </value-type> | |
89 |
|
104 | |||
90 |
<value-type name="QXml |
|
105 | <value-type name="QXmlSerializerPointer"/> | |
|
106 | ||||
|
107 | <object-type name="QXmlQuery"> | |||
|
108 | <modify-function signature="setFocus(QIODevice*)"> | |||
|
109 | <modify-argument index="1"> | |||
|
110 | <reference-count action="set" variable-name="__rcFocusDevice"/> | |||
|
111 | </modify-argument> | |||
|
112 | </modify-function> | |||
|
113 | <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)"> | |||
|
114 | <modify-argument index="1"> | |||
|
115 | <reference-count action="set" variable-name="__rcNetworkAccessManager"/> | |||
|
116 | </modify-argument> | |||
|
117 | </modify-function> | |||
|
118 | <modify-function signature="evaluateTo(QAbstractXmlReceiver *)const" remove="all"/> | |||
91 | <modify-function signature="evaluateTo(QStringList<QString>*)const" remove="all"/> |
|
119 | <modify-function signature="evaluateTo(QStringList<QString>*)const" remove="all"/> | |
92 | <modify-function signature="setMessageHandler(QAbstractMessageHandler*)"> |
|
120 | <modify-function signature="setMessageHandler(QAbstractMessageHandler*)"> | |
93 | <modify-argument index="1"> |
|
121 | <modify-argument index="1"> | |
@@ -104,24 +132,40 | |||||
104 | <reference-count action="set" variable-name="__rcUriResolver"/> |
|
132 | <reference-count action="set" variable-name="__rcUriResolver"/> | |
105 | </modify-argument> |
|
133 | </modify-argument> | |
106 | </modify-function> |
|
134 | </modify-function> | |
107 |
</ |
|
135 | </object-type> | |
108 | <object-type name="QXmlResultItems"/> |
|
136 | <object-type name="QXmlResultItems"/> | |
109 |
|
137 | |||
110 | <rejection class="QXmlSerializer" function-name="item"/> |
|
138 | <rejection class="QXmlSerializer" function-name="item"/> | |
111 | <object-type name="QXmlSerializer"> |
|
139 | <object-type name="QXmlSerializer"> | |
|
140 | <modify-function signature="atDocumentRoot()const" remove="all"/> | |||
|
141 | <modify-function signature="startContent()" remove="all"/> | |||
|
142 | <modify-function signature="writeEscaped(QString)" remove="all"/> | |||
|
143 | <modify-function signature="writeEscapedAttribute(QString)" remove="all"/> | |||
|
144 | <modify-function signature="write(QString)" remove="all"/> | |||
|
145 | <modify-function signature="write(QXmlName)" remove="all"/> | |||
|
146 | <modify-function signature="write(const char *)" remove="all"/> | |||
|
147 | <modify-function signature="isBindingInScope(QXmlName)const" remove="all"/> | |||
|
148 | <modify-function signature="setCodec(const QTextCodec *)"> | |||
|
149 | <modify-argument index="1"> | |||
|
150 | <reference-count action="set" variable-name="__rcCodec"/> | |||
|
151 | </modify-argument> | |||
|
152 | </modify-function> | |||
112 | </object-type> |
|
153 | </object-type> | |
113 |
|
154 | |||
114 |
|
155 | |||
115 |
|
156 | |||
116 | <suppress-warning text="WARNING(MetaJavaBuilder) :: horribly broken type ''"/> |
|
157 | <suppress-warning text="WARNING(MetaJavaBuilder) :: horribly broken type ''"/> | |
|
158 | <suppress-warning text="WARNING(MetaJavaBuilder) :: template baseclass 'QExplicitlySharedDataPointer<QXmlSerializer>' of 'QXmlSerializerPointer' is not known"/> | |||
117 |
|
159 | |||
118 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlItem::QXmlItem', unmatched parameter type 'QPatternist::Item const&'"/> |
|
160 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlItem::QXmlItem', unmatched parameter type 'QPatternist::Item const&'"/> | |
119 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::sequencedTypedValue', unmatched return type 'QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QPatternist::Item>>"/> |
|
161 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::sequencedTypedValue', unmatched return type 'QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QPatternist::Item>>"/> | |
|
162 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNamePool::QXmlNamePool', unmatched parameter type 'QPatternist::NamePool*'"/> | |||
120 |
|
163 | |||
121 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::QXmlNodeModelIndex', unmatched parameter type 'QPatternist::NodeIndexStorage const&'"/> |
|
164 | <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::QXmlNodeModelIndex', unmatched parameter type 'QPatternist::NodeIndexStorage const&'"/> | |
122 |
|
165 | |||
123 | <!-- To avoid warnings when running the generator on systems without XML patterns --> |
|
166 | <!-- To avoid warnings when running the generator on systems without XML patterns --> | |
124 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSimpleXmlNodeModel' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
167 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSimpleXmlNodeModel' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
|
168 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlSerializerPointer' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |||
125 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSourceLocation' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
169 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSourceLocation' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
126 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlFormatter' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
170 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlFormatter' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
127 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QAbstractUriResolver' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
171 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QAbstractUriResolver' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
@@ -139,5 +183,5 | |||||
139 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlNodeModelIndex' for enum 'NodeKind' is not declared"/> |
|
183 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlNodeModelIndex' for enum 'NodeKind' is not declared"/> | |
140 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QAbstractXmlNodeModel' for enum 'SimpleAxis' is not declared"/> |
|
184 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QAbstractXmlNodeModel' for enum 'SimpleAxis' is not declared"/> | |
141 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlNamePool' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> |
|
185 | <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlNamePool' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> | |
142 |
|
186 | <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlQuery' for enum 'QueryLanguage' is not declared"/> | ||
143 | </typesystem> |
|
187 | </typesystem> |
General Comments 0
You need to be logged in to leave comments.
Login now