Cleanup pointer and trailing whitespace (omissions)

The "Cleanup pointer whitespace" patch was augmented by some
C++11 changes.

Unfortunately, this was done in the same commit, and so some old
whitespace that was removed could re-appear invisibly, since it
was in the original version.

This fix tries to remove all trailing whitespace and also adds a few
" *" corrections that were lost. The "type *" entries in XML files were
changed back to "type*".

Change-Id: Ic5c945ad64a47455fb15eebdf184b126af5ecd1d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
 
 

6 files changed, 17 insertions, 17 deletions

diff --git a/sources/pyside2/PySide2/QtConcurrent/curr_errors.txt b/sources/pyside2/PySide2/QtConcurrent/curr_errors.txt
index 827ebea5c..d8405c755 100644
--- a/sources/pyside2/PySide2/QtConcurrent/curr_errors.txt
+++ b/sources/pyside2/PySide2/QtConcurrent/curr_errors.txt
@@ -3,7 +3,7 @@ Generating enum model...                     [OK]
 Generating namespace model...                [WARNING]
     enum 'QtConcurrent::ThreadFunctionResult' does not have a type entry or is not an enum
     enum 'QtConcurrent::ReduceQueueThrottleLimit' does not have a type entry or is not an enum
-    
+
 
 Resolving typedefs...                        [OK]
 Fixing class inheritance...                  [OK]
@@ -14,7 +14,7 @@ Done, 2 warnings (506 known issues)
 Scanning dependencies of target QtConcurrent
 [ 21%] Building CXX object PySide/QtConcurrent/CMakeFiles/QtConcurrent.dir/PySide/QtConcurrent/qtconcurrent_module_wrapper.cpp.o
 In file included from /Users/tismer/src/pyside-setup2/pyside_build/py3.4-qt5.4.2-64bit-debug/pyside/PySide/QtConcurrent/PySide/QtConcurrent/qtconcurrent_module_wrapper.cpp:30:
-/Users/tismer/src/pyside-setup2/pyside_build/py3.4-qt5.4.2-64bit-debug/pyside/PySide/QtConcurrent/PySide/QtConcurrent/pyside_qtconcurrent_python.h:44:10: fatal error: 
+/Users/tismer/src/pyside-setup2/pyside_build/py3.4-qt5.4.2-64bit-debug/pyside/PySide/QtConcurrent/PySide/QtConcurrent/pyside_qtconcurrent_python.h:44:10: fatal error:
       'qtconcurrentexception.h' file not found
 #include <qtconcurrentexception.h>
          ^
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 67270ea67..efb68a310 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -903,7 +903,7 @@
     <!-- get* methods. Inject code -->
     <modify-function signature="getCmyk(int*,int*,int*,int*,int*)">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>
@@ -930,7 +930,7 @@
     </modify-function>
     <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>
@@ -957,7 +957,7 @@
     </modify-function>
     <modify-function signature="getHsl(int*,int*,int*,int*)const" since="4.6">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>
@@ -980,7 +980,7 @@
     </modify-function>
     <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const" since="4.6">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>
@@ -1003,7 +1003,7 @@
     </modify-function>
     <modify-function signature="getHsv(int*,int*,int*,int*)const">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>
@@ -1026,7 +1026,7 @@
     </modify-function>
     <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>
@@ -1049,7 +1049,7 @@
     </modify-function>
     <modify-function signature="getRgb(int*,int*,int*,int*)const">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>
@@ -1072,7 +1072,7 @@
     </modify-function>
     <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index 2e69f98e0..f7ac67857 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -177,13 +177,13 @@
       <enum-type name="Status"/>
       <modify-function signature="setViewfinder(QVideoWidget*)">
         <modify-argument index="1">
-            <replace-type modified-type="QObject *"/>
+            <replace-type modified-type="QObject*"/>
         </modify-argument>
         <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
       </modify-function>
       <modify-function signature="setViewfinder(QGraphicsVideoItem*)">
         <modify-argument index="1">
-            <replace-type modified-type="QObject *"/>
+            <replace-type modified-type="QObject*"/>
         </modify-argument>
         <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
       </modify-function>
@@ -272,13 +272,13 @@
       <enum-type name="Error"/>
       <modify-function signature="setVideoOutput(QVideoWidget*)">
         <modify-argument index="1">
-            <replace-type modified-type="QObject *"/>
+            <replace-type modified-type="QObject*"/>
         </modify-argument>
         <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
       </modify-function>
       <modify-function signature="setVideoOutput(QGraphicsVideoItem*)">
         <modify-argument index="1">
-            <replace-type modified-type="QObject *"/>
+            <replace-type modified-type="QObject*"/>
         </modify-argument>
         <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
       </modify-function>
diff --git a/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp b/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp
index 7278edff3..a042ac2cc 100644
--- a/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp
+++ b/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp
@@ -153,7 +153,7 @@ void registerTypeIfInheritsFromClass(
                       ::Construct,
                     sizeof(QQmlListProperty<WrapperClass>),
                     static_cast< ::QFlags<QMetaType::TypeFlag> >(
-                        QtPrivate::QMetaTypeTypeFlags<QQmlListProperty<WrapperClass> >::Flags),                    
+                        QtPrivate::QMetaTypeTypeFlags<QQmlListProperty<WrapperClass> >::Flags),
                     nullptr);
         if (lstType == -1) {
             PyErr_Format(PyExc_TypeError, "Meta type registration of \"%s\" for QML usage failed.",
diff --git a/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml b/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml
index b77e06573..b272eec19 100644
--- a/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml
+++ b/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml
@@ -46,7 +46,7 @@
     <load-typesystem name="QtQml/typesystem_qml.xml" generate="no"/>
     <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/>
 
-    
+
     <object-type name="QQuickWidget">
         <enum-type name="ResizeMode"/>
         <enum-type name="Status"/>
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 207c3e831..23fb4857e 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -2676,7 +2676,7 @@
     <modify-function signature="del()" rename="del_"/>
     <modify-function signature="getTextMargins(int*,int*,int*,int*)const">
         <modify-argument index="0">
-            <replace-type modified-type="PyObject *"/>
+            <replace-type modified-type="PyObject*"/>
         </modify-argument>
         <modify-argument index="1">
             <remove-argument/>