Fixed typesystem parser warnings.

8 files changed, 16 insertions, 15 deletions

diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 35fbbc0c9..2d00d6b8a 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -95,6 +95,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qstring_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qstringlist_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qstringmatcher_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qstringref_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsysinfo_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsystemlocale_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsystemsemaphore_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qt_wrapper.cpp
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 040ce7bc7..375ffa1b4 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -475,7 +475,6 @@
   <rejection class="QSharedData"/>
   <rejection class="QSharedDataPointer"/>
   <rejection class="QStack"/>
-  <rejection class="QSysInfo"/>
   <rejection class="QThreadStorage"/>
   <rejection class="QThreadStorageData"/>
   <rejection class="QTypeInfo"/>
@@ -628,6 +627,8 @@
   <enum-type name="QSettings::Status"/>
   <enum-type name="QSocketNotifier::Type"/>
   <enum-type name="QSystemLocale::QueryType"/>
+  <enum-type name="QSysInfo::Endian"/>
+  <enum-type name="QSysInfo::Sizes"/>
   <enum-type name="QTextCodec::ConversionFlag" flags="QTextCodec::ConversionFlags"/>
   <enum-type name="QTextStream::FieldAlignment"/>
   <enum-type name="QTextStream::NumberFlag" flags="QTextStream::NumberFlags"/>
@@ -700,7 +701,6 @@
   <enum-type name="QCryptographicHash::Algorithm"/>
   <enum-type name="QReadWriteLock::RecursionMode"/>
   <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions"/>
-  <enum-type name="QtConcurrent::ThreadFunctionResult"/>
   <enum-type name="QCoreApplication::Encoding" />
   <enum-type name="Qt::AlignmentFlag" flags="Qt::Alignment" />
   <enum-type name="Qt::CursorShape" />
@@ -2060,6 +2060,7 @@
   </object-type>
   <object-type name="QSocketNotifier"/>
   <object-type name="QSystemLocale"/>
+  <object-type name="QSysInfo"/>
   <object-type name="QTemporaryFile">
     <extra-includes>
       <include file-name="QAbstractFileEngine" location="global"/>
@@ -2844,6 +2845,8 @@
   <suppress-warning text="Shadowing: QFile::fileName() const and QTemporaryFile::fileName() const"/>
   <suppress-warning text="enum 'QtValidLicenseForDeclarativeModule' does not have a type entry or is not an enum"/>
   <suppress-warning text="unhandled enum value: ~0u in Qt::GestureType"/>
+  <suppress-warning text="unhandled enum value: (sizeof(void*)&lt;&lt;3) in QSysInfo::Sizes"/>
   <suppress-warning text="unmatched enum ~0u"/>
+  <suppress-warning text="unmatched enum (sizeof(void*)&lt;&lt;3)"/>
   <suppress-warning text="signature 'setCustomType(float)' for function modification in 'QEasingCurve' not found. Possible candidates: setCustomType(double) in QEasingCurve"/>
 </typesystem>
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 78335eb4a..9697e3cf8 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -92,7 +92,6 @@
   <rejection class="QAccessibleInterfaceEx"/>
   <rejection class="QAccessibleWidget"/>
   <rejection class="QAccessibleWidgetEx"/>
-  <rejection class="QAccessibleEvent"/>
   <rejection class="QAbstractItemDelegate" function-name="operator="/>
   <rejection class="QAbstractTextDocumentLayout::PaintContext" field-name="selections"/>
   <rejection class="QApplication" function-name="compressEvent"/>
diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml
index def235f2c..b52b72f03 100644
--- a/PySide/QtNetwork/typesystem_network.xml
+++ b/PySide/QtNetwork/typesystem_network.xml
@@ -175,12 +175,6 @@
         <modify-function signature="QHostAddress(quint8*)" remove="all" />
         <modify-function signature="operator=(QString)" remove="all"/>
         <modify-function signature="operator=(QHostAddress)" remove="all"/>
-        <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&amp;,quint16)" remove="all" />
-        <!--
-        <inject-code class="target" position="end">
-            python::implicitly_convertible&lt;QHostAddress::SpecialAddress,QHostAddress&gt;();
-        </inject-code>
-          -->
     </value-type>
 
     <value-type name="QHostInfo">
diff --git a/PySide/QtTest/typesystem_test.xml b/PySide/QtTest/typesystem_test.xml
index 428a8eef8..cbf8add63 100644
--- a/PySide/QtTest/typesystem_test.xml
+++ b/PySide/QtTest/typesystem_test.xml
@@ -27,12 +27,12 @@
 
   <rejection class="QTouchEventSequence"/>
 
-  <!--<enum-type name="QTest::AttributeIndex"/>
+  <enum-type name="QTest::AttributeIndex"/>
   <enum-type name="QTest::KeyAction"/>
   <enum-type name="QTest::LogElementType"/>
   <enum-type name="QTest::MouseAction"/>
   <enum-type name="QTest::SkipMode"/>
-  <enum-type name="QTest::TestFailMode"/>-->
+  <enum-type name="QTest::TestFailMode"/>
 
   <rejection class="QSignalSpy"/>
   <rejection class="QTestEventList"/>
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml
index b0d7338f8..dd3b5ba73 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -10,6 +10,7 @@
   <enum-type name="QWebSettings::FontSize"/>
   <enum-type name="QWebSettings::WebGraphic"/>
   <enum-type name="QWebSettings::WebAttribute"/>
+  <enum-type name="QWebPage::ErrorDomain"/>
   <enum-type name="QWebPage::NavigationType"/>
   <enum-type name="QWebPage::WebAction"/>
   <enum-type name="QWebPage::WebWindowType"/>
@@ -40,8 +41,6 @@
           <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-    <!-- TODO QtScript isn't implemented yet -->
-    <modify-function signature="addToJavaScriptWindowObject(QString,QObject*,QScriptEngine::ValueOwnership)" remove="all" />
     <!-- TODO QMultiMap isn't implemented yet -->
     <modify-function signature="metaData()const" remove="all" />
   </object-type>
diff --git a/PySide/QtXml/typesystem_xml.xml b/PySide/QtXml/typesystem_xml.xml
index c3fc1b34a..5c0811eea 100644
--- a/PySide/QtXml/typesystem_xml.xml
+++ b/PySide/QtXml/typesystem_xml.xml
@@ -433,6 +433,8 @@
         </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 a771a101a..4f10bda67 100644
--- a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
+++ b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml
@@ -6,7 +6,7 @@
     <enum-type name="QAbstractXmlNodeModel::NodeCopySetting" />
     <enum-type name="QXmlNodeModelIndex::NodeKind" />
     <enum-type name="QXmlNodeModelIndex::DocumentOrder" />
-    <enum-type name="QXmlNodeModelIndex::Axis" />
+    <enum-type name="QXmlNodeModelIndex::Axis"/>
     <enum-type name="QXmlQuery::QueryLanguage" />
 
     <value-type name="QXmlSchema"/>
@@ -46,7 +46,6 @@
         <modify-function signature="namespaceBindings()const" remove="all" />
         <modify-function signature="namespaceForPrefix(short)const" remove="all" />
         <modify-function signature="stringValue()const" remove="all" />
-        <modify-function signature="type()const" remove="all" />
         <modify-function signature="is(const QXmlNodeModelIndex &amp;)const" remove="all" />
         <modify-function signature="reset()" remove="all" />
     </value-type>
@@ -54,4 +53,8 @@
     <value-type name="QXmlQuery" />
     <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"/>
 </typesystem>