diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-11-04 14:52:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-11-04 14:52:12 -0600 |
| commit | ab9c0372a33806de1210b9b6f3bc7544895ad4fb (patch) | |
| tree | a89fc03291abd722fbe8310dc9a102c4f8d6c8f1 | |
| parent | 8d210f61fc399ab91c0dee097a47185cf9e008fd (diff) | |
| download | tqt3-ab9c0372a33806de1210b9b6f3bc7544895ad4fb.tar.gz tqt3-ab9c0372a33806de1210b9b6f3bc7544895ad4fb.zip | |
Automated update from Qt3
| -rw-r--r-- | src/kernel/qobject.cpp | 8 | ||||
| -rw-r--r-- | src/kernel/qthread_unix.cpp | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 4442023a5..d40bf0415 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -2739,7 +2739,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) else { if (object->d->ownThread && !object->d->ownThread->finished()) { #ifdef QT_DEBUG - tqDebug("TQObject::activate_signal: Emitting cross-thread signal from object %p (member %d receiver %p) (1)\n\r", this, c->member(), object); + tqDebug("TQObject::activate_signal: Emitting cross-thread signal from object %p (member %d receiver %p) (1)\n", this, c->member(), object); #endif // QT_DEBUG TQApplication::postEvent(object, new TQMetaCallEvent(c->member(), this, deepCopyTQUObjectArray(o), TQMetaCallEvent::MetaCallEmit)); } @@ -2758,7 +2758,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) else { if (object->d->ownThread && !object->d->ownThread->finished()) { #ifdef QT_DEBUG - tqDebug("TQObject::activate_signal: Invoking cross-thread method from object %p (member %d receiver %p) (1)\n\r", this, c->member(), object); + tqDebug("TQObject::activate_signal: Invoking cross-thread method from object %p (member %d receiver %p) (1)\n", this, c->member(), object); #endif // QT_DEBUG TQApplication::postEvent(object, new TQMetaCallEvent(c->member(), this, deepCopyTQUObjectArray(o), TQMetaCallEvent::MetaCallInvoke)); } @@ -2806,7 +2806,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) else { if (object->d->ownThread && !object->d->ownThread->finished()) { #ifdef QT_DEBUG - tqDebug("TQObject::activate_signal: Emitting cross-thread signal from object %p (member %d receiver %p) (2)\n\r", this, c->member(), object); + tqDebug("TQObject::activate_signal: Emitting cross-thread signal from object %p (member %d receiver %p) (2)\n", this, c->member(), object); #endif // QT_DEBUG TQApplication::postEvent(object, new TQMetaCallEvent(c->member(), this, deepCopyTQUObjectArray(o), TQMetaCallEvent::MetaCallEmit)); } @@ -2825,7 +2825,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) else { if (object->d->ownThread && !object->d->ownThread->finished()) { #ifdef QT_DEBUG - tqDebug("TQObject::activate_signal: Invoking cross-thread method from object %p (member %d receiver %p) (2)\n\r", this, c->member(), object); + tqDebug("TQObject::activate_signal: Invoking cross-thread method from object %p (member %d receiver %p) (2)\n", this, c->member(), object); #endif // QT_DEBUG TQApplication::postEvent(object, new TQMetaCallEvent(c->member(), this, deepCopyTQUObjectArray(o), TQMetaCallEvent::MetaCallInvoke)); } diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp index 6e8c4fdc3..08b668e64 100644 --- a/src/kernel/qthread_unix.cpp +++ b/src/kernel/qthread_unix.cpp @@ -132,7 +132,7 @@ void *TQThreadInstance::start( void *_arg ) #endif // QT_USE_GLIBMAINLOOP #ifdef QT_DEBUG - tqDebug("TQThreadInstance::start: Setting thread storage to %p\n\r", (TQThread *) arg[0]); + tqDebug("TQThreadInstance::start: Setting thread storage to %p\n", (TQThread *) arg[0]); #endif // QT_DEBUG setCurrentThread( (TQThread *) arg[0] ); @@ -156,7 +156,9 @@ void TQThreadInstance::finish( void * ) return; } - tqDebug("TQThreadInstance::finish: In TQThreadInstance::finish for thread %p\n\r", (TQThread*)d->args[0]); +#ifdef QT_DEBUG + tqDebug("TQThreadInstance::finish: In TQThreadInstance::finish for thread %p\n", (TQThread*)d->args[0]); +#endif // QT_DEBUG TQApplication::threadTerminationHandler((TQThread*)d->args[0]); |