diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-22 10:35:08 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-22 11:18:43 +0200 |
| commit | b7647b38103676c68ad603d1391e62c5d01dc3b2 (patch) | |
| tree | 1cfd3d9e9458965763b64a3b5e49454cba423c73 /src/corelib/tools/qvector.h | |
| parent | 66c8ec60ff44fa8f2fb0d3994ffccf4b033fdb70 (diff) | |
Fixes some warning in headers
such as
margins.h:90: warning: declaration of ???bottom??? shadows a member of _this_"
'a' stands for argument
Reviewed-by: jbache
Diffstat (limited to 'src/corelib/tools/qvector.h')
| -rw-r--r-- | src/corelib/tools/qvector.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 2737a8774f..b77b53a21d 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -373,9 +373,9 @@ QVector<T> &QVector<T>::operator=(const QVector<T> &v) template <typename T> inline QVectorData *QVector<T>::malloc(int aalloc) { - QVectorData *data = static_cast<QVectorData *>(qMalloc(sizeOfTypedData() + (aalloc - 1) * sizeof(T))); - Q_CHECK_PTR(data); - return data; + QVectorData *vectordata = static_cast<QVectorData *>(qMalloc(sizeOfTypedData() + (aalloc - 1) * sizeof(T))); + Q_CHECK_PTR(vectordata); + return vectordata; } template <typename T> |