diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-04-06 13:46:18 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 07:00:10 +0200 |
| commit | a193c1f9b54546bf991c311164a7ea8c94fecc09 (patch) | |
| tree | 9cd553d7c08d0d5d5cafc1e9040e30c0a92371cd /src/serviceframework | |
| parent | 29a1b0576f08b01f46b86a8c394bb1b5b70a9ead (diff) | |
Fix warnings found in headers (headersclean)
qservicereply.h:95:9: error: declaration of ‘parent’ shadows a member of 'this' [-Werror=shadow]
qservicereply.h:112:5: error: declaration of ‘proxyObject’ shadows a member of 'this' [-Werror=shadow]
Change-Id: I697bb79fae7fbe77451f3652f5360fb79ba30373
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/serviceframework')
| -rw-r--r-- | src/serviceframework/qservicereply.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/serviceframework/qservicereply.h b/src/serviceframework/qservicereply.h index 308104aa..15371a39 100644 --- a/src/serviceframework/qservicereply.h +++ b/src/serviceframework/qservicereply.h @@ -91,8 +91,8 @@ class QServiceReply : public QServiceReplyBase { Q_OBJECT public: - QServiceReply(QObject *parent = 0) - : QServiceReplyBase(parent), + QServiceReply(QObject *p = 0) + : QServiceReplyBase(p), m_proxyObject(0) { // nothing to do @@ -108,9 +108,9 @@ class QServiceReply : public QServiceReplyBase return m_proxyObject; } - void setProxyObject(QObject *proxyObject) + void setProxyObject(QObject *newProxyObject) { - m_proxyObject = proxyObject; + m_proxyObject = newProxyObject; } private: |