AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trivial fix in qjsonobject.h for -Werror=shadow

Browse Source 
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>
This commit is contained in:
Jani Uusi-Rantala 2012-02-01 14:34:52 +02:00 committed by Qt by Nokia
parent 40fa7a816f
commit efecd01189
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/json/qjsonobject.h
View File

@ -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 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 &other) const { return i == other.i; }
inline bool operator!=(const iterator &o) const { return i != o.i; } inline bool operator!=(const iterator &other) const { return i != other.i; }
}; };
friend class const_iterator; friend class const_iterator;