diff -r ef0373b55136 -r 758a864f9613 src/network/bearer/qnetworkconfiguration_p.h --- a/src/network/bearer/qnetworkconfiguration_p.h Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/bearer/qnetworkconfiguration_p.h Mon Oct 04 01:19:32 2010 +0300 @@ -68,6 +68,7 @@ QNetworkConfigurationPrivate () : mutex(QMutex::Recursive), type(QNetworkConfiguration::Invalid), purpose(QNetworkConfiguration::UnknownPurpose), + bearerType(QNetworkConfiguration::BearerUnknown), isValid(false), roamingSupported(false) { } @@ -78,24 +79,22 @@ serviceNetworkMembers.clear(); } - virtual QString bearerName() const + virtual QString bearerTypeName() const { - QMutexLocker locker(&mutex); - - return bearer; + return QLatin1String("Unknown"); } QMap serviceNetworkMembers; mutable QMutex mutex; - QString bearer; QString name; QString id; QNetworkConfiguration::StateFlags state; QNetworkConfiguration::Type type; QNetworkConfiguration::Purpose purpose; + QNetworkConfiguration::BearerType bearerType; bool isValid; bool roamingSupported;