From 65733af6aa0a494a21b6083628cec69dff005ad1 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 29 Jan 2012 19:15:04 +0100 Subject: [PATCH] Fix compilation of Qt apps with -Wshadow -Werror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qstring.h:648:70: error: declaration of ‘size’ shadows a member of 'this' Change-Id: I96d2a5b1201b53b11d23bf194b89fa8967b9e25d Reviewed-by: Oswald Buddenhagen --- src/corelib/tools/qstring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index daf0fde6b0..614ba714e2 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -645,7 +645,7 @@ class QLatin1String { public: Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s) : m_size(s ? int(strlen(s)) : 0), m_data(s) {} - Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s, int size) : m_size(size), m_data(s) {} + Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s, int sz) : m_size(sz), m_data(s) {} inline const char *latin1() const { return m_data; } inline int size() const { return m_size; }