lots of lots of small changes today, from 60+ warnings down to 27

1 files changed, 37 insertions, 26 deletions

diff --git a/PySide/QtCore/typesystem_core_common.xml b/PySide/QtCore/typesystem_core_common.xml
index 8380ce72c..89d936d5b 100644
--- a/PySide/QtCore/typesystem_core_common.xml
+++ b/PySide/QtCore/typesystem_core_common.xml
@@ -163,8 +163,8 @@
     <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
     <include file-name="signalmanager.h" location="global"/>
   </primitive-type>
-  <!-- Qt5: Replace QBool by bool
-  <primitive-type name="QBool" target-lang-api-name="PyBool">
+  <!-- Qt5: Replace QBool by bool -->
+  <primitive-type name="bool" target-lang-api-name="PyBool">
     <conversion-rule>
         <native-to-target>
         return PyBool_FromLong((bool)%in);
@@ -176,7 +176,7 @@
         </target-to-native>
     </conversion-rule>
   </primitive-type>
-  -->
+
   <!-- Qt5: add the new pointer-ish types -->
   <primitive-type name="qintptr" />
   <primitive-type name="quintptr" />
@@ -796,6 +796,7 @@
     <enum-type name="AnchorAttribute"/>
     <enum-type name="AnchorPoint" since="4.6" />
     <enum-type name="ApplicationAttribute"/>
+    <enum-type name="ApplicationState" flags="ApplicationStates"/>
     <enum-type name="ArrowType"/>
     <enum-type name="AspectRatioMode"/>
     <enum-type name="Axis"/>
@@ -814,8 +815,10 @@
     <enum-type name="DockWidgetArea" flags="DockWidgetAreas" />
     <enum-type name="DockWidgetAreaSizes"/>
     <enum-type name="DropAction" flags="DropActions"/>
+    <enum-type name="Edge" flags="Edges"/>
     <enum-type name="EventPriority"/>
     <enum-type name="FillRule"/>
+    <enum-type name="FindChildOption" flags="FindChildOptions"/>
     <enum-type name="FocusPolicy"/>
     <enum-type name="FocusReason"/>
     <enum-type name="GestureFlag" flags="GestureFlags" since="4.6"/>
@@ -836,12 +839,17 @@
     <enum-type name="MatchFlag" flags="MatchFlags"/>
     <enum-type name="Modifier"/>
     <enum-type name="MouseButton" flags="MouseButtons"/>
+    <enum-type name="MouseEventFlag" flags="MouseEventFlags"/>
+    <enum-type name="MouseEventSource"/>
+    <enum-type name="NativeGestureType"/>
     <enum-type name="NavigationMode" since="4.6"/>
     <enum-type name="Orientation" flags="Orientations"/>
     <enum-type name="PenCapStyle"/>
     <enum-type name="PenJoinStyle"/>
     <enum-type name="PenStyle"/>
+    <enum-type name="ScreenOrientation" flags="ScreenOrientations"/>
     <enum-type name="ScrollBarPolicy"/>
+    <enum-type name="ScrollPhase"/>
     <enum-type name="ShortcutContext"/>
     <enum-type name="SizeHint"/>
     <enum-type name="SizeMode"/>
@@ -851,6 +859,7 @@
     <enum-type name="TextFormat"/>
     <enum-type name="TextInteractionFlag" flags="TextInteractionFlags"/>
     <enum-type name="TileRule" since="4.6"/>
+    <enum-type name="TimerType"/>
     <enum-type name="TimeSpec"/>
     <enum-type name="ToolBarArea" flags="ToolBarAreas" />
     <enum-type name="ToolBarAreaSizes"/>
@@ -1245,8 +1254,6 @@
         PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](yearNumber));
         </inject-code>
     </modify-function>
-    <!-- This function isn't part of Qt public API -->
-    <modify-function signature="julianToGregorian(uint,int&amp;,int&amp;,int&amp;)" remove="all"/>
   </value-type>
   <value-type name="QDateTime" hash-function="PySide::hash">
     <inject-code class="native" position="beginning">
@@ -1913,11 +1920,11 @@
   </object-type>
   <object-type name="QAbstractFileEngineIterator"/>
   <object-type name="QAbstractItemModel">
+    <enum-type name="LayoutChangeHint" />
     <!-- This function was replaced by a added function -->
     <modify-function signature="createIndex(int, int, void*) const" remove="all"/>
     <!-- This function is the same as createIndex(int, int, int) const -->
-    <modify-function signature="createIndex(int,int, quint32)const" remove="all" />
-    <modify-function signature="createIndex(int, int, int)const">
+    <modify-function signature="createIndex(int, int, quintptr)const">
         <modify-argument index="3">
             <replace-default-expression with="0" />
         </modify-argument>
@@ -1963,6 +1970,8 @@
       <include file-name="QCoreApplication" location="global"/>
       <include file-name="signalmanager.h" location="local" />
     </extra-includes>
+    <!-- XXX Qt5: probably needs to be handled by "QObject::d_ptr->dynamicMetaObject();"
+        see cppgenerator.cpp
     <modify-function signature="metaObject() const">
       <inject-code class="target" position="beginning">
         %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME();
@@ -1972,6 +1981,8 @@
         <reference-count action="set"/>
       </modify-argument>
     </modify-function>
+    -->
+
     <modify-function signature="deleteLater()">
       <modify-argument index="this">
         <define-ownership owner="c++"/>
@@ -2339,6 +2350,7 @@
     </add-function>
   </value-type>
   <value-type name="QByteArray" hash-function="qHash">
+    <enum-type name="Base64Option" />
     <conversion-rule>
         <target-to-native>
             <add-conversion type="Py_None">
@@ -2717,17 +2729,17 @@
             %PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(%1, %2, %3), %2, Shiboken::Buffer::ReadWrite);
         </inject-code>
     </modify-function>
-    <modify-function signature="remove()" allow-thread="yes"/>
-    <modify-function signature="remove(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="rename(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="rename(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="link(const QString&amp;)" allow-thread="yes"/>
-    <modify-function signature="link(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
     <modify-function signature="flush()" allow-thread="yes"/>
   </object-type>
   <object-type name="QFile">
     <modify-function signature="copy(const QString&amp;)" allow-thread="yes"/>
     <modify-function signature="copy(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="link(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="link(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="remove()" allow-thread="yes"/>
+    <modify-function signature="remove(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="rename(const QString&amp;)" allow-thread="yes"/>
+    <modify-function signature="rename(const QString&amp;, const QString&amp;)" allow-thread="yes"/>
   </object-type>
 
   <object-type name="QIODevice">
@@ -2821,7 +2833,7 @@
     <enum-type name="LibraryLocation"/>
   </object-type>
   <object-type name="QMutexLocker" copyable="no">
-    <modify-function signature="QMutexLocker(QMutex*)" allow-thread="yes">
+    <modify-function signature="QMutexLocker(QBasicMutex*)" allow-thread="yes">
         <modify-argument index="1">
             <reference-count action="set" variable-name="mutex()const0"/>
         </modify-argument>
@@ -2842,9 +2854,7 @@
 
   <!-- Qt5 addition -->
   <object-type name="QBasicMutex">
-    <enum-type name="RecursionMode"/>
     <modify-function signature="lock()" allow-thread="yes"/>
-    <modify-function signature="tryLock(int)" allow-thread="yes"/>
     <modify-function signature="tryLock()" allow-thread="yes"/>
   </object-type>
 
@@ -2852,7 +2862,6 @@
     <enum-type name="RecursionMode"/>
     <modify-function signature="lock()" allow-thread="yes"/>
     <modify-function signature="tryLock(int)" allow-thread="yes"/>
-    <modify-function signature="tryLock()" allow-thread="yes"/>
   </object-type>
   <object-type name="QSemaphore">
     <modify-function signature="acquire(int)" allow-thread="yes"/>
@@ -2921,12 +2930,12 @@
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
-  -->
     <modify-function signature="setCodecForCStrings(QTextCodec*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
+    -->
     <modify-function signature="setCodecForLocale(QTextCodec*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
@@ -2981,7 +2990,7 @@
     <modify-function signature="setData(const char*,int)" remove="all"/>
   </object-type>
   <object-type name="QTimer">
-    <modify-function signature="singleShot(int,QObject*,const char*)">
+    <modify-function signature="singleShot(int,const QObject*,const char*)">
       <inject-code class="target" position="beginning">
         // %FUNCTION_NAME() - disable generation of c++ function call
         (void) %2; // remove warning about unused variable
@@ -3154,6 +3163,7 @@
 -->
   <object-type name="QProcess">
     <enum-type name="ExitStatus"/>
+    <enum-type name="InputChannelMode"/>
     <enum-type name="ProcessChannel"/>
     <enum-type name="ProcessChannelMode"/>
     <enum-type name="ProcessError"/>
@@ -3232,7 +3242,9 @@
     <modify-function signature="flush()" allow-thread="yes"/>
     <modify-function signature="sendEvent(QObject*, QEvent*)" allow-thread="yes"/>
     <modify-function signature="sendPostedEvents(QObject*, int)" allow-thread="yes"/>
+    <!-- Qt5: signature gone
     <modify-function signature="sendPostedEvents()" allow-thread="yes"/>
+    -->
     <modify-function signature="instance()">
       <inject-code class="target">
         QCoreApplication* app = QCoreApplication::instance();
@@ -3248,14 +3260,14 @@
     </modify-function>
 
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
-    <!-- ### Obsolete -->
+    <!-- ### Obsolete
     <modify-function signature="argc()" remove="all"/>
     <modify-function signature="argv()" remove="all"/>
-    <!-- ### -->
+    -->
     <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes">
       <modify-argument index="2" invalidate-after-use="yes"/>
     </modify-function>
-    <modify-function signature="QCoreApplication(int &amp;, char  **)" access="private"/>
+    <modify-function signature="QCoreApplication(int &amp;, char  **, int)" access="private"/>
     <inject-code class="native" file="glue/qcoreapplication_init.cpp" position="beginning" />
     <modify-function signature="postEvent(QObject*,QEvent*)">
       <modify-argument index="2">
@@ -3608,7 +3620,6 @@
     <modify-function signature="operator&lt;&lt;(qulonglong)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(signed short)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(signed int)" remove="all"/>
-    <modify-function signature="operator&lt;&lt;(bool)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(unsigned int)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(unsigned short)" remove="all"/>
     <modify-function signature="operator&lt;&lt;(const char*)" remove="all"/>
@@ -3733,8 +3744,7 @@
     <include file-name="qobjectdefs.h" location="global" />
     <!-- This isn't part of Qt public API -->
     <modify-function signature="connect(const QObject*, int, const QObject*, int, int, int*)" remove="all" />
-    <!-- CT: trying this stuff for the first time (arghh) -->
-    <modify-function signature="connect(const QObject*, int, const QObject*, int, int, int*)" remove="all" />
+    <modify-function signature="getParameterTypes(int *) const" remove="all" />
   </object-type>
   <object-type name="QMetaObject::Connection">
     <include file-name="qobjectdefs.h" location="global" />
@@ -3955,13 +3965,14 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
 
   <object-type name="QState" since="4.6">
     <enum-type name="ChildMode"/>
+    <enum-type name="RestorePolicy"/>
     <modify-function signature="addTransition(QAbstractTransition*)">
       <modify-argument index="1">
         <parent index="this" action="add"/>
       </modify-argument>
     </modify-function>
 
-    <modify-function signature="addTransition(QObject*, const char*, QAbstractState*)">
+    <modify-function signature="addTransition(const QObject*, const char*, QAbstractState*)">
       <modify-argument index="return">
         <parent index="this" action="add"/>
       </modify-argument>