diff options
author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2018-04-13 13:16:09 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-16 10:57:02 +0000 |
commit | 4338e285a9930f1847925ea66ac0cccb0b12fde0 (patch) | |
tree | 78431dbb9d31d782e9bb475a7da5c5404cafeb90 /src/plugins/geoservices | |
parent | 2f100373feff003b3a9f43c9314ea239f38b97b3 (diff) | |
download | qtlocation-4338e285a9930f1847925ea66ac0cccb0b12fde0.tar.gz |
Compile windows
Don't use "interface" keyword unless really needed. The interface keyword
is defined as a preprocessor macro:
#define interface struct
This was done by MS in order to be able to write this (which adds more
semantic):
interface {
HRESULT foo() = 0;
[...]
}
Change-Id: I95c6396158971220299cdc0ded6ffb11c677990c
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/plugins/geoservices')
-rw-r--r-- | src/plugins/geoservices/nokia/qgeouriprovider.cpp | 4 | ||||
-rw-r--r-- | src/plugins/geoservices/nokia/qgeouriprovider.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp index b471f7c1..cef3d484 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp +++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp @@ -82,9 +82,9 @@ void QGeoUriProvider::setCurrentHost(const QString &host) } } -void QGeoUriProvider::mobileCountryCodeChanged(int interface, const QString& mcc) +void QGeoUriProvider::mobileCountryCodeChanged(int interfaceId, const QString& mcc) { - Q_UNUSED(interface) + Q_UNUSED(interfaceId) Q_UNUSED(mcc) setCurrentHost(isInternationalNetwork() || m_localizedHost.isEmpty() ? m_internationalHost : m_localizedHost); diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.h b/src/plugins/geoservices/nokia/qgeouriprovider.h index e8d93a0f..d4d178a5 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.h +++ b/src/plugins/geoservices/nokia/qgeouriprovider.h @@ -58,7 +58,7 @@ public: QString getCurrentHost() const; private Q_SLOTS: - void mobileCountryCodeChanged(int interface, const QString& mcc); + void mobileCountryCodeChanged(int interfaceId, const QString& mcc); private: bool isInternationalNetwork() const; |