Revert "Fixed signal/slot class name based on PSEP 100."
This reverts commit 361ac438c2.
Conflicts:
libpyside/qsignal.cpp
This commit is contained in:
parent
2cb23734c8
commit
c161698a40
9 changed files with 25 additions and 25 deletions
|
|
@ -39,7 +39,7 @@
|
||||||
#include "qsignal.h"
|
#include "qsignal.h"
|
||||||
#include "signalmanager.h"
|
#include "signalmanager.h"
|
||||||
|
|
||||||
#define SIGNAL_CLASS_NAME "signal"
|
#define SIGNAL_CLASS_NAME "Signal"
|
||||||
#define QT_SIGNAL_SENTINEL "2"
|
#define QT_SIGNAL_SENTINEL "2"
|
||||||
|
|
||||||
namespace PySide
|
namespace PySide
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#define SLOT_DEC_NAME "slot"
|
#define SLOT_DEC_NAME "Slot"
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -11,24 +11,24 @@ class MyObject(QObject):
|
||||||
QObject.__init__(self, parent)
|
QObject.__init__(self, parent)
|
||||||
self._slotCalledCount = 0
|
self._slotCalledCount = 0
|
||||||
|
|
||||||
@slot()
|
@Slot()
|
||||||
def mySlot(self):
|
def mySlot(self):
|
||||||
self._slotCalledCount = self._slotCalledCount + 1
|
self._slotCalledCount = self._slotCalledCount + 1
|
||||||
|
|
||||||
@slot(int)
|
@Slot(int)
|
||||||
@slot('QString')
|
@Slot('QString')
|
||||||
def mySlot2(self, arg0):
|
def mySlot2(self, arg0):
|
||||||
self._slotCalledCount = self._slotCalledCount + 1
|
self._slotCalledCount = self._slotCalledCount + 1
|
||||||
|
|
||||||
@slot(name='mySlot3')
|
@Slot(name='mySlot3')
|
||||||
def foo(self):
|
def foo(self):
|
||||||
self._slotCalledCount = self._slotCalledCount + 1
|
self._slotCalledCount = self._slotCalledCount + 1
|
||||||
|
|
||||||
@slot(QString, int)
|
@Slot(QString, int)
|
||||||
def mySlot4(self, a, b):
|
def mySlot4(self, a, b):
|
||||||
self._slotCalledCount = self._slotCalledCount + 1
|
self._slotCalledCount = self._slotCalledCount + 1
|
||||||
|
|
||||||
@slot(result=int)
|
@Slot(result=int)
|
||||||
def mySlot5(self):
|
def mySlot5(self):
|
||||||
self._slotCalledCount = self._slotCalledCount + 1
|
self._slotCalledCount = self._slotCalledCount + 1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from PySide.QtCore import QObject, signal
|
from PySide.QtCore import QObject, Signal
|
||||||
|
|
||||||
class BoundAndUnboundSignalsTest(unittest.TestCase):
|
class BoundAndUnboundSignalsTest(unittest.TestCase):
|
||||||
|
|
||||||
|
|
@ -13,12 +13,12 @@ class BoundAndUnboundSignalsTest(unittest.TestCase):
|
||||||
del self.methods
|
del self.methods
|
||||||
|
|
||||||
def testUnboundSignal(self):
|
def testUnboundSignal(self):
|
||||||
self.assertEqual(type(QObject.destroyed), signal)
|
self.assertEqual(type(QObject.destroyed), Signal)
|
||||||
self.assertFalse(self.methods.issubset(dir(QObject.destroyed)))
|
self.assertFalse(self.methods.issubset(dir(QObject.destroyed)))
|
||||||
|
|
||||||
def testBoundSignal(self):
|
def testBoundSignal(self):
|
||||||
obj = QObject()
|
obj = QObject()
|
||||||
self.assertNotEqual(type(obj.destroyed), signal)
|
self.assertNotEqual(type(obj.destroyed), Signal)
|
||||||
self.assert_(self.methods.issubset(dir(obj.destroyed)))
|
self.assert_(self.methods.issubset(dir(obj.destroyed)))
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from PySide.QtCore import QObject, signal
|
from PySide.QtCore import QObject, Signal
|
||||||
|
|
||||||
class ExtQObject(QObject):
|
class ExtQObject(QObject):
|
||||||
|
|
||||||
mySignal = signal()
|
mySignal = Signal()
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
QObject.__init__(self)
|
QObject.__init__(self)
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from PySide.QtCore import QObject, QCoreApplication, QTimeLine, slot
|
from PySide.QtCore import QObject, QCoreApplication, QTimeLine, Slot
|
||||||
from helper import UsesQCoreApplication
|
from helper import UsesQCoreApplication
|
||||||
|
|
||||||
class ExtQObject(QObject):
|
class ExtQObject(QObject):
|
||||||
|
|
@ -11,7 +11,7 @@ class ExtQObject(QObject):
|
||||||
QObject.__init__(self)
|
QObject.__init__(self)
|
||||||
self.counter = 0
|
self.counter = 0
|
||||||
|
|
||||||
@slot('qreal')
|
@Slot('qreal')
|
||||||
def foo(self, value):
|
def foo(self, value):
|
||||||
self.counter += 1
|
self.counter += 1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,17 +2,17 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from PySide.QtCore import QObject, QCoreApplication, QTimeLine, signal, slot
|
from PySide.QtCore import QObject, QCoreApplication, QTimeLine, Signal, Slot
|
||||||
from helper import UsesQCoreApplication
|
from helper import UsesQCoreApplication
|
||||||
|
|
||||||
class ExtQObject(QObject):
|
class ExtQObject(QObject):
|
||||||
signalbetween = signal('qreal')
|
signalbetween = Signal('qreal')
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
QObject.__init__(self)
|
QObject.__init__(self)
|
||||||
self.counter = 0
|
self.counter = 0
|
||||||
|
|
||||||
@slot('qreal')
|
@Slot('qreal')
|
||||||
def foo(self, value):
|
def foo(self, value):
|
||||||
self.counter += 1
|
self.counter += 1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ class MyObject(QWidget):
|
||||||
QWidget.__init__(self, parent)
|
QWidget.__init__(self, parent)
|
||||||
self._method_called = False
|
self._method_called = False
|
||||||
|
|
||||||
@slot()
|
@Slot()
|
||||||
def on_button_clicked(self):
|
def on_button_clicked(self):
|
||||||
self._method_called = True
|
self._method_called = True
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,14 +8,14 @@ from PySide.QtCore import *
|
||||||
from helper import UsesQCoreApplication
|
from helper import UsesQCoreApplication
|
||||||
|
|
||||||
class MyObject(QTimer):
|
class MyObject(QTimer):
|
||||||
sig1 = signal()
|
sig1 = Signal()
|
||||||
sig2 = signal(int, name='rangeChanged')
|
sig2 = Signal(int, name='rangeChanged')
|
||||||
sig3 = signal(int)
|
sig3 = Signal(int)
|
||||||
sig4 = signal((int,), (QString,))
|
sig4 = Signal((int,), (QString,))
|
||||||
sig5 = signal((QString,), (int,))
|
sig5 = Signal((QString,), (int,))
|
||||||
|
|
||||||
|
|
||||||
@slot(int)
|
@Slot(int)
|
||||||
def myRange(self, r):
|
def myRange(self, r):
|
||||||
self._range = r
|
self._range = r
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue