Fix compile error in MinGW build

Method parameter interface conflicts in MinGW build.
Renamed interface to interfaceName.

Task-number: AUTOSUITE-1236
Change-Id: I6e425830590ab8281772ae1f3372fa9a2410626f
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

5 files changed, 16 insertions, 16 deletions

diff --git a/src/ivicore/qiviabstractfeature.cpp b/src/ivicore/qiviabstractfeature.cpp
index 906ac5f..aaa59d0 100644
--- a/src/ivicore/qiviabstractfeature.cpp
+++ b/src/ivicore/qiviabstractfeature.cpp
@@ -54,10 +54,10 @@
 
 QT_BEGIN_NAMESPACE
 
-QIviAbstractFeaturePrivate::QIviAbstractFeaturePrivate(const QString &interface, QIviAbstractFeature *parent)
+QIviAbstractFeaturePrivate::QIviAbstractFeaturePrivate(const QString &interfaceName, QIviAbstractFeature *parent)
     : QObjectPrivate()
     , q_ptr(parent)
-    , m_interface(interface)
+    , m_interface(interfaceName)
     , m_serviceObject(nullptr)
     , m_discoveryMode(QIviAbstractFeature::AutoDiscovery)
     , m_discoveryResult(QIviAbstractFeature::NoResult)
@@ -257,10 +257,10 @@ void QIviAbstractFeaturePrivate::onInitializationDone()
 
     The \a parent argument is passed on to the \l QObject constructor.
 
-    The \a interface argument is used to locate suitable service objects.
+    The \a interfaceName argument is used to locate suitable service objects.
 */
-QIviAbstractFeature::QIviAbstractFeature(const QString &interface, QObject *parent)
-    : QObject(*new QIviAbstractFeaturePrivate(interface, this), parent)
+QIviAbstractFeature::QIviAbstractFeature(const QString &interfaceName, QObject *parent)
+    : QObject(*new QIviAbstractFeaturePrivate(interfaceName, this), parent)
 {
     Q_D(QIviAbstractFeature);
     d->initialize();
diff --git a/src/ivicore/qiviabstractfeature.h b/src/ivicore/qiviabstractfeature.h
index b6fb4ca..1d03352 100644
--- a/src/ivicore/qiviabstractfeature.h
+++ b/src/ivicore/qiviabstractfeature.h
@@ -93,7 +93,7 @@ public:
     };
     Q_ENUM(DiscoveryResult)
 
-    explicit QIviAbstractFeature(const QString &interface, QObject *parent = nullptr);
+    explicit QIviAbstractFeature(const QString &interfaceName, QObject *parent = nullptr);
 
     QIviServiceObject *serviceObject() const;
     QIviAbstractFeature::DiscoveryMode discoveryMode() const;
diff --git a/src/ivicore/qiviabstractfeaturelistmodel.cpp b/src/ivicore/qiviabstractfeaturelistmodel.cpp
index 77a7fb0..dbd8e3e 100644
--- a/src/ivicore/qiviabstractfeaturelistmodel.cpp
+++ b/src/ivicore/qiviabstractfeaturelistmodel.cpp
@@ -45,8 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QIviHelperFeature::QIviHelperFeature(const QString &interface, QIviAbstractFeatureListModel *model)
-    : QIviAbstractFeature(interface)
+QIviHelperFeature::QIviHelperFeature(const QString &interfaceName, QIviAbstractFeatureListModel *model)
+    : QIviAbstractFeature(interfaceName)
     , m_model(model)
 {
 }
@@ -98,9 +98,9 @@ const QIviAbstractFeaturePrivate *QIviHelperFeature::iviPrivate() const
     return d;
 }
 
-QIviAbstractFeatureListModelPrivate::QIviAbstractFeatureListModelPrivate(const QString &interface, QIviAbstractFeatureListModel *model)
+QIviAbstractFeatureListModelPrivate::QIviAbstractFeatureListModelPrivate(const QString &interfaceName, QIviAbstractFeatureListModel *model)
     : QAbstractItemModelPrivate()
-    , m_feature(new QIviHelperFeature(interface, model))
+    , m_feature(new QIviHelperFeature(interfaceName, model))
     , m_qmlCreation(false)
 {
 
@@ -189,10 +189,10 @@ QIviFeatureInterface *QIviAbstractFeatureListModelPrivate::backend() const
 
     The \a parent argument is passed on to the \l QAbstractListModel base class.
 
-    The \a interface argument is used to locate suitable service objects.
+    The \a interfaceName argument is used to locate suitable service objects.
 */
-QIviAbstractFeatureListModel::QIviAbstractFeatureListModel(const QString &interface, QObject *parent)
-    : QAbstractListModel(*new QIviAbstractFeatureListModelPrivate(interface, this), parent)
+QIviAbstractFeatureListModel::QIviAbstractFeatureListModel(const QString &interfaceName, QObject *parent)
+    : QAbstractListModel(*new QIviAbstractFeatureListModelPrivate(interfaceName, this), parent)
 {
     Q_D(QIviAbstractFeatureListModel);
     d->initialize();
diff --git a/src/ivicore/qiviabstractfeaturelistmodel.h b/src/ivicore/qiviabstractfeaturelistmodel.h
index 989830c..ee8d621 100644
--- a/src/ivicore/qiviabstractfeaturelistmodel.h
+++ b/src/ivicore/qiviabstractfeaturelistmodel.h
@@ -64,7 +64,7 @@ class Q_QTIVICORE_EXPORT QIviAbstractFeatureListModel : public QAbstractListMode
 
 public:
 
-    explicit QIviAbstractFeatureListModel(const QString &interface, QObject *parent = nullptr);
+    explicit QIviAbstractFeatureListModel(const QString &interfaceName, QObject *parent = nullptr);
 
     QIviServiceObject *serviceObject() const;
     QIviAbstractFeature::DiscoveryMode discoveryMode() const;
diff --git a/src/ivicore/qiviabstractfeaturelistmodel_p.h b/src/ivicore/qiviabstractfeaturelistmodel_p.h
index ea09a91..47f185f 100644
--- a/src/ivicore/qiviabstractfeaturelistmodel_p.h
+++ b/src/ivicore/qiviabstractfeaturelistmodel_p.h
@@ -67,7 +67,7 @@ class Q_QTIVICORE_EXPORT QIviHelperFeature : public QIviAbstractFeature
     Q_OBJECT
 
 public:
-    QIviHelperFeature(const QString &interface, QIviAbstractFeatureListModel *model);
+    QIviHelperFeature(const QString &interfaceName, QIviAbstractFeatureListModel *model);
 
     bool acceptServiceObject(QIviServiceObject *so) override;
     bool acceptServiceObjectDefaultImpl(QIviServiceObject *so);
@@ -90,7 +90,7 @@ public:
 class Q_QTIVICORE_EXPORT QIviAbstractFeatureListModelPrivate : public QAbstractItemModelPrivate
 {
 public:
-    QIviAbstractFeatureListModelPrivate(const QString &interface, QIviAbstractFeatureListModel *model);
+    QIviAbstractFeatureListModelPrivate(const QString &interfaceName, QIviAbstractFeatureListModel *model);
     ~QIviAbstractFeatureListModelPrivate() override;
 
     virtual void initialize();