Commit 4338e285 authored by Jan Arve Sæther's avatar Jan Arve Sæther Committed by Paolo Angelelli
Browse files

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: default avatarPaolo Angelelli <paolo.angelelli@qt.io>
parent 2f100373
No related merge requests found
Showing with 3 additions and 3 deletions
...@@ -82,9 +82,9 @@ void QGeoUriProvider::setCurrentHost(const QString &host) ...@@ -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) Q_UNUSED(mcc)
setCurrentHost(isInternationalNetwork() || m_localizedHost.isEmpty() ? m_internationalHost : m_localizedHost); setCurrentHost(isInternationalNetwork() || m_localizedHost.isEmpty() ? m_internationalHost : m_localizedHost);
......
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
QString getCurrentHost() const; QString getCurrentHost() const;
private Q_SLOTS: private Q_SLOTS:
void mobileCountryCodeChanged(int interface, const QString& mcc); void mobileCountryCodeChanged(int interfaceId, const QString& mcc);
private: private:
bool isInternationalNetwork() const; bool isInternationalNetwork() const;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment