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/qqmlguard_p.h | |
| 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/qqmlguard_p.h')
| -rw-r--r-- | src/qml/qml/qqmlguard_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlguard_p.h b/src/qml/qml/qqmlguard_p.h index 455f5c93a8..b2e0949c74 100644 --- a/src/qml/qml/qqmlguard_p.h +++ b/src/qml/qml/qqmlguard_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE -class QQmlGuardImpl +class QQmlGuardImpl { public: inline QQmlGuardImpl(); @@ -91,7 +91,7 @@ public: inline T *object() const; inline void setObject(T *g); - + inline bool isNull() const { return !o; } @@ -141,7 +141,7 @@ void QQmlGuardImpl::addGuard() { Q_ASSERT(!prev); - if (QObjectPrivate::get(o)->wasDeleted) + if (QObjectPrivate::get(o)->wasDeleted) return; QQmlData *data = QQmlData::get(o, true); @@ -198,13 +198,13 @@ QQmlGuard<T> &QQmlGuard<T>::operator=(T *g) } template<class T> -T *QQmlGuard<T>::object() const -{ - return static_cast<T *>(o); +T *QQmlGuard<T>::object() const +{ + return static_cast<T *>(o); } template<class T> -void QQmlGuard<T>::setObject(T *g) +void QQmlGuard<T>::setObject(T *g) { if (g != o) { if (prev) remGuard(); |