From b2fc251bb4628a06282d1dcaeda79222b300b912 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 6 Jan 2010 09:43:03 +1000
Subject: Bearer Management Integration 3.

---
 src/network/bearer/qcorewlanengine_mac.mm  | 16 ++--------------
 src/network/bearer/qcorewlanengine_mac_p.h |  2 --
 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;
 
-- 
cgit v0.12