From 380c65e62de0e60da667dc0d87935171b91b9c6c Mon Sep 17 00:00:00 2001
From: Christian Tismer <tismer@stackless.com>
Date: Sun, 16 Jun 2019 12:05:39 +0200
Subject: 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>
---
 sources/shiboken2/libshiboken/sbkdbg.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'sources/shiboken2/libshiboken/sbkdbg.h')

diff --git a/sources/shiboken2/libshiboken/sbkdbg.h b/sources/shiboken2/libshiboken/sbkdbg.h
index fdaf2a27a..02ea773ac 100644
--- a/sources/shiboken2/libshiboken/sbkdbg.h
+++ b/sources/shiboken2/libshiboken/sbkdbg.h
@@ -63,20 +63,20 @@
 class BaseLogger
 {
 public:
-    BaseLogger(const BaseLogger&) = delete;
-    BaseLogger(BaseLogger&&) = delete;
-    BaseLogger& operator=(const BaseLogger&) = delete;
-    BaseLogger& operator=(BaseLogger&&) = delete;
+    BaseLogger(const BaseLogger &) = delete;
+    BaseLogger(BaseLogger &&) = delete;
+    BaseLogger &operator=(const BaseLogger &) = delete;
+    BaseLogger &operator=(BaseLogger &&) = delete;
 
-    BaseLogger(std::ostream& output, const char* function, const char* context)
+    BaseLogger(std::ostream &output, const char *function, const char *context)
         : m_stream(output), m_function(function), m_context(context) {}
     ~BaseLogger()
     {
         m_stream << std::endl;
     }
-    std::ostream& operator()() { return m_stream; };
+    std::ostream &operator()() { return m_stream; };
     template <typename T>
-    std::ostream& operator<<(const T& t)
+    std::ostream &operator<<(const T &t)
     {
         m_stream << '[';
         if (m_context[0])
@@ -84,24 +84,24 @@ public:
         return m_stream << COLOR_WHITE << m_function << COLOR_END << "] " << t;
     }
 private:
-    std::ostream& m_stream;
-    const char* m_function;
-    const char* m_context;
+    std::ostream &m_stream;
+    const char *m_function;
+    const char *m_context;
 };
 
-inline std::ostream& operator<<(std::ostream& out, PyObject* obj)
+inline std::ostream &operator<<(std::ostream &out, PyObject *obj)
 {
-    PyObject* repr = Shiboken::Object::isValid(obj, false) ? PyObject_Repr(obj) : 0;
+    PyObject *repr = Shiboken::Object::isValid(obj, false) ? PyObject_Repr(obj) : 0;
     if (repr) {
 #ifdef IS_PY3K
-        PyObject* str = PyUnicode_AsUTF8String(repr);
+        PyObject *str = PyUnicode_AsUTF8String(repr);
         Py_DECREF(repr);
         repr = str;
 #endif
         out << PyBytes_AS_STRING(repr);
         Py_DECREF(repr);
     } else {
-        out << reinterpret_cast<void*>(obj);
+        out << reinterpret_cast<void *>(obj);
     }
     return out;
 }
@@ -109,7 +109,7 @@ inline std::ostream& operator<<(std::ostream& out, PyObject* obj)
 class _SbkDbg : public BaseLogger
 {
 public:
-    _SbkDbg(const char* function, const char* context = "") : BaseLogger(std::cout, function, context) {}
+    _SbkDbg(const char *function, const char *context = "") : BaseLogger(std::cout, function, context) {}
 };
 
 #ifdef __GNUG__
@@ -122,7 +122,7 @@ public:
 
 struct SbkDbg {
     template <typename T>
-    SbkDbg& operator<<(const T&) { return *this; }
+    SbkDbg &operator<<(const T &) { return *this; }
 };
 
 #endif
-- 
cgit v1.2.3