diff options
| -rw-r--r-- | libpyside/qsignal.cpp | 6 | ||||
| -rw-r--r-- | libpyside/qslot.cpp | 2 | ||||
| -rw-r--r-- | tests/signals/decorators_test.py | 12 | ||||
| -rwxr-xr-x | tests/signals/ref01_test.py | 6 | ||||
| -rwxr-xr-x | tests/signals/ref04_test.py | 4 | ||||
| -rwxr-xr-x | tests/signals/ref05_test.py | 4 | ||||
| -rwxr-xr-x | tests/signals/ref06_test.py | 6 | ||||
| -rw-r--r-- | tests/signals/signal_autoconnect_test.py | 2 | ||||
| -rw-r--r-- | tests/signals/signal_object_test.py | 12 |
9 files changed, 26 insertions, 28 deletions
diff --git a/libpyside/qsignal.cpp b/libpyside/qsignal.cpp index f5c132921..159d8c2d0 100644 --- a/libpyside/qsignal.cpp +++ b/libpyside/qsignal.cpp @@ -39,7 +39,7 @@ #include "qsignal.h" #include "signalmanager.h" -#define SIGNAL_CLASS_NAME "Signal" +#define SIGNAL_CLASS_NAME "signal" namespace PySide { @@ -402,7 +402,6 @@ PyObject* signal_instance_connect(PyObject* self, PyObject* args, PyObject* kwds while(sourceWalk && !match) { targetWalk = reinterpret_cast<SignalInstanceData*>(slot); while(targetWalk && !match) { - printf("sig [%s] [%s]\n", sourceWalk->signature, targetWalk->signature); if (QMetaObject::checkConnectArgs(sourceWalk->signature, targetWalk->signature)) { PyList_Append(pyArgs, sourceWalk->source); Shiboken::AutoDecRef sourceSignature(PyString_FromString(sourceWalk->signature)); @@ -436,7 +435,6 @@ PyObject* signal_instance_connect(PyObject* self, PyObject* args, PyObject* kwds return PyObject_CallObject(pyMethod, tupleArgs); } - printf("signatures not match\n"); return 0; } @@ -503,7 +501,7 @@ PyObject* signal_instance_emit(PyObject* self, PyObject* args) PyObject* signalNew(const char* name, ...) { va_list listSignatures; - char* sig; + char* sig = 0; SignalData* self = PyObject_New(SignalData, &Signal_Type); self->signalName = strdup(name); self->signaturesSize = 0; diff --git a/libpyside/qslot.cpp b/libpyside/qslot.cpp index e74838cf4..db8f50052 100644 --- a/libpyside/qslot.cpp +++ b/libpyside/qslot.cpp @@ -37,7 +37,7 @@ #include <QString> -#define SLOT_DEC_NAME "Slot" +#define SLOT_DEC_NAME "slot" typedef struct { diff --git a/tests/signals/decorators_test.py b/tests/signals/decorators_test.py index db068d009..a6a8572ba 100644 --- a/tests/signals/decorators_test.py +++ b/tests/signals/decorators_test.py @@ -11,24 +11,24 @@ class MyObject(QObject): QObject.__init__(self, parent) self._slotCalledCount = 0 - @Slot() + @slot() def mySlot(self): self._slotCalledCount = self._slotCalledCount + 1 - @Slot(int) - @Slot('QString') + @slot(int) + @slot('QString') def mySlot2(self, arg0): self._slotCalledCount = self._slotCalledCount + 1 - @Slot(name='mySlot3') + @slot(name='mySlot3') def foo(self): self._slotCalledCount = self._slotCalledCount + 1 - @Slot(QString, int) + @slot(QString, int) def mySlot4(self, a, b): self._slotCalledCount = self._slotCalledCount + 1 - @Slot(result=int) + @slot(result=int) def mySlot5(self): self._slotCalledCount = self._slotCalledCount + 1 diff --git a/tests/signals/ref01_test.py b/tests/signals/ref01_test.py index ba6839ec3..6f30bf507 100755 --- a/tests/signals/ref01_test.py +++ b/tests/signals/ref01_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QObject, Signal +from PySide.QtCore import QObject, signal class BoundAndUnboundSignalsTest(unittest.TestCase): @@ -13,12 +13,12 @@ class BoundAndUnboundSignalsTest(unittest.TestCase): del self.methods def testUnboundSignal(self): - self.assertEqual(type(QObject.destroyed), Signal) + self.assertEqual(type(QObject.destroyed), signal) self.assertFalse(self.methods.issubset(dir(QObject.destroyed))) def testBoundSignal(self): obj = QObject() - self.assertNotEqual(type(obj.destroyed), Signal) + self.assertNotEqual(type(obj.destroyed), signal) self.assert_(self.methods.issubset(dir(obj.destroyed))) if __name__ == '__main__': diff --git a/tests/signals/ref04_test.py b/tests/signals/ref04_test.py index 88a59f68a..4ca223986 100755 --- a/tests/signals/ref04_test.py +++ b/tests/signals/ref04_test.py @@ -2,11 +2,11 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QObject, Signal +from PySide.QtCore import QObject, signal class ExtQObject(QObject): - mySignal = Signal() + mySignal = signal() def __init__(self): QObject.__init__(self) diff --git a/tests/signals/ref05_test.py b/tests/signals/ref05_test.py index 7c53300a5..e41248143 100755 --- a/tests/signals/ref05_test.py +++ b/tests/signals/ref05_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QObject, QCoreApplication, QTimeLine, Slot +from PySide.QtCore import QObject, QCoreApplication, QTimeLine, slot from helper import UsesQCoreApplication class ExtQObject(QObject): @@ -11,7 +11,7 @@ class ExtQObject(QObject): QObject.__init__(self) self.counter = 0 - @Slot('qreal') + @slot('qreal') def foo(self, value): self.counter += 1 diff --git a/tests/signals/ref06_test.py b/tests/signals/ref06_test.py index 05712b3be..cefa1f2ca 100755 --- a/tests/signals/ref06_test.py +++ b/tests/signals/ref06_test.py @@ -2,17 +2,17 @@ # -*- coding: utf-8 -*- import unittest -from PySide.QtCore import QObject, QCoreApplication, QTimeLine, Signal, Slot +from PySide.QtCore import QObject, QCoreApplication, QTimeLine, signal, slot from helper import UsesQCoreApplication class ExtQObject(QObject): - signalbetween = Signal('qreal') + signalbetween = signal('qreal') def __init__(self): QObject.__init__(self) self.counter = 0 - @Slot('qreal') + @slot('qreal') def foo(self, value): self.counter += 1 diff --git a/tests/signals/signal_autoconnect_test.py b/tests/signals/signal_autoconnect_test.py index d3e74910f..d1727334f 100644 --- a/tests/signals/signal_autoconnect_test.py +++ b/tests/signals/signal_autoconnect_test.py @@ -10,7 +10,7 @@ class MyObject(QWidget): QWidget.__init__(self, parent) self._method_called = False - @Slot() + @slot() def on_button_clicked(self): self._method_called = True diff --git a/tests/signals/signal_object_test.py b/tests/signals/signal_object_test.py index 614c0e602..53bd4eed1 100644 --- a/tests/signals/signal_object_test.py +++ b/tests/signals/signal_object_test.py @@ -8,14 +8,14 @@ from PySide.QtCore import * from helper import UsesQCoreApplication class MyObject(QTimer): - sig1 = Signal() - sig2 = Signal(int, name='rangeChanged') - sig3 = Signal(int) - sig4 = Signal((int,), (QString,)) - sig5 = Signal((QString,), (int,)) + sig1 = signal() + sig2 = signal(int, name='rangeChanged') + sig3 = signal(int) + sig4 = signal((int,), (QString,)) + sig5 = signal((QString,), (int,)) - @Slot(int) + @slot(int) def myRange(self, r): self._range = r |