diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-11 14:58:21 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-14 10:01:40 +0200 |
| commit | c4203e827e11de5371aecdaf3c8430e76310639e (patch) | |
| tree | 3f0e67c48ae70c97a00f8c7051a78347ee3c9c8d | |
| parent | 7390792c7ac25e515a12427735354727a0d9a9ee (diff) | |
Fixed symbol clash between sensor and positioning plug-in on iOS
locationDelegate is used by two iOS plug-ins at the same time.
This removes the duplicate names and thus fixes the build if
the same application happens to use the two APIs.
Task-number: QTBUG-40198
Change-Id: I7bb0c1400f1a088a70854b522ca81ee58f1abbb0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | src/plugins/position/corelocation/qgeopositioninfosource_cl.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm index 47ceb6b6..65848f7d 100644 --- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm +++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm @@ -46,13 +46,13 @@ #define MINIMUM_UPDATE_INTERVAL 1000 -@interface locationDelegate : NSObject <CLLocationManagerDelegate> +@interface PositionLocationDelegate : NSObject <CLLocationManagerDelegate> { QGeoPositionInfoSourceCL *m_positionInfoSource; } @end -@implementation locationDelegate +@implementation PositionLocationDelegate - (id)initWithInfoSource:(QGeoPositionInfoSourceCL*) positionInfoSource { self = [super init]; @@ -132,7 +132,7 @@ bool QGeoPositionInfoSourceCL::enableLocationManager() if (!m_locationManager) { m_locationManager = [[CLLocationManager alloc] init]; m_locationManager.desiredAccuracy = kCLLocationAccuracyBest; - m_locationManager.delegate = [[locationDelegate alloc] initWithInfoSource:this]; + m_locationManager.delegate = [[PositionLocationDelegate alloc] initWithInfoSource:this]; } return (m_locationManager != 0); |