diff options
| author | David Laing <david.laing@nokia.com> | 2010-10-05 08:56:59 +1000 |
|---|---|---|
| committer | David Laing <david.laing@nokia.com> | 2010-10-05 09:00:46 +1000 |
| commit | f4115b5b1e944b224e6a85facbcad8e96badf592 (patch) | |
| tree | 3ab0a3388c97d2c8688b358e4938cb06bf80d8e9 | |
| parent | 830e0ae8ab89824eba29521bf980f980922ef497 (diff) | |
Potential fix for position source confusion on S60.
| -rw-r--r-- | src/location/qgeopositioninfosource_s60.cpp | 4 | ||||
| -rw-r--r-- | src/location/qgeopositioninfosource_s60_p.h | 13 | ||||
| -rw-r--r-- | src/location/qgeosatelliteinfosource_s60_p.h | 13 |
3 files changed, 26 insertions, 4 deletions
diff --git a/src/location/qgeopositioninfosource_s60.cpp b/src/location/qgeopositioninfosource_s60.cpp index b29a2eba31..031bef4d1f 100644 --- a/src/location/qgeopositioninfosource_s60.cpp +++ b/src/location/qgeopositioninfosource_s60.cpp @@ -307,7 +307,7 @@ TInt CQGeoPositionInfoSourceS60::getMoreAccurateMethod(TInt aTimeout, TUint8 aBi for (TInt i = 0 ; i < mListSize; i++) { if (mList[i].mIsAvailable - //&& posMethods.testFlag(mList[i].mPosMethod) + && posMethods.testFlag(mList[i].mPosMethod) && (mList[i].mStatus != TPositionModuleStatus::EDeviceUnknown) && (mList[i].mStatus != TPositionModuleStatus::EDeviceError) && (((aBits >> i) & 1)) @@ -328,7 +328,7 @@ TInt CQGeoPositionInfoSourceS60::getMoreAccurateMethod(TInt aTimeout, TUint8 aBi for (TInt i = 0 ; i < mListSize; i++) { if (mList[i].mIsAvailable - //&& posMethods.testFlag(mList[i].mPosMethod) + && posMethods.testFlag(mList[i].mPosMethod) && (mList[i].mStatus != TPositionModuleStatus::EDeviceUnknown) && (mList[i].mStatus != TPositionModuleStatus::EDeviceError) && (((aBits >> i) & 1))) { diff --git a/src/location/qgeopositioninfosource_s60_p.h b/src/location/qgeopositioninfosource_s60_p.h index 2207472239..f2e7794572 100644 --- a/src/location/qgeopositioninfosource_s60_p.h +++ b/src/location/qgeopositioninfosource_s60_p.h @@ -42,6 +42,17 @@ #ifndef QGEOPOSITIONINFOSOURCES60_H #define QGEOPOSITIONINFOSOURCES60_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + // INCLUDES #include <e32std.h> #include <e32base.h> @@ -50,7 +61,7 @@ #include "qmlbackendao_s60_p.h" #include "notificationcallback_s60_p.h" -#define MAX_SIZE 5 +#define MAX_SIZE 25 QTM_BEGIN_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_s60_p.h b/src/location/qgeosatelliteinfosource_s60_p.h index 1814b6da5e..86e3dbfe3a 100644 --- a/src/location/qgeosatelliteinfosource_s60_p.h +++ b/src/location/qgeosatelliteinfosource_s60_p.h @@ -42,6 +42,17 @@ #ifndef QGEOSATELLITEINFOSOURCE60_H_ #define QGEOSATELLITEINFOSOURCE60_H_ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + // INCLUDES #include <e32std.h> #include <e32base.h> @@ -49,7 +60,7 @@ #include "qgeosatelliteinfosource.h" #include "notificationsatellitecallback_s60_p.h" -#define MAX_SIZE 5 +#define MAX_SIZE 25 QTM_BEGIN_NAMESPACE |