diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-15 22:01:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 21:01:53 +0100 |
commit | e2ea0a83cc876fb54a2a8bf6f1350dbfa52f596b (patch) | |
tree | 36ec4b74aa50b9355e74e5d186039c3cdbd38acd /src/qml/qml/ftw/qqmlthread.cpp | |
parent | 2ce7959eb9e69cd68013fc6a0f77a9556a84365b (diff) |
fix whitespace
remove trailing spaces and expand tabs
Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/ftw/qqmlthread.cpp')
-rw-r--r-- | src/qml/qml/ftw/qqmlthread.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/qml/qml/ftw/qqmlthread.cpp b/src/qml/qml/ftw/qqmlthread.cpp index 1ea3f25405..c49463c913 100644 --- a/src/qml/qml/ftw/qqmlthread.cpp +++ b/src/qml/qml/ftw/qqmlthread.cpp @@ -83,10 +83,10 @@ public: void threadEvent(); protected: - virtual bool event(QEvent *); + virtual bool event(QEvent *); private: - struct MainObject : public QObject { + struct MainObject : public QObject { MainObject(QQmlThreadPrivate *p); virtual bool event(QEvent *e); QQmlThreadPrivate *p; @@ -97,8 +97,8 @@ private: QWaitCondition _wait; }; -QQmlThreadPrivate::MainObject::MainObject(QQmlThreadPrivate *p) -: p(p) +QQmlThreadPrivate::MainObject::MainObject(QQmlThreadPrivate *p) +: p(p) { } @@ -116,22 +116,22 @@ void QQmlThreadPrivate::triggerThreadEvent() QCoreApplication::postEvent(this, new QEvent(QEvent::User)); } -bool QQmlThreadPrivate::MainObject::event(QEvent *e) +bool QQmlThreadPrivate::MainObject::event(QEvent *e) { - if (e->type() == QEvent::User) + if (e->type() == QEvent::User) p->mainEvent(); return QObject::event(e); } - + QQmlThreadPrivate::QQmlThreadPrivate(QQmlThread *q) -: q(q), m_threadProcessing(false), m_mainProcessing(false), m_shutdown(false), +: q(q), m_threadProcessing(false), m_mainProcessing(false), m_shutdown(false), m_mainThreadWaiting(false), mainSync(0), m_mainObject(this) { } bool QQmlThreadPrivate::event(QEvent *e) { - if (e->type() == QEvent::User) + if (e->type() == QEvent::User) threadEvent(); return QThread::event(e); } @@ -175,7 +175,7 @@ void QQmlThreadPrivate::mainEvent() unlock(); } -void QQmlThreadPrivate::threadEvent() +void QQmlThreadPrivate::threadEvent() { lock(); |