From 8454a6992e8b560efc72d75be1f8dbb442093519 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Wed, 30 Mar 2011 13:00:17 +0200
Subject: Fix compilation warnings

---
 src/corelib/tools/qstringbuilder.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 614346c..260b574 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -118,14 +118,14 @@ private:
     friend class QString;
     template <typename T> T convertTo() const
     {
-        const uint size = QConcatenable< QStringBuilder<A, B> >::size(*this);
-        T s(size, Qt::Uninitialized);
+        const uint len = QConcatenable< QStringBuilder<A, B> >::size(*this);
+        T s(len, Qt::Uninitialized);
 
         typename T::iterator d = s.data();
         typename T::const_iterator const start = d;
         QConcatenable< QStringBuilder<A, B> >::appendTo(*this, d);
 
-        if (!QConcatenable< QStringBuilder<A, B> >::ExactSize && int(size) != d - start) {
+        if (!QConcatenable< QStringBuilder<A, B> >::ExactSize && int(len) != d - start) {
             // this resize is necessary since we allocate a bit too much
             // when dealing with variable sized 8-bit encodings
             s.resize(d - start);
@@ -384,8 +384,7 @@ namespace QtStringBuilder {
     { typedef A ConvertTo; };
     template <typename T> struct ConvertToTypeHelper<T, QString>
     { typedef QString ConvertTo; };
-};
-
+}
 
 template <typename A, typename B>
 struct QConcatenable< QStringBuilder<A, B> >
-- 
cgit v0.12