From 34f071ed1d5a9c861f54a836e6034f3fdef709ee Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 23 Sep 2019 00:34:29 +0200 Subject: [PATCH] Change conflicting variable --- src/core/utilities.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp index 7285d8172..b728a5065 100644 --- a/src/core/utilities.cpp +++ b/src/core/utilities.cpp @@ -820,19 +820,19 @@ QString MacAddress() { QString ret; - for (QNetworkInterface &interface : QNetworkInterface::allInterfaces()) { + for (QNetworkInterface &netif : QNetworkInterface::allInterfaces()) { if ( - (interface.hardwareAddress() == "00:00:00:00:00:00") || - (interface.flags() & QNetworkInterface::IsLoopBack) || - !(interface.flags() & QNetworkInterface::IsUp) || - !(interface.flags() & QNetworkInterface::IsRunning) + (netif.hardwareAddress() == "00:00:00:00:00:00") || + (netif.flags() & QNetworkInterface::IsLoopBack) || + !(netif.flags() & QNetworkInterface::IsUp) || + !(netif.flags() & QNetworkInterface::IsRunning) ) { continue; } if (ret.isEmpty() #if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) - || interface.type() == QNetworkInterface::Ethernet || interface.type() == QNetworkInterface::Wifi + || netif.type() == QNetworkInterface::Ethernet || netif.type() == QNetworkInterface::Wifi #endif ) { - ret = interface.hardwareAddress(); + ret = netif.hardwareAddress(); } }