aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.lima@openbossa.org>2010-05-31 10:37:21 -0300
committerHugo Parente Lima <hugo.lima@openbossa.org>2010-05-31 10:41:51 -0300
commitc161698a4014b1d73c3409c62ea93e2369abf9b8 (patch)
tree62a32461f3b5c075c5cadf6f4afa1487a9c105b8 /tests
parent2cb23734c85529a32e720b6f624fa6176a8e0a32 (diff)
Revert "Fixed signal/slot class name based on PSEP 100."
This reverts commit 361ac438c2b9e3c6c10c9ab2207a6464557b8a85. Conflicts: libpyside/qsignal.cpp
Diffstat (limited to 'tests')
-rw-r--r--tests/signals/decorators_test.py12
-rwxr-xr-xtests/signals/ref01_test.py6
-rwxr-xr-xtests/signals/ref04_test.py4
-rwxr-xr-xtests/signals/ref05_test.py4
-rwxr-xr-xtests/signals/ref06_test.py6
-rw-r--r--tests/signals/signal_autoconnect_test.py2
-rw-r--r--tests/signals/signal_object_test.py12
7 files changed, 23 insertions, 23 deletions
diff --git a/tests/signals/decorators_test.py b/tests/signals/decorators_test.py
index a6a8572b..db068d00 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 6f30bf50..ba6839ec 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 4ca22398..88a59f68 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 e4124814..7c53300a 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 cefa1f2c..05712b3b 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 d1727334..d3e74910 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 53bd4eed..614c0e60 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