diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-29 06:39:05 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-02 00:09:06 (GMT) |
commit | d12f39e50e4144f3272424bb0bff18c857105654 (patch) | |
tree | ffde9a7863c78af2adabcb9c7e85c79d9f79cfc6 /src/plugins/bearer/nativewifi | |
parent | 613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf (diff) | |
download | Qt-d12f39e50e4144f3272424bb0bff18c857105654.zip Qt-d12f39e50e4144f3272424bb0bff18c857105654.tar.gz Qt-d12f39e50e4144f3272424bb0bff18c857105654.tar.bz2 |
Use an enum to return the bearer type of a network configuration.
Task-number: QTBUG-12378
Reviewed-by: Alex
Diffstat (limited to 'src/plugins/bearer/nativewifi')
-rw-r--r-- | src/plugins/bearer/nativewifi/qnativewifiengine.cpp | 7 | ||||
-rw-r--r-- | src/plugins/bearer/nativewifi/qnativewifiengine.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp index 1a55402..ba8297e 100644 --- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp @@ -206,7 +206,7 @@ void QNativeWifiEngine::scanComplete() ptr->id = id; ptr->state = state; ptr->type = QNetworkConfiguration::InternetAccessPoint; - ptr->bearer = QLatin1String("WLAN"); + ptr->bearerType = QNetworkConfiguration::BearerWLAN; accessPointConfigurations.insert(id, ptr); @@ -350,11 +350,6 @@ bool QNativeWifiEngine::hasIdentifier(const QString &id) return false; } -/*QString QNativeWifiEngine::bearerName(const QString &) -{ - return QLatin1String("WLAN"); -}*/ - void QNativeWifiEngine::connectToId(const QString &id) { QMutexLocker locker(&mutex); diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.h b/src/plugins/bearer/nativewifi/qnativewifiengine.h index 0e9576b..dccf2e2 100644 --- a/src/plugins/bearer/nativewifi/qnativewifiengine.h +++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h @@ -75,8 +75,6 @@ public: QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - //QString bearerName(const QString &id); - void connectToId(const QString &id); void disconnectFromId(const QString &id); |