summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-04 09:33:55 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-04 09:43:15 (GMT)
commitfbe7f34f46de3e0732489c0043f89cc5aa535ecb (patch)
tree65d29b66abf662a35ddd2565e9b4194515a1e263 /src/corelib/thread
parente3b1daaadf9daff424c71ddcf642986f1bc1be8c (diff)
downloadQt-fbe7f34f46de3e0732489c0043f89cc5aa535ecb.zip
Qt-fbe7f34f46de3e0732489c0043f89cc5aa535ecb.tar.gz
Qt-fbe7f34f46de3e0732489c0043f89cc5aa535ecb.tar.bz2
Trailing whitespace and tab/space fixes for src/corelib
Diffstat (limited to 'src/corelib/thread')
-rw-r--r--src/corelib/thread/qthread.cpp2
-rw-r--r--src/corelib/thread/qthread_p.h2
-rw-r--r--src/corelib/thread/qthread_unix.cpp16
3 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index fac50ee..a4a57ce 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -183,7 +183,7 @@ QThreadPrivate::QThreadPrivate(QThreadData *d)
id = 0;
waiters = 0;
#endif
-#if defined (Q_WS_WIN) || defined (Q_OS_SYMBIAN)
+#if defined (Q_WS_WIN) || defined (Q_OS_SYMBIAN)
terminationEnabled = true;
terminatePending = false;
#endif
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index 51de0be..752796b 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -152,7 +152,7 @@ public:
static void finish(void *, bool lockAnyway=true);
#endif // Q_OS_WIN32
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN)
+#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN)
bool terminationEnabled, terminatePending;
# endif
QThreadData *data;
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 881b889..cabf823 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -178,7 +178,7 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)
else
#endif
#ifdef Q_OS_SYMBIAN
- data->eventDispatcher = new QEventDispatcherSymbian;
+ data->eventDispatcher = new QEventDispatcherSymbian;
#else
data->eventDispatcher = new QEventDispatcherUNIX;
#endif
@@ -193,7 +193,7 @@ void *QThreadPrivate::start(void *arg)
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
pthread_cleanup_push(QThreadPrivate::finish, arg);
#endif
-
+
QThread *thr = reinterpret_cast<QThread *>(arg);
QThreadData *data = QThreadData::get2(thr);
@@ -226,7 +226,7 @@ void *QThreadPrivate::start(void *arg)
#ifndef Q_OS_SYMBIAN
pthread_cleanup_pop(1);
#else
- QThreadPrivate::finish(arg);
+ QThreadPrivate::finish(arg);
#endif
return 0;
@@ -266,7 +266,7 @@ void QThreadPrivate::finish(void *arg)
d->thread_id = 0;
#ifdef Q_OS_SYMBIAN
if (closeNativeHandle)
- d->data->symbian_thread_handle.Close();
+ d->data->symbian_thread_handle.Close();
#endif
d->thread_done.wakeAll();
#ifdef Q_OS_SYMBIAN
@@ -325,7 +325,7 @@ int QThread::idealThreadCount()
#elif defined(Q_OS_INTEGRITY)
// ### TODO - how to get the amound of CPUs on INTEGRITY?
#elif defined(Q_OS_SYMBIAN)
- // ### TODO - Get the number of cores from HAL? when multicore architectures (SMP) are supported
+ // ### TODO - Get the number of cores from HAL? when multicore architectures (SMP) are supported
cores = 1;
#else
// the rest: Linux, Solaris, AIX, Tru64
@@ -545,10 +545,10 @@ void QThread::terminate()
d->terminatePending = true;
return;
}
-
+
d->terminated = true;
QThreadPrivate::finish(this, false, false);
- d->data->symbian_thread_handle.Terminate(KErrNone);
+ d->data->symbian_thread_handle.Terminate(KErrNone);
d->data->symbian_thread_handle.Close();
#endif
@@ -592,7 +592,7 @@ void QThread::setTerminationEnabled(bool enabled)
d->terminated = true;
QThreadPrivate::finish(thr, false);
locker.unlock(); // don't leave the mutex locked!
- pthread_exit(NULL);
+ pthread_exit(NULL);
}
#endif
}