Type systems of all modules but QtCore and QtGui reviewed.

8 files changed, 95 insertions, 103 deletions

diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml
index 7343a4b49..bf9a57590 100644
--- a/PySide/QtDeclarative/typesystem_declarative.xml
+++ b/PySide/QtDeclarative/typesystem_declarative.xml
@@ -66,6 +66,7 @@
     <object-type name="QDeclarativeExtensionInterface"/>
     <object-type name="QDeclarativeComponent">
         <enum-type name="Status"/>
+        <!-- This ctor isn't part of Qt public API -->
         <modify-function signature="QDeclarativeComponent(QObject*)" remove="all" />
     </object-type>
     <object-type name="QDeclarativeContext">
diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml
index 5b0657913..f261f3a4d 100644
--- a/PySide/QtNetwork/typesystem_network.xml
+++ b/PySide/QtNetwork/typesystem_network.xml
@@ -92,7 +92,6 @@
             <include file-name="autoarraypointer.h" location="global"/>
         </extra-includes>
 
-        <modify-function signature="closeConnection()" remove="all"/>
         <modify-function signature="readAll()" allow-thread="yes"/>
         <modify-function signature="read(char*, qint64)" allow-thread="yes">
           <modify-argument index="return">
@@ -105,6 +104,9 @@
             <insert-template name="read_wrapper"/>
           </inject-code>
         </modify-function>
+        <!-- ### Obsolete methods -->
+        <modify-function signature="closeConnection()" remove="all"/>
+        <!-- ### -->
     </object-type>
     <object-type name="QTcpServer">
         <modify-function signature="waitForNewConnection(int,bool*)" allow-thread="yes">
@@ -148,13 +150,13 @@
             </modify-argument>
             <inject-code class="target" position="beginning" file="glue/qudpsocket_read_datagram_glue.cpp"/>
         </modify-function>
-        <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&amp;,quint16)" remove="all"/>
         <modify-function signature="writeDatagram(const QByteArray&amp;, const QHostAddress&amp;, quint16)" allow-thread="yes"/>
+        <!-- ### writeDatagram(QByteArray, ...) does the trick -->
+        <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&amp;,quint16)" remove="all"/>
+        <!-- ### -->
     </object-type>
 
-    <object-type name="QHttpHeader">
-        <modify-function signature="QHttpHeader(QHttpHeader)" remove="all"/>
-    </object-type>
+    <object-type name="QHttpHeader" />
     <object-type name="QLocalServer">
         <modify-function signature="waitForNewConnection(int,bool*)" allow-thread="yes">
             <!-- FIXME -->
@@ -203,7 +205,9 @@
 
     <value-type name="QHostAddress" hash-function="qHash">
         <enum-type name="SpecialAddress"/>
+        <!-- ### QHostAddress(QIPv6Address) does this -->
         <modify-function signature="QHostAddress(quint8*)" remove="all" />
+        <!-- ### -->
     </value-type>
 
     <value-type name="QHostInfo">
@@ -235,9 +239,12 @@
         <enum-type name="PermissionSpec"/>
     </value-type>
 
+    <rejection class="QIPv6Address" field-name="c"/>
     <value-type name="QIPv6Address">
+        <!-- ### See bug 788 -->
         <modify-function signature="operator[](int)const" remove="all" />
         <modify-function signature="operator[](int)" remove="all" />
+        <!-- ### -->
     </value-type>
 
     <value-type name="QAuthenticator" />
diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml
index 6ff9614db..0ccacd8e0 100644
--- a/PySide/QtOpenGL/typesystem_opengl.xml
+++ b/PySide/QtOpenGL/typesystem_opengl.xml
@@ -42,6 +42,7 @@
     <enum-type name="OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/>
   </value-type>
 
+  <rejection class="QGLContext" field-name="currentCtx" />
   <object-type name="QGLContext">
     <enum-type name="BindOption" flags="QGLContext::BindOptions"/>
     <modify-function signature="chooseContext(const QGLContext*)">
@@ -51,16 +52,10 @@
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
 
-    <modify-function signature="getProcAddress(QString)const">
-        <remove/>
-    </modify-function>
-    <modify-field name="currentCtx" read="false" write="false"/>
-    <modify-function signature="setDevice(QPaintDevice*)">
-        <remove/>
-    </modify-function>
+    <!-- ### Obsolete functions and ctors -->
     <modify-function signature="generateFontDisplayLists(QFont, int)" remove="all"/>
-    <modify-function signature="tryVisual(const QGLFormat&amp;, int)" remove="all"/>
-    <modify-function signature="chooseVisual()" remove="all"/>
+    <modify-function signature="QGLContext(const QGLFormat&amp;, QPaintDevice*)" remove="all" />
+    <!-- ### -->
   </object-type>
   <object-type name="QGLFramebufferObject">
     <enum-type name="Attachment"/>
@@ -83,10 +78,13 @@
         <parent index="2" action="add"/>
       </modify-argument>
     </modify-function>
-    <!--- Obsolete -->
+    <!-- ### Not part of Qt public API -->
     <modify-function signature="setContext(QGLContext*,const QGLContext*,bool)" remove="all" />
+    <!-- ### -->
+    <!--- ### Obsolete functions -->
     <modify-function signature="fontDisplayListBase(QFont, int)" remove="all"/>
     <modify-function signature="setFormat(QGLFormat)" remove="all"/>
+    <!-- ### -->
   </object-type>
 
   <value-type name="QGLFramebufferObjectFormat"/>
@@ -94,13 +92,14 @@
     <enum-type name="ShaderTypeBit" flags="QGLShader::ShaderType"/>
   </object-type>
   <object-type name="QGLShaderProgram">
-    <!-- use QMatrixZxY overloads -->
+    <!-- ### Use QMatrixZxY overloads -->
     <modify-function signature="setUniformValue(int, Array)" remove="all" />
     <modify-function signature="setUniformValue(const char*, Array)" remove="all" />
     <modify-function signature="setAttributeValue(int,const float*,int,int)" remove="all" />
     <modify-function signature="setAttributeValue(const char*,const float*,int,int)" remove="all" />
     <modify-function signature="setAttributeArray(int, uint, const void*, int, int)" remove="all" since="4.7" />
     <modify-function signature="setAttributeArray(const char*, uint, const void*, int, int)" remove="all" since="4.7" />
+    <!-- ### -->
   </object-type>
 
   <!-- Qt 4.7 -->
diff --git a/PySide/QtSql/typesystem_sql.xml b/PySide/QtSql/typesystem_sql.xml
index f7c532539..40a08a13d 100644
--- a/PySide/QtSql/typesystem_sql.xml
+++ b/PySide/QtSql/typesystem_sql.xml
@@ -113,7 +113,9 @@
     <modify-function signature="commitTransaction()" allow-thread="yes" />
     <modify-function signature="rollbackTransaction()" allow-thread="yes" />
     <modify-function signature="open(const QString &amp;, const QString&amp;, const QString&amp;, const QString&amp;, int, const QString&amp;)" allow-thread="yes" />
+    <!-- ### This is too low level for Python, and pointer would be useless for the Python programmer -->
     <modify-function signature="handle() const" remove="all"/>
+    <!-- ### -->
   </object-type>
 
   <object-type name="QSqlQueryModel">
@@ -143,7 +145,9 @@
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
       </extra-includes>
+      <!-- ### This isn't part of Qt public API -->
       <modify-function signature="virtual_hook(int,void*)" remove="all" />
+      <!-- ### -->
       <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
       <modify-function signature="fetchLast()" allow-thread="yes" />
       <modify-function signature="fetchFirst()" allow-thread="yes" />
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml
index ca763bf70..1e632926b 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -54,7 +54,7 @@
       </modify-argument>
     </modify-function>
     <modify-function signature="print(QPrinter*)const" rename="print_" />
-    <!-- TODO QMultiMap isn't implemented yet -->
+    <!-- See BUG 773 -->
     <modify-function signature="metaData()const" remove="all" />
   </object-type>
 
diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml
index d018ee5e0..9d8fb1fb8 100644
--- a/PySide/QtXml/typesystem_xml.xml
+++ b/PySide/QtXml/typesystem_xml.xml
@@ -27,33 +27,23 @@
     <rejection class="QXmlInputSource" field-name="EndOfData"/>
     <rejection class="QXmlInputSource" field-name="EndOfDocument"/>
 
-    <value-type name="QDomAttr">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomCDATASection">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomCharacterData">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomComment">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
+    <value-type name="QDomAttr" />
+    <value-type name="QDomCDATASection" />
+    <value-type name="QDomCharacterData" />
+    <value-type name="QDomComment" />
 
     <template name="qdomdocument_setcontent">
         QString _errorMsg_;
         int _errorLine_ = 0;
         int _errorColumn_ = 0;
+
+        PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
         bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;_errorMsg_, &amp;_errorLine_, &amp;_errorColumn_);
+        PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
         %PYARG_0 = Shiboken::makeTuple(_ret_, _errorMsg_, _errorLine_, _errorColumn_);
     </template>
 
     <value-type name="QDomDocument">
-        <modify-function signature="nodeType()const" remove="all"/>
-
         <!-- will be replaced in inject code -->
         <modify-function signature="setContent(const QByteArray&amp;, bool, QString*, int*, int*)">
             <modify-argument index="3">
@@ -217,22 +207,10 @@
         </modify-function>
     </value-type>
 
-    <value-type name="QDomDocumentFragment">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomDocumentType">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomEntity">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomEntityReference">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
+    <value-type name="QDomDocumentFragment" />
+    <value-type name="QDomDocumentType" />
+    <value-type name="QDomEntity" />
+    <value-type name="QDomEntityReference" />
     <value-type name="QDomImplementation">
         <enum-type name="InvalidDataPolicy"/>
     </value-type>
@@ -247,30 +225,13 @@
     </value-type>
 
     <value-type name="QDomNodeList" />
+    <value-type name="QDomNotation" />
+    <value-type name="QDomProcessingInstruction" />
 
-    <value-type name="QDomNotation">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomProcessingInstruction">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
-
-    <value-type name="QDomText">
-        <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>
+    <value-type name="QDomText" />
 
     <object-type name="QXmlParseException"/>
 
-<!-- These are defined in QtCore
-    <value-type name="QXmlStreamAttribute"/>
-    <value-type name="QXmlStreamAttributes"/>
-
-    <value-type name="QXmlStreamNamespaceDeclaration"/>
-    <value-type name="QXmlStreamNotationDeclaration"/>
-    <value-type name="QXmlStreamEntityDeclaration"/>
--->
-
     <value-type name="QXmlAttributes"/>
 
     <object-type name="QXmlNamespaceSupport"/>
@@ -309,7 +270,11 @@
             </modify-argument>
             <inject-code class="target" position="end">
                 QXmlInputSource* _qxmlinputsource_arg_ = 0;
+
+                PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
                 %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
+                PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
+
                 %PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_);
             </inject-code>
         </modify-function>
@@ -332,7 +297,9 @@
             </modify-argument>
             <inject-code class="target" position="end">
                 QXmlInputSource* _qxmlinputsource_arg_ = 0;
+                PyThreadState* _save = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS
                 %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, %2, _qxmlinputsource_arg_);
+                PyEval_RestoreThread(_save); // Py_END_ALLOW_THREADS
                 %PYARG_0 = Shiboken::makeTuple(%0, _qxmlinputsource_arg_);
             </inject-code>
         </modify-function>
@@ -340,16 +307,6 @@
     <object-type name="QXmlInputSource"/>
     <object-type name="QXmlLocator"/>
 
-<!-- These are defined already in QtCore
-    <object-type name="QXmlStreamReader">
-        <enum-type name="Error" />
-        <enum-type name="TokenType" />
-    </object-type>
-
-    <object-type name="QXmlStreamWriter">
-    </object-type>
--->
-
     <object-type name="QXmlReader">
         <modify-function signature="parse(const QXmlInputSource*)">
             <modify-argument index="1" invalidate-after-use="yes"/>
@@ -452,9 +409,5 @@
             </inject-code>
         </modify-function>
     </object-type>
-
-    <suppress-warning text="Shadowing: QDomNode::attributes() const and QDomElement::attributes() const"/>
-    <suppress-warning text="Shadowing: QDomNode::nodeType() const and QDomElement::nodeType() const"/>
-
 </typesystem>
 
diff --git a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
index 322e2f0b7..51fca16af 100644
--- a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
+++ b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
@@ -44,6 +44,7 @@
     <object-type name="QXmlFormatter" />
     <value-type name="QXmlItem" />
     <value-type name="QXmlName">
+        <!-- ### These methods aren't part of Qt public API -->
         <modify-function signature="QXmlName(short, short, short)" remove="all" />
         <modify-function signature="setNamespaceURI(short)" remove="all" />
         <modify-function signature="localName()const" remove="all" />
@@ -55,14 +56,19 @@
         <modify-function signature="setPrefix(short)" remove="all" />
         <modify-function signature="setLocalName(short)" remove="all" />
         <modify-function signature="code()const" remove="all" />
+        <!-- ### -->
     </value-type>
     <value-type name="QXmlNamePool" />
+
+    <rejection class="QXmlNodeModelIndex" function-name="type" />
+    <rejection class="QXmlNodeModelIndex" function-name="sequencedTypedValue" />
+    <rejection class="QXmlNodeModelIndex" function-name="iterate" />
+    <!-- ### This enum isn't part of Qt public API -->
+    <suppress-warning text="enum 'QXmlNodeModelIndex::Axis' does not have a type entry or is not an enum"/>
     <value-type name="QXmlNodeModelIndex">
-        <enum-type name="Axis"/>
         <enum-type name="DocumentOrder" />
         <enum-type name="NodeKind" />
-        <modify-function signature="internalPointer()const" remove="all" />
-        <!-- Qt internal methods -->
+        <!-- ### Qt internal methods -->
         <modify-function signature="name()const" remove="all" />
         <modify-function signature="root()const" remove="all" />
         <modify-function signature="documentUri()const" remove="all" />
@@ -76,6 +82,7 @@
         <modify-function signature="stringValue()const" remove="all" />
         <modify-function signature="is(const QXmlNodeModelIndex &amp;)const" remove="all" />
         <modify-function signature="reset()" remove="all" />
+        <!-- ### -->
     </value-type>
 
     <value-type name="QXmlQuery">
@@ -84,7 +91,6 @@
     <object-type name="QXmlResultItems" />
     <object-type name="QXmlSerializer" />
 
-
-    <suppress-warning text="unhandled enum value: ForwardAxis in QXmlNodeModelIndex::Axis"/>
-    <suppress-warning text="unhandled enum value: ReverseAxis in QXmlNodeModelIndex::Axis"/>
+    <suppress-warning text="class 'QAbstractXmlNodeModel' inherits from unknown base class 'QSharedData'"/>
+    <suppress-warning text="class not found for setup inheritance 'QSharedData'"/>
 </typesystem>
diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml
index c10fcc003..fb4041d1d 100644
--- a/PySide/phonon/typesystem_phonon.xml
+++ b/PySide/phonon/typesystem_phonon.xml
@@ -78,10 +78,12 @@
                 <include file-name="backendcapabilities.h" location="global"/>
                 <include file-name="pyside_phonon.h" location="local"/>
 
+                <!-- ### This isn't part of Qt public API -->
                 <modify-function signature="notifier()" remove="all"/>
                 <modify-function signature="Phonon::BackendCapabilities::NotifierWrapper(Phonon::BackendCapabilities::Notifier*)">
                   <access modifier="private"/>
-              </modify-function>
+                </modify-function>
+                <!-- ### -->
               <inject-code class="target" position="end">
                    PySideSignal* signal_item;
 
@@ -127,21 +129,19 @@
 
         <value-type name="EffectParameter">
             <enum-type name="Hint" flags="Phonon::EffectParameter::Hints"/>
-            <modify-function signature="EffectParameter()" remove="all"/> <!-- internal -->
-            <modify-function signature="operator&lt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <!-- internal -->
-            <modify-function signature="operator&gt;(const Phonon::EffectParameter &amp;)const" remove="all"/> <!-- internal -->
-            <modify-function signature="id()const" remove="all"/> <!-- internal -->
-            <modify-function signature="operator=(Phonon::EffectParameter)" remove="all"/> <!-- Covered by copy constructor -->
-            <modify-function signature="EffectParameter(Phonon::EffectParameter)" remove="all"/>
+            <!-- ### Internal methods and ctors -->
+            <modify-function signature="EffectParameter()" remove="all"/>
+            <modify-function signature="operator&lt;(const Phonon::EffectParameter &amp;)const" remove="all"/>
+            <modify-function signature="operator&gt;(const Phonon::EffectParameter &amp;)const" remove="all"/>
+            <modify-function signature="id()const" remove="all"/>
             <modify-function signature="operator==(Phonon::EffectParameter)const" remove="all"/>
+            <!-- ### -->
         </value-type>
         <value-type name="MediaSource">
             <enum-type name="Type"/>
-            <modify-function signature="operator=(Phonon::MediaSource)" remove="all"/> <!-- Covered by copy constructor -->
         </value-type>
         <value-type name="Path">
             <modify-function signature="disconnect()" rename="disconnectPath"/>
-            <modify-function signature="operator=(Phonon::Path)" remove="all"/> <!-- Covered by copy constructor -->
             <modify-function signature="insertEffect(Phonon::EffectDescription,Phonon::Effect*)">
                 <modify-argument index="1">
                     <parent index="this" action="add"/>
@@ -170,29 +170,49 @@
         </value-type>
         <value-type name="ObjectDescription" generate="no"/>
         <value-type name="EffectDescription">
+            <!-- ### See bug 786 -->
             <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
             <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+            <!-- ### -->
+            <!-- ### See bug 787 -->
             <modify-function signature="fromIndex(int)" remove="all"/>
+            <!-- ### -->
         </value-type>
         <value-type name="AudioOutputDevice">
+            <!-- ### See bug 786 -->
             <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
             <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+            <!-- ### -->
+            <!-- ### See bug 787 -->
             <modify-function signature="fromIndex(int)" remove="all"/>
+            <!-- ### -->
         </value-type>
        <value-type name="AudioCaptureDevice">
+            <!-- ### See bug 786 -->
             <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
             <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+            <!-- ### -->
+            <!-- ### See bug 787 -->
             <modify-function signature="fromIndex(int)" remove="all"/>
+            <!-- ### -->
         </value-type>
         <value-type name="AudioChannelDescription">
+            <!-- ### See bug 786 -->
             <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
             <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+            <!-- ### -->
+            <!-- ### See bug 787 -->
             <modify-function signature="fromIndex(int)" remove="all"/>
+            <!-- ### -->
         </value-type>
         <value-type name="SubtitleDescription">
+            <!-- ### See bug 786 -->
             <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
             <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+            <!-- ### -->
+            <!-- ### See bug 787 -->
             <modify-function signature="fromIndex(int)" remove="all"/>
+            <!-- ### -->
         </value-type>
 
 
@@ -232,14 +252,16 @@
             </modify-function>
         </object-type>
 
-
-        <!-- The following entries may be present in the system or not. Keep this section organized. -->
+        <!-- ### The following entries may be present in the system or not. Keep this section organized. -->
         <value-type name="VideoCaptureDevice">
+            <!-- ### See bug 786 -->
             <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
             <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
+            <!-- ### -->
+            <!-- ### See bug 787 -->
             <modify-function signature="fromIndex(int)" remove="all"/>
+            <!-- ### -->
         </value-type>
-        <!-- The above entries may be present in the system or not. Keep this section organized. -->
-
+        <!-- ### -->
     </namespace-type>
 </typesystem>