ivicore: Don't shadow other members in template classes

Change-Id: I8dbc90830f815b90f26af7c343b3548c13c60d94
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/ivicore/qivipendingreply.h b/src/ivicore/qivipendingreply.h
index d22504c..bb89dea 100644
--- a/src/ivicore/qivipendingreply.h
+++ b/src/ivicore/qivipendingreply.h
@@ -121,9 +121,9 @@ public:
         : QIviPendingReplyBase(qMetaTypeId<T>())
     {}
 
-    void setSuccess(const T &value)
+    void setSuccess(const T &val)
     {
-        setSuccessNoCheck(QVariant::fromValue(value));
+        setSuccessNoCheck(QVariant::fromValue(val));
     }
 
     T reply() const { return m_watcher->value().template value<T>(); }
@@ -143,9 +143,9 @@ public:
         : QIviPendingReplyBase(qMetaTypeId<QVariant>())
     {}
 
-    void setSuccess(const QVariant &value)
+    void setSuccess(const QVariant &val)
     {
-        setSuccessNoCheck(value);
+        setSuccessNoCheck(val);
     }
 
     QVariant reply() const { return m_watcher->value(); }
diff --git a/src/ivicore/qivisimulationproxy.h b/src/ivicore/qivisimulationproxy.h
index 8e23e9c..980826d 100644
--- a/src/ivicore/qivisimulationproxy.h
+++ b/src/ivicore/qivisimulationproxy.h
@@ -127,8 +127,8 @@ namespace qtivi_private {
     template <typename T> class QIviSimulationProxy: public QIviSimulationProxyBase
     {
     public:
-        QIviSimulationProxy(QObject *parent=nullptr)
-            : QIviSimulationProxyBase(&staticMetaObject, m_instance, methodMap(), parent)
+        QIviSimulationProxy(QObject *p=nullptr)
+            : QIviSimulationProxyBase(&staticMetaObject, m_instance, methodMap(), p)
         {
             Q_ASSERT_X(m_instance, "QIviSimulationProxy()", "QIviSimulationProxy::registerInstance needs to be called first");
         }