diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-22 08:35:08 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-22 09:18:43 (GMT) |
| commit | b7647b38103676c68ad603d1391e62c5d01dc3b2 (patch) | |
| tree | 1cfd3d9e9458965763b64a3b5e49454cba423c73 /src/corelib/tools/qmargins.h | |
| parent | 66c8ec60ff44fa8f2fb0d3994ffccf4b033fdb70 (diff) | |
| download | Qt-b7647b38103676c68ad603d1391e62c5d01dc3b2.zip Qt-b7647b38103676c68ad603d1391e62c5d01dc3b2.tar.gz Qt-b7647b38103676c68ad603d1391e62c5d01dc3b2.tar.bz2 | |
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/qmargins.h')
| -rw-r--r-- | src/corelib/tools/qmargins.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h index ba634de..b40380c 100644 --- a/src/corelib/tools/qmargins.h +++ b/src/corelib/tools/qmargins.h @@ -87,8 +87,8 @@ Q_DECLARE_TYPEINFO(QMargins, Q_MOVABLE_TYPE); inline QMargins::QMargins() { m_top = m_bottom = m_left = m_right = 0; } -inline QMargins::QMargins(int left, int top, int right, int bottom) -{ m_left = left; m_top = top; m_right = right; m_bottom = bottom; } +inline QMargins::QMargins(int aleft, int atop, int aright, int abottom) + : m_left(aleft), m_top(atop), m_right(aright), m_bottom(abottom) {} inline bool QMargins::isNull() const { return m_left==0 && m_top==0 && m_right==0 && m_bottom==0; } @@ -106,17 +106,17 @@ inline int QMargins::bottom() const { return m_bottom; } -inline void QMargins::setLeft(int left) -{ m_left = left; } +inline void QMargins::setLeft(int aleft) +{ m_left = aleft; } -inline void QMargins::setTop(int top) -{ m_top = top; } +inline void QMargins::setTop(int atop) +{ m_top = atop; } -inline void QMargins::setRight(int right) -{ m_right = right; } +inline void QMargins::setRight(int aright) +{ m_right = aright; } -inline void QMargins::setBottom(int bottom) -{ m_bottom = bottom; } +inline void QMargins::setBottom(int abottom) +{ m_bottom = abottom; } inline bool operator==(const QMargins &m1, const QMargins &m2) { |