diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-09-08 10:50:35 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-15 12:10:09 (GMT) |
| commit | efa0b410703898cb78d48d62ef7d389be2e87a33 (patch) | |
| tree | cde8db0f6e560b37a657a5ebbe5e1df0353e32ee /src | |
| parent | 873065d0c93616e6cda08daf8ba7fbef2ab139b2 (diff) | |
| download | Qt-efa0b410703898cb78d48d62ef7d389be2e87a33.zip Qt-efa0b410703898cb78d48d62ef7d389be2e87a33.tar.gz Qt-efa0b410703898cb78d48d62ef7d389be2e87a33.tar.bz2 | |
Don't use 'id' as variable name, it has special meaning in Objctive-C
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 844e38b..db577fd 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -850,7 +850,7 @@ quint64 QCoreWlanEngine::bytesReceived(const QString &id) return getBytes(interfaceStr,true); } -quint64 QCoreWlanEngine::startTime(const QString &id) +quint64 QCoreWlanEngine::startTime(const QString &identifier) { QMutexLocker locker(&mutex); QMacCocoaAutoReleasePool pool; @@ -885,7 +885,7 @@ quint64 QCoreWlanEngine::startTime(const QString &id) for(int i = 0; i < dictSize; i++) { if([ssidStr isEqualToString:keys[i]]) { const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString(objects[i]))); - if(ident == id) { + if(ident == identifier) { ok = true; } } |