aboutsummaryrefslogtreecommitdiffstats
path: root/libpyside/pysideslot.cpp
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-10-03 18:49:42 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:56:08 -0300
commit1e29ab65924166688e352eaaa099ad571a980c4f (patch)
tree2a7ae3cb38b33a3211c9cec0da70016dd5d44c1d /libpyside/pysideslot.cpp
parenta2cb6fe0254a122f0ad9d2ee991d9a249903ee12 (diff)
Initia QtCore port to python3.
Diffstat (limited to 'libpyside/pysideslot.cpp')
-rw-r--r--libpyside/pysideslot.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/libpyside/pysideslot.cpp b/libpyside/pysideslot.cpp
index 16b891bd0..d2aba108d 100644
--- a/libpyside/pysideslot.cpp
+++ b/libpyside/pysideslot.cpp
@@ -46,8 +46,7 @@ static PyObject* slotCall(PyObject*, PyObject*, PyObject*);
// Class Definition -----------------------------------------------
static PyTypeObject PySideSlotType = {
- PyObject_HEAD_INIT(NULL)
- 0, /*ob_size*/
+ PyVarObject_HEAD_INIT(0, 0)
"PySide.QtCore."SLOT_DEC_NAME, /*tp_name*/
sizeof(PySideSlot), /*tp_basicsize*/
0, /*tp_itemsize*/
@@ -150,7 +149,7 @@ PyObject* slotCall(PyObject* self, PyObject* args, PyObject* kw)
if (!data->slotName) {
PyObject *funcName = reinterpret_cast<PyFunctionObject*>(callback)->func_name;
- data->slotName = strdup(PyString_AS_STRING(funcName));
+ data->slotName = strdup(Shiboken::String::toCString(funcName));
}
@@ -159,9 +158,9 @@ PyObject* slotCall(PyObject* self, PyObject* args, PyObject* kw)
signature = returnType + " " + signature;
if (!pySlotName)
- pySlotName = PyString_FromString(PYSIDE_SLOT_LIST_ATTR);
+ pySlotName = Shiboken::String::fromCString(PYSIDE_SLOT_LIST_ATTR);
- PyObject *pySignature = PyString_FromString(signature);
+ PyObject *pySignature = Shiboken::String::fromCString(signature);
PyObject *signatureList = 0;
if (PyObject_HasAttr(callback, pySlotName)) {
signatureList = PyObject_GetAttr(callback, pySlotName);