projects
/
gc-dialer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e50b24
)
PySide Bug Reproduction: Switching to compat code
author
Ed Page
<eopage@byu.net>
Wed, 6 Apr 2011 02:22:08 +0000
(21:22 -0500)
committer
Ed Page
<eopage@byu.net>
Tue, 19 Apr 2011 23:49:32 +0000
(18:49 -0500)
hand_tests/threading.py
patch
|
blob
|
history
diff --git
a/hand_tests/threading.py
b/hand_tests/threading.py
index
d4f9c91
..
5581f94
100755
(executable)
--- a/
hand_tests/threading.py
+++ b/
hand_tests/threading.py
@@
-5,10
+5,12
@@
from __future__ import division
import time
import time
-import PyQt4.QtCore as QtCore
+import sys
+sys.path.insert(0,"./src")
+from util import qt_compat
-class QThread44(QtCore.QThread):
+class QThread44(qt_compat.QtCore.QThread):
"""
This is to imitate QThread in Qt 4.4+ for when running on older version
See http://labs.trolltech.com/blogs/2010/06/17/youre-doing-it-wrong
"""
This is to imitate QThread in Qt 4.4+ for when running on older version
See http://labs.trolltech.com/blogs/2010/06/17/youre-doing-it-wrong
@@
-16,21
+18,21
@@
class QThread44(QtCore.QThread):
"""
def __init__(self, parent = None):
"""
def __init__(self, parent = None):
- QtCore.QThread.__init__(self, parent)
+ qt_compat.QtCore.QThread.__init__(self, parent)
def run(self):
self.exec_()
def run(self):
self.exec_()
-class Producer(QtCore.QObject):
+class Producer(qt_compat.QtCore.QObject):
- data = QtCore.pyqtSignal(int)
- done = QtCore.pyqtSignal()
+ data = qt_compat.Signal(int)
+ done = qt_compat.Signal()
def __init__(self):
def __init__(self):
- QtCore.QObject.__init__(self)
+ qt_compat.QtCore.QObject.__init__(self)
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
def process(self):
print "Starting producer"
for i in xrange(10):
def process(self):
print "Starting producer"
for i in xrange(10):
@@
-39,26
+41,26
@@
class Producer(QtCore.QObject):
self.done.emit()
self.done.emit()
-class Consumer(QtCore.QObject):
+class Consumer(qt_compat.QtCore.QObject):
def __init__(self):
def __init__(self):
- QtCore.QObject.__init__(self)
+ qt_compat.QtCore.QObject.__init__(self)
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
def process(self):
print "Starting consumer"
def process(self):
print "Starting consumer"
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
def print_done(self):
print "Done"
def print_done(self):
print "Done"
- @QtCore.pyqtSlot(int)
+ @qt_compat.Slot(int)
def print_data(self, i):
print i
if __name__ == "__main__":
def print_data(self, i):
print i
if __name__ == "__main__":
- app = QtCore.QCoreApplication([])
+ app = qt_compat.QtCore.QCoreApplication([])
producerThread = QThread44()
producer = Producer()
producerThread = QThread44()
producer = Producer()
@@
-73,7
+75,7
@@
if __name__ == "__main__":
producer.data.connect(consumer.print_data)
producer.done.connect(consumer.print_done)
producer.data.connect(consumer.print_data)
producer.done.connect(consumer.print_done)
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
def producer_done():
print "Shutting down"
producerThread.quit()
def producer_done():
print "Shutting down"
producerThread.quit()
@@
-83,7
+85,7
@@
if __name__ == "__main__":
count = [0]
count = [0]
- @QtCore.pyqtSlot()
+ @qt_compat.Slot()
def thread_done():
print "Thread done"
count[0] += 1
def thread_done():
print "Thread done"
count[0] += 1