diff options
| author | Oleg Shparber <[email protected]> | 2014-11-20 22:16:53 -0800 |
|---|---|---|
| committer | Oleg Shparber <[email protected]> | 2014-11-21 19:19:19 +0100 |
| commit | 2cb6d1bf32e017026f618dcfdbef3980f5363656 (patch) | |
| tree | e2429bfd2b5030aab2e3c33e74f6158cbccab7e9 /src/qml/jsruntime/qv4object.cpp | |
| parent | d6140dbfe8ee700c20c1bb9811b4d15a30a83767 (diff) | |
Make QV4::RegExpObject header independent from masm headers
Also remove pointless uint32_t for uint values and replace
a few inconsistent uint16_t uses with quint16. MSVC was using uintN_t
defined in masm headers instead of cstdint, so this change eliminates
such situation.
Change-Id: Ibd7dd50fc047dcdc78e057299883311a24dd3960
Reviewed-by: Simon Hausmann <[email protected]>
Reviewed-by: Lars Knoll <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 2b89a37771..78614eeffb 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -1179,8 +1179,8 @@ QStringList ArrayObject::toQStringList() const Scope scope(engine); ScopedValue v(scope); - uint32_t length = getLength(); - for (uint32_t i = 0; i < length; ++i) { + uint length = getLength(); + for (uint i = 0; i < length; ++i) { v = const_cast<ArrayObject *>(this)->getIndexed(i); result.append(v->toQStringNoThrow()); } |