QNetworkConfiguration: remove unused member 'serviceNetworkMembers'
It's never set anywhere, neiher in QtBase nor in any other Qt module. So, remove. Change-Id: If616d350a1c1c74f6f3e87f8cd98ccb3bff5cf70 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This commit is contained in:
parent
a44a3a4999
commit
cd563b3497
@ -414,34 +414,7 @@ bool QNetworkConfiguration::isRoamingAvailable() const
|
||||
*/
|
||||
QList<QNetworkConfiguration> QNetworkConfiguration::children() const
|
||||
{
|
||||
QList<QNetworkConfiguration> results;
|
||||
|
||||
if (!d)
|
||||
return results;
|
||||
|
||||
QMutexLocker locker(&d->mutex);
|
||||
|
||||
if (d->type != QNetworkConfiguration::ServiceNetwork || !d->isValid)
|
||||
return results;
|
||||
|
||||
for (auto it = d->serviceNetworkMembers.begin(), end = d->serviceNetworkMembers.end(); it != end;) {
|
||||
QNetworkConfigurationPrivatePointer p = it.value();
|
||||
//if we have an invalid member get rid of it -> was deleted earlier on
|
||||
{
|
||||
QMutexLocker childLocker(&p->mutex);
|
||||
|
||||
if (!p->isValid) {
|
||||
it = d->serviceNetworkMembers.erase(it);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
QNetworkConfiguration item;
|
||||
item.d = p;
|
||||
results << item;
|
||||
++it;
|
||||
}
|
||||
|
||||
return results;
|
||||
return {};
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -72,13 +72,6 @@ public:
|
||||
isValid(false), roamingSupported(false),
|
||||
timeout(DefaultTimeout)
|
||||
{}
|
||||
virtual ~QNetworkConfigurationPrivate()
|
||||
{
|
||||
//release pointers to member configurations
|
||||
serviceNetworkMembers.clear();
|
||||
}
|
||||
|
||||
QMap<unsigned int, QNetworkConfigurationPrivatePointer> serviceNetworkMembers;
|
||||
|
||||
mutable QMutex mutex;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user