diff options
author | Christian Tismer <tismer@stackless.com> | 2019-06-16 12:05:39 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-24 11:25:31 +0200 |
commit | 380c65e62de0e60da667dc0d87935171b91b9c6c (patch) | |
tree | 480c872f247316a66e446ba196a5bd1a339a0bcd /sources/pyside2/libpyside/globalreceiverv2.h | |
parent | 992ff1f7925009b7ead6d6f005cafcf2e57ed44e (diff) |
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>
Diffstat (limited to 'sources/pyside2/libpyside/globalreceiverv2.h')
-rw-r--r-- | sources/pyside2/libpyside/globalreceiverv2.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sources/pyside2/libpyside/globalreceiverv2.h b/sources/pyside2/libpyside/globalreceiverv2.h index b92be93a8..433f587a9 100644 --- a/sources/pyside2/libpyside/globalreceiverv2.h +++ b/sources/pyside2/libpyside/globalreceiverv2.h @@ -82,8 +82,8 @@ public: /** * Reimplemented function from QObject **/ - int qt_metacall(QMetaObject::Call call, int id, void** args) override; - const QMetaObject* metaObject() const override; + int qt_metacall(QMetaObject::Call call, int id, void **args) override; + const QMetaObject *metaObject() const override; /** * Add a extra slot to this object @@ -91,7 +91,7 @@ public: * @param signature The signature of the slot to be added * @return The index of this slot on metaobject **/ - int addSlot(const char* signature); + int addSlot(const char *signature); /** * Notify to GlobalReceiver about when a new connection was made @@ -103,14 +103,14 @@ public: * * @param link This is a optional paramenter used to link the ref to some QObject life **/ - void incRef(const QObject* link = 0); + void incRef(const QObject *link = nullptr); /** * Used to decrement the reference of the GlobalReceiver object * * @param link This is a optional paramenter used to dismiss the link ref to some QObject **/ - void decRef(const QObject* link = 0); + void decRef(const QObject *link = nullptr); /* * Return the count of refs which the GlobalReceiver has @@ -118,7 +118,7 @@ public: * @param link If any QObject was passed, the function return the number of references relative to this 'link' object * @return The number of references **/ - int refCount(const QObject* link) const; + int refCount(const QObject *link) const; /** * Use to retrieve the unique hash of this GlobalReceiver object @@ -133,7 +133,7 @@ public: * @param callback The Python callable object used to calculate the id * @return a string with a unique id based on GlobalReceiver contents **/ - static QByteArray hash(PyObject* callback); + static QByteArray hash(PyObject *callback); const MetaObjectBuilder &metaObjectBuilder() const { return m_metaObject; } MetaObjectBuilder &metaObjectBuilder() { return m_metaObject; } @@ -141,7 +141,7 @@ public: private: MetaObjectBuilder m_metaObject; DynamicSlotDataV2 *m_data; - QList<const QObject*> m_refs; + QList<const QObject *> m_refs; SharedMap m_sharedMap; }; |