summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2014-12-05 08:30:12 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2014-12-05 15:32:46 +0100
commit05ad2fc2f4267defd4b9b7f0b8706d2624f10d12 (patch)
tree457bd95df3168e54cfc380345a6a0442ce963c12
parentb74e046174fa22399b9a2c944ccac56c49564ed6 (diff)
Fix warnings by MSVC 64 in qtranslator.cpp.
kernel\qtranslator.cpp(880) : warning C4267: 'initializing' : conversion from 'size_t' to 'const uint', possible loss of data kernel\qtranslator.cpp(881) : warning C4267: 'initializing' : conversion from 'size_t' to 'const uint', possible loss of data kernel\qtranslator.cpp(882) : warning C4267: 'initializing' : conversion from 'size_t' to 'const uint', possible loss of data kernel\qtranslator.cpp(975) : warning C4267: 'initializing' : conversion from 'size_t' to 'const int', possible loss of data Task-number: QTBUG-39757 Change-Id: I54f130e1d83ecc1623ab3c7b9b4fb14de6351625 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--src/corelib/kernel/qtranslator.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 22bf8fdc21..c2d8397ae0 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -877,9 +877,9 @@ static QString getMessage(const uchar *m, const uchar *end, const char *context,
{
const uchar *tn = 0;
uint tn_length = 0;
- const uint sourceTextLen = strlen(sourceText);
- const uint contextLen = strlen(context);
- const uint commentLen = strlen(comment);
+ const uint sourceTextLen = uint(strlen(sourceText));
+ const uint contextLen = uint(strlen(context));
+ const uint commentLen = uint(strlen(comment));
for (;;) {
uchar tag = 0;
@@ -972,7 +972,7 @@ QString QTranslatorPrivate::do_translate(const char *context, const char *source
return QString();
c = contextArray + (2 + (hTableSize << 1) + (off << 1));
- const int contextLen = strlen(context);
+ const uint contextLen = uint(strlen(context));
for (;;) {
quint8 len = read8(c++);
if (len == 0)