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>
 
 

16 files changed, 46 insertions, 46 deletions

diff --git a/sources/pyside2/tests/QtCore/qmetaobject_test.py b/sources/pyside2/tests/QtCore/qmetaobject_test.py
index 73ab81c7c..81a3e7015 100644
--- a/sources/pyside2/tests/QtCore/qmetaobject_test.py
+++ b/sources/pyside2/tests/QtCore/qmetaobject_test.py
@@ -60,7 +60,7 @@ class qmetaobject_test(unittest.TestCase):
         f = QFile()
         fm = f.metaObject()
         self.assertEqual(m.methodCount(), fm.methodCount())
-    """        
+    """
 
     def test_DynamicSlotSignal(self):
         o = DynObject()
diff --git a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
index 68f79161d..fdd71957b 100644
--- a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
@@ -59,7 +59,7 @@ class TestQObjectConnectNotify(UsesQCoreApplication):
     '''Test case for QObject::connectNotify'''
     def setUp(self):
         UsesQCoreApplication.setUp(self)
-        self.called = False             
+        self.called = False
 
     def tearDown(self):
         UsesQCoreApplication.tearDown(self)
diff --git a/sources/pyside2/tests/QtCore/qslot_object_test.py b/sources/pyside2/tests/QtCore/qslot_object_test.py
index cfb9e7883..b8d5513ff 100644
--- a/sources/pyside2/tests/QtCore/qslot_object_test.py
+++ b/sources/pyside2/tests/QtCore/qslot_object_test.py
@@ -42,7 +42,7 @@ class objTest(QtCore.QObject):
 
     def slot(self):
         global qApp
- 
+
         self.ok = True
         qApp.quit()
 
@@ -51,8 +51,8 @@ class objTest(QtCore.QObject):
 class slotTest(unittest.TestCase):
     def quit_app(self):
         global qApp
-       
-        qApp.quit() 
+
+        qApp.quit()
 
     def testBasic(self):
         global qApp
diff --git a/sources/pyside2/tests/QtGui/qregion_test.py b/sources/pyside2/tests/QtGui/qregion_test.py
index 3d5c17c36..72cec4bd5 100644
--- a/sources/pyside2/tests/QtGui/qregion_test.py
+++ b/sources/pyside2/tests/QtGui/qregion_test.py
@@ -38,7 +38,7 @@ class QRegionTest(UsesQApplication):
     def testFunctionUnit(self):
         r = QRegion(0, 0, 10, 10)
         r2 = QRegion(5, 5, 10, 10)
- 
+
         ru = r.united(r2)
         self.assertTrue(ru.contains(QPoint(0,0)))
         self.assertTrue(ru.contains(QPoint(5,5)))
diff --git a/sources/pyside2/tests/QtGui/timed_app_test.py b/sources/pyside2/tests/QtGui/timed_app_test.py
index d35e595eb..dc0e7c4b0 100644
--- a/sources/pyside2/tests/QtGui/timed_app_test.py
+++ b/sources/pyside2/tests/QtGui/timed_app_test.py
@@ -28,7 +28,7 @@
 
 import unittest
 
-from helper import TimedQApplication 
+from helper import TimedQApplication
 
 class TestTimedApp(TimedQApplication):
     '''Simple test case for TimedQApplication'''
diff --git a/sources/pyside2/tests/QtQml/bug_726.py b/sources/pyside2/tests/QtQml/bug_726.py
index 310153421..20fa4d196 100755
--- a/sources/pyside2/tests/QtQml/bug_726.py
+++ b/sources/pyside2/tests/QtQml/bug_726.py
@@ -50,7 +50,7 @@ class ProxyObject(QtCore.QObject):
     @QtCore.Slot(str)
     def receivedObject(self, name):
         self._receivedName = name
- 
+
 
 class TestConnectionWithInvalidSignature(TimedQApplication):
 
diff --git a/sources/pyside2/tests/QtQml/bug_997.qml b/sources/pyside2/tests/QtQml/bug_997.qml
index 7d2b7fcc0..f36a7e8f8 100755
--- a/sources/pyside2/tests/QtQml/bug_997.qml
+++ b/sources/pyside2/tests/QtQml/bug_997.qml
@@ -29,6 +29,6 @@
 import QtQuick 2.0
 
 Text {
-    text: owner.name + " " + owner.phone 
+    text: owner.name + " " + owner.phone
     Component.onCompleted: { owner.newName = owner.name }
 }
diff --git a/sources/pyside2/tests/QtScript/bug_1022.py b/sources/pyside2/tests/QtScript/bug_1022.py
index d076b23aa..63866ec3c 100644
--- a/sources/pyside2/tests/QtScript/bug_1022.py
+++ b/sources/pyside2/tests/QtScript/bug_1022.py
@@ -32,7 +32,7 @@ from PySide2.QtCore import *
 from PySide2.QtScript import *
 
 class QScriptValueTest(unittest.TestCase):
-    def testQScriptValue(self): 
+    def testQScriptValue(self):
         app = QCoreApplication([])
         engine = QScriptEngine()
         repr(engine.evaluate('1 + 1'))
diff --git a/sources/pyside2/tests/QtSvg/tiger.svg b/sources/pyside2/tests/QtSvg/tiger.svg
index 983e57026..681fbd209 100644
--- a/sources/pyside2/tests/QtSvg/tiger.svg
+++ b/sources/pyside2/tests/QtSvg/tiger.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
          "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/sources/pyside2/tests/QtWidgets/bug_307.py b/sources/pyside2/tests/QtWidgets/bug_307.py
index 4e5ecab45..0a0e9faa5 100644
--- a/sources/pyside2/tests/QtWidgets/bug_307.py
+++ b/sources/pyside2/tests/QtWidgets/bug_307.py
@@ -37,9 +37,9 @@ class Test (QApplication) :
     def __init__(self, argv) :
         super(Test, self).__init__(argv)
         self._called = False
-        
+
     def called(self):
-        self._called = True        
+        self._called = True
 
 
 class QApplicationSignalsTest(unittest.TestCase):
@@ -49,6 +49,6 @@ class QApplicationSignalsTest(unittest.TestCase):
         app.connect(button, SIGNAL("clicked()"), app.called)
         button.click()
         self.assertTrue(app._called)
-        
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside2/tests/QtWidgets/bug_338.py b/sources/pyside2/tests/QtWidgets/bug_338.py
index 27957a032..e51cb1523 100644
--- a/sources/pyside2/tests/QtWidgets/bug_338.py
+++ b/sources/pyside2/tests/QtWidgets/bug_338.py
@@ -47,9 +47,9 @@ class BugTest(unittest.TestCase):
         scene = QtWidgets.QGraphicsScene()
         item = DiagramItem()
         item2 = DiagramItem()
-        #this cause segfault 
+        #this cause segfault
         scene.addItem(item)
         scene.addItem(item2)
-  
+
 if __name__ == "__main__":
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/sources/pyside2/tests/QtWidgets/bug_688.py b/sources/pyside2/tests/QtWidgets/bug_688.py
index 716d88df3..2bab2050a 100644
--- a/sources/pyside2/tests/QtWidgets/bug_688.py
+++ b/sources/pyside2/tests/QtWidgets/bug_688.py
@@ -38,20 +38,20 @@ class BugTest(UsesQApplication):
         editor = QTextEdit()
         cursor = QTextCursor(editor.textCursor())
         cursor.movePosition(QTextCursor.Start)
-   
+
         mainFrame = cursor.currentFrame()
-        
+
         plainCharFormat = QTextCharFormat()
         boldCharFormat = QTextCharFormat()
         boldCharFormat.setFontWeight(QFont.Bold);
         cursor.insertText("""
-                          Text documents are represented by the 
-                          QTextDocument class, rather than by QString objects. 
-                          Each QTextDocument object contains information about 
-                          the document's internal representation, its structure, 
-                          and keeps track of modifications to provide undo/redo 
-                          facilities. This approach allows features such as the 
-                          layout management to be delegated to specialized 
+                          Text documents are represented by the
+                          QTextDocument class, rather than by QString objects.
+                          Each QTextDocument object contains information about
+                          the document's internal representation, its structure,
+                          and keeps track of modifications to provide undo/redo
+                          facilities. This approach allows features such as the
+                          layout management to be delegated to specialized
                           classes, but also provides a focus for the framework.""",
                           plainCharFormat)
 
@@ -62,28 +62,28 @@ class BugTest(UsesQApplication):
         cursor.insertFrame(frameFormat)
 
         cursor.insertText("""
-                          Documents are either converted from external sources 
-                          or created from scratch using Qt. The creation process 
-                          can done by an editor widget, such as QTextEdit, or by 
+                          Documents are either converted from external sources
+                          or created from scratch using Qt. The creation process
+                          can done by an editor widget, such as QTextEdit, or by
                           explicit calls to the Scribe API.""",
                           boldCharFormat)
 
         cursor = mainFrame.lastCursorPosition()
         cursor.insertText("""
-                          There are two complementary ways to visualize the 
-                          contents of a document: as a linear buffer that is 
-                          used by editors to modify the contents, and as an 
-                          object hierarchy containing structural information 
-                          that is useful to layout engines. In the hierarchical 
-                          model, the objects generally correspond to visual 
-                          elements such as frames, tables, and lists. At a lower 
-                          level, these elements describe properties such as the 
-                          style of text used and its alignment. The linear 
-                          representation of the document is used for editing and 
+                          There are two complementary ways to visualize the
+                          contents of a document: as a linear buffer that is
+                          used by editors to modify the contents, and as an
+                          object hierarchy containing structural information
+                          that is useful to layout engines. In the hierarchical
+                          model, the objects generally correspond to visual
+                          elements such as frames, tables, and lists. At a lower
+                          level, these elements describe properties such as the
+                          style of text used and its alignment. The linear
+                          representation of the document is used for editing and
                           manipulation of the document's contents.""",
                           plainCharFormat)
 
-        
+
         frame = cursor.currentFrame()
 
         items = []
@@ -110,7 +110,7 @@ class BugTest(UsesQApplication):
             b.__isub__(1)
             i -= 1
 
-        
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/sources/pyside2/tests/QtWidgets/qfontdialog_test.py b/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
index dd9980c90..09e9b7173 100644
--- a/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
+++ b/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
@@ -42,7 +42,7 @@ class TestFontDialog(TimedQApplication):
 
     def testGetFontQDialog(self):
         QtWidgets.QFontDialog.getFont(QtGui.QFont("FreeSans",10))
-    
+
     def testGetFontQDialogQString(self):
         QtWidgets.QFontDialog.getFont(QtGui.QFont("FreeSans",10), None, "Select font")
 
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
index 7565fd99a..345ea7c45 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
@@ -36,13 +36,13 @@ from PySide2 import QtWidgets
 from helper import UsesQApplication
 
 class Item(QtWidgets.QGraphicsItem):
-    
+
     def __init__(self):
         QtWidgets.QGraphicsItem.__init__(self)
 
     def boundingRect(self):
         return QtCore.QRectF(0, 0, 100, 100)
-    
+
     def paint(self, painter, option, widget):
         painter.setBrush(QtGui.QColor(255, 255, 255))
         painter.drawRect(0, 0, 100, 100)
diff --git a/sources/pyside2/tests/QtWidgets/reference_count_test.py b/sources/pyside2/tests/QtWidgets/reference_count_test.py
index 836020ad9..c2a0ec979 100644
--- a/sources/pyside2/tests/QtWidgets/reference_count_test.py
+++ b/sources/pyside2/tests/QtWidgets/reference_count_test.py
@@ -75,7 +75,7 @@ class ReferenceCount(UsesQApplication):
         global destroyedPol
 
         self.beforeTest()
-        
+
         rect = self.scene.addRect(10.0, 10.0, 10.0, 10.0)
         self.assertTrue(isinstance(rect, QGraphicsRectItem))
 
diff --git a/sources/pyside2/tests/pysidetest/curr_errors.txt b/sources/pyside2/tests/pysidetest/curr_errors.txt
index 83b6e6212..a02da203d 100644
--- a/sources/pyside2/tests/pysidetest/curr_errors.txt
+++ b/sources/pyside2/tests/pysidetest/curr_errors.txt
@@ -6,7 +6,7 @@ Fixing class inheritance...                  [OK]
 Detecting inconsistencies in class model...  [OK]
 [OK]
     type 'QPyTextObject' is specified in typesystem, but not defined. This could potentially lead to compilation errors.
-    
+
 
 
 Done, 1 warnings (1051 known issues)