AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNetworkInterfaceManager: use ranged-for in interfaceFrom*

Browse Source 
Also replace the long template names with auto.

Change-Id: Idfaf4493266cf251e85cbf23bcd6bfe74b713cf0
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Mårten Nordheim 2017-10-23 16:14:27 +02:00
parent 5b9f4a7130
commit 760e80feb2
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/network/kernel/qnetworkinterface.cpp
View File

@ -91,17 +91,16 @@ QNetworkInterfaceManager::~QNetworkInterfaceManager()
QSharedDataPointer<QNetworkInterfacePrivate> QNetworkInterfaceManager::interfaceFromName(const QString &name)
{
QList<QSharedDataPointer<QNetworkInterfacePrivate> > interfaceList = allInterfaces();
QList<QSharedDataPointer<QNetworkInterfacePrivate> >::ConstIterator it = interfaceList.constBegin();
const auto interfaceList = allInterfaces();
bool ok;
uint index = name.toUInt(&ok);
for ( ; it != interfaceList.constEnd(); ++it) {
if (ok && (*it)->index == int(index))
return *it;
else if ((*it)->name == name)
return *it;
for (const auto &interface : interfaceList) {
if (ok && interface->index == int(index))
return interface;
else if (interface->name == name)
return interface;
}
return empty;
@ -109,11 +108,11 @@ QSharedDataPointer<QNetworkInterfacePrivate> QNetworkInterfaceManager::interface
QSharedDataPointer<QNetworkInterfacePrivate> QNetworkInterfaceManager::interfaceFromIndex(int index)
{
QList<QSharedDataPointer<QNetworkInterfacePrivate> > interfaceList = allInterfaces();
QList<QSharedDataPointer<QNetworkInterfacePrivate> >::ConstIterator it = interfaceList.constBegin();
for ( ; it != interfaceList.constEnd(); ++it)
if ((*it)->index == index)
return *it;
const auto interfaceList = allInterfaces();
for (const auto &interface : interfaceList) {
if (interface->index == index)
return interface;
}
return empty;
}