diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-10-15 11:18:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-15 13:46:52 +0200 |
| commit | 09d882150937d61f7764a0c208de064ef1f8236a (patch) | |
| tree | aa7f9067aa6eae9fd339b706f476f34c33068625 | |
| parent | f23e58322ef73731b74d19d82425cedab9512149 (diff) | |
Fix potential enum value clashes in QGeoPositionInfoSource::Error.
The declarative version of the position info source reuses the C++ enums.
Nevertheless the declarative version may add its own enums as well.
Shift the enum values such that C++ and QML version of the API can stay
in sync and at the same time add values independent from each other.
Change-Id: Ic7082a3d34e7a69f6518a3f1268ee319068bf15d
Reviewed-by: Anders Gunnarsson <anders.gunnarsson@appello.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| -rw-r--r-- | src/imports/positioning/qdeclarativepositionsource_p.h | 3 | ||||
| -rw-r--r-- | src/positioning/qgeopositioninfosource.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/positioning/qdeclarativepositionsource_p.h b/src/imports/positioning/qdeclarativepositionsource_p.h index fc720301..61593a28 100644 --- a/src/imports/positioning/qdeclarativepositionsource_p.h +++ b/src/imports/positioning/qdeclarativepositionsource_p.h @@ -86,7 +86,8 @@ public: AccessError = QGeoPositionInfoSource::AccessError, ClosedError = QGeoPositionInfoSource::ClosedError, UnknownSourceError = QGeoPositionInfoSource::UnknownSourceError, - SocketError + //Leave a gap for future error enum values in QGeoPositionInfoSource::Error + SocketError = 100 }; Q_ENUMS(SourceError) diff --git a/src/positioning/qgeopositioninfosource.h b/src/positioning/qgeopositioninfosource.h index 3e1d54c8..3c641f57 100644 --- a/src/positioning/qgeopositioninfosource.h +++ b/src/positioning/qgeopositioninfosource.h @@ -57,9 +57,9 @@ class Q_POSITIONING_EXPORT QGeoPositionInfoSource : public QObject public: enum Error { - AccessError, - ClosedError, /* 1 */ - UnknownSourceError = -1 + AccessError = 0, + ClosedError, + UnknownSourceError }; Q_ENUMS(Error) |