diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-04-06 14:09:52 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2013-04-07 18:19:41 +0200 |
| commit | f1fee68a6716304be54d0219d25ad60bd048dc40 (patch) | |
| tree | d484c89eea46179542919135f7fc5deb00a9cf87 /src | |
| parent | 231b3ac1581d5aaf8bf3c6a70153c6560e215a00 (diff) | |
| download | qtlocation-f1fee68a6716304be54d0219d25ad60bd048dc40.tar.gz | |
Fix warnings in qtlocation found by GCC 4.8
qgeocameratiles.cpp:584:31: warning: typedef ‘iter’ locally defined but not used [-Wunused-local-typedefs]
qgeotiledmappingmanagerengine.cpp:237:51: warning: typedef ‘cache_iter’ locally defined but not used [-Wunused-local-typedefs]
locationvaluetypeprovider.h:73:10: warning: unused parameter ‘dataSize’ [-Wunused-parameter]
Change-Id: I7200cc6094ce55c807b3e6dbbd37b6b94f5e6a57
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/location/locationvaluetypeprovider.h | 6 | ||||
| -rw-r--r-- | src/location/maps/qgeocameratiles.cpp | 1 | ||||
| -rw-r--r-- | src/location/maps/qgeotiledmappingmanagerengine.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/imports/location/locationvaluetypeprovider.h b/src/imports/location/locationvaluetypeprovider.h index 4890c5a1..3b86da66 100644 --- a/src/imports/location/locationvaluetypeprovider.h +++ b/src/imports/location/locationvaluetypeprovider.h @@ -73,6 +73,7 @@ private: bool typedInit(void *data, size_t dataSize) { Q_ASSERT(dataSize >= sizeof(T)); + Q_UNUSED(dataSize); T *t = reinterpret_cast<T *>(data); new (t) T(); return true; @@ -84,6 +85,7 @@ private: bool typedDestroy(void *data, size_t dataSize) { Q_ASSERT(dataSize >= sizeof(T)); + Q_UNUSED(dataSize); T *t = reinterpret_cast<T *>(data); t->~T(); return true; @@ -95,6 +97,7 @@ private: bool typedCopyConstruct(const void *src, void *dst, size_t dstSize) { Q_ASSERT(dstSize >= sizeof(T)); + Q_UNUSED(dstSize); const T *srcT = reinterpret_cast<const T *>(src); T *dstT = reinterpret_cast<T *>(dst); new (dstT) T(*srcT); @@ -121,6 +124,7 @@ private: bool typedStore(const void *src, void *dst, size_t dstSize) { Q_ASSERT(dstSize >= sizeof(T)); + Q_UNUSED(dstSize); const T *srcT = reinterpret_cast<const T *>(src); T *dstT = reinterpret_cast<T *>(dst); new (dstT) T(*srcT); @@ -135,6 +139,7 @@ private: T *dstT = reinterpret_cast<T *>(dst); if (srcType == dstType) { Q_ASSERT(srcSize >= sizeof(T)); + Q_UNUSED(srcSize); const T *srcT = reinterpret_cast<const T *>(src); *dstT = *srcT; } else { @@ -149,6 +154,7 @@ private: bool typedWrite(const void *src, void *dst, size_t dstSize) { Q_ASSERT(dstSize >= sizeof(T)); + Q_UNUSED(dstSize); const T *srcT = reinterpret_cast<const T *>(src); T *dstT = reinterpret_cast<T *>(dst); if (*dstT != *srcT) { diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp index d5ce2f58..daff7235 100644 --- a/src/location/maps/qgeocameratiles.cpp +++ b/src/location/maps/qgeocameratiles.cpp @@ -581,7 +581,6 @@ QPair<Polygon, Polygon> QGeoCameraTilesPrivate::clipFootprintToMap(const Polygon double side = 1.0 * sideLength_; - typedef Polygon::iterator iter; typedef Polygon::const_iterator const_iter; const_iter i = footprint.constBegin(); diff --git a/src/location/maps/qgeotiledmappingmanagerengine.cpp b/src/location/maps/qgeotiledmappingmanagerengine.cpp index a2e8c10e..0dc3eaa3 100644 --- a/src/location/maps/qgeotiledmappingmanagerengine.cpp +++ b/src/location/maps/qgeotiledmappingmanagerengine.cpp @@ -234,8 +234,6 @@ void QGeoTiledMappingManagerEngine::engineTileFinished(const QGeoTileSpec &spec, d->tileHash_.remove(spec); - typedef QSet<QGeoTileCache *>::const_iterator cache_iter; - tileCache()->insert(spec, bytes, format, d->cacheHint_); map = maps.constBegin(); |