Showing the changes to libraries/shared/src/GenericThread.cpp (1 of 6 files). Show all
Unified · Split
| @@ -17,12 +17,9 @@ GenericThread::GenericThread() : · 16 unmodified lines | |||
| 17 | _stopThread(false), | 17 | _stopThread(false), |
| 18 | _isThreaded(false) // assume non-threaded, must call initialize() | 18 | _isThreaded(false) // assume non-threaded, must call initialize() |
| 19 | { | 19 | { |
| 20 | //qDebug() << "GenericThread::GenericThread() this=" << this; | ||
| 21 | } | 20 | } |
| 22 | 21 | ||
| 23 | GenericThread::~GenericThread() { | 22 | GenericThread::~GenericThread() { |
| 24 | //qDebug() << "GenericThread::~GenericThread() this=" << this; | ||
| 25 | |||
| 26 | // we only need to call terminate() if we're actually threaded and still running | 23 | // we only need to call terminate() if we're actually threaded and still running |
| 27 | if (isStillRunning() && isThreaded()) { | 24 | if (isStillRunning() && isThreaded()) { |
| 28 | terminate(); | 25 | terminate(); |
| @@ -45,7 +42,6 @@ void GenericThread::initialize(bool isThreaded) { · 16 unmodified lines | |||
| 45 | } | 42 | } |
| 46 | 43 | ||
| 47 | void GenericThread::terminate() { | 44 | void GenericThread::terminate() { |
| 48 | //qDebug() << "GenericThread::terminate()... this=" << this; | ||
| 49 | if (_isThreaded) { | 45 | if (_isThreaded) { |
| 50 | _stopThread = true; | 46 | _stopThread = true; |
| 51 | 47 | ||
| @@ -74,7 +70,6 @@ void GenericThread::threadRoutine() { · 22 unmodified lines | |||
| 74 | 70 | ||
| 75 | // If we were on a thread, then quit our thread | 71 | // If we were on a thread, then quit our thread |
| 76 | if (_isThreaded && _thread) { | 72 | if (_isThreaded && _thread) { |
| 77 | //qDebug() << "GenericThread::threadRoutine()... about to call _thread->quit() this=" << this << " _thread=" << _thread; | ||
| 78 | _thread->quit(); | 73 | _thread->quit(); |
| 79 | } | 74 | } |
| 80 | 75 | ||