summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-05 23:43:03 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-01-05 23:43:03 (GMT)
commitb2fc251bb4628a06282d1dcaeda79222b300b912 (patch)
tree6266f6456cfd6eedd9ea47e28cb4611735f51d5d /src
parent31e6fc5ae7f7fbe2f23b519cb76dcc579dac1f41 (diff)
downloadQt-b2fc251bb4628a06282d1dcaeda79222b300b912.zip
Qt-b2fc251bb4628a06282d1dcaeda79222b300b912.tar.gz
Qt-b2fc251bb4628a06282d1dcaeda79222b300b912.tar.bz2
Bearer Management Integration 3.
Diffstat (limited to 'src')
-rw-r--r--src/network/bearer/qcorewlanengine_mac.mm16
-rw-r--r--src/network/bearer/qcorewlanengine_mac_p.h2
2 files changed, 2 insertions, 16 deletions
diff --git a/src/network/bearer/qcorewlanengine_mac.mm b/src/network/bearer/qcorewlanengine_mac.mm
index 41ec79a..6fad457 100644
--- a/src/network/bearer/qcorewlanengine_mac.mm
+++ b/src/network/bearer/qcorewlanengine_mac.mm
@@ -75,7 +75,7 @@ inline QString cfstringRefToQstring(CFStringRef cfStringRef) {
if (CFStringGetCString(CFStringRef(cfStringRef), cstring, maxLength, kCFStringEncodingUTF8)) {
retVal = QString::fromUtf8(cstring);
}
- delete cstring;
+ delete[] cstring;
return retVal;
}
@@ -315,7 +315,7 @@ QList<QNetworkConfigurationPrivate *> QCoreWlanEngine::scanForSsids(const QStrin
CWInterface *currentInterface = [CWInterface interfaceWithName:qstringToNSString(interfaceName)];
NSError *err = nil;
NSDictionary *parametersDict = nil;
- NSArray* apArray = [NSMutableArray arrayWithArray:[currentInterface scanForNetworksWithParameters:parametersDict error:&err]];
+ NSArray* apArray = [currentInterface scanForNetworksWithParameters:parametersDict error:&err];
CWNetwork *apNetwork;
if(!err) {
@@ -396,18 +396,6 @@ bool QCoreWlanEngine::isKnownSsid(const QString &interfaceName, const QString &s
return false;
}
-QList<QNetworkConfigurationPrivate *> QCoreWlanEngine::getWlanProfiles(const QString &interfaceName)
-{
- Q_UNUSED(interfaceName)
-#if defined(MAC_SDK_10_6)
-// for( CW8021XProfile *each8021XProfile in [CW8021XProfile allUser8021XProfiles] ) {
-// qWarning() << "Profile name" << nsstringToQString([each8021XProfile ssid]);
-// }
-
-#endif
- return QList<QNetworkConfigurationPrivate *> ();
-}
-
bool QCoreWlanEngine::getAllScInterfaces()
{
networkInterfaces.clear();
diff --git a/src/network/bearer/qcorewlanengine_mac_p.h b/src/network/bearer/qcorewlanengine_mac_p.h
index 6ad093a..5bdba3d 100644
--- a/src/network/bearer/qcorewlanengine_mac_p.h
+++ b/src/network/bearer/qcorewlanengine_mac_p.h
@@ -88,8 +88,6 @@ private:
QTimer pollTimer;
QList<QNetworkConfigurationPrivate *> scanForSsids(const QString &interfaceName);
- QList<QNetworkConfigurationPrivate *> getWlanProfiles(const QString &interfaceName);
-
bool isKnownSsid(const QString &interfaceName, const QString &ssid);
QList<QNetworkConfigurationPrivate *> foundConfigurations;