aboutsummaryrefslogtreecommitdiffstats
path: root/libpyside/qslot.cpp
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-10-06 18:19:42 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2010-10-07 11:44:07 -0300
commita43eafaae46060adfc6e0f15fb14b56c6c887494 (patch)
tree5dcd1ef9e57ba14964931419237807daf25e890e /libpyside/qslot.cpp
parent1a10971865153e252d99b19018b5f2444e06a0eb (diff)
Don't export symbols that don't need to be exported and rename many functions.
Diffstat (limited to 'libpyside/qslot.cpp')
-rw-r--r--libpyside/qslot.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/libpyside/qslot.cpp b/libpyside/qslot.cpp
index 273de2721..762f85f28 100644
--- a/libpyside/qslot.cpp
+++ b/libpyside/qslot.cpp
@@ -21,9 +21,9 @@
*/
#include <shiboken.h>
-#include "dynamicqmetaobject_p.h"
-
#include <QString>
+#include "dynamicqmetaobject_p.h"
+#include "qsignal_p.h"
#define SLOT_DEC_NAME "Slot"
@@ -41,10 +41,6 @@ extern "C"
static int slot_init(PyObject*, PyObject*, PyObject*);
static PyObject* slot_call(PyObject*, PyObject*, PyObject*);
-//external qsignal.cpp
-extern char* get_type_name(PyObject*);
-
-
// Class Definition -----------------------------------------------
static PyTypeObject Slot_Type = {
PyObject_HEAD_INIT(NULL)
@@ -124,7 +120,7 @@ int slot_init(PyObject *self, PyObject *args, PyObject *kw)
SlotData *data = reinterpret_cast<SlotData*>(self);
for(Py_ssize_t i = 0, i_max = PyTuple_Size(args); i < i_max; i++) {
PyObject *argType = PyTuple_GET_ITEM(args, i);
- char *typeName = get_type_name(argType);
+ char *typeName = PySide::getTypeName(argType);
if (typeName) {
if (data->args) {
data->args = reinterpret_cast<char*>(realloc(data->args, (strlen(data->args) + 1 + strlen(typeName)) * sizeof(char*)));
@@ -141,7 +137,7 @@ int slot_init(PyObject *self, PyObject *args, PyObject *kw)
data->slotName = strdup(argName);
if (argResult)
- data->resultType = get_type_name(argResult);
+ data->resultType = PySide::getTypeName(argResult);
else
data->resultType = strdup("void");