diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2013-01-22 10:15:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 10:45:03 +0100 |
| commit | caaff1211d85d2f8e85dbc9c9e2fd42acbef3ac0 (patch) | |
| tree | a699a6974ce47445177ce254aa7dd7331001508a /src/imports | |
| parent | 2dbaae64ccd0fa3646d68d77cbc9baac7d3bde2e (diff) | |
Do not use interface as variable or parameter name
As "interface" is defined as struct in objbase.h on windows it either
should not be used as a variable or parameter name or undefed before.
(see CI failure in https://codereview.qt-project.org/#change,45321 )
As parts of QtSystems rely on other windows headers which need interface
defined as struct it cannot be 'undef'ed "globally". Thus "interface" is
replaced with proper values in files where it occurs.
Change-Id: I9f77df966c7243fbc06aea87be075bfbd9b05d4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Cristiano di Flora <cristiano.diflora@gmail.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/serviceframework/qdeclarativeserviceold.cpp | 8 | ||||
| -rw-r--r-- | src/imports/serviceframework/qdeclarativeserviceold_p.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/serviceframework/qdeclarativeserviceold.cpp b/src/imports/serviceframework/qdeclarativeserviceold.cpp index b595b5c6..52b8f5cc 100644 --- a/src/imports/serviceframework/qdeclarativeserviceold.cpp +++ b/src/imports/serviceframework/qdeclarativeserviceold.cpp @@ -107,9 +107,9 @@ QServiceInterfaceDescriptor QDeclarativeService::interfaceDesc() const This property holds the interface name of the service that corresponds to QServiceInterfaceDescriptor::interfaceName(). */ -void QDeclarativeService::setInterfaceName(const QString &interface) +void QDeclarativeService::setInterfaceName(const QString &serviceInterface) { - m_interface = interface; + m_interface = serviceInterface; updateDescriptor(); } @@ -376,9 +376,9 @@ QString QDeclarativeServiceList::serviceName() const This property holds the interface name of the services that corresponds to setting QServiceFilter::setInterface(). */ -void QDeclarativeServiceList::setInterfaceName(const QString &interface) +void QDeclarativeServiceList::setInterfaceName(const QString &serviceInterface) { - m_interface = interface; + m_interface = serviceInterface; updateFilterResults(); if (m_componentComplete) emit interfaceNameChanged(); diff --git a/src/imports/serviceframework/qdeclarativeserviceold_p.h b/src/imports/serviceframework/qdeclarativeserviceold_p.h index a4446e26..d39fdffe 100644 --- a/src/imports/serviceframework/qdeclarativeserviceold_p.h +++ b/src/imports/serviceframework/qdeclarativeserviceold_p.h @@ -68,7 +68,7 @@ public: void setInterfaceDesc(const QServiceInterfaceDescriptor& desc); QServiceInterfaceDescriptor interfaceDesc() const; - void setInterfaceName(const QString& interface); + void setInterfaceName(const QString& serviceInterface); QString interfaceName() const; QString serviceName() const; void setServiceName(const QString &service); @@ -147,7 +147,7 @@ public: void setServiceName(const QString& service); QString serviceName() const; - void setInterfaceName(const QString& interface); + void setInterfaceName(const QString& serviceInterface); QString interfaceName() const; void setMinorVersion(int minor); |