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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 60d6921c4e..2737a8774f 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -543,7 +543,7 @@ void QVector<T>::append(const T &t)
 template <typename T>
 Q_TYPENAME QVector<T>::iterator QVector<T>::insert(iterator before, size_type n, const T &t)
 {
-    int offset = before - p->array;
+    int offset = int(before - p->array);
     if (n != 0) {
         const T copy(t);
         if (d->ref != 1 || d->size + n > d->alloc)
@@ -577,8 +577,8 @@ Q_TYPENAME QVector<T>::iterator QVector<T>::insert(iterator before, size_type n,
 template <typename T>
 Q_TYPENAME QVector<T>::iterator QVector<T>::erase(iterator abegin, iterator aend)
 {
-    int f = abegin - p->array;
-    int l = aend - p->array;
+    int f = int(abegin - p->array);
+    int l = int(aend - p->array);
     int n = l - f;
     detach();
     if (QTypeInfo<T>::isComplex) {