X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Futil%2Fqore_utils.py;h=654a87a9f9a643bed0518aa865febbda5d0cb269;hb=da9af3284a8c0bf8189266e0878e7211402d69af;hp=e9b8c49c8ddcc428ce878e9af0092ca9832e94bb;hpb=2b7d4c59e1c7af8fc23b60f6569529a03064acd0;p=gc-dialer

diff --git a/src/util/qore_utils.py b/src/util/qore_utils.py
index e9b8c49..654a87a 100644
--- a/src/util/qore_utils.py
+++ b/src/util/qore_utils.py
@@ -25,15 +25,15 @@ class QThread44(QtCore.QThread):
 
 class _ParentThread(QtCore.QObject):
 
-	def __init__(self, pool):
+	def __init__(self, futureThread):
 		QtCore.QObject.__init__(self)
-		self._pool = pool
+		self._futureThread = futureThread
 
 	@qt_compat.Slot(object)
 	@misc.log_exception(_moduleLogger)
 	def _on_task_complete(self, taskResult):
 		on_success, on_error, isError, result = taskResult
-		if not self._pool._isRunning:
+		if not self._futureThread._isRunning:
 			if isError:
 				_moduleLogger.error("Masking: %s" % (result, ))
 			isError = True
@@ -49,14 +49,14 @@ class _WorkerThread(QtCore.QObject):
 
 	taskComplete  = qt_compat.Signal(object)
 
-	def __init__(self, pool):
+	def __init__(self, futureThread):
 		QtCore.QObject.__init__(self)
-		self._pool = pool
+		self._futureThread = futureThread
 
 	@qt_compat.Slot(object)
 	@misc.log_exception(_moduleLogger)
 	def _on_task_added(self, task):
-		if not self._pool._isRunning:
+		if not self._futureThread._isRunning:
 			_moduleLogger.error("Dropping task")
 
 		func, args, kwds, on_success, on_error = task
@@ -75,13 +75,13 @@ class _WorkerThread(QtCore.QObject):
 	@qt_compat.Slot()
 	@misc.log_exception(_moduleLogger)
 	def _on_stop_requested(self):
-		self._pool._thread.quit()
+		self._futureThread._thread.quit()
 
 
-class AsyncPool(QtCore.QObject):
+class FutureThread(QtCore.QObject):
 
 	_addTask = qt_compat.Signal(object)
-	_stopPool = qt_compat.Signal()
+	_stopFutureThread = qt_compat.Signal()
 
 	def __init__(self):
 		QtCore.QObject.__init__(self)
@@ -93,7 +93,7 @@ class AsyncPool(QtCore.QObject):
 
 		self._addTask.connect(self._worker._on_task_added)
 		self._worker.taskComplete.connect(self._parent._on_task_complete)
-		self._stopPool.connect(self._worker._on_stop_requested)
+		self._stopFutureThread.connect(self._worker._on_stop_requested)
 
 	def start(self):
 		self._thread.start()
@@ -101,7 +101,7 @@ class AsyncPool(QtCore.QObject):
 
 	def stop(self):
 		self._isRunning = False
-		self._stopPool.emit()
+		self._stopFutureThread.emit()
 
 	def add_task(self, func, args, kwds, on_success, on_error):
 		assert self._isRunning, "Task queue not started"