aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside2/plugins')
-rw-r--r--sources/pyside2/plugins/customwidget.cpp20
-rw-r--r--sources/pyside2/plugins/customwidgets.cpp11
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;
}