From efecd011897e8852cf67ce119dafa879fc671b9c Mon Sep 17 00:00:00 2001 From: Jani Uusi-Rantala Date: Wed, 1 Feb 2012 14:34:52 +0200 Subject: Trivial fix in qjsonobject.h for -Werror=shadow There was a few errors coming from other components using qtbase - error: declaration of 'o' shadows a member of 'this' [-Werror=shadow]. Change-Id: Ib394f404370f001e68fde8b424cd5fff527d8fe7 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/corelib/json/qjsonobject.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/json/qjsonobject.h b/src/corelib/json/qjsonobject.h index 5963b3be7a..d2831a3cea 100644 --- a/src/corelib/json/qjsonobject.h +++ b/src/corelib/json/qjsonobject.h @@ -158,8 +158,8 @@ public: inline const_iterator &operator+=(int j) { i += j; return *this; } inline const_iterator &operator-=(int j) { i -= j; return *this; } - inline bool operator==(const iterator &o) const { return i == o.i; } - inline bool operator!=(const iterator &o) const { return i != o.i; } + inline bool operator==(const iterator &other) const { return i == other.i; } + inline bool operator!=(const iterator &other) const { return i != other.i; } }; friend class const_iterator; -- cgit v1.2.3