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 | |
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')
-rw-r--r-- | sources/pyside2/plugins/customwidget.cpp | 20 | ||||
-rw-r--r-- | sources/pyside2/plugins/customwidgets.cpp | 11 |
2 files changed, 15 insertions, 16 deletions
diff --git a/sources/pyside2/plugins/customwidget.cpp b/sources/pyside2/plugins/customwidget.cpp index f3ce09b62..6a6d7a3be 100644 --- a/sources/pyside2/plugins/customwidget.cpp +++ b/sources/pyside2/plugins/customwidget.cpp @@ -43,11 +43,11 @@ struct PyCustomWidgetPrivate { - PyObject* pyObject; + PyObject *pyObject; bool initialized; }; -PyCustomWidget::PyCustomWidget(PyObject* objectType) +PyCustomWidget::PyCustomWidget(PyObject *objectType) : m_data(new PyCustomWidgetPrivate()) { m_data->pyObject = objectType; @@ -104,13 +104,13 @@ QString PyCustomWidget::whatsThis() const return QString(); } -QWidget* PyCustomWidget::createWidget(QWidget* parent) +QWidget *PyCustomWidget::createWidget(QWidget *parent) { //Create a python instance and return cpp object - PyObject* pyParent; + PyObject *pyParent; bool unkowParent = false; if (parent) { - pyParent = reinterpret_cast<PyObject*>(Shiboken::BindingManager::instance().retrieveWrapper(parent)); + pyParent = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(parent)); if (pyParent) { Py_INCREF(pyParent); } else { @@ -127,22 +127,22 @@ QWidget* PyCustomWidget::createWidget(QWidget* parent) PyTuple_SET_ITEM(pyArgs, 0, pyParent); //tuple will keep pyParent reference //Call python constructor - SbkObject* result = reinterpret_cast<SbkObject*>(PyObject_CallObject(m_data->pyObject, pyArgs)); + auto result = reinterpret_cast<SbkObject *>(PyObject_CallObject(m_data->pyObject, pyArgs)); - QWidget* widget = 0; + QWidget *widget = nullptr; if (result) { if (unkowParent) //if parent does not exists in python, transfer the ownership to cpp Shiboken::Object::releaseOwnership(result); else - Shiboken::Object::setParent(pyParent, reinterpret_cast<PyObject*>(result)); + Shiboken::Object::setParent(pyParent, reinterpret_cast<PyObject *>(result)); - widget = reinterpret_cast<QWidget*>(Shiboken::Object::cppPointer(result, Py_TYPE(result))); + widget = reinterpret_cast<QWidget *>(Shiboken::Object::cppPointer(result, Py_TYPE(result))); } return widget; } -void PyCustomWidget::initialize(QDesignerFormEditorInterface* core) +void PyCustomWidget::initialize(QDesignerFormEditorInterface *core) { m_data->initialized = true; } 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; } |