diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
tree | 206c90d47387f8322b68f5e3db613189397e1af3 /src/qml/jsruntime/qv4regexpobject.cpp | |
parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff) |
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.
Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).
Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4regexpobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index 9a5afdf308..000e2c3a7e 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -283,25 +283,25 @@ void RegExpPrototype::init(ExecutionEngine *engine, Object *constructor) ctor->defineReadonlyProperty(engine->id_length(), Primitive::fromInt32(2)); // Properties deprecated in the spec but required by "the web" :( - ctor->defineAccessorProperty(QStringLiteral("lastMatch"), method_get_lastMatch_n<0>, 0); - ctor->defineAccessorProperty(QStringLiteral("$&"), method_get_lastMatch_n<0>, 0); - ctor->defineAccessorProperty(QStringLiteral("$1"), method_get_lastMatch_n<1>, 0); - ctor->defineAccessorProperty(QStringLiteral("$2"), method_get_lastMatch_n<2>, 0); - ctor->defineAccessorProperty(QStringLiteral("$3"), method_get_lastMatch_n<3>, 0); - ctor->defineAccessorProperty(QStringLiteral("$4"), method_get_lastMatch_n<4>, 0); - ctor->defineAccessorProperty(QStringLiteral("$5"), method_get_lastMatch_n<5>, 0); - ctor->defineAccessorProperty(QStringLiteral("$6"), method_get_lastMatch_n<6>, 0); - ctor->defineAccessorProperty(QStringLiteral("$7"), method_get_lastMatch_n<7>, 0); - ctor->defineAccessorProperty(QStringLiteral("$8"), method_get_lastMatch_n<8>, 0); - ctor->defineAccessorProperty(QStringLiteral("$9"), method_get_lastMatch_n<9>, 0); - ctor->defineAccessorProperty(QStringLiteral("lastParen"), method_get_lastParen, 0); - ctor->defineAccessorProperty(QStringLiteral("$+"), method_get_lastParen, 0); - ctor->defineAccessorProperty(QStringLiteral("input"), method_get_input, 0); - ctor->defineAccessorProperty(QStringLiteral("$_"), method_get_input, 0); - ctor->defineAccessorProperty(QStringLiteral("leftContext"), method_get_leftContext, 0); - ctor->defineAccessorProperty(QStringLiteral("$`"), method_get_leftContext, 0); - ctor->defineAccessorProperty(QStringLiteral("rightContext"), method_get_rightContext, 0); - ctor->defineAccessorProperty(QStringLiteral("$'"), method_get_rightContext, 0); + ctor->defineAccessorProperty(QStringLiteral("lastMatch"), method_get_lastMatch_n<0>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$&"), method_get_lastMatch_n<0>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$1"), method_get_lastMatch_n<1>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$2"), method_get_lastMatch_n<2>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$3"), method_get_lastMatch_n<3>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$4"), method_get_lastMatch_n<4>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$5"), method_get_lastMatch_n<5>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$6"), method_get_lastMatch_n<6>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$7"), method_get_lastMatch_n<7>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$8"), method_get_lastMatch_n<8>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$9"), method_get_lastMatch_n<9>, nullptr); + ctor->defineAccessorProperty(QStringLiteral("lastParen"), method_get_lastParen, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$+"), method_get_lastParen, nullptr); + ctor->defineAccessorProperty(QStringLiteral("input"), method_get_input, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$_"), method_get_input, nullptr); + ctor->defineAccessorProperty(QStringLiteral("leftContext"), method_get_leftContext, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$`"), method_get_leftContext, nullptr); + ctor->defineAccessorProperty(QStringLiteral("rightContext"), method_get_rightContext, nullptr); + ctor->defineAccessorProperty(QStringLiteral("$'"), method_get_rightContext, nullptr); defineDefaultProperty(QStringLiteral("constructor"), (o = ctor)); defineDefaultProperty(QStringLiteral("exec"), method_exec, 1); |