diff options
author | Jani Uusi-Rantala <jani.uusi-rantala@nokia.com> | 2012-02-01 14:34:52 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 00:00:45 +0100 |
commit | efecd011897e8852cf67ce119dafa879fc671b9c (patch) | |
tree | 73bc4905be56758cdc2f819365f90be08e66d897 /src/corelib/json | |
parent | 40fa7a816fae344f443ab7c4d431ded0179dace1 (diff) |
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 <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/json')
-rw-r--r-- | src/corelib/json/qjsonobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |