From 254d365d5c8017a63916bf524c69313cefdeccb2 Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Mon, 4 Oct 2010 18:59:17 -0300 Subject: Use QByteArray instead of QString in some internal QLayout functions. As only latin1 chars are expected, we don't need waste memory with QString. --- PySide/QtGui/glue/qlayout_help_functions.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PySide/QtGui/glue/qlayout_help_functions.h b/PySide/QtGui/glue/qlayout_help_functions.h index 9e07ff5d3..e62077a73 100644 --- a/PySide/QtGui/glue/qlayout_help_functions.h +++ b/PySide/QtGui/glue/qlayout_help_functions.h @@ -3,10 +3,10 @@ void addLayoutOwnership(QLayout *layout, QLayoutItem *item); -inline QString retrieveObjectName(PyObject *obj) +inline QByteArray retrieveObjectName(PyObject *obj) { Shiboken::AutoDecRef objName(PyObject_Str(obj)); - return QString(PyString_AsString(objName)); + return PyString_AsString(objName); } inline void addLayoutOwnership(QLayout *layout, QWidget *widget) @@ -18,7 +18,7 @@ inline void addLayoutOwnership(QLayout *layout, QWidget *widget) //keep the reference while the layout is orphan Shiboken::AutoDecRef pyParent(Shiboken::Converter::toPython(layout)); Shiboken::AutoDecRef pyChild(Shiboken::Converter::toPython(widget)); - Shiboken::keepReference(reinterpret_cast(pyParent.object()), qPrintable(retrieveObjectName(pyParent)), pyChild, true); + Shiboken::keepReference(reinterpret_cast(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true); } else { Shiboken::AutoDecRef pyParent(Shiboken::Converter::toPython(parent)); Shiboken::AutoDecRef pyChild(Shiboken::Converter::toPython(widget)); @@ -34,7 +34,7 @@ inline void addLayoutOwnership(QLayout *layout, QLayout *other) //keep the reference while the layout is orphan Shiboken::AutoDecRef pyParent(Shiboken::Converter::toPython(layout)); Shiboken::AutoDecRef pyChild(Shiboken::Converter::toPython(other)); - Shiboken::keepReference(reinterpret_cast(pyParent.object()), qPrintable(retrieveObjectName(pyParent)), pyChild, true); + Shiboken::keepReference(reinterpret_cast(pyParent.object()), retrieveObjectName(pyParent).data(), pyChild, true); return; } -- cgit v1.2.3