diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-21 16:32:35 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 01:53:15 +0100 |
| commit | 558049e972fde4e4ba3f60c1982b63d324385bf1 (patch) | |
| tree | 7aec0f153850843d68e484280b85b1043af0c195 /src/corelib | |
| parent | 31a0358afb4fde998d1eeeaa80fc32e4420266c7 (diff) | |
Fix warnings on shadowing data members with arguments
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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qarraydataops.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index cfb1863d7a..1b8ed3372d 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -163,9 +163,9 @@ struct QGenericArrayOps struct Destructor { - Destructor(T *&iter) - : iter(&iter) - , end(iter) + Destructor(T *&it) + : iter(&it) + , end(it) { } @@ -231,10 +231,10 @@ struct QMovableArrayOps struct ReversibleDisplace { - ReversibleDisplace(T *begin, T *end, size_t displace) - : begin(begin) - , end(end) - , displace(displace) + ReversibleDisplace(T *start, T *finish, size_t diff) + : begin(start) + , end(finish) + , displace(diff) { ::memmove(begin + displace, begin, (end - begin) * sizeof(T)); } @@ -255,7 +255,7 @@ struct QMovableArrayOps struct CopyConstructor { - CopyConstructor(T *where) : where(where) {} + CopyConstructor(T *w) : where(w) {} void copy(const T *src, const T *const srcEnd) { |