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

Fix warnings on shadowing data members with arguments

Browse Source 
Example emitted by GCC 4.2.1:

    warning: declaration of ‘iter’ shadows a member of 'this'

Change-Id: I288da01c511a1404bf41881a6c96a5f3cd00d0a7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
This commit is contained in:
João Abecasis 2012-02-21 16:32:35 +01:00 committed by Qt by Nokia
parent 31a0358afb
commit 558049e972
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/tools/qarraydataops.h
View File

@ -163,9 +163,9 @@ struct QGenericArrayOps
struct Destructor struct Destructor
{ {
Destructor(T *&iter) Destructor(T *&it)
: iter(&iter) : iter(&it)
, end(iter) , end(it)
{ {
} }
@ -231,10 +231,10 @@ struct QMovableArrayOps
struct ReversibleDisplace struct ReversibleDisplace
{ {
ReversibleDisplace(T *begin, T *end, size_t displace) ReversibleDisplace(T *start, T *finish, size_t diff)
: begin(begin) : begin(start)
, end(end) , end(finish)
, displace(displace) , displace(diff)
{ {
::memmove(begin + displace, begin, (end - begin) * sizeof(T)); ::memmove(begin + displace, begin, (end - begin) * sizeof(T));
} }
@ -255,7 +255,7 @@ struct QMovableArrayOps
struct CopyConstructor struct CopyConstructor
{ {
CopyConstructor(T *where) : where(where) {} CopyConstructor(T *w) : where(w) {}
void copy(const T *src, const T *const srcEnd) void copy(const T *src, const T *const srcEnd)
{ {