Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unused QBearerEngine members

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-11-26 00:38:49 +00:00
parent 304775706d
commit ad51f0e024
3 changed files with 4 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/network/bearer/qbearerengine.cpp
View file

@ -49,25 +49,12 @@ QBearerEngine::~QBearerEngine()
QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator it; QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator it;
QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator end; QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator end;
for (it = snapConfigurations.begin(), end = snapConfigurations.end(); it != end; ++it) {
it.value()->isValid = false;
it.value()->id.clear();
}
snapConfigurations.clear();
for (it = accessPointConfigurations.begin(), end = accessPointConfigurations.end(); for (it = accessPointConfigurations.begin(), end = accessPointConfigurations.end();
it != end; ++it) { it != end; ++it) {
it.value()->isValid = false; it.value()->isValid = false;
it.value()->id.clear(); it.value()->id.clear();
} }
accessPointConfigurations.clear(); accessPointConfigurations.clear();
for (it = userChoiceConfigurations.begin(), end = userChoiceConfigurations.end();
it != end; ++it) {
it.value()->isValid = false;
it.value()->id.clear();
}
userChoiceConfigurations.clear();
} }
bool QBearerEngine::requiresPolling() const bool QBearerEngine::requiresPolling() const
@ -92,18 +79,6 @@ bool QBearerEngine::configurationsInUse() const
return true; return true;
} }
for (it = snapConfigurations.constBegin(),
end = snapConfigurations.constEnd(); it != end; ++it) {
if (it.value()->ref > 1)
return true;
}
for (it = userChoiceConfigurations.constBegin(),
end = userChoiceConfigurations.constEnd(); it != end; ++it) {
if (it.value()->ref > 1)
return true;
}
return false; return false;
} }

2
src/network/bearer/qbearerengine_p.h
View file

@ -95,8 +95,6 @@ protected:
//it must be updated if configurations change, are added/removed or //it must be updated if configurations change, are added/removed or
//the members of ServiceNetworks change //the members of ServiceNetworks change
QHash<QString, QNetworkConfigurationPrivatePointer> accessPointConfigurations; QHash<QString, QNetworkConfigurationPrivatePointer> accessPointConfigurations;
QHash<QString, QNetworkConfigurationPrivatePointer> snapConfigurations;
QHash<QString, QNetworkConfigurationPrivatePointer> userChoiceConfigurations;
QMutex mutex; QMutex mutex;
}; };

61
src/network/bearer/qnetworkconfigmanager_p.cpp
View file

@ -85,43 +85,10 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(
} }
// Engines don't have a default configuration. // Engines don't have a default configuration.
// Return first active snap
QNetworkConfigurationPrivatePointer defaultConfiguration; QNetworkConfigurationPrivatePointer defaultConfiguration;
foreach (QBearerEngine *engine, sessionEngines) {
QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator it;
QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator end;
QMutexLocker locker(&engine->mutex);
for (it = engine->snapConfigurations.begin(),
end = engine->snapConfigurations.end(); it != end; ++it) {
QNetworkConfigurationPrivatePointer ptr = it.value();
QMutexLocker configLocker(&ptr->mutex);
if ((ptr->state & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
QNetworkConfiguration config;
config.d = ptr;
return config;
} else if (!defaultConfiguration) {
if ((ptr->state & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered)
defaultConfiguration = ptr;
}
}
}
// No Active SNAPs return first Discovered SNAP.
if (defaultConfiguration) {
QNetworkConfiguration config;
config.d = defaultConfiguration;
return config;
}
/* /*
No Active or Discovered SNAPs, find the perferred access point. Find the perferred access point. The following priority order is used:
The following priority order is used:
1. Active Ethernet 1. Active Ethernet
2. Active WLAN 2. Active WLAN
@ -213,20 +180,6 @@ QList<QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurati
result << pt; result << pt;
} }
} }
//find all service networks
for (it = engine->snapConfigurations.begin(),
end = engine->snapConfigurations.end(); it != end; ++it) {
QNetworkConfigurationPrivatePointer ptr = it.value();
QMutexLocker configLocker(&ptr->mutex);
if ((ptr->state & filter) == filter) {
QNetworkConfiguration pt;
pt.d = ptr;
result << pt;
}
}
} }
return result; return result;
@ -241,16 +194,10 @@ QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIden
foreach (QBearerEngine *engine, sessionEngines) { foreach (QBearerEngine *engine, sessionEngines) {
QMutexLocker locker(&engine->mutex); QMutexLocker locker(&engine->mutex);
if (engine->accessPointConfigurations.contains(identifier)) if (engine->accessPointConfigurations.contains(identifier)) {
item.d = engine->accessPointConfigurations[identifier]; item.d = engine->accessPointConfigurations[identifier];
else if (engine->snapConfigurations.contains(identifier)) return item;
item.d = engine->snapConfigurations[identifier]; }
else if (engine->userChoiceConfigurations.contains(identifier))
item.d = engine->userChoiceConfigurations[identifier];
else
continue;
return item;
} }
return item; return item;