aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJukka Jokiniva <jukka.jokiniva@qt.io>2019-09-11 08:49:25 +0300
committerJukka Jokiniva <jukka.jokiniva@qt.io>2019-09-11 10:23:01 +0300
commit51d1472eb3e605c9da7030be1f7ef5ae36975aa6 (patch)
tree37318cd558247d99e890f178b39a991f8faac277
parent5021eef798b2afed3f8ceca696cb993ffa188b96 (diff)
Fix compile error in MinGW build
Method parameter interface conflicts in MinGW build. Renamed interface to interfaceName. Task-number: AUTOSUITE-1236 Change-Id: I18a5841810d8ce784872cecd41469e34a315a034 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
-rw-r--r--src/ivicore/qiviserviceinterface.cpp2
-rw-r--r--src/ivicore/qiviserviceinterface.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ivicore/qiviserviceinterface.cpp b/src/ivicore/qiviserviceinterface.cpp
index 79cd83e..06d1885 100644
--- a/src/ivicore/qiviserviceinterface.cpp
+++ b/src/ivicore/qiviserviceinterface.cpp
@@ -83,7 +83,7 @@ QIviServiceInterface::~QIviServiceInterface()
*/
/*!
- \fn QObject* QIviServiceInterface::interfaceInstance(const QString& interface) const
+ \fn QObject* QIviServiceInterface::interfaceInstance(const QString& interfaceName) const
Returns an object implementing the service interface requested through \a interface.
*/
diff --git a/src/ivicore/qiviserviceinterface.h b/src/ivicore/qiviserviceinterface.h
index 98e43f6..e842c86 100644
--- a/src/ivicore/qiviserviceinterface.h
+++ b/src/ivicore/qiviserviceinterface.h
@@ -70,10 +70,10 @@ public:
virtual ~QIviServiceInterface();
virtual QStringList interfaces() const = 0;
- virtual QIviFeatureInterface *interfaceInstance(const QString &interface) const = 0;
+ virtual QIviFeatureInterface *interfaceInstance(const QString &interfaceName) const = 0;
- template <class T> T interfaceInstance(const QString &interface) const {
- T inst = qivi_interface_cast<T>(interfaceInstance(interface));
+ template <class T> T interfaceInstance(const QString &interfaceName) const {
+ T inst = qivi_interface_cast<T>(interfaceInstance(interfaceName));
return inst;
}
};