diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 11:00:02 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 10:31:31 +0200 |
commit | 5ddcd47dbdab9710a547244d29fe038bde3d8c98 (patch) | |
tree | fb6176ee512708eabc01cbe43f557c4d306e8c82 /src/declarative/qml/qdeclarativepropertycache.cpp | |
parent | 8f72ef77d1f37b46583deed532951c6b0e5937ae (diff) |
Declarative: Fix MSVC and g++ warnings
Potentially severe:
- Fix int/bool mismatches
- Use of uninitialized variable
- Do connectionMask shift operations in 64bit
- Enum type mismatch for QLineControl::EchoMode
Various:
- class/struct mismatches
- UnhandledEnumeration values
- Unused variables
- Constructor initialization order
Change-Id: Ieb52f8990445fe95f94070175a0f9beb66863240
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativepropertycache.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativepropertycache.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index cf2022cb0a..134c588538 100644 --- a/src/declarative/qml/qdeclarativepropertycache.cpp +++ b/src/declarative/qml/qdeclarativepropertycache.cpp @@ -338,8 +338,12 @@ void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaOb // Extract method name const char *signature = m.signature(); const char *cptr = signature; - bool utf8 = false; - while (*cptr != '(') { Q_ASSERT(*cptr != 0); utf8 |= *cptr & 0x80; ++cptr; } + char utf8 = 0; + while (*cptr != '(') { + Q_ASSERT(*cptr != 0); + utf8 |= *cptr & 0x80; + ++cptr; + } Data *data = &methodIndexCache[ii - methodIndexCacheStart]; Data *sigdata = 0; @@ -417,9 +421,12 @@ void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaOb continue; const char *str = p.name(); - bool utf8 = false; + char utf8 = 0; const char *cptr = str; - while (*cptr != 0) { utf8 |= *cptr & 0x80; ++cptr; } + while (*cptr != 0) { + utf8 |= *cptr & 0x80; + ++cptr; + } Data *data = &propertyIndexCache[ii - propertyIndexCacheStart]; |