diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-17 19:33:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 16:53:10 +0100 |
| commit | a0d27513f4eff3f76fd85e6442aca443b7c05a53 (patch) | |
| tree | 2239ed849796744299fbe25ab3cc50c2867160e9 /src/declarative/qml/qdeclarativeexpression_p.h | |
| parent | 9ba631edb469599d3973982f8d5d72a9ba059eab (diff) | |
whitespace fixes
remove trailing spaces & expand tabs
Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeexpression_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h index 5cc568ef..13cefebc 100644 --- a/src/declarative/qml/qdeclarativeexpression_p.h +++ b/src/declarative/qml/qdeclarativeexpression_p.h @@ -84,7 +84,7 @@ private: QDeclarativeAbstractExpression *m_nextExpression; }; -class QDeclarativeDelayedError +class QDeclarativeDelayedError { public: inline QDeclarativeDelayedError() : nextError(0), prevError(0) {} @@ -107,7 +107,7 @@ private: QDeclarativeDelayedError **prevError; }; -class QDeclarativeQtScriptExpression : public QDeclarativeAbstractExpression, +class QDeclarativeQtScriptExpression : public QDeclarativeAbstractExpression, public QDeclarativeDelayedError { public: @@ -199,7 +199,7 @@ public: static void exceptionToError(QScriptEngine *, QDeclarativeError &); static QScriptValue evalInObjectScope(QDeclarativeContextData *, QObject *, const QString &, const QString &, int, QScriptValue *); - static QScriptValue evalInObjectScope(QDeclarativeContextData *, QObject *, const QScriptProgram &, + static QScriptValue evalInObjectScope(QDeclarativeContextData *, QObject *, const QScriptProgram &, QScriptValue *); bool expressionFunctionValid:1; @@ -210,22 +210,22 @@ public: }; QDeclarativeQtScriptExpression::DeleteWatcher::DeleteWatcher(QDeclarativeQtScriptExpression *data) -: m_wasDeletedStorage(false), m_d(data) +: m_wasDeletedStorage(false), m_d(data) { - if (!m_d->deleted) - m_d->deleted = &m_wasDeletedStorage; + if (!m_d->deleted) + m_d->deleted = &m_wasDeletedStorage; m_wasDeleted = m_d->deleted; } -QDeclarativeQtScriptExpression::DeleteWatcher::~DeleteWatcher() +QDeclarativeQtScriptExpression::DeleteWatcher::~DeleteWatcher() { if (false == *m_wasDeleted && m_wasDeleted == m_d->deleted) m_d->deleted = 0; } -bool QDeclarativeQtScriptExpression::DeleteWatcher::wasDeleted() const -{ - return *m_wasDeleted; +bool QDeclarativeQtScriptExpression::DeleteWatcher::wasDeleted() const +{ + return *m_wasDeleted; } QT_END_NAMESPACE |