##// END OF EJS Templates
update to Qt 4.6 xml files...
florianlink -
r108:f39067ff6f9f
parent child
Show More
@@ -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 383 _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __first, _InputIterator __last,
384 384 _OutputIterator __result)
385 385 {
386 std::cout << env.current_file << std::endl;
386 387 if (pp_isalpha (*__first) || *__first == '_')
387 388 {
388 389 pp_macro_expander expand_include (env);
@@ -390,7 +391,8 _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __fi
390 391 name.reserve (255);
391 392 expand_include (__first, __last, std::back_inserter (name));
392 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 396 handle_include (__skip_current_path, it, name.end (), __result);
395 397 return __first;
396 398 }
@@ -123,7 +123,7 void SetupGenerator::generate()
123 123 }
124 124
125 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 128 if (shortPackName.endsWith("Builtin")) {
129 129 shortPackName = shortPackName.mid(0, shortPackName.length()-strlen("builtin"));
@@ -135,12 +135,14 void SetupGenerator::generate()
135 135 QString shellCreator;
136 136 if (cls->generateShellClass()) {
137 137 shellCreator = ", PythonQtSetInstanceWrapperOnShell<" + ShellGenerator::shellClassName(cls) + ">";
138 } else {
139 shellCreator = ", NULL";
138 140 }
139 141 if (cls->isQObject()) {
140 s << "PythonQt::self()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;
142 s << "PythonQt::priv()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module);" << endl;
141 143 } else {
142 144 QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():"";
143 s << "PythonQt::self()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;
145 s << "PythonQt::priv()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module);" << endl;
144 146 }
145 147 foreach(AbstractMetaClass* interface, cls->interfaces()) {
146 148 // the interface might be our own class... (e.g. QPaintDevice)
@@ -52,8 +52,7 bool ShellGenerator::shouldGenerate(const AbstractMetaClass *meta_class) const
52 52 if (meta_class->name().startsWith("Global")) return false;
53 53 if (meta_class->name().startsWith("QStyleOptionComplex")) return false;
54 54 if (meta_class->name().startsWith("QTextLayout")) return false;
55 //if (meta_class->name().startsWith("QTextStream")) return false; // because of >> operators
56 //if (meta_class->name().startsWith("QDataStream")) return false; // "
55 if (meta_class->name().startsWith("QPersistentModelIndex")) return false;
57 56 return ((cg & TypeEntry::GenerateCode) != 0);
58 57 }
59 58
@@ -42,6 +42,7
42 42 #include "shellimplgenerator.h"
43 43 #include "reporthandler.h"
44 44 #include "fileout.h"
45 #include <iostream>
45 46
46 47 extern void declareFunctionMetaTypes(QTextStream &stream,
47 48 const AbstractMetaFunctionList &functions,
@@ -61,12 +62,18 static void writeHelperCode(QTextStream &s, const AbstractMetaClass *)
61 62 {
62 63 }
63 64
65
66
64 67 void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)
65 68 {
66 69 QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";
67 70 QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
68 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 79 s << "#include <PythonQtSignalReceiver.h>" << endl;
This diff has been collapsed as it changes many lines, (522 lines changed) Show them Hide them
@@ -1,6 +1,7
1 1 <?xml version="1.0"?>
2 2 <typesystem>
3 3
4 <value-type name="QModelIndex"/>
4 5 <rejection class="*" function-name="d_func"/>
5 6 <rejection class="*" function-name="data_ptr"/>
6 7 <rejection class="*" function-name="detach"/>
@@ -11,6 +12,7
11 12
12 13 <rejection class="" enum-name="QtValidLicenseForTestModule"/>
13 14
15
14 16 <rejection class="" enum-name="QtValidLicenseForDBusModule"/>
15 17 <rejection class="" enum-name="QtValidLicenseForSqlModule"/>
16 18 <rejection class="" enum-name="QtValidLicenseForOpenGLModule"/>
@@ -26,8 +28,17
26 28 <rejection class="" enum-name="QtValidLicenseForGuiModule"/>
27 29 <rejection class="" enum-name="QtValidLicenseForScriptModule"/>
28 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 35 <rejection class="QtConcurrent" enum-name="enum_1" />
36 <rejection class="QtConcurrent" function-name="operator|" />
30 37
38 <rejection class="Qt" enum-name="Modifier" />
39
40 <rejection class="QSharedPointer" />
41 <rejection class="QWeakPointer" />
31 42 <rejection class="QFuture::const_iterator" />
32 43 <rejection class="QFutureInterface" />
33 44 <rejection class="QFutureInterfaceBase" />
@@ -48,6 +59,7
48 59 <rejection class="QtConcurrent::Median"/>
49 60 <rejection class="QtConcurrent::MemberFunctionWrapper"/>
50 61 <rejection class="QtConcurrent::MemberFunctionWrapper1"/>
62 <rejection class="QtConcurrent::qValueType" />
51 63 <rejection class="QtConcurrent::ReduceKernel"/>
52 64 <rejection class="QtConcurrent::ResultItem"/>
53 65 <rejection class="QtConcurrent::ResultIterator"/>
@@ -184,10 +196,25
184 196 <rejection class="QBasicAtomicInt" />
185 197 <rejection class="QBasicAtomic"/>
186 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 210 <rejection class="QBitRef"/>
188 211 <rejection class="QCache"/>
212 <rejection class="QContiguousCache"/>
213 <rejection class="QContiguousCacheData"/>
214 <rejection class="QContiguousCacheTypedData"/>
189 215 <rejection class="QCharRef"/>
190 216 <rejection class="QDebug"/>
217 <rejection class="QNoDebug" />
191 218 <rejection class="QExplicitlySharedDataPointer"/>
192 219 <rejection class="QFlag"/>
193 220 <rejection class="QFlags"/>
@@ -209,6 +236,7
209 236 <rejection class="QHashNode"/>
210 237 <rejection class="QHashNode"/>
211 238 <rejection class="QInternal"/>
239 <rejection class="QIncompatibleFlag" />
212 240 <rejection class="QLibrary"/>
213 241 <rejection class="QLinkedList"/>
214 242 <rejection class="QLinkedListData"/>
@@ -217,6 +245,8
217 245 <rejection class="QListData"/>
218 246 <rejection class="QListIterator"/>
219 247 <rejection class="QMap"/>
248 <rejection class="QMapNode" />
249 <rejection class="QMapPayloadNode" />
220 250 <rejection class="QMapData"/>
221 251 <rejection class="QMapIterator"/>
222 252 <rejection class="QMetaType"/>
@@ -275,6 +305,14
275 305 <rejection class="QSubString"/>
276 306 <rejection class="QUintForType"/>
277 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 317 <rejection class="QLocale::Data" />
280 318 <rejection class="QGlobalStaticDeleter" />
@@ -312,10 +350,11
312 350 <rejection class="stat" />
313 351 <rejection class="tm" />
314 352
353 <rejection class="Qt" enum-name="Initialization" />
354
315 355 <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/>
316 356 <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/>
317 <rejection class="QAbstractFileEngine" function-name="beginEntryList"/>
318 <rejection class="QAbstractFileEngine" function-name="endEntryList"/>
357
319 358 <rejection class="QAbstractFileEngine" function-name="extension"/>
320 359 <rejection class="QCoreApplication" function-name="compressEvent"/>
321 360 <rejection class="QCoreApplication" function-name="eventFilter"/>
@@ -350,6 +389,8
350 389 <rejection class="QObject" function-name="disconnect"/>
351 390 <rejection class="QObject" function-name="disconnectNotify"/>
352 391 <rejection class="QObject" function-name="registerUserData"/>
392 <rejection class="QObject" function-name="sender"/>
393 <rejection class="QTimer" function-name="singleShot"/>
353 394 <rejection class="QProcess" function-name="pid"/>
354 395 <rejection class="QRegion" function-name="cleanUp"/>
355 396 <rejection class="QSettings" function-name="registerFormat"/>
@@ -366,6 +407,7
366 407 <rejection class="QVector" function-name="alloc"/>
367 408 <rejection class="QVector" function-name="operator+="/>
368 409 <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/>
410 <rejection class="QtConcurrent::ThreadEngineBarrier" />
369 411
370 412 <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/>
371 413 <rejection class="QDataStream" enum-name="ByteOrder"/>
@@ -374,11 +416,32
374 416 <namespace-type name="Qt">
375 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 439 <enum-type name="QtMsgType">
379 440 <reject-enum-value name="QtSystemMsg" />
380 441 </enum-type>
381 442
443
444 <enum-type name="QReadWriteLock::RecursionMode" />
382 445 <enum-type name="QSystemSemaphore::AccessMode" />
383 446 <enum-type name="QSystemSemaphore::SystemSemaphoreError" />
384 447 <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons" />
@@ -458,7 +521,6
458 521 <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/>
459 522 <enum-type name="Qt::LayoutDirection"/>
460 523 <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/>
461 <enum-type name="Qt::Modifier"/>
462 524 <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/>
463 525 <enum-type name="Qt::Orientation" flags="Qt::Orientations"/>
464 526 <enum-type name="Qt::PenCapStyle"/>
@@ -488,6 +550,7
488 550 <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions" />
489 551 <enum-type name="QtConcurrent::ThreadFunctionResult" />
490 552
553
491 554 <enum-type name="QCoreApplication::Encoding">
492 555 <reject-enum-value name="DefaultCodec"/>
493 556 </enum-type>
@@ -514,7 +577,6
514 577
515 578 <enum-type name="QDataStream::Version">
516 579 <reject-enum-value name="Qt_4_1"/>
517 <reject-enum-value name="Qt_4_5"/>
518 580 </enum-type>
519 581
520 582 <enum-type name="QDir::SortFlag" flags="QDir::SortFlags">
@@ -557,6 +619,7
557 619 <reject-enum-value name="WA_MacMetalStyle"/>
558 620 </enum-type>
559 621
622 <value-type name="QProcessEnvironment" />
560 623 <value-type name="QBasicTimer"/>
561 624 <value-type name="QByteArrayMatcher">
562 625 <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/>
@@ -567,7 +630,8
567 630 <remove/>
568 631 </modify-function>
569 632
570 <modify-function signature="setYMD(int, int, int)" remove="all"/> <!--### Obsolete in 4.3-->
633 <modify-function signature="setYMD(int, int, int)" remove="all"/>
634 <!--### Obsolete in 4.3-->
571 635 </value-type>
572 636
573 637 <value-type name="QDateTime">
@@ -582,57 +646,112
582 646 </modify-function>
583 647 <modify-function signature="operator=(QDir)" remove="all"/>
584 648 <modify-function signature="operator=(QString)" remove="all"/>
585 <modify-function signature="addResourceSearchPath(QString)" remove="all"/> <!--### Obsolete in 4.3-->
649 <modify-function signature="addResourceSearchPath(QString)" remove="all"/>
650 <!--### Obsolete in 4.3-->
586 651 </value-type>
587 652
588 653 <value-type name="QPoint"/>
589 654 <value-type name="QPointF"/>
590 655
591 656 <value-type name="QRect">
592 <modify-function signature="getCoords(int*,int*,int*,int*)const"> <remove/> </modify-function>
593 <modify-function signature="getRect(int*,int*,int*,int*)const"> <remove/> </modify-function>
594 <modify-function signature="operator&amp;=(QRect)"> <remove/> </modify-function>
595 <modify-function signature="operator|=(QRect)"> <remove/> </modify-function>
596 <modify-function signature="operator&amp;(QRect)const"> <remove/> </modify-function>
597 <modify-function signature="operator|(QRect)const"> <remove/> </modify-function>
598
599 <modify-function signature="intersect(const QRect&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
600 <modify-function signature="unite(const QRect&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
657 <modify-function signature="getCoords(int*,int*,int*,int*)const">
658 <remove/>
659 </modify-function>
660 <modify-function signature="getRect(int*,int*,int*,int*)const">
661 <remove/>
662 </modify-function>
663 <modify-function signature="operator&amp;=(QRect)">
664 <remove/>
665 </modify-function>
666 <modify-function signature="operator|=(QRect)">
667 <remove/>
668 </modify-function>
669 <modify-function signature="operator&amp;(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&amp;)const" remove="all"/>
677 <!--### Obsolete in 4.3-->
678 <modify-function signature="unite(const QRect&amp;)const" remove="all"/>
679 <!--### Obsolete in 4.3-->
601 680 </value-type>
602 681
603 682 <value-type name="QRectF">
604 <modify-function signature="getCoords(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function>
605 <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function>
606 <modify-function signature="operator&amp;=(QRectF)"> <remove/> </modify-function>
607 <modify-function signature="operator|=(QRectF)"> <remove/> </modify-function>
608 <modify-function signature="operator&amp;(QRectF)const"> <remove/> </modify-function>
609 <modify-function signature="operator|(QRectF)const"> <remove/> </modify-function>
610
611 <modify-function signature="intersect(const QRectF&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
612 <modify-function signature="unite(const QRectF&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
683 <modify-function signature="getCoords(double*,double*,double*,double*)const">
684 <remove/>
685 </modify-function>
686 <modify-function signature="getRect(double*,double*,double*,double*)const">
687 <remove/>
688 </modify-function>
689 <modify-function signature="operator&amp;=(QRectF)">
690 <remove/>
691 </modify-function>
692 <modify-function signature="operator|=(QRectF)">
693 <remove/>
694 </modify-function>
695 <modify-function signature="operator&amp;(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&amp;)const" remove="all"/>
703 <!--### Obsolete in 4.3-->
704 <modify-function signature="unite(const QRectF&amp;)const" remove="all"/>
705 <!--### Obsolete in 4.3-->
613 706 </value-type>
614 707
615 708
616 709 <value-type name="QSize">
617 <modify-function signature="operator*=(qreal)"> <access modifier="private"/> </modify-function>
618 <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function>
619 <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function>
620 <modify-function signature="operator-=(QSize)"> <access modifier="private"/> </modify-function>
621 <modify-function signature="rheight()"> <remove/> </modify-function>
622 <modify-function signature="rwidth()"> <remove/> </modify-function>
710 <modify-function signature="operator*=(double)">
711 <access modifier="private"/>
712 </modify-function>
713 <modify-function signature="operator/=(double)">
714 <access modifier="private"/>
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 728 </value-type>
624 729
625 730 <value-type name="QSizeF">
626 <modify-function signature="operator*=(qreal)"> <access modifier="private"/> </modify-function>
627 <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function>
628 <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function>
629 <modify-function signature="operator-=(QSizeF)"> <access modifier="private"/> </modify-function>
630 <modify-function signature="rheight()"> <remove/> </modify-function>
631 <modify-function signature="rwidth()"> <remove/> </modify-function>
731 <modify-function signature="operator*=(double)">
732 <access modifier="private"/>
733 </modify-function>
734 <modify-function signature="operator/=(double)">
735 <access modifier="private"/>
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 749 </value-type>
633 750
634 751 <value-type name="QStringMatcher">
635 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 755 </value-type>
637 756
638 757 <value-type name="QTime"/>
@@ -650,13 +769,12
650 769 </value-type>
651 770
652 771 <value-type name="QLocale">
653 <modify-function signature="toString(qlonglong) const" remove="all"/>
654 <modify-function signature="toString(ushort) const" remove="all"/>
772 <modify-function signature="toString(unsigned long long) const" remove="all"/>
773 <modify-function signature="toString(unsigned short) const" remove="all"/>
655 774 <modify-function signature="toString(unsigned int) const" remove="all"/>
656 775 <modify-function signature="toUInt(QString,bool*,int)const" remove="all"/>
657 776 <modify-function signature="toULongLong(QString,bool*,int)const" remove="all"/>
658 777 <modify-function signature="operator=(QLocale)" remove="all"/>
659
660 778 </value-type>
661 779
662 780
@@ -673,18 +791,27
673 791 <modify-function signature="operator~()const" access="private"/>
674 792 </value-type>
675 793
794 <object-type name="QReadWriteLock"/>
676 795 <object-type name="QDirIterator"/>
677 796 <object-type name="QAbstractFileEngineIterator"/>
678 <object-type name="QAbstractItemModel"/>
797 <object-type name="QAbstractItemModel">
798 <modify-function signature="rowsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/>
799 <modify-function signature="rowsInserted(QModelIndex,int,int)" private-signal="yes"/>
679 800
680 <object-type name="QAbstractListModel">
681 <extra-includes>
682 <include file-name="QStringList" location="global"/>
683 <include file-name="QSize" location="global"/>
684 </extra-includes>
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"/>
685 812 </object-type>
686 813
687 <object-type name="QAbstractTableModel">
814 <object-type name="QAbstractListModel">
688 815 <extra-includes>
689 816 <include file-name="QStringList" location="global"/>
690 817 <include file-name="QSize" location="global"/>
@@ -698,8 +825,10
698 825 <modify-function signature="operator=(QUrl)" remove="all"/>
699 826 <modify-function signature="operator=(QString)" remove="all"/>
700 827
701 <modify-function signature="fromPunycode(const QByteArray&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
702 <modify-function signature="toPunycode(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
828 <modify-function signature="fromPunycode(const QByteArray&amp;)" remove="all"/>
829 <!--### Obsolete in 4.3-->
830 <modify-function signature="toPunycode(const QString&amp;)" remove="all"/>
831 <!--### Obsolete in 4.3-->
703 832 </value-type>
704 833
705 834 <value-type name="QRegExp">
@@ -707,6 +836,18
707 836 <include file-name="QStringList" location="global"/>
708 837 </extra-includes>
709 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 851 </value-type>
711 852
712 853 <value-type name="QFileInfo">
@@ -723,10 +864,11
723 864 </modify-argument>
724 865 </modify-function>
725 866
726 <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
867 <modify-function signature="readLink()const" remove="all"/>
868 <!--### Obsolete in 4.3-->
727 869 </value-type>
728 870
729 <!-- <interface-type name="QFactoryInterface" java-name="QAbstractFactory" /> -->
871 <interface-type name="QFactoryInterface" />
730 872
731 873 <value-type name="QByteArray">
732 874
@@ -745,7 +887,7
745 887 <modify-function signature="end()" remove="all"/>
746 888 <modify-function signature="end()const" remove="all"/>
747 889 <modify-function signature="number(uint,int)" remove="all"/>
748 <modify-function signature="number(qulonglong,int)" remove="all"/>
890 <modify-function signature="number(unsigned long long,int)" remove="all"/>
749 891 <modify-function signature="operator const char *()const" remove="all"/>
750 892 <modify-function signature="operator const void *()const" remove="all"/>
751 893 <modify-function signature="operator+=(const char*)" remove="all"/>
@@ -761,8 +903,8
761 903 <modify-function signature="push_front(const QByteArray&amp;)" remove="all"/>
762 904 <modify-function signature="push_front(const char*)" remove="all"/>
763 905 <modify-function signature="setNum(uint,int)" remove="all"/>
764 <modify-function signature="setNum(qulonglong,int)" remove="all"/>
765 <modify-function signature="setNum(ushort,int)" remove="all"/>
906 <modify-function signature="setNum(unsigned long long,int)" remove="all"/>
907 <modify-function signature="setNum(unsigned short,int)" remove="all"/>
766 908 <modify-function signature="toLong(bool*, int) const" remove="all"/>
767 909 <modify-function signature="toLongLong(bool*, int) const" remove="all"/>
768 910 <modify-function signature="toShort(bool*, int) const" remove="all"/>
@@ -782,17 +924,45
782 924 <modify-function signature="operator=(QTextBoundaryFinder)" remove="all" />
783 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 949 <object-type name="QXmlStreamEntityResolver" />
786 950 <object-type name="QAbstractEventDispatcher"/>
787 951 <object-type name="QEventLoop"/>
788 952 <object-type name="QFile">
789 <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
790 <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3-->
791 <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all" /> <!-- Can't provide same API and performance -->
792 <modify-function signature="unmap(uchar*)" remove="all" /> <!-- Can't provide same API and performance -->
953 <modify-function signature="readLink()const" remove="all"/>
954 <!--### Obsolete in 4.3-->
955 <modify-function signature="readLink(QString)" remove="all"/>
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 961 </object-type>
794 962
795 963 <object-type name="QIODevice"/>
964 <object-type name="QStateMachine::SignalEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StateMachineSignal" />
965 <object-type name="QStateMachine::WrappedEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StateMachineWrapped" />
796 966
797 967 <object-type name="QCryptographicHash"/>
798 968 <object-type name="QLibraryInfo"/>
@@ -852,9 +1022,6
852 1022 </modify-function>
853 1023 </object-type>
854 1024
855 <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory" />
856 <object-type name="QTextCodecPlugin" />
857
858 1025 <object-type name="QTextDecoder">
859 1026 <modify-function signature="toUnicode(const char*,int)">
860 1027 <remove/>
@@ -889,6 +1056,8
889 1056 <modify-function signature="buffer()">
890 1057 <remove/>
891 1058 </modify-function>
1059 <modify-function signature="connectNotify(const char *)" remove="all" />
1060 <modify-function signature="disconnectNotify(const char *)" remove="all" />
892 1061 </object-type>
893 1062
894 1063 <object-type name="QTimer"/>
@@ -901,20 +1070,22
901 1070 </modify-function>
902 1071 </object-type>
903 1072
904 <!-- <object-type name="QAbstractFileEngine::MapExtensionOption" /> -->
905 <!-- <object-type name="QAbstractFileEngine::MapExtensionReturn" /> -->
906 <!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> -->
1073 <object-type name="QAbstractFileEngine::MapExtensionOption" />
1074 <object-type name="QAbstractFileEngine::MapExtensionReturn" />
1075 <object-type name="QAbstractFileEngine::UnMapExtensionOption" />
907 1076 <object-type name="QAbstractFileEngine">
908 1077 <extra-includes>
909 1078 <include file-name="QDateTime" location="global"/>
910 1079 </extra-includes>
911 <modify-function signature="map(qlonglong,qlonglong,QFile::MemoryMapFlags)" remove="all" />
1080 <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all" />
912 1081 <modify-function signature="unmap(unsigned char*)" remove="all" />
913 1082 </object-type>
914 1083
915 1084 <object-type name="QProcess">
916 <modify-function signature="readChannelMode()const" remove="all"/> <!--### Obsolete in 4.3-->
917 <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3-->
1085 <modify-function signature="readChannelMode()const" remove="all"/>
1086 <!--### Obsolete in 4.3-->
1087 <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/>
1088 <!--### Obsolete in 4.3-->
918 1089 </object-type>
919 1090
920 1091 <object-type name="QSignalMapper">
@@ -970,11 +1141,11
970 1141 <modify-function signature="deleteLater()">
971 1142 <rename to="disposeLater"/>
972 1143 </modify-function>
973 <!--
1144
974 1145 <modify-function signature="inherits(const char*)const">
975 1146 <remove/>
976 1147 </modify-function>
977 -->
1148
978 1149 <modify-function signature="property(const char*)const">
979 1150 <access modifier="private"/>
980 1151 </modify-function>
@@ -995,8 +1166,10
995 1166 <include file-name="QStringList" location="global"/>
996 1167 </extra-includes>
997 1168
998 <modify-function signature="argv()" remove="all" /> <!-- Obsolete -->
999 <modify-function signature="argc()" remove="all" /> <!-- Obsolete -->
1169 <modify-function signature="argv()" remove="all" />
1170 <!-- Obsolete -->
1171 <modify-function signature="argc()" remove="all" />
1172 <!-- Obsolete -->
1000 1173
1001 1174 <modify-function signature="notify(QObject*,QEvent*)">
1002 1175 <modify-argument index="2" invalidate-after-use="yes" />
@@ -1042,8 +1215,16
1042 1215 <include file-name="QStringList" location="global"/>
1043 1216 </extra-includes>
1044 1217
1045 <modify-function signature="setSystemIniPath(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
1046 <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
1218 <modify-function signature="setIniCodec(QTextCodec*)">
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&amp;)" remove="all"/>
1225 <!--### Obsolete in 4.3-->
1226 <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/>
1227 <!--### Obsolete in 4.3-->
1047 1228 </object-type>
1048 1229
1049 1230 <object-type name="QEvent" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type() == QEvent::None"/>
@@ -1059,26 +1240,54
1059 1240 <reference-count action="set" variable-name="__rcDevice"/>
1060 1241 </modify-argument>
1061 1242 </modify-function>
1062 <!--
1063 1243 <modify-function signature="unsetDevice()">
1064 1244 <inject-code position="end">
1065 1245 __rcDevice = null;
1066 1246 </inject-code>
1067 1247 </modify-function>
1068 -->
1069 1248
1070 1249
1071 <modify-function signature="operator&lt;&lt;(const char*)"> <remove/> </modify-function>
1072 <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>
1073 <modify-function signature="operator&lt;&lt;(unsigned long long)"> <remove/> </modify-function>
1074 <modify-function signature="operator&lt;&lt;(unsigned short)"> <remove/> </modify-function>
1250 <modify-function signature="operator&lt;&lt;(const char*)">
1251 <remove/>
1252 </modify-function>
1253 <modify-function signature="operator&lt;&lt;(unsigned char)">
1254 <remove/>
1255 </modify-function>
1256 <modify-function signature="operator&lt;&lt;(unsigned int)">
1257 <remove/>
1258 </modify-function>
1259 <modify-function signature="operator&lt;&lt;(unsigned long long)">
1260 <remove/>
1261 </modify-function>
1262 <modify-function signature="operator&lt;&lt;(unsigned short)">
1263 <remove/>
1264 </modify-function>
1075 1265
1076 <modify-function signature="operator&gt;&gt;(char &amp;*)"> <remove/> </modify-function>
1266 <modify-function signature="operator&gt;&gt;(char &amp;*)">
1267 <remove/>
1268 </modify-function>
1269 <modify-function signature="operator&gt;&gt;(uint&amp;)">
1270 <remove/>
1271 </modify-function>
1272 <modify-function signature="operator&gt;&gt;(unsigned char&amp;)">
1273 <remove/>
1274 </modify-function>
1275 <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)">
1276 <remove/>
1277 </modify-function>
1077 1278
1078 <modify-function signature="readRawData(char*,int)"> <remove/> </modify-function>
1079 <modify-function signature="readBytes(char&amp;*,uint&amp;)"> <remove/> </modify-function>
1080 <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function>
1081 <modify-function signature="writeBytes(const char*,uint)"> <remove/> </modify-function>
1279 <modify-function signature="readRawData(char*,int)">
1280 <remove/>
1281 </modify-function>
1282 <modify-function signature="readBytes(char&amp;*,uint&amp;)">
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 1291 </object-type>
1083 1292
1084 1293 <object-type name="QFSFileEngine">
@@ -1088,25 +1297,75
1088 1297 </object-type>
1089 1298
1090 1299 <object-type name="QTextStream">
1091 <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
1092 <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
1093 <modify-function signature="operator&gt;&gt;(QChar&amp;)"> <remove/> </modify-function>
1094 <modify-function signature="operator&lt;&lt;(const void*)"> <remove/> </modify-function>
1095 <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>
1096 <modify-function signature="operator&lt;&lt;(qlonglong)"> <remove/> </modify-function>
1097 <modify-function signature="operator&lt;&lt;(const QChar &amp;)"> <remove/> </modify-function>
1098 <modify-function signature="operator&lt;&lt;(unsigned long)"> <remove/> </modify-function>
1099 <modify-function signature="operator&lt;&lt;(signed long)"> <remove/> </modify-function>
1100 <modify-function signature="operator&lt;&lt;(const char*)"> <remove/> </modify-function>
1101 <modify-function signature="operator&lt;&lt;(unsigned short)"> <remove/> </modify-function>
1102 <modify-function signature="operator&gt;&gt;(qulonglong&amp;)"> <remove/> </modify-function>
1103 <modify-function signature="operator&gt;&gt;(ulong&amp;)"> <remove/> </modify-function>
1104 <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
1105 <modify-function signature="string()const"> <remove/> </modify-function>
1106 <modify-function signature="operator&gt;&gt;(signed long&amp;)"> <remove/> </modify-function>
1107 <modify-function signature="operator&gt;&gt;(char*)"> <remove/> </modify-function>
1108 <modify-function signature="operator&gt;&gt;(QByteArray&amp;)"> <remove/> </modify-function>
1109 <modify-function signature="operator&gt;&gt;(QString&amp;)"> <remove/> </modify-function>
1300 <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)">
1301 <remove/>
1302 </modify-function>
1303 <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)">
1304 <remove/>
1305 </modify-function>
1306 <modify-function signature="operator&gt;&gt;(QChar&amp;)">
1307 <remove/>
1308 </modify-function>
1309 <modify-function signature="operator&lt;&lt;(const void*)">
1310 <remove/>
1311 </modify-function>
1312 <modify-function signature="operator&lt;&lt;(unsigned int)">
1313 <remove/>
1314 </modify-function>
1315 <modify-function signature="operator&lt;&lt;(unsigned long long)">
1316 <remove/>
1317 </modify-function>
1318 <modify-function signature="operator&lt;&lt;(const QChar &amp;)">
1319 <remove/>
1320 </modify-function>
1321 <modify-function signature="operator&lt;&lt;(unsigned long)">
1322 <remove/>
1323 </modify-function>
1324 <modify-function signature="operator&lt;&lt;(signed long)">
1325 <remove/>
1326 </modify-function>
1327 <modify-function signature="operator&lt;&lt;(const char*)">
1328 <remove/>
1329 </modify-function>
1330 <modify-function signature="operator&lt;&lt;(unsigned short)">
1331 <remove/>
1332 </modify-function>
1333 <modify-function signature="operator&lt;&lt;(const QByteArray&amp;)">
1334 <remove/>
1335 </modify-function>
1336 <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)">
1337 <remove/>
1338 </modify-function>
1339 <modify-function signature="operator&gt;&gt;(uint&amp;)">
1340 <remove/>
1341 </modify-function>
1342 <modify-function signature="operator&gt;&gt;(ulong&amp;)">
1343 <remove/>
1344 </modify-function>
1345 <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)">
1346 <remove />
1347 </modify-function>
1348 <modify-function signature="string()const">
1349 <remove />
1350 </modify-function>
1351 <modify-function signature="operator&gt;&gt;(signed long&amp;)">
1352 <remove/>
1353 </modify-function>
1354 <modify-function signature="operator&gt;&gt;(char*)">
1355 <remove/>
1356 </modify-function>
1357 <modify-function signature="operator&gt;&gt;(QByteArray&amp;)">
1358 <remove/>
1359 </modify-function>
1360 <modify-function signature="operator&gt;&gt;(QString&amp;)">
1361 <remove/>
1362 </modify-function>
1363 <modify-function signature="operator&gt;&gt;(unsigned short&amp;)">
1364 <remove/>
1365 </modify-function>
1366 <modify-function signature="operator&lt;&lt;(const QString&amp;)">
1367 <remove/>
1368 </modify-function>
1110 1369
1111 1370
1112 1371 <modify-function signature="setCodec(QTextCodec *)">
@@ -1135,45 +1394,47
1135 1394 <modify-function signature="operator T() const" remove="all" />
1136 1395 <modify-function signature="operator=(const QFuture &amp;)" remove="all" />
1137 1396 </value-type>
1138 <value-type name="QtScriptVoidFuture" java-name="QFutureVoid">
1397 <value-type name="QtJambiVoidFuture" java-name="QFutureVoid">
1139 1398 <modify-function signature="resultCount()const" remove="all" />
1140 1399 <modify-function signature="isResultReadyAt(int)const" remove="all" />
1141 1400 </value-type>
1142 <value-type name="QtScriptFuture" java-name="QFuture" generic-class="yes" />
1401 <value-type name="QtJambiFuture" java-name="QFuture" generic-class="yes" />
1143 1402
1144 1403 <object-type name="QFutureWatcherBase">
1145 1404 <modify-function signature="connectNotify(const char *)" remove="all" />
1146 1405 <modify-function signature="disconnectNotify(const char *)" remove="all" />
1147 1406 </object-type>
1148 <object-type name="QtScriptVoidFutureWatcher" java-name="QFutureWatcherVoid" />
1407 <object-type name="QtJambiVoidFutureWatcher" java-name="QFutureWatcherVoid" />
1149 1408
1150 1409 <object-type name="QFutureWatcher" generate="no">
1151 1410 <modify-function signature="future()const" remove="all" />
1152 1411 </object-type>
1153 <object-type name="QtScriptFutureWatcher" java-name="QFutureWatcher" generic-class="yes" />
1412 <object-type name="QtJambiFutureWatcher" java-name="QFutureWatcher" generic-class="yes" />
1154 1413
1155 1414 <object-type name="QFutureSynchronizer" generate="no" />
1156 <object-type name="QtScriptFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer" />
1157 <object-type name="QtScriptVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid" />
1415 <object-type name="QtJambiFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer" />
1416 <object-type name="QtJambiVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid" />
1158 1417 <object-type name="QThreadPool" />
1159 1418
1160 1419 <object-type name="QFutureIterator" generate="no">
1161 1420 <modify-function signature="operator=(const QFuture&amp;)" remove="all" />
1162 1421 </object-type>
1163 <object-type name="QtScriptFutureIterator" generic-class="yes" java-name="QFutureIterator" />
1422 <object-type name="QtJambiFutureIterator" generic-class="yes" java-name="QFutureIterator" />
1164 1423 <object-type name="QRunnable" />
1165 1424
1425 <!-- Inefficient hash codes -->
1426 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
1427 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
1428 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
1429 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
1430 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
1431 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
1432 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QProcessEnvironment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
1166 1433
1167 <value-type name="QXmlStreamAttribute"/>
1168 <value-type name="QXmlStreamAttributes"/>
1169 <value-type name="QXmlStreamNamespaceDeclaration"/>
1170 <value-type name="QXmlStreamNotationDeclaration"/>
1171 <value-type name="QXmlStreamEntityDeclaration"/>
1172 <object-type name="QXmlStreamReader"/>
1173 <object-type name="QXmlStreamWriter"/>
1174
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 1438 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'std::*'"/>
1178 1439 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
1179 1440 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
@@ -1196,34 +1457,17
1196 1457 <suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/>
1197 1458 <suppress-warning text="* private virtual function '*' in 'QFontDialog'"/>
1198 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 1460 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase&amp;'" />
1216 1461 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase const&amp;'" />
1217 1462 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase&amp;'" />
1218 1463 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase const&amp;'" />
1219 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function" />
1220 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 1465 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constBegin', unmatched return type 'const_iterator'" />
1223 1466 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::end', unmatched return type 'const_iterator'" />
1224 1467 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd', unmatched return type 'const_iterator'" />
1225 1468 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface&lt;T&gt;*'" />
1226 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&amp;'" />
1227 1471 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'" />
1228 1472 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList&lt;U&gt;'" />
1229 1473 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList&lt;MapFunctor::result_type&gt;'" />
@@ -1231,6 +1475,7
1231 1475 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Iterator'" />
1232 1476 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Sequence const&amp;'" />
1233 1477 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filter', unmatched parameter type 'Sequence&amp;'" />
1478 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;qValueType&lt;Iterator&gt;::value_type&gt;" />
1234 1479 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;Sequence::value_type&gt;'" />
1235 1480 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;Iterator::value_type&gt;'" />
1236 1481 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMappedReduced', unmatched return type 'V'" />
@@ -1269,4 +1514,9
1269 1514 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingFilter', unmatched parameter type 'Sequence&amp;'" />
1270 1515 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::createFunctor', unmatched return type 'QtConcurrent::SelectMemberFunctor0&lt;T,Class&gt;::type'" />
1271 1516
1517 <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFuture&lt;void&gt;::operator= - definition *ignored*" />
1518 <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureInterface&lt;void&gt;::future - definition *ignored*" />
1519 <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureWatcher&lt;void&gt;::setFuture - definition *ignored*" />
1520
1521
1272 1522 </typesystem>
This diff has been collapsed as it changes many lines, (901 lines changed) Show them Hide them
@@ -33,6 +33,7
33 33 QString %out% = %in%.toString();
34 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 37 <rejection class="*" function-name="d_func"/>
37 38 <rejection class="*" function-name="data_ptr"/>
38 39 <rejection class="*" function-name="detach"/>
@@ -43,6 +44,7
43 44
44 45 <rejection class="" enum-name="QtValidLicenseForTestModule"/>
45 46
47
46 48 <rejection class="" enum-name="QtValidLicenseForDBusModule"/>
47 49 <rejection class="" enum-name="QtValidLicenseForSqlModule"/>
48 50 <rejection class="" enum-name="QtValidLicenseForOpenGLModule"/>
@@ -58,8 +60,17
58 60 <rejection class="" enum-name="QtValidLicenseForGuiModule"/>
59 61 <rejection class="" enum-name="QtValidLicenseForScriptModule"/>
60 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 67 <rejection class="QtConcurrent" enum-name="enum_1"/>
68 <rejection class="QtConcurrent" function-name="operator|"/>
69
70 <rejection class="Qt" enum-name="Modifier"/>
62 71
72 <rejection class="QSharedPointer"/>
73 <rejection class="QWeakPointer"/>
63 74 <rejection class="QFuture::const_iterator"/>
64 75 <rejection class="QFutureInterface"/>
65 76 <rejection class="QFutureInterfaceBase"/>
@@ -80,6 +91,7
80 91 <rejection class="QtConcurrent::Median"/>
81 92 <rejection class="QtConcurrent::MemberFunctionWrapper"/>
82 93 <rejection class="QtConcurrent::MemberFunctionWrapper1"/>
94 <rejection class="QtConcurrent::qValueType"/>
83 95 <rejection class="QtConcurrent::ReduceKernel"/>
84 96 <rejection class="QtConcurrent::ResultItem"/>
85 97 <rejection class="QtConcurrent::ResultIterator"/>
@@ -216,10 +228,25
216 228 <rejection class="QBasicAtomicInt"/>
217 229 <rejection class="QBasicAtomic"/>
218 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 242 <rejection class="QBitRef"/>
220 243 <rejection class="QCache"/>
244 <rejection class="QContiguousCache"/>
245 <rejection class="QContiguousCacheData"/>
246 <rejection class="QContiguousCacheTypedData"/>
221 247 <rejection class="QCharRef"/>
222 248 <rejection class="QDebug"/>
249 <rejection class="QNoDebug"/>
223 250 <rejection class="QExplicitlySharedDataPointer"/>
224 251 <rejection class="QFlag"/>
225 252 <rejection class="QFlags"/>
@@ -241,6 +268,7
241 268 <rejection class="QHashNode"/>
242 269 <rejection class="QHashNode"/>
243 270 <rejection class="QInternal"/>
271 <rejection class="QIncompatibleFlag"/>
244 272 <rejection class="QLibrary"/>
245 273 <rejection class="QLinkedList"/>
246 274 <rejection class="QLinkedListData"/>
@@ -249,6 +277,8
249 277 <rejection class="QListData"/>
250 278 <rejection class="QListIterator"/>
251 279 <rejection class="QMap"/>
280 <rejection class="QMapNode"/>
281 <rejection class="QMapPayloadNode"/>
252 282 <rejection class="QMapData"/>
253 283 <rejection class="QMapIterator"/>
254 284 <rejection class="QMetaType"/>
@@ -307,6 +337,14
307 337 <rejection class="QSubString"/>
308 338 <rejection class="QUintForType"/>
309 339 <rejection class="QtConcurrent::internal"/>
340 <rejection class="QByteArrayMatcher::Data"/>
341 <rejection class="QStringMatcher::Data"/>
342
343 <rejection class="StringBuilder"/>
344 <rejection class="QConcatenable"/>
345 <rejection class="QLatin1Literal"/>
346 <rejection class="QIntegerForSizeof"/>
347
310 348
311 349 <rejection class="QLocale::Data"/>
312 350 <rejection class="QGlobalStaticDeleter"/>
@@ -344,10 +382,11
344 382 <rejection class="stat"/>
345 383 <rejection class="tm"/>
346 384
385 <rejection class="Qt" enum-name="Initialization"/>
386
347 387 <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/>
348 388 <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/>
349 <rejection class="QAbstractFileEngine" function-name="beginEntryList"/>
350 <rejection class="QAbstractFileEngine" function-name="endEntryList"/>
389
351 390 <rejection class="QAbstractFileEngine" function-name="extension"/>
352 391 <rejection class="QCoreApplication" function-name="compressEvent"/>
353 392 <rejection class="QCoreApplication" function-name="eventFilter"/>
@@ -382,6 +421,8
382 421 <rejection class="QObject" function-name="disconnect"/>
383 422 <rejection class="QObject" function-name="disconnectNotify"/>
384 423 <rejection class="QObject" function-name="registerUserData"/>
424 <rejection class="QObject" function-name="sender"/>
425 <rejection class="QTimer" function-name="singleShot"/>
385 426 <rejection class="QProcess" function-name="pid"/>
386 427 <rejection class="QRegion" function-name="cleanUp"/>
387 428 <rejection class="QSettings" function-name="registerFormat"/>
@@ -398,6 +439,7
398 439 <rejection class="QVector" function-name="alloc"/>
399 440 <rejection class="QVector" function-name="operator+="/>
400 441 <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/>
442 <rejection class="QtConcurrent::ThreadEngineBarrier"/>
401 443
402 444 <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/>
403 445 <rejection class="QDataStream" enum-name="ByteOrder"/>
@@ -410,11 +452,32
410 452 </extra-includes>
411 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 475 <enum-type name="QtMsgType">
415 476 <reject-enum-value name="QtSystemMsg"/>
416 477 </enum-type>
417 478
479
480 <enum-type name="QReadWriteLock::RecursionMode"/>
418 481 <enum-type name="QSystemSemaphore::AccessMode"/>
419 482 <enum-type name="QSystemSemaphore::SystemSemaphoreError"/>
420 483 <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons"/>
@@ -494,7 +557,6
494 557 <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/>
495 558 <enum-type name="Qt::LayoutDirection"/>
496 559 <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/>
497 <enum-type name="Qt::Modifier"/>
498 560 <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/>
499 561 <enum-type name="Qt::Orientation" flags="Qt::Orientations"/>
500 562 <enum-type name="Qt::PenCapStyle"/>
@@ -524,6 +586,7
524 586 <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions"/>
525 587 <enum-type name="QtConcurrent::ThreadFunctionResult"/>
526 588
589
527 590 <enum-type name="QCoreApplication::Encoding">
528 591 <reject-enum-value name="DefaultCodec"/>
529 592 </enum-type>
@@ -550,7 +613,6
550 613
551 614 <enum-type name="QDataStream::Version">
552 615 <reject-enum-value name="Qt_4_1"/>
553 <reject-enum-value name="Qt_4_5"/>
554 616 </enum-type>
555 617
556 618 <enum-type name="QDir::SortFlag" flags="QDir::SortFlags">
@@ -593,6 +655,7
593 655 <reject-enum-value name="WA_MacMetalStyle"/>
594 656 </enum-type>
595 657
658 <value-type name="QProcessEnvironment"/>
596 659 <value-type name="QBasicTimer"/>
597 660 <value-type name="QByteArrayMatcher">
598 661 <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/>
@@ -603,7 +666,8
603 666 <remove/>
604 667 </modify-function>
605 668
606 <modify-function signature="setYMD(int, int, int)" remove="all"/> <!--### Obsolete in 4.3-->
669 <modify-function signature="setYMD(int, int, int)" remove="all"/>
670 <!--### Obsolete in 4.3-->
607 671 </value-type>
608 672
609 673 <value-type name="QDateTime">
@@ -618,7 +682,8
618 682 </modify-function>
619 683 <modify-function signature="operator=(QDir)" remove="all"/>
620 684 <modify-function signature="operator=(QString)" remove="all"/>
621 <modify-function signature="addResourceSearchPath(QString)" remove="all"/> <!--### Obsolete in 4.3-->
685 <modify-function signature="addResourceSearchPath(QString)" remove="all"/>
686 <!--### Obsolete in 4.3-->
622 687 </value-type>
623 688
624 689 <value-type name="QPoint">
@@ -630,56 +695,105
630 695 <modify-function signature="ry()" remove="all"/>
631 696 </value-type>
632 697
633 <value-type name="QLine">
634 </value-type>
635 <value-type name="QLineF">
636 </value-type>
637
638 698 <value-type name="QRect">
639 <modify-function signature="getCoords(int*,int*,int*,int*)const"> <remove/> </modify-function>
640 <modify-function signature="getRect(int*,int*,int*,int*)const"> <remove/> </modify-function>
641 <modify-function signature="operator&amp;=(QRect)"> <remove/> </modify-function>
642 <modify-function signature="operator|=(QRect)"> <remove/> </modify-function>
643 <modify-function signature="operator&amp;(QRect)const"> <remove/> </modify-function>
644 <modify-function signature="operator|(QRect)const"> <remove/> </modify-function>
645
646 <modify-function signature="intersect(const QRect&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
647 <modify-function signature="unite(const QRect&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
699 <modify-function signature="getCoords(int*,int*,int*,int*)const">
700 <remove/>
701 </modify-function>
702 <modify-function signature="getRect(int*,int*,int*,int*)const">
703 <remove/>
704 </modify-function>
705 <modify-function signature="operator&amp;=(QRect)">
706 <remove/>
707 </modify-function>
708 <modify-function signature="operator|=(QRect)">
709 <remove/>
710 </modify-function>
711 <modify-function signature="operator&amp;(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&amp;)const" remove="all"/>
719 <!--### Obsolete in 4.3-->
720 <modify-function signature="unite(const QRect&amp;)const" remove="all"/>
721 <!--### Obsolete in 4.3-->
648 722 </value-type>
649 723
650 724 <value-type name="QRectF">
651 <modify-function signature="getCoords(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function>
652 <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function>
653 <modify-function signature="operator&amp;=(QRectF)"> <remove/> </modify-function>
654 <modify-function signature="operator|=(QRectF)"> <remove/> </modify-function>
655 <modify-function signature="operator&amp;(QRectF)const"> <remove/> </modify-function>
656 <modify-function signature="operator|(QRectF)const"> <remove/> </modify-function>
657
658 <modify-function signature="intersect(const QRectF&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
659 <modify-function signature="unite(const QRectF&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
725 <modify-function signature="getCoords(double*,double*,double*,double*)const">
726 <remove/>
727 </modify-function>
728 <modify-function signature="getRect(double*,double*,double*,double*)const">
729 <remove/>
730 </modify-function>
731 <modify-function signature="operator&amp;=(QRectF)">
732 <remove/>
733 </modify-function>
734 <modify-function signature="operator|=(QRectF)">
735 <remove/>
736 </modify-function>
737 <modify-function signature="operator&amp;(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&amp;)const" remove="all"/>
745 <!--### Obsolete in 4.3-->
746 <modify-function signature="unite(const QRectF&amp;)const" remove="all"/>
747 <!--### Obsolete in 4.3-->
660 748 </value-type>
661 749
662 750
663 751 <value-type name="QSize">
664 <modify-function signature="operator*=(qreal)"> <access modifier="private"/> </modify-function>
665 <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function>
666 <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function>
667 <modify-function signature="operator-=(QSize)"> <access modifier="private"/> </modify-function>
668 <modify-function signature="rheight()"> <remove/> </modify-function>
669 <modify-function signature="rwidth()"> <remove/> </modify-function>
752 <modify-function signature="operator*=(double)">
753 <access modifier="private"/>
754 </modify-function>
755 <modify-function signature="operator/=(double)">
756 <access modifier="private"/>
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 770 </value-type>
671 771
672 772 <value-type name="QSizeF">
673 <modify-function signature="operator*=(qreal)"> <access modifier="private"/> </modify-function>
674 <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function>
675 <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function>
676 <modify-function signature="operator-=(QSizeF)"> <access modifier="private"/> </modify-function>
677 <modify-function signature="rheight()"> <remove/> </modify-function>
678 <modify-function signature="rwidth()"> <remove/> </modify-function>
773 <modify-function signature="operator*=(double)">
774 <access modifier="private"/>
775 </modify-function>
776 <modify-function signature="operator/=(double)">
777 <access modifier="private"/>
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 791 </value-type>
680 792
681 793 <value-type name="QStringMatcher">
682 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 797 </value-type>
684 798
685 799 <value-type name="QTime"/>
@@ -697,14 +811,13
697 811 </value-type>
698 812
699 813 <value-type name="QLocale">
700 <modify-function signature="toString(qlonglong) const" remove="all"/>
701 <modify-function signature="toString(ushort) const" remove="all"/>
814 <modify-function signature="toString(unsigned long long) const" remove="all"/>
815 <modify-function signature="toString(unsigned short) const" remove="all"/>
702 816 <modify-function signature="toString(unsigned int) const" remove="all"/>
703 817 <modify-function signature="toUInt(QString,bool*,int)const" remove="all"/>
704 818 <modify-function signature="toULongLong(QString,bool*,int)const" remove="all"/>
705 819 <modify-function signature="operator=(QLocale)" remove="all"/>
706 820
707
708 821 <extra-includes>
709 822 <include file-name="QDate" location="global"/>
710 823 </extra-includes>
@@ -901,18 +1014,27
901 1014 </modify-function>
902 1015 </value-type>
903 1016
1017 <object-type name="QReadWriteLock"/>
904 1018 <object-type name="QDirIterator"/>
905 1019 <object-type name="QAbstractFileEngineIterator"/>
906 <object-type name="QAbstractItemModel"/>
1020 <object-type name="QAbstractItemModel">
1021 <modify-function signature="rowsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/>
1022 <modify-function signature="rowsInserted(QModelIndex,int,int)" private-signal="yes"/>
907 1023
908 <object-type name="QAbstractListModel">
909 <extra-includes>
910 <include file-name="QStringList" location="global"/>
911 <include file-name="QSize" location="global"/>
912 </extra-includes>
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"/>
913 1035 </object-type>
914 1036
915 <object-type name="QAbstractTableModel">
1037 <object-type name="QAbstractListModel">
916 1038 <extra-includes>
917 1039 <include file-name="QStringList" location="global"/>
918 1040 <include file-name="QSize" location="global"/>
@@ -926,8 +1048,10
926 1048 <modify-function signature="operator=(QUrl)" remove="all"/>
927 1049 <modify-function signature="operator=(QString)" remove="all"/>
928 1050
929 <modify-function signature="fromPunycode(const QByteArray&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
930 <modify-function signature="toPunycode(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
1051 <modify-function signature="fromPunycode(const QByteArray&amp;)" remove="all"/>
1052 <!--### Obsolete in 4.3-->
1053 <modify-function signature="toPunycode(const QString&amp;)" remove="all"/>
1054 <!--### Obsolete in 4.3-->
931 1055 </value-type>
932 1056
933 1057 <value-type name="QRegExp">
@@ -935,6 +1059,18
935 1059 <include file-name="QStringList" location="global"/>
936 1060 </extra-includes>
937 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 1074 </value-type>
939 1075
940 1076 <value-type name="QFileInfo">
@@ -951,7 +1087,8
951 1087 </modify-argument>
952 1088 </modify-function>
953 1089
954 <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
1090 <modify-function signature="readLink()const" remove="all"/>
1091 <!--### Obsolete in 4.3-->
955 1092
956 1093 <modify-function signature="QFileInfo(QFile)">
957 1094 <modify-argument index="1">
@@ -971,7 +1108,7
971 1108 </modify-function>
972 1109 </value-type>
973 1110
974 <!-- <interface-type name="QFactoryInterface" java-name="QAbstractFactory" /> -->
1111 <interface-type name="QFactoryInterface"/>
975 1112
976 1113 <value-type name="QByteArray">
977 1114
@@ -990,7 +1127,7
990 1127 <modify-function signature="end()" remove="all"/>
991 1128 <modify-function signature="end()const" remove="all"/>
992 1129 <modify-function signature="number(uint,int)" remove="all"/>
993 <modify-function signature="number(qulonglong,int)" remove="all"/>
1130 <modify-function signature="number(unsigned long long,int)" remove="all"/>
994 1131 <modify-function signature="operator const char *()const" remove="all"/>
995 1132 <modify-function signature="operator const void *()const" remove="all"/>
996 1133 <modify-function signature="operator+=(const char*)" remove="all"/>
@@ -1006,8 +1143,8
1006 1143 <modify-function signature="push_front(const QByteArray&amp;)" remove="all"/>
1007 1144 <modify-function signature="push_front(const char*)" remove="all"/>
1008 1145 <modify-function signature="setNum(uint,int)" remove="all"/>
1009 <modify-function signature="setNum(qulonglong,int)" remove="all"/>
1010 <modify-function signature="setNum(ushort,int)" remove="all"/>
1146 <modify-function signature="setNum(unsigned long long,int)" remove="all"/>
1147 <modify-function signature="setNum(unsigned short,int)" remove="all"/>
1011 1148 <modify-function signature="toLong(bool*, int) const" remove="all"/>
1012 1149 <modify-function signature="toLongLong(bool*, int) const" remove="all"/>
1013 1150 <modify-function signature="toShort(bool*, int) const" remove="all"/>
@@ -1249,6 +1386,28
1249 1386 <modify-function signature="operator=(QTextBoundaryFinder)" remove="all"/>
1250 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 1411 <object-type name="QXmlStreamEntityResolver"/>
1253 1412 <object-type name="QAbstractEventDispatcher">
1254 1413 <extra-includes>
@@ -1257,10 +1416,14
1257 1416 </object-type>
1258 1417 <object-type name="QEventLoop"/>
1259 1418 <object-type name="QFile">
1260 <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
1261 <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3-->
1262 <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all"/> <!-- Can't provide same API and performance -->
1263 <modify-function signature="unmap(uchar*)" remove="all"/> <!-- Can't provide same API and performance -->
1419 <modify-function signature="readLink()const" remove="all"/>
1420 <!--### Obsolete in 4.3-->
1421 <modify-function signature="readLink(QString)" remove="all"/>
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 1428 <modify-function signature="open(int,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
1266 1429 <modify-function signature="decodeName(const char*)" remove="all"/>
@@ -1274,6 +1437,8
1274 1437 <modify-function signature="readLine(char *,qint64)" remove="all"/>
1275 1438 <modify-function signature="write(const char *,qint64)" remove="all"/>
1276 1439 </object-type>
1440 <object-type name="QStateMachine::SignalEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StateMachineSignal"/>
1441 <object-type name="QStateMachine::WrappedEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StateMachineWrapped"/>
1277 1442
1278 1443 <object-type name="QCryptographicHash">
1279 1444 <modify-function signature="addData(const char*,int)" remove="all"/>
@@ -1344,9 +1509,6
1344 1509 </modify-function>
1345 1510 </object-type>
1346 1511
1347 <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory"/>
1348 <object-type name="QTextCodecPlugin"/>
1349
1350 1512 <object-type name="QTextDecoder">
1351 1513 <modify-function signature="toUnicode(const char*,int)">
1352 1514 <remove/>
@@ -1381,6 +1543,8
1381 1543 <modify-function signature="buffer()">
1382 1544 <remove/>
1383 1545 </modify-function>
1546 <modify-function signature="connectNotify(const char *)" remove="all"/>
1547 <modify-function signature="disconnectNotify(const char *)" remove="all"/>
1384 1548
1385 1549 <!-- ### modify to return value by pointer? -->
1386 1550 <modify-function signature="buffer()const" remove="all"/>
@@ -1399,20 +1563,22
1399 1563 </modify-function>
1400 1564 </object-type>
1401 1565
1402 <!-- <object-type name="QAbstractFileEngine::MapExtensionOption" /> -->
1403 <!-- <object-type name="QAbstractFileEngine::MapExtensionReturn" /> -->
1404 <!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> -->
1566 <object-type name="QAbstractFileEngine::MapExtensionOption"/>
1567 <object-type name="QAbstractFileEngine::MapExtensionReturn"/>
1568 <object-type name="QAbstractFileEngine::UnMapExtensionOption"/>
1405 1569 <object-type name="QAbstractFileEngine">
1406 1570 <extra-includes>
1407 1571 <include file-name="QDateTime" location="global"/>
1408 1572 </extra-includes>
1409 <modify-function signature="map(qlonglong,qlonglong,QFile::MemoryMapFlags)" remove="all"/>
1573 <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/>
1410 1574 <modify-function signature="unmap(unsigned char*)" remove="all"/>
1411 1575 </object-type>
1412 1576
1413 1577 <object-type name="QProcess">
1414 <modify-function signature="readChannelMode()const" remove="all"/> <!--### Obsolete in 4.3-->
1415 <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3-->
1578 <modify-function signature="readChannelMode()const" remove="all"/>
1579 <!--### Obsolete in 4.3-->
1580 <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/>
1581 <!--### Obsolete in 4.3-->
1416 1582 </object-type>
1417 1583
1418 1584 <object-type name="QSignalMapper">
@@ -1488,11 +1654,11
1488 1654 <modify-function signature="deleteLater()">
1489 1655 <rename to="disposeLater"/>
1490 1656 </modify-function>
1491 <!--
1657
1492 1658 <modify-function signature="inherits(const char*)const">
1493 1659 <remove/>
1494 1660 </modify-function>
1495 -->
1661
1496 1662 <modify-function signature="property(const char*)const">
1497 1663 <access modifier="private"/>
1498 1664 </modify-function>
@@ -1540,8 +1706,10
1540 1706 <include file-name="QStringList" location="global"/>
1541 1707 </extra-includes>
1542 1708
1543 <modify-function signature="argv()" remove="all"/> <!-- Obsolete -->
1544 <modify-function signature="argc()" remove="all"/> <!-- Obsolete -->
1709 <modify-function signature="argv()" remove="all"/>
1710 <!-- Obsolete -->
1711 <modify-function signature="argc()" remove="all"/>
1712 <!-- Obsolete -->
1545 1713
1546 1714 <modify-function signature="notify(QObject*,QEvent*)">
1547 1715 <modify-argument index="2" invalidate-after-use="yes"/>
@@ -1632,8 +1800,16
1632 1800 <include file-name="QStringList" location="global"/>
1633 1801 </extra-includes>
1634 1802
1635 <modify-function signature="setSystemIniPath(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
1636 <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
1803 <modify-function signature="setIniCodec(QTextCodec*)">
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&amp;)" remove="all"/>
1810 <!--### Obsolete in 4.3-->
1811 <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/>
1812 <!--### Obsolete in 4.3-->
1637 1813 </object-type>
1638 1814
1639 1815 <object-type name="QEvent" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type() == QEvent::None"/>
@@ -1649,26 +1825,54
1649 1825 <reference-count action="set" variable-name="__rcDevice"/>
1650 1826 </modify-argument>
1651 1827 </modify-function>
1652 <!--
1653 1828 <modify-function signature="unsetDevice()">
1654 1829 <inject-code position="end">
1655 1830 __rcDevice = null;
1656 1831 </inject-code>
1657 1832 </modify-function>
1658 -->
1659 1833
1660 1834
1661 <modify-function signature="operator&lt;&lt;(const char*)"> <remove/> </modify-function>
1662 <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>
1663 <modify-function signature="operator&lt;&lt;(unsigned long long)"> <remove/> </modify-function>
1664 <modify-function signature="operator&lt;&lt;(unsigned short)"> <remove/> </modify-function>
1835 <modify-function signature="operator&lt;&lt;(const char*)">
1836 <remove/>
1837 </modify-function>
1838 <modify-function signature="operator&lt;&lt;(unsigned char)">
1839 <remove/>
1840 </modify-function>
1841 <modify-function signature="operator&lt;&lt;(unsigned int)">
1842 <remove/>
1843 </modify-function>
1844 <modify-function signature="operator&lt;&lt;(unsigned long long)">
1845 <remove/>
1846 </modify-function>
1847 <modify-function signature="operator&lt;&lt;(unsigned short)">
1848 <remove/>
1849 </modify-function>
1665 1850
1666 <modify-function signature="operator&gt;&gt;(char &amp;*)"> <remove/> </modify-function>
1851 <modify-function signature="operator&gt;&gt;(char &amp;*)">
1852 <remove/>
1853 </modify-function>
1854 <modify-function signature="operator&gt;&gt;(uint&amp;)">
1855 <remove/>
1856 </modify-function>
1857 <modify-function signature="operator&gt;&gt;(unsigned char&amp;)">
1858 <remove/>
1859 </modify-function>
1860 <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)">
1861 <remove/>
1862 </modify-function>
1667 1863
1668 <modify-function signature="readRawData(char*,int)"> <remove/> </modify-function>
1669 <modify-function signature="readBytes(char&amp;*,uint&amp;)"> <remove/> </modify-function>
1670 <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function>
1671 <modify-function signature="writeBytes(const char*,uint)"> <remove/> </modify-function>
1864 <modify-function signature="readRawData(char*,int)">
1865 <remove/>
1866 </modify-function>
1867 <modify-function signature="readBytes(char&amp;*,uint&amp;)">
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 1877 <modify-function signature="operator&gt;&gt;(signed char&amp;)" remove="all"/>
1674 1878 <modify-function signature="operator&lt;&lt;(signed char)" remove="all"/>
@@ -1861,25 +2065,75
1861 2065 </object-type>
1862 2066
1863 2067 <object-type name="QTextStream">
1864 <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
1865 <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
1866 <modify-function signature="operator&gt;&gt;(QChar&amp;)"> <remove/> </modify-function>
1867 <modify-function signature="operator&lt;&lt;(const void*)"> <remove/> </modify-function>
1868 <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>
1869 <modify-function signature="operator&lt;&lt;(qlonglong)"> <remove/> </modify-function>
1870 <modify-function signature="operator&lt;&lt;(const QChar &amp;)"> <remove/> </modify-function>
1871 <modify-function signature="operator&lt;&lt;(unsigned long)"> <remove/> </modify-function>
1872 <modify-function signature="operator&lt;&lt;(signed long)"> <remove/> </modify-function>
1873 <modify-function signature="operator&lt;&lt;(const char*)"> <remove/> </modify-function>
1874 <modify-function signature="operator&lt;&lt;(unsigned short)"> <remove/> </modify-function>
1875 <modify-function signature="operator&gt;&gt;(qulonglong&amp;)"> <remove/> </modify-function>
1876 <modify-function signature="operator&gt;&gt;(ulong&amp;)"> <remove/> </modify-function>
1877 <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
1878 <modify-function signature="string()const"> <remove/> </modify-function>
1879 <modify-function signature="operator&gt;&gt;(signed long&amp;)"> <remove/> </modify-function>
1880 <modify-function signature="operator&gt;&gt;(char*)"> <remove/> </modify-function>
1881 <modify-function signature="operator&gt;&gt;(QByteArray&amp;)"> <remove/> </modify-function>
1882 <modify-function signature="operator&gt;&gt;(QString&amp;)"> <remove/> </modify-function>
2068 <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)">
2069 <remove/>
2070 </modify-function>
2071 <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)">
2072 <remove/>
2073 </modify-function>
2074 <modify-function signature="operator&gt;&gt;(QChar&amp;)">
2075 <remove/>
2076 </modify-function>
2077 <modify-function signature="operator&lt;&lt;(const void*)">
2078 <remove/>
2079 </modify-function>
2080 <modify-function signature="operator&lt;&lt;(unsigned int)">
2081 <remove/>
2082 </modify-function>
2083 <modify-function signature="operator&lt;&lt;(unsigned long long)">
2084 <remove/>
2085 </modify-function>
2086 <modify-function signature="operator&lt;&lt;(const QChar &amp;)">
2087 <remove/>
2088 </modify-function>
2089 <modify-function signature="operator&lt;&lt;(unsigned long)">
2090 <remove/>
2091 </modify-function>
2092 <modify-function signature="operator&lt;&lt;(signed long)">
2093 <remove/>
2094 </modify-function>
2095 <modify-function signature="operator&lt;&lt;(const char*)">
2096 <remove/>
2097 </modify-function>
2098 <modify-function signature="operator&lt;&lt;(unsigned short)">
2099 <remove/>
2100 </modify-function>
2101 <modify-function signature="operator&lt;&lt;(const QByteArray&amp;)">
2102 <remove/>
2103 </modify-function>
2104 <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)">
2105 <remove/>
2106 </modify-function>
2107 <modify-function signature="operator&gt;&gt;(uint&amp;)">
2108 <remove/>
2109 </modify-function>
2110 <modify-function signature="operator&gt;&gt;(ulong&amp;)">
2111 <remove/>
2112 </modify-function>
2113 <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)">
2114 <remove/>
2115 </modify-function>
2116 <modify-function signature="string()const">
2117 <remove/>
2118 </modify-function>
2119 <modify-function signature="operator&gt;&gt;(signed long&amp;)">
2120 <remove/>
2121 </modify-function>
2122 <modify-function signature="operator&gt;&gt;(char*)">
2123 <remove/>
2124 </modify-function>
2125 <modify-function signature="operator&gt;&gt;(QByteArray&amp;)">
2126 <remove/>
2127 </modify-function>
2128 <modify-function signature="operator&gt;&gt;(QString&amp;)">
2129 <remove/>
2130 </modify-function>
2131 <modify-function signature="operator&gt;&gt;(unsigned short&amp;)">
2132 <remove/>
2133 </modify-function>
2134 <modify-function signature="operator&lt;&lt;(const QString&amp;)">
2135 <remove/>
2136 </modify-function>
1883 2137
1884 2138
1885 2139 <modify-function signature="setCodec(QTextCodec *)">
@@ -2098,419 +2352,47
2098 2352 <modify-function signature="operator T() const" remove="all"/>
2099 2353 <modify-function signature="operator=(const QFuture &amp;)" remove="all"/>
2100 2354 </value-type>
2101 <value-type name="QtScriptVoidFuture" java-name="QFutureVoid">
2355 <value-type name="QtJambiVoidFuture" java-name="QFutureVoid">
2102 2356 <modify-function signature="resultCount()const" remove="all"/>
2103 2357 <modify-function signature="isResultReadyAt(int)const" remove="all"/>
2104
2105 <modify-function signature="operator==(const QFuture &amp;)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 &amp;)">
2111 <modify-argument index="1">
2112 <replace-type modified-type="QtScriptVoidFuture"/>
2113 </modify-argument>
2114 </modify-function>
2115 </value-type>
2116 <value-type name="QtScriptFuture" java-name="QFuture" generic-class="yes">
2117 <modify-function signature="operator==(const QFuture &amp;)const">
2118 <modify-argument index="1">
2119 <replace-type modified-type="QtScriptFuture"/>
2120 </modify-argument>
2121 </modify-function>
2122 <modify-function signature="QFuture(const QFuture &amp;)">
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 2358 </value-type>
2359 <value-type name="QtJambiFuture" java-name="QFuture" generic-class="yes"/>
2130 2360
2131 2361 <object-type name="QFutureWatcherBase">
2132 2362 <modify-function signature="connectNotify(const char *)" remove="all"/>
2133 2363 <modify-function signature="disconnectNotify(const char *)" remove="all"/>
2134 2364 </object-type>
2135 <object-type name="QtScriptVoidFutureWatcher" java-name="QFutureWatcherVoid">
2136 <modify-function signature="setFuture(const QFuture &amp;)">
2137 <modify-argument index="1">
2138 <replace-type modified-type="QtScriptVoidFuture"/>
2139 </modify-argument>
2140 </modify-function>
2141 </object-type>
2365 <object-type name="QtJambiVoidFutureWatcher" java-name="QFutureWatcherVoid"/>
2142 2366
2143 2367 <object-type name="QFutureWatcher" generate="no">
2144 2368 <modify-function signature="future()const" remove="all"/>
2145 2369 </object-type>
2146 <object-type name="QtScriptFutureWatcher" java-name="QFutureWatcher" generic-class="yes">
2147 <modify-function signature="setFuture(const QFuture &amp;)">
2148 <modify-argument index="1">
2149 <replace-type modified-type="QtScriptFuture"/>
2150 </modify-argument>
2151 </modify-function>
2152 </object-type>
2370 <object-type name="QtJambiFutureWatcher" java-name="QFutureWatcher" generic-class="yes"/>
2153 2371
2154 2372 <object-type name="QFutureSynchronizer" generate="no"/>
2155 <object-type name="QtScriptFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer">
2156 <modify-function signature="QFutureSynchronizer(const QFuture &amp;)">
2157 <modify-argument index="1">
2158 <replace-type modified-type="QtScriptFuture"/>
2159 </modify-argument>
2160 </modify-function>
2161 <modify-function signature="addFuture(const QFuture &amp;)">
2162 <modify-argument index="1">
2163 <replace-type modified-type="QtScriptFuture"/>
2164 </modify-argument>
2165 </modify-function>
2166 <modify-function signature="setFuture(const QFuture &amp;)">
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 &amp;)">
2175 <modify-argument index="1">
2176 <replace-type modified-type="QtScriptVoidFuture"/>
2177 </modify-argument>
2178 </modify-function>
2179 <modify-function signature="addFuture(const QFuture &amp;)">
2180 <modify-argument index="1">
2181 <replace-type modified-type="QtScriptVoidFuture"/>
2182 </modify-argument>
2183 </modify-function>
2184 <modify-function signature="setFuture(const QFuture &amp;)">
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>
2373 <object-type name="QtJambiFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer"/>
2374 <object-type name="QtJambiVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid"/>
2191 2375 <object-type name="QThreadPool"/>
2192 2376
2193 2377 <object-type name="QFutureIterator" generate="no">
2194 2378 <modify-function signature="operator=(const QFuture&amp;)" remove="all"/>
2195 2379 </object-type>
2196 <object-type name="QtScriptFutureIterator" generic-class="yes" java-name="QFutureIterator">
2197 <modify-function signature="QFutureIterator(const QFuture &amp;)">
2198 <modify-argument index="1">
2199 <replace-type modified-type="QtScriptFuture"/>
2200 </modify-argument>
2201 </modify-function>
2202 </object-type>
2380 <object-type name="QtJambiFutureIterator" generic-class="yes" java-name="QFutureIterator"/>
2203 2381 <object-type name="QRunnable"/>
2204 2382
2383 <!-- Inefficient hash codes -->
2384 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
2385 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
2386 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
2387 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
2388 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
2389 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
2390 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QProcessEnvironment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
2205 2391
2206 <value-type name="QXmlStreamAttribute">
2207 <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/>
2208
2209 <modify-function signature="name()const">
2210 <modify-argument index="return">
2211 <conversion-rule class="native">
2212 <insert-template name="core.convert_stringref_to_string"/>
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&lt;QXmlStreamAttribute&gt;)const" remove="all"/>
2252 <modify-function signature="operator&lt;&lt;(QVector&lt;QXmlStreamAttribute&gt;)" remove="all"/>
2253 <modify-function signature="operator&lt;&lt;(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 &amp;, const QLatin1String &amp;)const">
2260 <remove/>
2261 </modify-function>
2262 <modify-function signature="value(const QLatin1String &amp;, const QLatin1String &amp;)const">
2263 <remove/>
2264 </modify-function>
2265 <modify-function signature="value(const QLatin1String &amp;)const">
2266 <remove/>
2267 </modify-function>
2268 <modify-function signature="hasAttribute(const QLatin1String &amp;)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
2313 <modify-function signature="name()const">
2314 <modify-argument index="return">
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 &amp; %out% = *qscriptvalue_cast&lt;QXmlStreamReader*&gt;(%in%);
2506 </conversion-rule>
2507 </modify-argument>
2508 </modify-function>
2509
2510 </object-type>
2511
2512 <value-type name="QModelIndex"/>
2392 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::selectIteration', unmatched parameter type 'T'"/>
2393 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QVariantAnimation::registerInterpolator', unmatched parameter type 'QVariantAnimation::Interpolator'"/>
2513 2394
2395 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'Qt::Initialization'"/>
2514 2396 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'std::*'"/>
2515 2397 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
2516 2398 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
@@ -2533,34 +2415,17
2533 2415 <suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/>
2534 2416 <suppress-warning text="* private virtual function '*' in 'QFontDialog'"/>
2535 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 2418 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase&amp;'"/>
2553 2419 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase const&amp;'"/>
2554 2420 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase&amp;'"/>
2555 2421 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase const&amp;'"/>
2556 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function"/>
2557 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 2423 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constBegin', unmatched return type 'const_iterator'"/>
2560 2424 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::end', unmatched return type 'const_iterator'"/>
2561 2425 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd', unmatched return type 'const_iterator'"/>
2562 2426 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface&lt;T&gt;*'"/>
2563 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&amp;'"/>
2564 2429 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'"/>
2565 2430 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList&lt;U&gt;'"/>
2566 2431 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList&lt;MapFunctor::result_type&gt;'"/>
@@ -2568,6 +2433,7
2568 2433 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Iterator'"/>
2569 2434 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Sequence const&amp;'"/>
2570 2435 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filter', unmatched parameter type 'Sequence&amp;'"/>
2436 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;qValueType&lt;Iterator&gt;::value_type&gt;"/>
2571 2437 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;Sequence::value_type&gt;'"/>
2572 2438 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;Iterator::value_type&gt;'"/>
2573 2439 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMappedReduced', unmatched return type 'V'"/>
@@ -2606,4 +2472,9
2606 2472 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingFilter', unmatched parameter type 'Sequence&amp;'"/>
2607 2473 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::createFunctor', unmatched return type 'QtConcurrent::SelectMemberFunctor0&lt;T,Class&gt;::type'"/>
2608 2474
2475 <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFuture&lt;void&gt;::operator= - definition *ignored*"/>
2476 <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureInterface&lt;void&gt;::future - definition *ignored*"/>
2477 <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureWatcher&lt;void&gt;::setFuture - definition *ignored*"/>
2478
2479
2609 2480 </typesystem>
@@ -1,10 +1,15
1 1 <?xml version="1.0"?>
2 2 <typesystem>
3
3 4 <rejection class="*" function-name="d_func"/>
4 5
5 6 <rejection class="*" field-name="d_ptr"/>
6 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 13 <rejection class="QWindowsCEStyle" />
9 14 <rejection class="QWindowsMobileStyle" />
10 15 <rejection class="QAbstractUndoItem"/>
@@ -66,6 +71,7
66 71 <rejection class="QTreeModel" function-name="node"/>
67 72 <rejection class="QTreeModel" function-name="initializeNode"/>
68 73 <rejection class="QTreeModel" function-name="queryChildren"/>
74 <rejection class="QTextObjectInterface" />
69 75 <rejection class="QAccessible" function-name="cast_helper"/>
70 76 <rejection class="QAccessible2"/>
71 77 <rejection class="QAccessibleInterface" function-name="backgroundColor"/>
@@ -81,7 +87,22
81 87 <rejection class="QTabletEvent" field-name="mExtra"/>
82 88 <rejection class="QWidgetItem" field-name="wid" />
83 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 106 <enum-type name="QAbstractItemDelegate::EndEditHint"/>
86 107 <enum-type name="QAbstractItemView::CursorAction"/>
87 108 <enum-type name="QAbstractItemView::DragDropMode"/>
@@ -123,6 +144,8
123 144 <enum-type name="QPlainTextEdit::LineWrapMode" />
124 145 <enum-type name="QPrintPreviewWidget::ViewMode" />
125 146 <enum-type name="QPrintPreviewWidget::ZoomMode" />
147 <enum-type name="QStyleOptionTabV3::StyleOptionVersion" />
148 <enum-type name="QStyleOptionFrameV3::StyleOptionVersion" />
126 149 <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion" />
127 150 <enum-type name="QStyleOptionViewItemV4::ViewItemPosition" />
128 151
@@ -136,7 +159,6
136 159 <enum-type name="QCalendarWidget::SelectionMode"/>
137 160 <enum-type name="QCalendarWidget::VerticalHeaderFormat"/>
138 161 <enum-type name="QColor::Spec"/>
139 <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/>
140 162 <enum-type name="QColormap::Mode"/>
141 163 <enum-type name="QComboBox::InsertPolicy"/>
142 164 <enum-type name="QComboBox::SizeAdjustPolicy"/>
@@ -159,7 +181,6
159 181 <enum-type name="QFont::StyleStrategy"/>
160 182 <enum-type name="QFont::Weight"/>
161 183 <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/>
162 <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/>
163 184 <enum-type name="QFrame::Shadow" extensible="yes"/>
164 185 <enum-type name="QFrame::Shape"/>
165 186 <enum-type name="QFrame::StyleMask"/>
@@ -195,8 +216,6
195 216 <enum-type name="QImageReader::ImageReaderError"/>
196 217 <enum-type name="QImageWriter::ImageWriterError"/>
197 218 <enum-type name="QInputContext::StandardFormat"/>
198 <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions"/>
199 <enum-type name="QInputDialog::InputMode"/>
200 219 <enum-type name="QInputMethodEvent::AttributeType"/>
201 220 <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/>
202 221 <enum-type name="QKeySequence::SequenceFormat"/>
@@ -241,7 +260,6
241 260 <enum-type name="QPrinter::Unit" />
242 261 <enum-type name="QPrinter::DuplexMode" />
243 262 <enum-type name="QProgressBar::Direction"/>
244 <enum-type name="QReadWriteLock::RecursionMode" />
245 263 <enum-type name="QRegion::RegionType"/>
246 264 <enum-type name="QRubberBand::Shape"/>
247 265 <enum-type name="QSessionManager::RestartHint"/>
@@ -348,8 +366,6
348 366 <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/>
349 367 <enum-type name="QSystemTrayIcon::ActivationReason"/>
350 368 <enum-type name="QSystemTrayIcon::MessageIcon"/>
351 <enum-type name="QTabBar::ButtonPosition"/>
352 <enum-type name="QTabBar::SelectionBehavior"/>
353 369 <enum-type name="QTabBar::Shape"/>
354 370 <enum-type name="QTabWidget::TabPosition"/>
355 371 <enum-type name="QTabWidget::TabShape"/>
@@ -488,15 +504,33
488 504 <reject-enum-value name="LastFontProperty"/>
489 505 </enum-type>
490 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" />
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 525 <value-type name="QTransform">
492 526 <modify-function signature="operator=(QTransform)" remove="all"/>
493 527 <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
494 <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
528 <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
495 529
496 <modify-function signature="operator*=(qreal)" access="private"/>
497 <modify-function signature="operator+=(qreal)" access="private"/>
498 <modify-function signature="operator-=(qreal)" access="private"/>
499 <modify-function signature="operator/=(qreal)" access="private"/>
530 <modify-function signature="operator*=(double)" access="private"/>
531 <modify-function signature="operator+=(double)" access="private"/>
532 <modify-function signature="operator-=(double)" access="private"/>
533 <modify-function signature="operator/=(double)" access="private"/>
500 534 <modify-function signature="operator*(QTransform)const" rename="multiplied" />
501 535 <modify-function signature="operator*=(QTransform)" access="private"/>
502 536 </value-type>
@@ -520,6 +554,9
520 554 <value-type name="QStyleOptionFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV2::Version">
521 555 <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
522 556 </value-type>
557 <value-type name="QStyleOptionFrameV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV3::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV3::Version">
558 <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
559 </value-type>
523 560
524 561 <value-type name="QStyleOptionGroupBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionGroupBox::Type &amp;&amp; %1-&gt;version == QStyleOptionGroupBox::Version"/>
525 562 <value-type name="QStyleOptionHeader" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version"/>
@@ -537,7 +574,13
537 574 <value-type name="QStyleOptionTabV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV2::Version">
538 575 <modify-function signature="operator=(const QStyleOptionTab &amp;)" remove="all"/>
539 576 </value-type>
577 <value-type name="QStyleOptionTabV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV3::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV3::Version">
578 <modify-function signature="operator=(QStyleOptionTab)" remove="all" />
579 </value-type>
540 580 <value-type name="QStyleOptionTabBarBase" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBase::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBase::Version"/>
581 <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBaseV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBaseV2::Version">
582 <modify-function signature="operator=(QStyleOptionTabBarBase)" remove="all" />
583 </value-type>
541 584 <value-type name="QStyleOptionTabWidgetFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabWidgetFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionTabWidgetFrame::Version"/>
542 585 <value-type name="QStyleOptionTitleBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTitleBar::Type &amp;&amp; %1-&gt;version == QStyleOptionTitleBar::Version"/>
543 586 <value-type name="QStyleOptionToolBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBar::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBar::Version"/>
@@ -565,7 +608,7
565 608 <modify-argument index="2"> <remove-default-expression/> </modify-argument>
566 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 612 <access modifier="private"/>
570 613 <modify-argument index="3">
571 614 <remove-default-expression/>
@@ -782,26 +825,30
782 825 <modify-function signature="operator&lt;&lt;(QItemSelectionRange)" remove="all"/>
783 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 832 <value-type name="QMatrix">
786 833 <extra-includes>
787 834 <include file-name="QPainterPath" location="global"/>
788 835 </extra-includes>
789 836
790 837 <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
791 <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
838 <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
792 839 <modify-function signature="operator=(QMatrix)" remove="all"/>
793 840
794 841 <modify-function signature="operator*(QMatrix)const" access="private"/>
795 842 <modify-function signature="operator*=(QMatrix)" access="private"/>
796 <modify-function signature="rotate(qreal)" access="private" rename="rotate_private"/>
797 <modify-function signature="scale(qreal,qreal)" access="private" rename="scale_private"/>
798 <modify-function signature="shear(qreal,qreal)" access="private" rename="shear_private"/>
799 <modify-function signature="translate(qreal,qreal)" access="private" rename="translate_private"/>
843 <modify-function signature="rotate(double)" access="private" rename="rotate_private"/>
844 <modify-function signature="scale(double,double)" access="private" rename="scale_private"/>
845 <modify-function signature="shear(double,double)" access="private" rename="shear_private"/>
846 <modify-function signature="translate(double,double)" access="private" rename="translate_private"/>
800 847
801 848 <modify-function signature="inverted(bool*)const">
802 849 <access modifier="private"/>
803 850 <modify-argument index="1">
804 <!-- <remove-default-expression/> -->
851 <remove-default-expression/>
805 852 </modify-argument>
806 853 </modify-function>
807 854
@@ -844,7 +891,7
844 891 </custom-destructor>
845 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 895 <custom-constructor>
849 896 return new QFontInfo(*copy);
850 897 </custom-constructor>
@@ -876,7 +923,7
876 923 <include file-name="QTextEdit" location="global"/>
877 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 927 <extra-includes>
881 928 <include file-name="QStringList" location="global"/>
882 929 </extra-includes>
@@ -897,7 +944,7
897 944 <modify-function signature="QImage(const char **)">
898 945 <access modifier="private"/>
899 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 949 </modify-function>
903 950 <modify-function signature="bits()const">
@@ -906,7 +953,7
906 953 <modify-function signature="scanLine(int)const">
907 954 <remove/>
908 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 957 <remove/>
911 958 </modify-function>
912 959
@@ -914,19 +961,27
914 961 <include file-name="QStringList" location="global"/>
915 962 <include file-name="QMatrix" location="global"/>
916 963 </extra-includes>
964 <modify-function signature="save(const QString &amp;, const char *, int) const">
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>
917 974
918 <modify-function signature="QImage(uchar*,int,int,QImage::Format)">
975 <modify-function signature="QImage(unsigned char*,int,int,QImage::Format)">
919 976 <access modifier="private"/>
920 977 </modify-function>
921 978
922 <!--
923 979 <modify-function signature="QImage(QString,const char*)">
924 980 <access modifier="private"/>
925 981 <modify-argument index="2">
926 982 <remove-default-expression/>
927 983 </modify-argument>
928 984 </modify-function>
929 -->
930 985
931 986 <modify-function signature="load(QString,const char*)">
932 987 <access modifier="private"/>
@@ -939,7 +994,7
939 994 <access modifier="private"/>
940 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 998 <access modifier="private"/>
944 999 <modify-argument index="2">
945 1000 <remove-default-expression/>
@@ -973,7 +1028,7
973 1028 </modify-argument>
974 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 1032 <remove/>
978 1033 </modify-function>
979 1034
@@ -1037,7 +1092,7
1037 1092 <remove/>
1038 1093 </modify-function>
1039 1094
1040 <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
1095 <modify-function signature="getCmykF(double*,double*,double*,double*,double*)">
1041 1096 <remove/>
1042 1097 </modify-function>
1043 1098
@@ -1045,7 +1100,7
1045 1100 <remove/>
1046 1101 </modify-function>
1047 1102
1048 <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
1103 <modify-function signature="getHsvF(double*,double*,double*,double*)const">
1049 1104 <remove/>
1050 1105 </modify-function>
1051 1106
@@ -1053,7 +1108,7
1053 1108 <remove/>
1054 1109 </modify-function>
1055 1110
1056 <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
1111 <modify-function signature="getRgbF(double*,double*,double*,double*)const">
1057 1112 <remove/>
1058 1113 </modify-function>
1059 1114
@@ -1061,7 +1116,7
1061 1116 <modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3-->
1062 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 1120 <custom-constructor>
1066 1121 return new QFontMetricsF(*copy);
1067 1122 </custom-constructor>
@@ -1100,7 +1155,7
1100 1155 </value-type>
1101 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 1159 <custom-constructor>
1105 1160 return new QFontMetrics(*copy);
1106 1161 </custom-constructor>
@@ -1178,11 +1233,14
1178 1233 <modify-function signature="operator=(const QPrinterInfo &amp;)" remove="all" />
1179 1234 </value-type>
1180 1235
1236 <value-type name="QMargins" />
1237
1181 1238 <interface-type name="QLayoutItem"/>
1182 1239 <interface-type name="QPaintDevice"/>
1183 1240
1184 1241 <interface-type name="QGraphicsItem" delete-in-main-thread="yes">
1185 1242 <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
1243 <modify-function signature="toGraphicsObject() const" remove="all" />
1186 1244
1187 1245 <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)">
1188 1246 <modify-argument index="1" invalidate-after-use="yes" />
@@ -1423,8 +1481,10
1423 1481 <modify-function signature="exec()" access="non-final"/>
1424 1482 <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3-->
1425 1483 <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3-->
1484 <modify-function signature="open()" virtual-slot="yes" />
1426 1485 <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3-->
1427 1486 <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3-->
1487 <modify-function signature="setVisible(bool)" allow-as-slot="yes"/>
1428 1488 </object-type>
1429 1489 <object-type name="QDialogButtonBox">
1430 1490 <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)">
@@ -1500,6 +1560,7
1500 1560 </object-type>
1501 1561 <object-type name="QFontComboBox"/>
1502 1562 <object-type name="QFontDialog" />
1563
1503 1564 <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/>
1504 1565 <object-type name="QGraphicsItemAnimation" >
1505 1566 <modify-function signature="setItem(QGraphicsItem*)">
@@ -1900,6 +1961,7
1900 1961 <modify-function signature="find(QString)">
1901 1962 <remove/>
1902 1963 </modify-function>
1964 <modify-function signature="find(QString,QPixmap*)" remove="all" />
1903 1965
1904 1966 <modify-function signature="find(QString,QPixmap&amp;)">
1905 1967 <access modifier="private"/>
@@ -1910,7 +1972,8
1910 1972 <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
1911 1973 <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes" />
1912 1974 </object-type>
1913 <object-type name="QPrintDialog" />
1975 <object-type name="QPrintDialog">
1976 </object-type>
1914 1977 <object-type name="QPrintEngine"/>
1915 1978 <object-type name="QProgressBar">
1916 1979 <modify-function signature="initStyleOption(QStyleOptionProgressBar*)const">
@@ -1928,7 +1991,6
1928 1991 </modify-argument>
1929 1992 </modify-function>
1930 1993 </object-type>
1931 <object-type name="QReadWriteLock"/>
1932 1994 <object-type name="QRegExpValidator"/>
1933 1995 <object-type name="QScrollArea">
1934 1996 <modify-function signature="setWidget(QWidget*)">
@@ -2055,11 +2117,18
2055 2117 <modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3-->
2056 2118 </object-type>
2057 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 2127 <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)">
2060 2128 <modify-argument index="1" invalidate-after-use="yes" />
2061 2129 </modify-function>
2062 2130 </object-type>
2131
2063 2132 <object-type name="QTimeEdit"/>
2064 2133 <object-type name="QToolBox">
2065 2134 <modify-function signature="addItem(QWidget*,QString)">
@@ -2323,13 +2392,24
2323 2392 </object-type>
2324 2393
2325 2394 <object-type name="QColorDialog">
2395
2326 2396 <modify-function signature="getColor(const QColor &amp;, QWidget *)">
2327 2397 <modify-argument index="1">
2328 2398 <replace-default-expression with="QColor.white"/>
2329 2399 </modify-argument>
2330 2400 </modify-function>
2331 2401 <modify-function signature="getRgba(uint,bool*,QWidget*)">
2332 <remove/>
2402 <rename to="getRgba_internal"/>
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>
2333 2413 </modify-function>
2334 2414 </object-type>
2335 2415
@@ -2520,6 +2600,11
2520 2600 <include file-name="QPainterPath" location="global"/>
2521 2601 <include file-name="QVarLengthArray" location="global"/>
2522 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 2608 <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
2524 2609 <modify-function signature="setScene(QGraphicsScene*)">
2525 2610 <modify-argument index="1">
@@ -2542,7 +2627,6
2542 2627 <modify-argument index="1" invalidate-after-use="yes" />
2543 2628 </modify-function>
2544 2629
2545 <!--
2546 2630 <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)">
2547 2631 <modify-argument index="2">
2548 2632 <remove-argument/>
@@ -2563,6 +2647,7
2563 2647 <insert-template name="gui.convert_graphicsitem_array_to_java">
2564 2648 <replace from="%LENGTH" to="%2"/>
2565 2649 </insert-template>
2650 jobjectArray graphicsItemArrayHolder = %out;
2566 2651 </conversion-rule>
2567 2652 <conversion-rule class="native">
2568 2653 <insert-template name="gui.convert_graphicsitem_array_from_java"/>
@@ -2575,21 +2660,51
2575 2660 <insert-template name="gui.convert_styleoptiongraphicsitem_array_to_java">
2576 2661 <replace from="%LENGTH" to="%2"/>
2577 2662 </insert-template>
2663 jobjectArray styleOptionArrayHolder = %out;
2578 2664 </conversion-rule>
2579 2665 <conversion-rule class="native">
2580 2666 <insert-template name="gui.convert_styleoptiongraphicsitem_array_from_java"/>
2581 2667 </conversion-rule>
2582 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 2677 </modify-function>
2584 -->
2585 2678 </object-type>
2586 2679
2587 2680 <object-type name="QInputDialog">
2681
2682 <modify-function signature="getInt(QWidget*,QString,QString,int,int,int,int,bool*,QFlags&lt;Qt::WindowType&gt;)">
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 2705 <modify-function signature="getDouble(QWidget *, const QString &amp;, const QString &amp;, double, double, double, int, bool *, QFlags&lt;Qt::WindowType&gt;)">
2589 <!--
2590 2706 <rename to="getDouble_internal"/>
2591 2707 <access modifier="private"/>
2592 -->
2593 2708 <modify-argument index="4">
2594 2709 <remove-default-expression />
2595 2710 </modify-argument>
@@ -2611,10 +2726,8
2611 2726 </modify-function>
2612 2727
2613 2728 <modify-function signature="getInteger(QWidget *, const QString &amp;, const QString &amp;, int, int, int, int, bool *, QFlags&lt;Qt::WindowType&gt;)">
2614 <!--
2615 2729 <rename to="getInteger_internal"/>
2616 2730 <access modifier="private"/>
2617 -->
2618 2731 <modify-argument index="4">
2619 2732 <remove-default-expression />
2620 2733 </modify-argument>
@@ -2636,10 +2749,8
2636 2749 </modify-function>
2637 2750
2638 2751 <modify-function signature="getItem(QWidget *, const QString &amp;, const QString &amp;, const QStringList&lt;QString&gt; &amp;, int, bool, bool *, QFlags&lt;Qt::WindowType&gt;)">
2639 <!--
2640 2752 <rename to="getItem_internal"/>
2641 2753 <access modifier="private"/>
2642 -->
2643 2754 <modify-argument index="4">
2644 2755 <remove-default-expression />
2645 2756 </modify-argument>
@@ -2658,10 +2769,8
2658 2769 </modify-function>
2659 2770
2660 2771 <modify-function signature="getText(QWidget *, const QString &amp;, const QString &amp;, QLineEdit::EchoMode, const QString &amp;, bool *, QFlags&lt;Qt::WindowType&gt;)">
2661 <!--
2662 2772 <rename to="getText_internal"/>
2663 2773 <access modifier="private"/>
2664 -->
2665 2774 <modify-argument index="4">
2666 2775 <remove-default-expression />
2667 2776 </modify-argument>
@@ -2827,6 +2936,20
2827 2936 </object-type>
2828 2937
2829 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&lt;QTreeWidgetItem*&gt;)const">
2951 <modify-argument index="1" invalidate-after-use="yes"/>
2952 </modify-function>
2830 2953 <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)">
2831 2954 <modify-argument index="1" invalidate-after-use="yes" />
2832 2955 </modify-function>
@@ -2870,11 +2993,6
2870 2993 <define-ownership class="java" owner="default"/>
2871 2994 </modify-argument>
2872 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 2996 <modify-function signature="setCurrentItem(QTreeWidgetItem*,int,QFlags&lt;QItemSelectionModel::SelectionFlag&gt;)">
2879 2997 <modify-argument index="1">
2880 2998 <reference-count action="ignore" />
@@ -3169,6 +3287,9
3169 3287 </object-type>
3170 3288
3171 3289 <object-type name="QListWidget">
3290 <modify-function signature="mimeData(const QList&lt;QListWidgetItem *&gt;)const">
3291 <modify-argument index="1" invalidate-after-use="yes" />
3292 </modify-function>
3172 3293 <modify-function signature="addItem(QListWidgetItem *)">
3173 3294 <modify-argument index="1">
3174 3295 <define-ownership class="java" owner="c++"/>
@@ -3179,11 +3300,6
3179 3300 <define-ownership class="java" owner="c++"/>
3180 3301 </modify-argument>
3181 3302 </modify-function>
3182 <modify-function signature="removeItemWidget(QListWidgetItem*)">
3183 <modify-argument index="1">
3184 <define-ownership class="java" owner="default"/>
3185 </modify-argument>
3186 </modify-function>
3187 3303 <modify-function signature="setCurrentItem(QListWidgetItem*)">
3188 3304 <modify-argument index="1">
3189 3305 <reference-count action="ignore"/>
@@ -3219,6 +3335,11
3219 3335 <reference-count action="ignore"/>
3220 3336 </modify-argument>
3221 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 3343 <modify-function signature="setModel(QAbstractItemModel*)">
3223 3344 <modify-argument index="1">
3224 3345 <reference-count action="ignore"/>
@@ -3319,7 +3440,6
3319 3440 </modify-argument>
3320 3441 </modify-function>
3321 3442
3322 <!--
3323 3443 <inject-code class="native">
3324 3444 extern "C" JNIEXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_com_trolltech_qt_gui_QWidget__1_1qt_1QMessageBox_1setWindowTitle)
3325 3445 (JNIEnv *__jni_env,
@@ -3356,7 +3476,6
3356 3476 QTJAMBI_DEBUG_TRACE("(native) -&gt; leaving: QMessageBox::setWindowModality(Qt::WindowModality modality)");
3357 3477 }
3358 3478 </inject-code>
3359 -->
3360 3479
3361 3480 <modify-function signature="render(QPaintDevice *, const QPoint &amp;, const QRegion &amp;, QFlags&lt;QWidget::RenderFlag&gt;)">
3362 3481 <modify-argument index="4">
@@ -3451,6 +3570,8
3451 3570 </object-type>
3452 3571
3453 3572 <object-type name="QMessageBox">
3573
3574
3454 3575 <modify-function signature="setWindowTitle(const QString &amp;)" remove="all"/>
3455 3576 <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/>
3456 3577 <extra-includes>
@@ -3523,7 +3644,6
3523 3644 <reference-count action="set" variable-name="__rcDevice"/>
3524 3645 </modify-argument>
3525 3646 </modify-function>
3526 <!--
3527 3647 <modify-function signature="read(QImage*)">
3528 3648 <modify-argument index="1">
3529 3649 <replace-type modified-type="com.trolltech.qt.gui.QImage"/>
@@ -3544,7 +3664,6
3544 3664 </conversion-rule>
3545 3665 </modify-argument>
3546 3666 </modify-function>
3547 -->
3548 3667
3549 3668 <modify-function signature="name()const" remove="all"/> <!--### Obsolete in 4.3-->
3550 3669 </object-type>
@@ -3599,8 +3718,7
3599 3718 </modify-function>
3600 3719 </object-type>
3601 3720
3602 <object-type name="QPageSetupDialog">
3603 </object-type>
3721 <object-type name="QPageSetupDialog" />
3604 3722
3605 3723 <object-type name="QTabWidget">
3606 3724 <modify-function signature="initStyleOption(QStyleOptionTabWidgetFrame*)const">
@@ -3713,6 +3831,7
3713 3831 </object-type>
3714 3832
3715 3833 <object-type name="QProgressDialog">
3834
3716 3835 <modify-function signature="setBar(QProgressBar*)">
3717 3836 <modify-argument index="1">
3718 3837 <define-ownership class="java" owner="c++"/>
@@ -3759,7 +3878,7
3759 3878 <extra-includes>
3760 3879 <include file-name="QUrl" location="global"/>
3761 3880 </extra-includes>
3762 <!--
3881
3763 3882 <modify-function signature="getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags&lt;QFileDialog::Option&gt;)">
3764 3883 <access modifier="private"/>
3765 3884 <modify-argument index="1">
@@ -3825,7 +3944,6
3825 3944 <remove-default-expression/>
3826 3945 </modify-argument>
3827 3946 </modify-function>
3828 -->
3829 3947
3830 3948 <modify-function signature="setIconProvider(QFileIconProvider*)">
3831 3949 <modify-argument index="1">
@@ -3857,6 +3975,11
3857 3975 <modify-function signature="initStyleOption(QStyleOptionTab*,int)const">
3858 3976 <access modifier="private"/>
3859 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 3983 </object-type>
3861 3984
3862 3985 <object-type name="QStandardItemModel">
@@ -4048,6 +4171,9
4048 4171 </object-type>
4049 4172
4050 4173 <object-type name="QTableWidget">
4174 <modify-function signature="mimeData(const QList&lt;QTableWidgetItem*&gt;)const">
4175 <modify-argument index="1" invalidate-after-use="yes"/>
4176 </modify-function>
4051 4177 <modify-function signature="isSortingEnabled()const" remove="all"/>
4052 4178 <modify-function signature="setSortingEnabled(bool)" remove="all"/>
4053 4179 <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)">
@@ -4132,6 +4258,19
4132 4258 </modify-function>
4133 4259 </object-type>
4134 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>
4271 </modify-function>
4272 </object-type>
4273
4135 4274 <object-type name="QSplitter">
4136 4275
4137 4276 <modify-function signature="getRange(int,int*,int*)const">
@@ -4373,6 +4512,13
4373 4512 <modify-field name="state" read="false" write="false"/>
4374 4513 </object-type>
4375 4514
4515 <object-type name="QAbstractTableModel">
4516 <extra-includes>
4517 <include file-name="QStringList" location="global"/>
4518 <include file-name="QSize" location="global"/>
4519 </extra-includes>
4520 </object-type>
4521
4376 4522 <object-type name="QGuiSignalMapper"/>
4377 4523
4378 4524 <object-type name="QComboBox">
@@ -4657,6 +4803,10
4657 4803 </modify-function>
4658 4804 </object-type>
4659 4805
4806 <object-type name="QMouseEventTransition" />
4807 <object-type name="QKeyEventTransition" />
4808 <value-type name="QQuaternion" />
4809
4660 4810 <object-type name="QCommandLinkButton" />
4661 4811 <object-type name="QFileSystemModel">
4662 4812 <modify-function signature="setIconProvider(QFileIconProvider*)">
@@ -4787,6 +4937,11
4787 4937 <reference-count action="set" variable-name="__rcParentLayoutItem" />
4788 4938 </modify-argument>
4789 4939 </modify-function>
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>
4790 4945 </object-type>
4791 4946 <interface-type name="QGraphicsLayoutItem" delete-in-main-thread="yes">
4792 4947 <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)">
@@ -4794,6 +4949,11
4794 4949 <reference-count action="set" variable-name="__rcParentLayoutItem" />
4795 4950 </modify-argument>
4796 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 4957 </interface-type>
4798 4958 <object-type name="QGraphicsLinearLayout" delete-in-main-thread="yes">
4799 4959 <modify-function signature="addItem(QGraphicsLayoutItem*)">
@@ -4832,6 +4992,28
4832 4992 </modify-argument>
4833 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&lt;QAction*&gt;)">
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 5017 <modify-function signature="changeEvent(QEvent*)">
4836 5018 <modify-argument index="1" invalidate-after-use="yes" />
4837 5019 </modify-function>
@@ -4896,7 +5078,8
4896 5078 </modify-argument>
4897 5079 </modify-function>
4898 5080 </object-type>
4899 <object-type name="QPrintPreviewDialog" />
5081 <object-type name="QPrintPreviewDialog" >
5082 </object-type>
4900 5083 <object-type name="QPrintPreviewWidget" />
4901 5084 <object-type name="QStyledItemDelegate">
4902 5085 <modify-function signature="setItemEditorFactory(QItemEditorFactory*)">
@@ -4921,6 +5104,7
4921 5104 <interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory" />
4922 5105 <interface-type name="QInputContextFactoryInterface" java-name="QAbstractInputContextFactory" />
4923 5106 <interface-type name="QStyleFactoryInterface" java-name="QAbstractStyleFactory" />
5107 <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory" />
4924 5108 <interface-type name="QPictureFormatInterface" java-name="QAbstractPictureFormat" />
4925 5109
4926 5110 <object-type name="QIconEnginePluginV2"/>
@@ -4929,7 +5113,65
4929 5113 <object-type name="QInputContextPlugin" />
4930 5114 <object-type name="QPictureFormatPlugin" />
4931 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-&gt;type() == QEvent::TouchBegin || %1-&gt;type() == QEvent::TouchUpdate || %1-&gt;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 5175 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'" />
4934 5176 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
4935 5177 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
@@ -4960,40 +5202,12
4960 5202 <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QInputEvent' inherits from polymorphic class 'QEvent', but has no polymorphic id set"/>
4961 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 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"/>
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" />
5205
4994 5206 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::pixmapData', unmatched return type 'QPixmapData*'"/>
4995 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) :: Class 'QTextOption_Tab' has equals operators but no qHash() function"/>
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 5213 </typesystem>
@@ -1,10 +1,15
1 1 <?xml version="1.0"?>
2 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 4 <rejection class="*" function-name="d_func"/>
4 5
5 6 <rejection class="*" field-name="d_ptr"/>
6 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 13 <rejection class="QWindowsCEStyle"/>
9 14 <rejection class="QWindowsMobileStyle"/>
10 15 <rejection class="QAbstractUndoItem"/>
@@ -66,6 +71,7
66 71 <rejection class="QTreeModel" function-name="node"/>
67 72 <rejection class="QTreeModel" function-name="initializeNode"/>
68 73 <rejection class="QTreeModel" function-name="queryChildren"/>
74 <rejection class="QTextObjectInterface"/>
69 75 <rejection class="QAccessible" function-name="cast_helper"/>
70 76 <rejection class="QAccessible2"/>
71 77 <rejection class="QAccessibleInterface" function-name="backgroundColor"/>
@@ -81,7 +87,22
81 87 <rejection class="QTabletEvent" field-name="mExtra"/>
82 88 <rejection class="QWidgetItem" field-name="wid"/>
83 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 106 <enum-type name="QAbstractItemDelegate::EndEditHint"/>
86 107 <enum-type name="QAbstractItemView::CursorAction"/>
87 108 <enum-type name="QAbstractItemView::DragDropMode"/>
@@ -123,6 +144,8
123 144 <enum-type name="QPlainTextEdit::LineWrapMode"/>
124 145 <enum-type name="QPrintPreviewWidget::ViewMode"/>
125 146 <enum-type name="QPrintPreviewWidget::ZoomMode"/>
147 <enum-type name="QStyleOptionTabV3::StyleOptionVersion"/>
148 <enum-type name="QStyleOptionFrameV3::StyleOptionVersion"/>
126 149 <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion"/>
127 150 <enum-type name="QStyleOptionViewItemV4::ViewItemPosition"/>
128 151
@@ -136,7 +159,6
136 159 <enum-type name="QCalendarWidget::SelectionMode"/>
137 160 <enum-type name="QCalendarWidget::VerticalHeaderFormat"/>
138 161 <enum-type name="QColor::Spec"/>
139 <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/>
140 162 <enum-type name="QColormap::Mode"/>
141 163 <enum-type name="QComboBox::InsertPolicy"/>
142 164 <enum-type name="QComboBox::SizeAdjustPolicy"/>
@@ -159,7 +181,6
159 181 <enum-type name="QFont::StyleStrategy"/>
160 182 <enum-type name="QFont::Weight"/>
161 183 <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/>
162 <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/>
163 184 <enum-type name="QFrame::Shadow" extensible="yes"/>
164 185 <enum-type name="QFrame::Shape"/>
165 186 <enum-type name="QFrame::StyleMask"/>
@@ -195,8 +216,6
195 216 <enum-type name="QImageReader::ImageReaderError"/>
196 217 <enum-type name="QImageWriter::ImageWriterError"/>
197 218 <enum-type name="QInputContext::StandardFormat"/>
198 <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions"/>
199 <enum-type name="QInputDialog::InputMode"/>
200 219 <enum-type name="QInputMethodEvent::AttributeType"/>
201 220 <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/>
202 221 <enum-type name="QKeySequence::SequenceFormat"/>
@@ -241,7 +260,6
241 260 <enum-type name="QPrinter::Unit"/>
242 261 <enum-type name="QPrinter::DuplexMode"/>
243 262 <enum-type name="QProgressBar::Direction"/>
244 <enum-type name="QReadWriteLock::RecursionMode"/>
245 263 <enum-type name="QRegion::RegionType"/>
246 264 <enum-type name="QRubberBand::Shape"/>
247 265 <enum-type name="QSessionManager::RestartHint"/>
@@ -348,8 +366,6
348 366 <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/>
349 367 <enum-type name="QSystemTrayIcon::ActivationReason"/>
350 368 <enum-type name="QSystemTrayIcon::MessageIcon"/>
351 <enum-type name="QTabBar::ButtonPosition"/>
352 <enum-type name="QTabBar::SelectionBehavior"/>
353 369 <enum-type name="QTabBar::Shape"/>
354 370 <enum-type name="QTabWidget::TabPosition"/>
355 371 <enum-type name="QTabWidget::TabShape"/>
@@ -488,15 +504,33
488 504 <reject-enum-value name="LastFontProperty"/>
489 505 </enum-type>
490 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"/>
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 525 <value-type name="QTransform">
492 526 <modify-function signature="operator=(QTransform)" remove="all"/>
493 527 <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
494 <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
528 <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
495 529
496 <modify-function signature="operator*=(qreal)" access="private"/>
497 <modify-function signature="operator+=(qreal)" access="private"/>
498 <modify-function signature="operator-=(qreal)" access="private"/>
499 <modify-function signature="operator/=(qreal)" access="private"/>
530 <modify-function signature="operator*=(double)" access="private"/>
531 <modify-function signature="operator+=(double)" access="private"/>
532 <modify-function signature="operator-=(double)" access="private"/>
533 <modify-function signature="operator/=(double)" access="private"/>
500 534 <modify-function signature="operator*(QTransform)const" rename="multiplied"/>
501 535 <modify-function signature="operator*=(QTransform)" access="private"/>
502 536
@@ -526,6 +560,9
526 560 <value-type name="QStyleOptionFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV2::Version">
527 561 <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
528 562 </value-type>
563 <value-type name="QStyleOptionFrameV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV3::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV3::Version">
564 <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
565 </value-type>
529 566
530 567 <value-type name="QStyleOptionGroupBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionGroupBox::Type &amp;&amp; %1-&gt;version == QStyleOptionGroupBox::Version"/>
531 568 <value-type name="QStyleOptionHeader" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version"/>
@@ -543,7 +580,13
543 580 <value-type name="QStyleOptionTabV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV2::Version">
544 581 <modify-function signature="operator=(const QStyleOptionTab &amp;)" remove="all"/>
545 582 </value-type>
583 <value-type name="QStyleOptionTabV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV3::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV3::Version">
584 <modify-function signature="operator=(QStyleOptionTab)" remove="all"/>
585 </value-type>
546 586 <value-type name="QStyleOptionTabBarBase" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBase::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBase::Version"/>
587 <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBaseV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBaseV2::Version">
588 <modify-function signature="operator=(QStyleOptionTabBarBase)" remove="all"/>
589 </value-type>
547 590 <value-type name="QStyleOptionTabWidgetFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabWidgetFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionTabWidgetFrame::Version"/>
548 591 <value-type name="QStyleOptionTitleBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTitleBar::Type &amp;&amp; %1-&gt;version == QStyleOptionTitleBar::Version"/>
549 592 <value-type name="QStyleOptionToolBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBar::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBar::Version"/>
@@ -571,7 +614,7
571 614 <modify-argument index="2"> <remove-default-expression/> </modify-argument>
572 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 618 <access modifier="private"/>
576 619 <modify-argument index="3">
577 620 <remove-default-expression/>
@@ -894,26 +937,30
894 937 <modify-function signature="operator&lt;&lt;(QItemSelectionRange)" remove="all"/>
895 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 944 <value-type name="QMatrix">
898 945 <extra-includes>
899 946 <include file-name="QPainterPath" location="global"/>
900 947 </extra-includes>
901 948
902 949 <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
903 <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
950 <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
904 951 <modify-function signature="operator=(QMatrix)" remove="all"/>
905 952
906 953 <modify-function signature="operator*(QMatrix)const" access="private"/>
907 954 <modify-function signature="operator*=(QMatrix)" access="private"/>
908 <modify-function signature="rotate(qreal)" access="private" rename="rotate_private"/>
909 <modify-function signature="scale(qreal,qreal)" access="private" rename="scale_private"/>
910 <modify-function signature="shear(qreal,qreal)" access="private" rename="shear_private"/>
911 <modify-function signature="translate(qreal,qreal)" access="private" rename="translate_private"/>
955 <modify-function signature="rotate(double)" access="private" rename="rotate_private"/>
956 <modify-function signature="scale(double,double)" access="private" rename="scale_private"/>
957 <modify-function signature="shear(double,double)" access="private" rename="shear_private"/>
958 <modify-function signature="translate(double,double)" access="private" rename="translate_private"/>
912 959
913 960 <modify-function signature="inverted(bool*)const">
914 961 <access modifier="private"/>
915 962 <modify-argument index="1">
916 <!-- <remove-default-expression/> -->
963 <remove-default-expression/>
917 964 </modify-argument>
918 965 </modify-function>
919 966
@@ -962,7 +1009,7
962 1009 </custom-destructor>
963 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 1013 <custom-constructor>
967 1014 return new QFontInfo(*copy);
968 1015 </custom-constructor>
@@ -1003,7 +1050,7
1003 1050 <include file-name="QTextEdit" location="global"/>
1004 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 1054 <extra-includes>
1008 1055 <include file-name="QStringList" location="global"/>
1009 1056 </extra-includes>
@@ -1024,7 +1071,7
1024 1071 <modify-function signature="QImage(const char **)">
1025 1072 <access modifier="private"/>
1026 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 1076 </modify-function>
1030 1077 <modify-function signature="bits()const">
@@ -1033,7 +1080,7
1033 1080 <modify-function signature="scanLine(int)const">
1034 1081 <remove/>
1035 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 1084 <remove/>
1038 1085 </modify-function>
1039 1086
@@ -1041,19 +1088,27
1041 1088 <include file-name="QStringList" location="global"/>
1042 1089 <include file-name="QMatrix" location="global"/>
1043 1090 </extra-includes>
1091 <modify-function signature="save(const QString &amp;, const char *, int) const">
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>
1044 1101
1045 <modify-function signature="QImage(uchar*,int,int,QImage::Format)">
1102 <modify-function signature="QImage(unsigned char*,int,int,QImage::Format)">
1046 1103 <access modifier="private"/>
1047 1104 </modify-function>
1048 1105
1049 <!--
1050 1106 <modify-function signature="QImage(QString,const char*)">
1051 1107 <access modifier="private"/>
1052 1108 <modify-argument index="2">
1053 1109 <remove-default-expression/>
1054 1110 </modify-argument>
1055 1111 </modify-function>
1056 -->
1057 1112
1058 1113 <modify-function signature="load(QString,const char*)">
1059 1114 <access modifier="private"/>
@@ -1066,7 +1121,7
1066 1121 <access modifier="private"/>
1067 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 1125 <access modifier="private"/>
1071 1126 <modify-argument index="2">
1072 1127 <remove-default-expression/>
@@ -1100,7 +1155,7
1100 1155 </modify-argument>
1101 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 1159 <remove/>
1105 1160 </modify-function>
1106 1161
@@ -1248,7 +1303,7
1248 1303 <remove/>
1249 1304 </modify-function>
1250 1305
1251 <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
1306 <modify-function signature="getCmykF(double*,double*,double*,double*,double*)">
1252 1307 <remove/>
1253 1308 </modify-function>
1254 1309
@@ -1256,7 +1311,7
1256 1311 <remove/>
1257 1312 </modify-function>
1258 1313
1259 <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
1314 <modify-function signature="getHsvF(double*,double*,double*,double*)const">
1260 1315 <remove/>
1261 1316 </modify-function>
1262 1317
@@ -1264,7 +1319,7
1264 1319 <remove/>
1265 1320 </modify-function>
1266 1321
1267 <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
1322 <modify-function signature="getRgbF(double*,double*,double*,double*)const">
1268 1323 <remove/>
1269 1324 </modify-function>
1270 1325
@@ -1272,7 +1327,7
1272 1327 <modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3-->
1273 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 1331 <custom-constructor>
1277 1332 return new QFontMetricsF(*copy);
1278 1333 </custom-constructor>
@@ -1316,7 +1371,7
1316 1371 </value-type>
1317 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 1375 <custom-constructor>
1321 1376 return new QFontMetrics(*copy);
1322 1377 </custom-constructor>
@@ -1398,11 +1453,14
1398 1453 <modify-function signature="operator=(const QPrinterInfo &amp;)" remove="all"/>
1399 1454 </value-type>
1400 1455
1456 <value-type name="QMargins"/>
1457
1401 1458 <interface-type name="QLayoutItem"/>
1402 1459 <interface-type name="QPaintDevice"/>
1403 1460
1404 1461 <interface-type name="QGraphicsItem" delete-in-main-thread="yes">
1405 1462 <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
1463 <modify-function signature="toGraphicsObject() const" remove="all"/>
1406 1464
1407 1465 <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)">
1408 1466 <modify-argument index="1" invalidate-after-use="yes"/>
@@ -1655,8 +1713,10
1655 1713 <modify-function signature="exec()" access="non-final"/>
1656 1714 <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3-->
1657 1715 <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3-->
1716 <modify-function signature="open()" virtual-slot="yes"/>
1658 1717 <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3-->
1659 1718 <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3-->
1719 <modify-function signature="setVisible(bool)" allow-as-slot="yes"/>
1660 1720 </object-type>
1661 1721 <object-type name="QDialogButtonBox">
1662 1722 <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)">
@@ -1777,6 +1837,7
1777 1837 </modify-argument>
1778 1838 </modify-function>
1779 1839 </object-type>
1840
1780 1841 <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/>
1781 1842 <object-type name="QGraphicsItemAnimation">
1782 1843 <modify-function signature="setItem(QGraphicsItem*)">
@@ -2217,6 +2278,7
2217 2278 <modify-function signature="find(QString)">
2218 2279 <remove/>
2219 2280 </modify-function>
2281 <modify-function signature="find(QString,QPixmap*)" remove="all"/>
2220 2282
2221 2283 <modify-function signature="find(QString,QPixmap&amp;)">
2222 2284 <access modifier="private"/>
@@ -2227,7 +2289,8
2227 2289 <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
2228 2290 <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/>
2229 2291 </object-type>
2230 <object-type name="QPrintDialog"/>
2292 <object-type name="QPrintDialog">
2293 </object-type>
2231 2294 <object-type name="QPrintEngine"/>
2232 2295 <object-type name="QProgressBar">
2233 2296 <modify-function signature="initStyleOption(QStyleOptionProgressBar*)const">
@@ -2245,7 +2308,6
2245 2308 </modify-argument>
2246 2309 </modify-function>
2247 2310 </object-type>
2248 <object-type name="QReadWriteLock"/>
2249 2311 <object-type name="QRegExpValidator"/>
2250 2312 <object-type name="QScrollArea">
2251 2313 <modify-function signature="setWidget(QWidget*)">
@@ -2377,11 +2439,18
2377 2439 <modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3-->
2378 2440 </object-type>
2379 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 2449 <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)">
2382 2450 <modify-argument index="1" invalidate-after-use="yes"/>
2383 2451 </modify-function>
2384 2452 </object-type>
2453
2385 2454 <object-type name="QTimeEdit"/>
2386 2455 <object-type name="QToolBox">
2387 2456 <modify-function signature="addItem(QWidget*,QString)">
@@ -2647,13 +2716,24
2647 2716 </object-type>
2648 2717
2649 2718 <object-type name="QColorDialog">
2719
2650 2720 <modify-function signature="getColor(const QColor &amp;, QWidget *)">
2651 2721 <modify-argument index="1">
2652 2722 <replace-default-expression with="QColor.white"/>
2653 2723 </modify-argument>
2654 2724 </modify-function>
2655 2725 <modify-function signature="getRgba(uint,bool*,QWidget*)">
2656 <remove/>
2726 <rename to="getRgba_internal"/>
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>
2657 2737 </modify-function>
2658 2738 </object-type>
2659 2739
@@ -2844,6 +2924,11
2844 2924 <include file-name="QPainterPath" location="global"/>
2845 2925 <include file-name="QVarLengthArray" location="global"/>
2846 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 2932 <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
2848 2933 <modify-function signature="setScene(QGraphicsScene*)">
2849 2934 <modify-argument index="1">
@@ -2866,7 +2951,6
2866 2951 <modify-argument index="1" invalidate-after-use="yes"/>
2867 2952 </modify-function>
2868 2953
2869 <!--
2870 2954 <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)">
2871 2955 <modify-argument index="2">
2872 2956 <remove-argument/>
@@ -2887,6 +2971,7
2887 2971 <insert-template name="gui.convert_graphicsitem_array_to_java">
2888 2972 <replace from="%LENGTH" to="%2"/>
2889 2973 </insert-template>
2974 jobjectArray graphicsItemArrayHolder = %out;
2890 2975 </conversion-rule>
2891 2976 <conversion-rule class="native">
2892 2977 <insert-template name="gui.convert_graphicsitem_array_from_java"/>
@@ -2899,21 +2984,51
2899 2984 <insert-template name="gui.convert_styleoptiongraphicsitem_array_to_java">
2900 2985 <replace from="%LENGTH" to="%2"/>
2901 2986 </insert-template>
2987 jobjectArray styleOptionArrayHolder = %out;
2902 2988 </conversion-rule>
2903 2989 <conversion-rule class="native">
2904 2990 <insert-template name="gui.convert_styleoptiongraphicsitem_array_from_java"/>
2905 2991 </conversion-rule>
2906 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>
2999 </modify-argument>
3000
2907 3001 </modify-function>
2908 -->
2909 3002 </object-type>
2910 3003
2911 3004 <object-type name="QInputDialog">
3005
3006 <modify-function signature="getInt(QWidget*,QString,QString,int,int,int,int,bool*,QFlags&lt;Qt::WindowType&gt;)">
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 3029 <modify-function signature="getDouble(QWidget *, const QString &amp;, const QString &amp;, double, double, double, int, bool *, QFlags&lt;Qt::WindowType&gt;)">
2913 <!--
2914 3030 <rename to="getDouble_internal"/>
2915 3031 <access modifier="private"/>
2916 -->
2917 3032 <modify-argument index="4">
2918 3033 <remove-default-expression/>
2919 3034 </modify-argument>
@@ -2935,10 +3050,8
2935 3050 </modify-function>
2936 3051
2937 3052 <modify-function signature="getInteger(QWidget *, const QString &amp;, const QString &amp;, int, int, int, int, bool *, QFlags&lt;Qt::WindowType&gt;)">
2938 <!--
2939 3053 <rename to="getInteger_internal"/>
2940 3054 <access modifier="private"/>
2941 -->
2942 3055 <modify-argument index="4">
2943 3056 <remove-default-expression/>
2944 3057 </modify-argument>
@@ -2960,10 +3073,8
2960 3073 </modify-function>
2961 3074
2962 3075 <modify-function signature="getItem(QWidget *, const QString &amp;, const QString &amp;, const QStringList&lt;QString&gt; &amp;, int, bool, bool *, QFlags&lt;Qt::WindowType&gt;)">
2963 <!--
2964 3076 <rename to="getItem_internal"/>
2965 3077 <access modifier="private"/>
2966 -->
2967 3078 <modify-argument index="4">
2968 3079 <remove-default-expression/>
2969 3080 </modify-argument>
@@ -2982,10 +3093,8
2982 3093 </modify-function>
2983 3094
2984 3095 <modify-function signature="getText(QWidget *, const QString &amp;, const QString &amp;, QLineEdit::EchoMode, const QString &amp;, bool *, QFlags&lt;Qt::WindowType&gt;)">
2985 <!--
2986 3096 <rename to="getText_internal"/>
2987 3097 <access modifier="private"/>
2988 -->
2989 3098 <modify-argument index="4">
2990 3099 <remove-default-expression/>
2991 3100 </modify-argument>
@@ -3213,6 +3322,20
3213 3322 </object-type>
3214 3323
3215 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&lt;QTreeWidgetItem*&gt;)const">
3337 <modify-argument index="1" invalidate-after-use="yes"/>
3338 </modify-function>
3216 3339 <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)">
3217 3340 <modify-argument index="1" invalidate-after-use="yes"/>
3218 3341 </modify-function>
@@ -3256,11 +3379,6
3256 3379 <define-ownership class="java" owner="default"/>
3257 3380 </modify-argument>
3258 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 3382 <modify-function signature="setCurrentItem(QTreeWidgetItem*,int,QFlags&lt;QItemSelectionModel::SelectionFlag&gt;)">
3265 3383 <modify-argument index="1">
3266 3384 <reference-count action="ignore"/>
@@ -3575,6 +3693,9
3575 3693 </object-type>
3576 3694
3577 3695 <object-type name="QListWidget">
3696 <modify-function signature="mimeData(const QList&lt;QListWidgetItem *&gt;)const">
3697 <modify-argument index="1" invalidate-after-use="yes"/>
3698 </modify-function>
3578 3699 <modify-function signature="addItem(QListWidgetItem *)">
3579 3700 <modify-argument index="1">
3580 3701 <define-ownership class="java" owner="c++"/>
@@ -3585,11 +3706,6
3585 3706 <define-ownership class="java" owner="c++"/>
3586 3707 </modify-argument>
3587 3708 </modify-function>
3588 <modify-function signature="removeItemWidget(QListWidgetItem*)">
3589 <modify-argument index="1">
3590 <define-ownership class="java" owner="default"/>
3591 </modify-argument>
3592 </modify-function>
3593 3709 <modify-function signature="setCurrentItem(QListWidgetItem*)">
3594 3710 <modify-argument index="1">
3595 3711 <reference-count action="ignore"/>
@@ -3625,6 +3741,11
3625 3741 <reference-count action="ignore"/>
3626 3742 </modify-argument>
3627 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 3749 <modify-function signature="setModel(QAbstractItemModel*)">
3629 3750 <modify-argument index="1">
3630 3751 <reference-count action="ignore"/>
@@ -3727,7 +3848,6
3727 3848 </modify-argument>
3728 3849 </modify-function>
3729 3850
3730 <!--
3731 3851 <inject-code class="native">
3732 3852 extern "C" JNIEXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_com_trolltech_qt_gui_QWidget__1_1qt_1QMessageBox_1setWindowTitle)
3733 3853 (JNIEnv *__jni_env,
@@ -3764,7 +3884,6
3764 3884 QTJAMBI_DEBUG_TRACE("(native) -&gt; leaving: QMessageBox::setWindowModality(Qt::WindowModality modality)");
3765 3885 }
3766 3886 </inject-code>
3767 -->
3768 3887
3769 3888 <modify-function signature="render(QPaintDevice *, const QPoint &amp;, const QRegion &amp;, QFlags&lt;QWidget::RenderFlag&gt;)">
3770 3889 <modify-argument index="4">
@@ -3865,6 +3984,8
3865 3984 </object-type>
3866 3985
3867 3986 <object-type name="QMessageBox">
3987
3988
3868 3989 <modify-function signature="setWindowTitle(const QString &amp;)" remove="all"/>
3869 3990 <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/>
3870 3991 <extra-includes>
@@ -3937,7 +4058,6
3937 4058 <reference-count action="set" variable-name="__rcDevice"/>
3938 4059 </modify-argument>
3939 4060 </modify-function>
3940 <!--
3941 4061 <modify-function signature="read(QImage*)">
3942 4062 <modify-argument index="1">
3943 4063 <replace-type modified-type="com.trolltech.qt.gui.QImage"/>
@@ -3958,7 +4078,6
3958 4078 </conversion-rule>
3959 4079 </modify-argument>
3960 4080 </modify-function>
3961 -->
3962 4081
3963 4082 <modify-function signature="name()const" remove="all"/> <!--### Obsolete in 4.3-->
3964 4083 </object-type>
@@ -4013,8 +4132,7
4013 4132 </modify-function>
4014 4133 </object-type>
4015 4134
4016 <object-type name="QPageSetupDialog">
4017 </object-type>
4135 <object-type name="QPageSetupDialog"/>
4018 4136
4019 4137 <object-type name="QTabWidget">
4020 4138 <modify-function signature="initStyleOption(QStyleOptionTabWidgetFrame*)const">
@@ -4127,6 +4245,7
4127 4245 </object-type>
4128 4246
4129 4247 <object-type name="QProgressDialog">
4248
4130 4249 <modify-function signature="setBar(QProgressBar*)">
4131 4250 <modify-argument index="1">
4132 4251 <define-ownership class="java" owner="c++"/>
@@ -4173,7 +4292,7
4173 4292 <extra-includes>
4174 4293 <include file-name="QUrl" location="global"/>
4175 4294 </extra-includes>
4176 <!--
4295
4177 4296 <modify-function signature="getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags&lt;QFileDialog::Option&gt;)">
4178 4297 <access modifier="private"/>
4179 4298 <modify-argument index="1">
@@ -4239,7 +4358,6
4239 4358 <remove-default-expression/>
4240 4359 </modify-argument>
4241 4360 </modify-function>
4242 -->
4243 4361
4244 4362 <modify-function signature="setIconProvider(QFileIconProvider*)">
4245 4363 <modify-argument index="1">
@@ -4271,6 +4389,11
4271 4389 <modify-function signature="initStyleOption(QStyleOptionTab*,int)const">
4272 4390 <access modifier="private"/>
4273 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 4397 </object-type>
4275 4398
4276 4399 <object-type name="QStandardItemModel">
@@ -4462,6 +4585,9
4462 4585 </object-type>
4463 4586
4464 4587 <object-type name="QTableWidget">
4588 <modify-function signature="mimeData(const QList&lt;QTableWidgetItem*&gt;)const">
4589 <modify-argument index="1" invalidate-after-use="yes"/>
4590 </modify-function>
4465 4591 <modify-function signature="isSortingEnabled()const" remove="all"/>
4466 4592 <modify-function signature="setSortingEnabled(bool)" remove="all"/>
4467 4593 <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)">
@@ -4548,6 +4674,19
4548 4674 </modify-function>
4549 4675 </object-type>
4550 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>
4687 </modify-function>
4688 </object-type>
4689
4551 4690 <object-type name="QSplitter">
4552 4691
4553 4692 <modify-function signature="getRange(int,int*,int*)const">
@@ -4789,6 +4928,13
4789 4928 <modify-field name="state" read="false" write="false"/>
4790 4929 </object-type>
4791 4930
4931 <object-type name="QAbstractTableModel">
4932 <extra-includes>
4933 <include file-name="QStringList" location="global"/>
4934 <include file-name="QSize" location="global"/>
4935 </extra-includes>
4936 </object-type>
4937
4792 4938 <object-type name="QGuiSignalMapper"/>
4793 4939
4794 4940 <object-type name="QComboBox">
@@ -5116,6 +5262,10
5116 5262 </modify-function>
5117 5263 </object-type>
5118 5264
5265 <object-type name="QMouseEventTransition"/>
5266 <object-type name="QKeyEventTransition"/>
5267 <value-type name="QQuaternion"/>
5268
5119 5269 <object-type name="QCommandLinkButton"/>
5120 5270 <object-type name="QFileSystemModel">
5121 5271 <modify-function signature="setIconProvider(QFileIconProvider*)">
@@ -5246,6 +5396,11
5246 5396 <reference-count action="set" variable-name="__rcParentLayoutItem"/>
5247 5397 </modify-argument>
5248 5398 </modify-function>
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>
5249 5404 </object-type>
5250 5405 <interface-type name="QGraphicsLayoutItem" delete-in-main-thread="yes">
5251 5406 <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)">
@@ -5253,6 +5408,11
5253 5408 <reference-count action="set" variable-name="__rcParentLayoutItem"/>
5254 5409 </modify-argument>
5255 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 5416 </interface-type>
5257 5417 <object-type name="QGraphicsLinearLayout" delete-in-main-thread="yes">
5258 5418 <modify-function signature="addItem(QGraphicsLayoutItem*)">
@@ -5291,6 +5451,28
5291 5451 </modify-argument>
5292 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&lt;QAction*&gt;)">
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 5476 <modify-function signature="changeEvent(QEvent*)">
5295 5477 <modify-argument index="1" invalidate-after-use="yes"/>
5296 5478 </modify-function>
@@ -5355,7 +5537,8
5355 5537 </modify-argument>
5356 5538 </modify-function>
5357 5539 </object-type>
5358 <object-type name="QPrintPreviewDialog"/>
5540 <object-type name="QPrintPreviewDialog">
5541 </object-type>
5359 5542 <object-type name="QPrintPreviewWidget"/>
5360 5543 <object-type name="QStyledItemDelegate">
5361 5544 <modify-function signature="setItemEditorFactory(QItemEditorFactory*)">
@@ -5380,6 +5563,7
5380 5563 <interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory"/>
5381 5564 <interface-type name="QInputContextFactoryInterface" java-name="QAbstractInputContextFactory"/>
5382 5565 <interface-type name="QStyleFactoryInterface" java-name="QAbstractStyleFactory"/>
5566 <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory"/>
5383 5567 <interface-type name="QPictureFormatInterface" java-name="QAbstractPictureFormat"/>
5384 5568
5385 5569 <object-type name="QIconEnginePluginV2"/>
@@ -5388,7 +5572,65
5388 5572 <object-type name="QInputContextPlugin"/>
5389 5573 <object-type name="QPictureFormatPlugin"/>
5390 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-&gt;type() == QEvent::TouchBegin || %1-&gt;type() == QEvent::TouchUpdate || %1-&gt;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 5634 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'"/>
5393 5635 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
5394 5636 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
@@ -5419,40 +5661,12
5419 5661 <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QInputEvent' inherits from polymorphic class 'QEvent', but has no polymorphic id set"/>
5420 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 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"/>
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"/>
5664
5453 5665 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::pixmapData', unmatched return type 'QPixmapData*'"/>
5454 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) :: Class 'QTextOption_Tab' has equals operators but no qHash() function"/>
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 5672 </typesystem>
@@ -3,10 +3,13
3 3 <include file-name="qssl.h" location="global" />
4 4 </namespace-type>
5 5
6 <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities" />
6 7 <enum-type name="QAbstractSocket::NetworkLayerProtocol" />
8 <enum-type name="QNetworkProxyQuery::QueryType" />
7 9 <enum-type name="QAbstractSocket::SocketError" />
8 10 <enum-type name="QAbstractSocket::SocketState" />
9 11 <enum-type name="QAbstractSocket::SocketType" />
12 <enum-type name="QAbstractSocket::SocketOption" />
10 13 <enum-type name="QFtp::Command" />
11 14 <enum-type name="QFtp::Error" />
12 15 <enum-type name="QFtp::State" />
@@ -17,9 +20,7
17 20 <enum-type name="QHttp::State" />
18 21 <enum-type name="QHttp::ConnectionMode" />
19 22 <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags" />
20 <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities" />
21 23 <enum-type name="QNetworkProxy::ProxyType" />
22 <enum-type name="QNetworkProxyQuery::QueryType" />
23 24 <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode" />
24 25 <enum-type name="QUrlInfo::PermissionSpec" />
25 26 <enum-type name="QHostInfo::HostInfoError" />
@@ -37,10 +38,33
37 38 <enum-type name="QNetworkRequest::CacheLoadControl" />
38 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>
48 </object-type>
49 <value-type name="QNetworkCacheMetaData">
50 <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all" />
51 </value-type>
52
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>
41 59 </object-type>
60 <value-type name="QNetworkProxyQuery" >
61 <modify-function signature="operator=(QNetworkProxyQuery)" remove="all" />
62 </value-type>
42 63
43 <object-type name="QAbstractSocket" />
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 68 <object-type name="QFtp" />
45 69
46 70 <object-type name="QHttp">
@@ -61,6 +85,16
61 85 <define-ownership class="java" owner="c++" />
62 86 </modify-argument>
63 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 98 </object-type>
65 99 <object-type name="QNetworkCookieJar" />
66 100 <object-type name="QNetworkReply" />
@@ -89,13 +123,6
89 123 <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/>
90 124 </value-type>
91 125
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
99 126 <value-type name="QNetworkInterface">
100 127 <modify-function signature="operator=(QNetworkInterface)" remove="all"/>
101 128 </value-type>
@@ -104,13 +131,6
104 131 <modify-function signature="operator=(QNetworkProxy)" remove="all"/>
105 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 134 <value-type name="QUrlInfo">
115 135 <modify-function signature="operator=(QUrlInfo)" remove="all"/>
116 136 </value-type>
@@ -148,14 +168,15
148 168 <object-type name="QSslSocket" />
149 169
150 170 <suppress-warning text="*unmatched parameter type 'sockaddr const*" />
151 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function" />
152 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function" />
153
154 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslKey' has equals operators but no qHash() function"/>
155 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslError' has equals operators but no qHash() function"/>
156 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslCertificate' has equals operators but no qHash() function"/>
157 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslCipher' has equals operators but no qHash() function"/>
158 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslConfiguration' has equals operators but no qHash() function"/>
171
172 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
173 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCacheMetaData' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
174 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxyQuery' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
175 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkAddressEntry' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
176 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
177 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
178 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
179 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
159 180
160 181 <!-- For people building without SSL support -->
161 182 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared" />
@@ -4,10 +4,13
4 4 <include file-name="qssl.h" location="global"/>
5 5 </namespace-type>
6 6
7 <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/>
7 8 <enum-type name="QAbstractSocket::NetworkLayerProtocol"/>
9 <enum-type name="QNetworkProxyQuery::QueryType"/>
8 10 <enum-type name="QAbstractSocket::SocketError"/>
9 11 <enum-type name="QAbstractSocket::SocketState"/>
10 12 <enum-type name="QAbstractSocket::SocketType"/>
13 <enum-type name="QAbstractSocket::SocketOption"/>
11 14 <enum-type name="QFtp::Command"/>
12 15 <enum-type name="QFtp::Error"/>
13 16 <enum-type name="QFtp::State"/>
@@ -18,9 +21,7
18 21 <enum-type name="QHttp::State"/>
19 22 <enum-type name="QHttp::ConnectionMode"/>
20 23 <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/>
21 <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/>
22 24 <enum-type name="QNetworkProxy::ProxyType"/>
23 <enum-type name="QNetworkProxyQuery::QueryType"/>
24 25 <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode"/>
25 26 <enum-type name="QUrlInfo::PermissionSpec"/>
26 27 <enum-type name="QHostInfo::HostInfoError"/>
@@ -38,10 +39,33
38 39 <enum-type name="QNetworkRequest::CacheLoadControl"/>
39 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>
49 </object-type>
50 <value-type name="QNetworkCacheMetaData">
51 <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all"/>
52 </value-type>
53
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>
42 60 </object-type>
61 <value-type name="QNetworkProxyQuery">
62 <modify-function signature="operator=(QNetworkProxyQuery)" remove="all"/>
63 </value-type>
43 64
44 <object-type name="QAbstractSocket"/>
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 69 <object-type name="QFtp"/>
46 70
47 71 <object-type name="QHttp">
@@ -78,6 +102,16
78 102 <define-ownership class="java" owner="c++"/>
79 103 </modify-argument>
80 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 115 </object-type>
82 116 <object-type name="QNetworkCookieJar"/>
83 117 <object-type name="QNetworkReply"/>
@@ -115,13 +149,6
115 149 <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/>
116 150 </value-type>
117 151
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
125 152 <value-type name="QNetworkInterface">
126 153 <modify-function signature="operator=(QNetworkInterface)" remove="all"/>
127 154 </value-type>
@@ -130,13 +157,6
130 157 <modify-function signature="operator=(QNetworkProxy)" remove="all"/>
131 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 160 <value-type name="QUrlInfo">
141 161 <modify-function signature="operator=(QUrlInfo)" remove="all"/>
142 162 </value-type>
@@ -182,14 +202,15
182 202 <object-type name="QSslSocket"/>
183 203
184 204 <suppress-warning text="*unmatched parameter type 'sockaddr const*"/>
185 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function"/>
186 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function"/>
187
188 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslKey' has equals operators but no qHash() function"/>
189 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslError' has equals operators but no qHash() function"/>
190 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslCertificate' has equals operators but no qHash() function"/>
191 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslCipher' has equals operators but no qHash() function"/>
192 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslConfiguration' has equals operators but no qHash() function"/>
205
206 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
207 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCacheMetaData' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
208 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxyQuery' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
209 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkAddressEntry' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
210 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
211 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
212 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
213 <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
193 214
194 215 <!-- For people building without SSL support -->
195 216 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared"/>
@@ -6,6 +6,9
6 6 <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions"/>
7 7 <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/>
8 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 13 <namespace-type name="QGL">
11 14 <include file-name="qgl.h" location="global"/>
@@ -23,6 +26,32
23 26 <modify-function signature="operator=(QGLFormat)" remove="all"/>
24 27 </value-type>
25 28
29 <value-type name="QGLFramebufferObjectFormat" />
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>
26 55 <object-type name="QGLContext">
27 56
28 57 <modify-function signature="chooseContext(const QGLContext*)">
@@ -59,11 +88,12
59 88 <modify-function signature="setFormat(QGLFormat)" remove="all"/>
60 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 94 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QGLColormap::QGLColormapData\*'" />
64 95 <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" />
65 96 <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'" />
66 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" />
68 98
69 99 </typesystem>
@@ -6,6 +6,9
6 6 <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions"/>
7 7 <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/>
8 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 13 <namespace-type name="QGL">
11 14 <include file-name="qgl.h" location="global"/>
@@ -23,6 +26,32
23 26 <modify-function signature="operator=(QGLFormat)" remove="all"/>
24 27 </value-type>
25 28
29 <value-type name="QGLFramebufferObjectFormat"/>
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>
26 55 <object-type name="QGLContext">
27 56
28 57 <modify-function signature="chooseContext(const QGLContext*)">
@@ -59,11 +88,12
59 88 <modify-function signature="setFormat(QGLFormat)" remove="all"/>
60 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 94 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QGLColormap::QGLColormapData\*'"/>
64 95 <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
65 96 <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
66 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"/>
68 98
69 99 </typesystem>
@@ -9,19 +9,15
9 9 <rejection class="Phonon::Factory" />
10 10 <rejection class="Phonon::Experimental" />
11 11 <rejection class="Phonon::ObjectDescriptionModel" />
12 <rejection class="Phonon::BackendCapabilities::Notifier" />
12 13 <rejection class="AudioOutputAdaptor" />
13 14 <rejection class="*" field-name="k_ptr" />
14
15 15 <rejection class="Phonon::AudioOutputInterface40" />
16 16 <rejection class="Phonon::AudioOutputInterface42" />
17 <rejection class="Phonon::AudioOutputInterface" />
18 17
19 18 <namespace-type name="Phonon" />
20 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 21 <enum-type name="Phonon::Category">
26 22 <reject-enum-value name="LastCategory" />
27 23 </enum-type>
@@ -48,8 +44,6
48 44
49 45 <interface-type name="Phonon::AbstractVideoOutput" java-name="AbstractVideoOutput" />
50 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 47 <interface-type name="Phonon::BackendInterface" java-name="AbstractBackend" />
54 48 <interface-type name="Phonon::EffectInterface" java-name="AbstractEffect" />
55 49 <interface-type name="Phonon::MediaNode" java-name="MediaNode" />
@@ -98,9 +92,6
98 92 <value-type name="Phonon::ObjectDescription" generate="no" />
99 93 <value-type name="Phonon::EffectDescription" java-name="EffectDescription" />
100 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 96 <object-type name="Phonon::AbstractAudioOutput" java-name="AbstractAudioOutput" />
106 97 <object-type name="Phonon::AbstractMediaStream" java-name="AbstractMediaStream" />
@@ -130,18 +121,27
130 121 </modify-function>
131 122 </object-type>
132 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" />
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 138 <suppress-warning text="WARNING(MetaJavaBuilder) :: Final class 'AbstractAudioOutput' set to non-final, as it is extended by other classes" />
134 139 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QDBus' does not have a type entry" />
135 140 <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'create(const QString &amp; name)' in 'QTextCodecPlugin'" />
136 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 142 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::operator&lt;&lt;', unmatched return type 'QDebug'" />
144 143 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::ObjectDescription::ObjectDescription', unmatched parameter type 'QExplicitlySharedDataPointer&lt;ObjectDescriptionData&gt; const&amp;'" />
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 200 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::AbstractVideoOutput' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
201 201 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::EffectWidget' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
202 202 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::VolumeFaderInterface' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
203
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 ''" />
204 206
205 207 </typesystem>
@@ -119,10 +119,11
119 119 <enum-type name="QSqlResult::VirtualHookOperation" />
120 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 125 <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'" />
123 126 <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" />
124 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 129 </typesystem>
@@ -120,10 +120,11
120 120 <enum-type name="QSqlResult::VirtualHookOperation"/>
121 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 126 <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
124 127 <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
125 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 130 </typesystem>
1 NO CONTENT: modified file
1 NO CONTENT: modified file
@@ -5,7 +5,9
5 5 <enum-type name="QWebSettings::FontFamily"/>
6 6 <enum-type name="QWebSettings::FontSize"/>
7 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 11 <enum-type name="QWebPage::Extension"/>
10 12 <enum-type name="QWebPage::NavigationType"/>
11 13 <enum-type name="QWebPage::WebAction"/>
@@ -13,7 +15,14
13 15 <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags" />
14 16 <enum-type name="QWebPage::LinkDelegationPolicy" />
15 17 <enum-type name="QWebPluginFactory::Extension"/>
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" />
16 23
24
25 <object-type name="QGraphicsWebView" />
17 26 <object-type name="QWebView">
18 27 <modify-function signature="setPage(QWebPage*)">
19 28 <modify-argument index="1">
@@ -28,30 +37,102
28 37 </modify-argument>
29 38 </modify-function>
30 39 </object-type>
31 <object-type name="QWebHistory"/>
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 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 66 <value-type name="QWebHitTestResult">
36 67 <modify-function signature="operator=(QWebHitTestResult)" remove="all" />
37 68 </value-type>
38 69
39 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 77 <modify-function signature="operator=(QWebHistoryItem)" remove="all"/>
41 78 </value-type>
42 79
43 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 86 </object-type>
45 87
46 <object-type name="QWebPluginFactory">
47 </object-type>
48 <value-type name="QWebPluginFactory::Plugin" generate="no">
88 <object-type name="QWebPluginFactory" />
89 <object-type name="QWebPluginDatabase" />
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>
49 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>
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 117 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::QWebFrame', unmatched parameter type 'QWebFrameData*'" />
52 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&lt;MimeType&gt;'" />
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 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 136 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'NavigationRequestResponse' is not declared" />
56 137 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'WebAttribute' is not declared" />
57 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 147 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHistory' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
67 148 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebView' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
68 149 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
69
70 150 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHitTestResult' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
71 151 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'FindFlag' is not declared" />
72 152 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'LinkDelegationPolicy' is not declared" />
73 153 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'FontFamily' is not declared" />
74 154 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'WebWindowType' is not declared" />
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." />
75 162
76 163 </typesystem>
@@ -5,7 +5,9
5 5 <enum-type name="QWebSettings::FontFamily"/>
6 6 <enum-type name="QWebSettings::FontSize"/>
7 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 11 <enum-type name="QWebPage::Extension"/>
10 12 <enum-type name="QWebPage::NavigationType"/>
11 13 <enum-type name="QWebPage::WebAction"/>
@@ -13,7 +15,14
13 15 <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags"/>
14 16 <enum-type name="QWebPage::LinkDelegationPolicy"/>
15 17 <enum-type name="QWebPluginFactory::Extension"/>
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"/>
16 23
24
25 <object-type name="QGraphicsWebView"/>
17 26 <object-type name="QWebView">
18 27 <modify-function signature="setPage(QWebPage*)">
19 28 <modify-argument index="1">
@@ -28,30 +37,102
28 37 </modify-argument>
29 38 </modify-function>
30 39 </object-type>
31 <object-type name="QWebHistory"/>
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 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 66 <value-type name="QWebHitTestResult">
36 67 <modify-function signature="operator=(QWebHitTestResult)" remove="all"/>
37 68 </value-type>
38 69
39 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 77 <modify-function signature="operator=(QWebHistoryItem)" remove="all"/>
41 78 </value-type>
42 79
43 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 86 </object-type>
45 87
46 <object-type name="QWebPluginFactory">
47 </object-type>
48 <value-type name="QWebPluginFactory::Plugin" generate="no">
88 <object-type name="QWebPluginFactory"/>
89 <object-type name="QWebPluginDatabase"/>
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>
49 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>
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 117 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::QWebFrame', unmatched parameter type 'QWebFrameData*'"/>
52 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&lt;MimeType&gt;'"/>
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 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 136 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'NavigationRequestResponse' is not declared"/>
56 137 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'WebAttribute' is not declared"/>
57 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 147 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHistory' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
67 148 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebView' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
68 149 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
69
70 150 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHitTestResult' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
71 151 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'FindFlag' is not declared"/>
72 152 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'LinkDelegationPolicy' is not declared"/>
73 153 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'FontFamily' is not declared"/>
74 154 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'WebWindowType' is not declared"/>
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."/>
75 162
76 163 </typesystem>
@@ -6,10 +6,10
6 6 <enum-type name="QDomNode::NodeType" />
7 7 <enum-type name="QDomNode::EncodingPolicy" />
8 8 <enum-type name="QDomImplementation::InvalidDataPolicy" />
9 <!--
10 9 <enum-type name="QXmlStreamReader::Error" />
11 10 <enum-type name="QXmlStreamReader::TokenType" />
12 -->
11 <enum-type name="QXmlStreamReader::ReadElementTextBehaviour" />
12
13 13
14 14 <value-type name="QDomAttr">
15 15 <modify-function signature="operator=(QDomAttr)" remove="all"/>
@@ -42,13 +42,18
42 42 </modify-argument>
43 43 </modify-function>
44 44
45
46 45 <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)">
47 46 <modify-argument index="1">
48 47 <reference-count action="set" variable-name="__rcContent" />
49 48 </modify-argument>
50 49 </modify-function>
51 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>
56
52 57 <modify-function signature="setContent(QIODevice*,QString*,int*,int*)">
53 58 <modify-argument index="1">
54 59 <reference-count action="set" variable-name="__rcContent" />
@@ -111,7 +116,6
111 116
112 117 <value-type name="QXmlParseException" />
113 118
114 <!--
115 119 <value-type name="QXmlStreamAttribute">
116 120 <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/>
117 121 </value-type>
@@ -134,6 +138,9
134 138 <modify-function signature="value(const QLatin1String &amp;)const">
135 139 <remove />
136 140 </modify-function>
141 <modify-function signature="hasAttribute(const QLatin1String &amp;)const">
142 <remove />
143 </modify-function>
137 144 </value-type>
138 145
139 146 <value-type name="QXmlStreamNamespaceDeclaration">
@@ -147,7 +154,6
147 154 <value-type name="QXmlStreamEntityDeclaration">
148 155 <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/>
149 156 </value-type>
150 -->
151 157
152 158 <value-type name="QXmlAttributes">
153 159 <modify-function signature="index(const QLatin1String&amp;) const">
@@ -183,13 +189,13
183 189 <modify-function signature="setAttribute(const QString &amp;, unsigned int)">
184 190 <remove />
185 191 </modify-function>
186 <modify-function signature="setAttribute(const QString &amp;, qulonglong)">
192 <modify-function signature="setAttribute(const QString &amp;, unsigned long long)">
187 193 <remove />
188 194 </modify-function>
189 195 <modify-function signature="setAttributeNS(const QString, const QString &amp;, unsigned int)">
190 196 <remove />
191 197 </modify-function>
192 <modify-function signature="setAttributeNS(const QString, const QString &amp;, qulonglong)">
198 <modify-function signature="setAttributeNS(const QString, const QString &amp;, unsigned long long)">
193 199 <remove />
194 200 </modify-function>
195 201
@@ -254,7 +260,6
254 260 </modify-function>
255 261 </object-type>
256 262
257 <!--
258 263 <object-type name="QXmlStreamReader">
259 264 <modify-function signature="QXmlStreamReader(const char*)" remove="all" />
260 265 <modify-function signature="addData(const char*)" remove="all" />
@@ -269,7 +274,6
269 274 <remove />
270 275 </modify-function>
271 276 </object-type>
272 -->
273 277
274 278 <object-type name="QXmlReader">
275 279 <modify-function signature="parse(const QXmlInputSource*)">
@@ -277,4 +281,14
277 281 </modify-function>
278 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 294 </typesystem>
@@ -6,10 +6,10
6 6 <enum-type name="QDomNode::NodeType"/>
7 7 <enum-type name="QDomNode::EncodingPolicy"/>
8 8 <enum-type name="QDomImplementation::InvalidDataPolicy"/>
9 <!--
10 9 <enum-type name="QXmlStreamReader::Error" />
11 10 <enum-type name="QXmlStreamReader::TokenType" />
12 -->
11 <enum-type name="QXmlStreamReader::ReadElementTextBehaviour"/>
12
13 13
14 14 <value-type name="QDomAttr">
15 15 <modify-function signature="operator=(QDomAttr)" remove="all"/>
@@ -42,13 +42,18
42 42 </modify-argument>
43 43 </modify-function>
44 44
45
46 45 <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)">
47 46 <modify-argument index="1">
48 47 <reference-count action="set" variable-name="__rcContent"/>
49 48 </modify-argument>
50 49 </modify-function>
51 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>
56
52 57 <modify-function signature="setContent(QIODevice*,QString*,int*,int*)">
53 58 <modify-argument index="1">
54 59 <reference-count action="set" variable-name="__rcContent"/>
@@ -129,14 +134,13
129 134
130 135 <value-type name="QXmlParseException"/>
131 136
132 <!--
133 137 <value-type name="QXmlStreamAttribute">
134 138 <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/>
135 139 </value-type>
136 140
137 141 <value-type name="QXmlStreamAttributes">
138 <modify-function signature="operator+(QVector&lt;QXmlStreamAttribute>)const" remove="all"/>
139 <modify-function signature="operator&lt;&lt;(QVector&lt;QXmlStreamAttribute>)" remove="all"/>
142 <modify-function signature="operator+(QVector&lt;QXmlStreamAttribute&gt;)const" remove="all"/>
143 <modify-function signature="operator&lt;&lt;(QVector&lt;QXmlStreamAttribute&gt;)" remove="all"/>
140 144 <modify-function signature="operator&lt;&lt;(QXmlStreamAttribute)" remove="all"/>
141 145 <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/>
142 146 <modify-function signature="pop_back()" remove="all"/>
@@ -152,6 +156,9
152 156 <modify-function signature="value(const QLatin1String &amp;)const">
153 157 <remove />
154 158 </modify-function>
159 <modify-function signature="hasAttribute(const QLatin1String &amp;)const">
160 <remove/>
161 </modify-function>
155 162 </value-type>
156 163
157 164 <value-type name="QXmlStreamNamespaceDeclaration">
@@ -165,7 +172,6
165 172 <value-type name="QXmlStreamEntityDeclaration">
166 173 <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/>
167 174 </value-type>
168 -->
169 175
170 176 <value-type name="QXmlAttributes">
171 177 <modify-function signature="index(const QLatin1String&amp;) const">
@@ -201,13 +207,13
201 207 <modify-function signature="setAttribute(const QString &amp;, unsigned int)">
202 208 <remove/>
203 209 </modify-function>
204 <modify-function signature="setAttribute(const QString &amp;, qulonglong)">
210 <modify-function signature="setAttribute(const QString &amp;, unsigned long long)">
205 211 <remove/>
206 212 </modify-function>
207 213 <modify-function signature="setAttributeNS(const QString, const QString &amp;, unsigned int)">
208 214 <remove/>
209 215 </modify-function>
210 <modify-function signature="setAttributeNS(const QString, const QString &amp;, qulonglong)">
216 <modify-function signature="setAttributeNS(const QString, const QString &amp;, unsigned long long)">
211 217 <remove/>
212 218 </modify-function>
213 219
@@ -272,7 +278,6
272 278 </modify-function>
273 279 </object-type>
274 280
275 <!--
276 281 <object-type name="QXmlStreamReader">
277 282 <modify-function signature="QXmlStreamReader(const char*)" remove="all" />
278 283 <modify-function signature="addData(const char*)" remove="all" />
@@ -287,7 +292,6
287 292 <remove />
288 293 </modify-function>
289 294 </object-type>
290 -->
291 295
292 296 <object-type name="QXmlReader">
293 297 <modify-function signature="parse(const QXmlInputSource*)">
@@ -306,4 +310,14
306 310 </modify-function>
307 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 323 </typesystem>
@@ -2,11 +2,14
2 2 <typesystem>
3 3
4 4
5 <namespace-type name="QPatternist"/>
6 <namespace-type name="QPatternistSDK"/>
7
5 8 <enum-type name="QXmlNodeModelIndex::NodeKind"/>
6 9 <enum-type name="QXmlNodeModelIndex::DocumentOrder"/>
7 <enum-type name="QXmlNodeModelIndex::Axis"/>
8 <enum-type name="QXmlQuery::QueryLanguage"/>
10 <enum-type name="QAbstractXmlNodeModel::NodeCopySetting"/>
9 11 <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/>
12 <enum-type name="QXmlQuery::QueryLanguage" />
10 13
11 14 <object-type name="QAbstractMessageHandler">
12 15 <modify-function signature="QAbstractMessageHandler(QObject*)" remove="all" />
@@ -15,29 +18,33
15 18 <object-type name="QAbstractXmlForwardIterator"/>
16 19
17 20 <rejection class="QPatternist::NodeIndexStorage" />
18
19 <rejection class="QAbstractXmlNodeModel" enum-name="NodeCopySetting"/>
21 <rejection class="QAbstractXmlNodeModel" function-name="mapToItem" />
20 22 <rejection class="QAbstractXmlNodeModel" function-name="mapToSequence" />
21 23 <rejection class="QAbstractXmlNodeModel" function-name="sequencedTypedValue" />
22 24 <rejection class="QAbstractXmlNodeModel" function-name="sendNamespaces" />
23 25 <rejection class="QAbstractXmlNodeModel" function-name="iterate" />
24 26 <rejection class="QAbstractXmlNodeModel" function-name="copyNodeTo" />
25 27 <rejection class="QAbstractXmlNodeModel" function-name="type" />
26 <rejection class="QAbstractXmlNodeModel" function-name="isDeepEqual" />
27 <rejection class="QAbstractXmlNodeModel" function-name="namespaceForPrefix" />
28 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 34 </object-type>
30 35
31 36 <rejection class="QAbstractXmlReceiver" function-name="item" />
32 37 <rejection class="QAbstractXmlReceiver" function-name="sendAsNode" />
33 <object-type name="QAbstractXmlReceiver">
34 </object-type>
38 <value-type name="QAbstractXmlReceiver">
39 </value-type>
35 40
36 41 <object-type name="QSimpleXmlNodeModel" />
37 42
38 43 <value-type name="QSourceLocation">
39 44 <modify-function signature="operator=(QSourceLocation)" remove="all" />
40 45 </value-type>
46 <value-type name="QXmlSchema" />
47 <object-type name="QXmlSchemaValidator" />
41 48
42 49 <rejection class="QXmlFormatter" function-name="item" />
43 50 <object-type name="QXmlFormatter">
@@ -49,8 +56,18
49 56 </value-type>
50 57
51 58 <value-type name="QXmlName">
59 <modify-function signature="QXmlName(QXmlNamePool&amp;,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 68 <modify-function signature="operator=(QXmlName)" remove="all" />
53 <modify-function signature="QXmlName(short,short,short)" remove="all" />
69 <modify-function signature="QXmlName(short,short,short)"
70 remove="all" />
54 71 <modify-function signature="localName()const" remove="all" />
55 72 <modify-function signature="prefix()const" remove="all" />
56 73 <modify-function signature="hasPrefix()const" remove="all" />
@@ -71,6 +88,7
71 88 <rejection class="QXmlNodeModelIndex" function-name="sendNamespaces" />
72 89 <rejection class="QXmlNodeModelIndex" function-name="iterate" />
73 90 <rejection class="QXmlNodeModelIndex" function-name="type" />
91 <rejection class="QXmlNodeModelIndex" enum-name="Axis" />
74 92 <value-type name="QXmlNodeModelIndex">
75 93 <modify-function signature="name() const" remove="all" />
76 94 <modify-function signature="root() const" remove="all" />
@@ -87,7 +105,20
87 105 <modify-function signature="internalPointer()const" remove="all" />
88 106 </value-type>
89 107
90 <value-type name="QXmlQuery">
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 122 <modify-function signature="evaluateTo(QStringList&lt;QString&gt;*)const" remove="all" />
92 123 <modify-function signature="setMessageHandler(QAbstractMessageHandler*)">
93 124 <modify-argument index="1">
@@ -104,24 +135,40
104 135 <reference-count action="set" variable-name="__rcUriResolver" />
105 136 </modify-argument>
106 137 </modify-function>
107 </value-type>
138 </object-type>
108 139 <object-type name="QXmlResultItems"/>
109 140
110 141 <rejection class="QXmlSerializer" function-name="item" />
111 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 156 </object-type>
113 157
114 158
115 159
116 160 <suppress-warning text="WARNING(MetaJavaBuilder) :: horribly broken type ''"/>
161 <suppress-warning text="WARNING(MetaJavaBuilder) :: template baseclass 'QExplicitlySharedDataPointer&lt;QXmlSerializer&gt;' of 'QXmlSerializerPointer' is not known" />
117 162
118 163 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlItem::QXmlItem', unmatched parameter type 'QPatternist::Item const&amp;'" />
119 164 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::sequencedTypedValue', unmatched return type 'QExplicitlySharedDataPointer&lt;QAbstractXmlForwardIterator&lt;QPatternist::Item&gt;&gt;"/>
165 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNamePool::QXmlNamePool', unmatched parameter type 'QPatternist::NamePool*'" />
120 166
121 167 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::QXmlNodeModelIndex', unmatched parameter type 'QPatternist::NodeIndexStorage const&amp;'" />
122 168
123 169 <!-- To avoid warnings when running the generator on systems without XML patterns -->
124 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 172 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSourceLocation' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
126 173 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlFormatter' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
127 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 186 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlNodeModelIndex' for enum 'NodeKind' is not declared"/>
140 187 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QAbstractXmlNodeModel' for enum 'SimpleAxis' is not declared"/>
141 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 190 </typesystem>
@@ -2,11 +2,14
2 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 8 <enum-type name="QXmlNodeModelIndex::NodeKind"/>
6 9 <enum-type name="QXmlNodeModelIndex::DocumentOrder"/>
7 <enum-type name="QXmlNodeModelIndex::Axis"/>
8 <enum-type name="QXmlQuery::QueryLanguage"/>
10 <enum-type name="QAbstractXmlNodeModel::NodeCopySetting"/>
9 11 <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/>
12 <enum-type name="QXmlQuery::QueryLanguage"/>
10 13
11 14 <object-type name="QAbstractMessageHandler">
12 15 <modify-function signature="QAbstractMessageHandler(QObject*)" remove="all"/>
@@ -15,29 +18,31
15 18 <object-type name="QAbstractXmlForwardIterator"/>
16 19
17 20 <rejection class="QPatternist::NodeIndexStorage"/>
18
19 <rejection class="QAbstractXmlNodeModel" enum-name="NodeCopySetting"/>
21 <rejection class="QAbstractXmlNodeModel" function-name="mapToItem"/>
20 22 <rejection class="QAbstractXmlNodeModel" function-name="mapToSequence"/>
21 23 <rejection class="QAbstractXmlNodeModel" function-name="sequencedTypedValue"/>
22 24 <rejection class="QAbstractXmlNodeModel" function-name="sendNamespaces"/>
23 25 <rejection class="QAbstractXmlNodeModel" function-name="iterate"/>
24 26 <rejection class="QAbstractXmlNodeModel" function-name="copyNodeTo"/>
25 27 <rejection class="QAbstractXmlNodeModel" function-name="type"/>
26 <rejection class="QAbstractXmlNodeModel" function-name="isDeepEqual"/>
27 <rejection class="QAbstractXmlNodeModel" function-name="namespaceForPrefix"/>
28 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 32 </object-type>
30 33
31 34 <rejection class="QAbstractXmlReceiver" function-name="item"/>
32 35 <rejection class="QAbstractXmlReceiver" function-name="sendAsNode"/>
33 <object-type name="QAbstractXmlReceiver">
34 </object-type>
36 <value-type name="QAbstractXmlReceiver">
37 </value-type>
35 38
36 39 <object-type name="QSimpleXmlNodeModel"/>
37 40
38 41 <value-type name="QSourceLocation">
39 42 <modify-function signature="operator=(QSourceLocation)" remove="all"/>
40 43 </value-type>
44 <value-type name="QXmlSchema"/>
45 <object-type name="QXmlSchemaValidator"/>
41 46
42 47 <rejection class="QXmlFormatter" function-name="item"/>
43 48 <object-type name="QXmlFormatter">
@@ -49,6 +54,15
49 54 </value-type>
50 55
51 56 <value-type name="QXmlName">
57 <modify-function signature="QXmlName(QXmlNamePool&amp;,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 66 <modify-function signature="operator=(QXmlName)" remove="all"/>
53 67 <modify-function signature="QXmlName(short,short,short)" remove="all"/>
54 68 <modify-function signature="localName()const" remove="all"/>
@@ -71,6 +85,7
71 85 <rejection class="QXmlNodeModelIndex" function-name="sendNamespaces"/>
72 86 <rejection class="QXmlNodeModelIndex" function-name="iterate"/>
73 87 <rejection class="QXmlNodeModelIndex" function-name="type"/>
88 <rejection class="QXmlNodeModelIndex" enum-name="Axis"/>
74 89 <value-type name="QXmlNodeModelIndex">
75 90 <modify-function signature="name() const" remove="all"/>
76 91 <modify-function signature="root() const" remove="all"/>
@@ -87,7 +102,20
87 102 <modify-function signature="internalPointer()const" remove="all"/>
88 103 </value-type>
89 104
90 <value-type name="QXmlQuery">
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 119 <modify-function signature="evaluateTo(QStringList&lt;QString&gt;*)const" remove="all"/>
92 120 <modify-function signature="setMessageHandler(QAbstractMessageHandler*)">
93 121 <modify-argument index="1">
@@ -104,24 +132,40
104 132 <reference-count action="set" variable-name="__rcUriResolver"/>
105 133 </modify-argument>
106 134 </modify-function>
107 </value-type>
135 </object-type>
108 136 <object-type name="QXmlResultItems"/>
109 137
110 138 <rejection class="QXmlSerializer" function-name="item"/>
111 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 153 </object-type>
113 154
114 155
115 156
116 157 <suppress-warning text="WARNING(MetaJavaBuilder) :: horribly broken type ''"/>
158 <suppress-warning text="WARNING(MetaJavaBuilder) :: template baseclass 'QExplicitlySharedDataPointer&lt;QXmlSerializer&gt;' of 'QXmlSerializerPointer' is not known"/>
117 159
118 160 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlItem::QXmlItem', unmatched parameter type 'QPatternist::Item const&amp;'"/>
119 161 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::sequencedTypedValue', unmatched return type 'QExplicitlySharedDataPointer&lt;QAbstractXmlForwardIterator&lt;QPatternist::Item&gt;&gt;"/>
162 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNamePool::QXmlNamePool', unmatched parameter type 'QPatternist::NamePool*'"/>
120 163
121 164 <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::QXmlNodeModelIndex', unmatched parameter type 'QPatternist::NodeIndexStorage const&amp;'"/>
122 165
123 166 <!-- To avoid warnings when running the generator on systems without XML patterns -->
124 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 169 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSourceLocation' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
126 170 <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlFormatter' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
127 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 183 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlNodeModelIndex' for enum 'NodeKind' is not declared"/>
140 184 <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QAbstractXmlNodeModel' for enum 'SimpleAxis' is not declared"/>
141 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 187 </typesystem>
General Comments 0
You need to be logged in to leave comments. Login now