Cleanup pointer whitespace everywhere

Among other files to fix, basewrapper.(cpp|h) was full of uncommon
pointer whitespace. After fixing that, I could not resist and fixed
also libshiboken, generators, and after acceptance also PySide.

Most of the time, this regex worked fine

   (\w\w+)([*&]+)[ ]*(?![&*]*[/=])

replaced with

    \1 \2

but everything was checked by hand.

I did not touch the shiboken tests which are quite hairy.

It turned out that inserting a space between a variable and asterisk
causes a crash of shiboken, if the same line contains "CONVERTTOCPP".
This was temporarily fixed by adding another space after it.
Example..

sources/pyside2/PySide2/glue/qtcore.cpp line 977

    QByteArray * cppSelf = %CONVERTTOCPP[QByteArray *](obj);
    //XXX      /|\ omitting this space crashes shiboken!

cppgenerator.cpp was special, since it was modified to _generate_
correct pointer whitespace. This caused a few testcases to fail,
which had to be adjusted, again. This was difficult since some
internal names must end on "*" and generated code normally not.
Removing the last errors involved binary search on path sets...

Apply C++ 11 fixits to the changed code, where applicable.

Done-with: Friedemann.Kleint@qt.io
Task-number: PYSIDE-1037
Change-Id: I4ac070f52c5efb296c05d581c9d46e6f397a6c81
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 
 

1 files changed, 12 insertions, 12 deletions

diff --git a/sources/shiboken2/libshiboken/sbkstring.h b/sources/shiboken2/libshiboken/sbkstring.h
index a6b5fbeed..ec674ee7b 100644
--- a/sources/shiboken2/libshiboken/sbkstring.h
+++ b/sources/shiboken2/libshiboken/sbkstring.h
@@ -53,18 +53,18 @@ namespace Shiboken
 {
 namespace String
 {
-    LIBSHIBOKEN_API bool check(PyObject* obj);
-    LIBSHIBOKEN_API bool checkType(PyTypeObject* obj);
-    LIBSHIBOKEN_API bool checkChar(PyObject* obj);
-    LIBSHIBOKEN_API bool isConvertible(PyObject* obj);
-    LIBSHIBOKEN_API PyObject* fromCString(const char* value);
-    LIBSHIBOKEN_API PyObject* fromCString(const char* value, int len);
-    LIBSHIBOKEN_API const char* toCString(PyObject* str, Py_ssize_t* len = 0);
-    LIBSHIBOKEN_API bool concat(PyObject** val1, PyObject* val2);
-    LIBSHIBOKEN_API PyObject* fromFormat(const char* format, ...);
-    LIBSHIBOKEN_API PyObject* fromStringAndSize(const char* str, Py_ssize_t size);
-    LIBSHIBOKEN_API int compare(PyObject* val1, const char* val2);
-    LIBSHIBOKEN_API Py_ssize_t len(PyObject* str);
+    LIBSHIBOKEN_API bool check(PyObject *obj);
+    LIBSHIBOKEN_API bool checkType(PyTypeObject *obj);
+    LIBSHIBOKEN_API bool checkChar(PyObject *obj);
+    LIBSHIBOKEN_API bool isConvertible(PyObject *obj);
+    LIBSHIBOKEN_API PyObject *fromCString(const char *value);
+    LIBSHIBOKEN_API PyObject *fromCString(const char *value, int len);
+    LIBSHIBOKEN_API const char *toCString(PyObject *str, Py_ssize_t *len = 0);
+    LIBSHIBOKEN_API bool concat(PyObject **val1, PyObject *val2);
+    LIBSHIBOKEN_API PyObject *fromFormat(const char *format, ...);
+    LIBSHIBOKEN_API PyObject *fromStringAndSize(const char *str, Py_ssize_t size);
+    LIBSHIBOKEN_API int compare(PyObject *val1, const char *val2);
+    LIBSHIBOKEN_API Py_ssize_t len(PyObject *str);
 
 } // namespace String
 } // namespace Shiboken