summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2011-07-18 20:13:06 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-19 07:49:23 +0200
commit2ca901a4178ca74713d1a40363374f424dfedef1 (patch)
tree8a876daebbe2f07faa4d07d4a0c2de2fbd2c429a
parent2ff17951aefc972057560edc94cc68f6f14e11bf (diff)
Remove unused variables.
Change-Id: Iaa19026ac9d41eb9ff93b79a67a1b6375381c587 Reviewed-on: http://codereview.qt.nokia.com/1804 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
-rw-r--r--src/location/maps/qgeomappingmanagerengine.cpp4
-rw-r--r--src/location/maps/qgeomaptextobject.cpp1
-rw-r--r--src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp2
-rw-r--r--src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp2
-rw-r--r--src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp2
5 files changed, 2 insertions, 9 deletions
diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp
index fd6c8c47..362ec23f 100644
--- a/src/location/maps/qgeomappingmanagerengine.cpp
+++ b/src/location/maps/qgeomappingmanagerengine.cpp
@@ -373,7 +373,7 @@ void QGeoMappingManagerEngine::setSupportsTilting(bool supportsTilting)
bool QGeoMappingManagerEngine::supportsCustomMapObjects() const
{
Q_D(const QGeoMappingManagerEngine);
- return d_ptr->supportsCustomMapObjects;
+ return d->supportsCustomMapObjects;
}
/*!
@@ -386,7 +386,7 @@ bool QGeoMappingManagerEngine::supportsCustomMapObjects() const
void QGeoMappingManagerEngine::setSupportsCustomMapObjects(bool supportsCustomMapObjects)
{
Q_D(QGeoMappingManagerEngine);
- d_ptr->supportsCustomMapObjects = supportsCustomMapObjects;
+ d->supportsCustomMapObjects = supportsCustomMapObjects;
}
/*!
diff --git a/src/location/maps/qgeomaptextobject.cpp b/src/location/maps/qgeomaptextobject.cpp
index 68cbc154..2b9ee8cd 100644
--- a/src/location/maps/qgeomaptextobject.cpp
+++ b/src/location/maps/qgeomaptextobject.cpp
@@ -241,7 +241,6 @@ QPoint QGeoMapTextObject::offset() const
void QGeoMapTextObject::setOffset(const QPoint &off)
{
- QPointF offset = off;
if (d_ptr->offset != off) {
d_ptr->offset = off;
emit offsetChanged(off);
diff --git a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
index 02279ade..9e5928bd 100644
--- a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp
@@ -106,7 +106,6 @@ void QGeoTiledMapPolygonObjectInfo::genPoly()
double oy = origin.latitude() * 3600.0;
double oldx = ox;
- double oldy = oy;
poly << QPointF(0,0);
for (int i = 0; i < path.size(); ++i) {
@@ -125,7 +124,6 @@ void QGeoTiledMapPolygonObjectInfo::genPoly()
poly << QPointF(x - ox, y - oy);
oldx = x;
- oldy = y;
}
}
diff --git a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
index 3e76ce90..472d032b 100644
--- a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp
@@ -98,7 +98,6 @@ void QGeoTiledMapPolylineObjectInfo::genPath()
double oy = origin.latitude() * 3600.0;
double oldx = ox;
- double oldy = oy;
p.moveTo(0, 0);
for (int i = 1; i < path.size(); ++i) {
@@ -117,7 +116,6 @@ void QGeoTiledMapPolylineObjectInfo::genPath()
p.lineTo(x - ox, y - oy);
oldx = x;
- oldy = y;
}
}
diff --git a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
index e6ae4553..4b14647f 100644
--- a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp
@@ -111,7 +111,6 @@ void QGeoTiledMapRouteObjectInfo::regenPath()
if (path.size() > 0) {
double oldx = 0.0;
- double oldy = 0.0;
for (int i = 0; i < path.size(); ++i) {
double x = path.at(i).longitude() * 3600.0;
@@ -131,7 +130,6 @@ void QGeoTiledMapRouteObjectInfo::regenPath()
}
oldx = x;
- oldy = y;
}
}