summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-03-30 11:00:17 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-04-01 10:59:42 (GMT)
commit8454a6992e8b560efc72d75be1f8dbb442093519 (patch)
tree9204f37c6e05a4cecc59218aec43e7472be89ec0
parentf0a4e3f79266ce5f0a7066ad43de4d05dc94a5d2 (diff)
downloadQt-8454a6992e8b560efc72d75be1f8dbb442093519.zip
Qt-8454a6992e8b560efc72d75be1f8dbb442093519.tar.gz
Qt-8454a6992e8b560efc72d75be1f8dbb442093519.tar.bz2
Fix compilation warnings
-rw-r--r--src/corelib/tools/qstringbuilder.h9
1 files 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> >