diff options
| author | David Faure <faure@kde.org> | 2009-09-13 08:18:57 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-13 08:18:57 (GMT) |
| commit | b2f2967411bcb23a807f6a17b042b4c58701af95 (patch) | |
| tree | 7db490cf7846973e8b9850a87a0abd0e54944c0c /src/corelib/tools/qbytearray.h | |
| parent | 139cffbfe1598b32ffe658968694d163dc53e3dd (diff) | |
| download | Qt-b2f2967411bcb23a807f6a17b042b4c58701af95.zip Qt-b2f2967411bcb23a807f6a17b042b4c58701af95.tar.gz Qt-b2f2967411bcb23a807f6a17b042b4c58701af95.tar.bz2 | |
Fix -Wconversion warnings where possible.
In order to detect "int foo = myQReal" mistakes, one needs to compile with -Wconversion.
However that flag triggers many warnings inside Qt. This commit fixes many of them, like
qchar.h:295: warning: conversion to 'ushort' from 'unsigned int' may alter its value
qglobal.h:1026: warning: conversion to 'qreal' from 'qint64' may alter its value
qbytearray.h:441: warning: conversion to 'char' from 'int' may alter its value
Other warnings remain (such as those coming from bitfields)
Merge-request: 1460
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/corelib/tools/qbytearray.h')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 14425ba..e258481 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -442,10 +442,10 @@ class Q_CORE_EXPORT QByteRef { public: #ifdef Q_COMPILER_MANGLES_RETURN_TYPE inline operator const char() const - { return i < a.d->size ? a.d->data[i] : 0; } + { return i < a.d->size ? a.d->data[i] : char(0); } #else inline operator char() const - { return i < a.d->size ? a.d->data[i] : 0; } + { return i < a.d->size ? a.d->data[i] : char(0); } #endif inline QByteRef &operator=(char c) { if (i >= a.d->size) a.expand(i); else a.detach(); |