diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-11-04 14:51:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-11-04 14:51:54 -0600 |
| commit | 2bec4674492e058ed822768c0a9c4a848dbf81d9 (patch) | |
| tree | 3868825a8f2ab785cb308248a8e88942610f5a6f /src | |
| parent | 99b03be63de497bebbc26fcb2a564f1938493ef0 (diff) | |
| download | qt3-2bec4674492e058ed822768c0a9c4a848dbf81d9.tar.gz qt3-2bec4674492e058ed822768c0a9c4a848dbf81d9.zip | |
Clean up prior commit
Diffstat (limited to 'src')
| -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 247db41..403691e 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -2739,7 +2739,7 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) else { if (object->d->ownThread && !object->d->ownThread->finished()) { #ifdef QT_DEBUG - qDebug("QObject::activate_signal: Emitting cross-thread signal from object %p (member %d receiver %p) (1)\n\r", this, c->member(), object); + qDebug("QObject::activate_signal: Emitting cross-thread signal from object %p (member %d receiver %p) (1)\n", this, c->member(), object); #endif // QT_DEBUG QApplication::postEvent(object, new QMetaCallEvent(c->member(), this, deepCopyQUObjectArray(o), QMetaCallEvent::MetaCallEmit)); } @@ -2758,7 +2758,7 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) else { if (object->d->ownThread && !object->d->ownThread->finished()) { #ifdef QT_DEBUG - qDebug("QObject::activate_signal: Invoking cross-thread method from object %p (member %d receiver %p) (1)\n\r", this, c->member(), object); + qDebug("QObject::activate_signal: Invoking cross-thread method from object %p (member %d receiver %p) (1)\n", this, c->member(), object); #endif // QT_DEBUG QApplication::postEvent(object, new QMetaCallEvent(c->member(), this, deepCopyQUObjectArray(o), QMetaCallEvent::MetaCallInvoke)); } @@ -2806,7 +2806,7 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) else { if (object->d->ownThread && !object->d->ownThread->finished()) { #ifdef QT_DEBUG - qDebug("QObject::activate_signal: Emitting cross-thread signal from object %p (member %d receiver %p) (2)\n\r", this, c->member(), object); + qDebug("QObject::activate_signal: Emitting cross-thread signal from object %p (member %d receiver %p) (2)\n", this, c->member(), object); #endif // QT_DEBUG QApplication::postEvent(object, new QMetaCallEvent(c->member(), this, deepCopyQUObjectArray(o), QMetaCallEvent::MetaCallEmit)); } @@ -2825,7 +2825,7 @@ void QObject::activate_signal( QConnectionList *clist, QUObject *o ) else { if (object->d->ownThread && !object->d->ownThread->finished()) { #ifdef QT_DEBUG - qDebug("QObject::activate_signal: Invoking cross-thread method from object %p (member %d receiver %p) (2)\n\r", this, c->member(), object); + qDebug("QObject::activate_signal: Invoking cross-thread method from object %p (member %d receiver %p) (2)\n", this, c->member(), object); #endif // QT_DEBUG QApplication::postEvent(object, new QMetaCallEvent(c->member(), this, deepCopyQUObjectArray(o), QMetaCallEvent::MetaCallInvoke)); } diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp index 530d401..bc492af 100644 --- a/src/kernel/qthread_unix.cpp +++ b/src/kernel/qthread_unix.cpp @@ -132,7 +132,7 @@ void *QThreadInstance::start( void *_arg ) #endif // QT_USE_GLIBMAINLOOP #ifdef QT_DEBUG - qDebug("QThreadInstance::start: Setting thread storage to %p\n\r", (QThread *) arg[0]); + qDebug("QThreadInstance::start: Setting thread storage to %p\n", (QThread *) arg[0]); #endif // QT_DEBUG setCurrentThread( (QThread *) arg[0] ); @@ -156,7 +156,9 @@ void QThreadInstance::finish( void * ) return; } - qDebug("QThreadInstance::finish: In QThreadInstance::finish for thread %p\n\r", (QThread*)d->args[0]); +#ifdef QT_DEBUG + qDebug("QThreadInstance::finish: In QThreadInstance::finish for thread %p\n", (QThread*)d->args[0]); +#endif // QT_DEBUG QApplication::threadTerminationHandler((QThread*)d->args[0]); |