From e5de212fdcd56c3a6207cd1a863cf1489339709a Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 3 May 2013 13:29:54 +0200 Subject: fix warning in ProStringList_join Fix C4267 MSVC warning. Make sepSize an int, because this function is never called with a size_t. Change-Id: I2b834fe7c1408e34d55d9f137231e2f5816f3f1d Reviewed-by: Oswald Buddenhagen (cherry picked from qtbase/98a73e16012f75934ce4b6e4c85fb4d6a2ad0a28) Reviewed-by: Joerg Bornemann Reviewed-by: hjk --- src/linguist/shared/proitems.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linguist/shared/proitems.cpp b/src/linguist/shared/proitems.cpp index 59029bc5d..8db3026eb 100644 --- a/src/linguist/shared/proitems.cpp +++ b/src/linguist/shared/proitems.cpp @@ -345,7 +345,7 @@ QTextStream &operator<<(QTextStream &t, const ProString &str) return t; } -static QString ProStringList_join(const ProStringList &this_, const QChar *sep, const size_t sepSize) +static QString ProStringList_join(const ProStringList &this_, const QChar *sep, const int sepSize) { int totalLength = 0; const int sz = this_.size(); -- cgit v1.2.1