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/plugins/customwidgets.cpp | |
| 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/plugins/customwidgets.cpp')
| -rw-r--r-- | sources/pyside2/plugins/customwidgets.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sources/pyside2/plugins/customwidgets.cpp b/sources/pyside2/plugins/customwidgets.cpp index 58d2a518c..e78dde206 100644 --- a/sources/pyside2/plugins/customwidgets.cpp +++ b/sources/pyside2/plugins/customwidgets.cpp @@ -43,21 +43,20 @@ struct PyCustomWidgetPrivate { - PyObject* pyObject; + PyObject *pyObject; bool initialized; }; struct PyCustomWidgetsPrivate { - QList<QDesignerCustomWidgetInterface*> widgets; + QList<QDesignerCustomWidgetInterface *> widgets; ~PyCustomWidgetsPrivate(); }; PyCustomWidgetsPrivate::~PyCustomWidgetsPrivate() { - foreach(QDesignerCustomWidgetInterface* iface, widgets) - delete iface; + qDeleteAll(widgets); widgets.clear(); } @@ -71,12 +70,12 @@ PyCustomWidgets::~PyCustomWidgets() delete m_data; } -void PyCustomWidgets::registerWidgetType(PyObject* widget) +void PyCustomWidgets::registerWidgetType(PyObject *widget) { m_data->widgets.append(new PyCustomWidget(widget)); } -QList<QDesignerCustomWidgetInterface*> PyCustomWidgets::customWidgets() const +QList<QDesignerCustomWidgetInterface *> PyCustomWidgets::customWidgets() const { return m_data->widgets; } |