[vidalia-svn] r4018: Minor changes necessitated by the Marble update. (vidalia/trunk/src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-08-09 14:29:31 -0400 (Sun, 09 Aug 2009)
New Revision: 4018

Modified:
   vidalia/trunk/src/vidalia/network/TorMapWidget.cpp
Log:

Minor changes necessitated by the Marble update.


Modified: vidalia/trunk/src/vidalia/network/TorMapWidget.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/TorMapWidget.cpp	2009-08-09 18:21:28 UTC (rev 4017)
+++ vidalia/trunk/src/vidalia/network/TorMapWidget.cpp	2009-08-09 18:29:31 UTC (rev 4018)
@@ -97,7 +97,7 @@
   kml.append("</Document></kml>");
 
   QString id = desc.id();
-  addPlaceMarkData(kml, id);
+  addPlacemarkData(kml, id);
   _routers.insert(id, GeoDataCoordinates(lon, lat, 0.0,
                                          GeoDataCoordinates::Degree));
 }
@@ -121,20 +121,16 @@
     CircuitGeoPath *geoPath = _circuits.value(circid);
 
     QString router = path.at(path.size()-1);
-    if (_routers.contains(router)) {
-      GeoDataCoordinates coords = _routers.value(router);
-      geoPath->first.append(new GeoDataCoordinates(coords));
-    }
+    if (_routers.contains(router))
+      geoPath->first.append(_routers.value(router));
   } else {
     /* Construct a new path */
     CircuitGeoPath *geoPath = new CircuitGeoPath();
     geoPath->second = false; /* initially unselected */
 
     foreach (QString router, path) {
-      if (_routers.contains(router)) {
-        GeoDataCoordinates coords = _routers.value(router);
-        geoPath->first.append(new GeoDataCoordinates(coords));
-      }      
+      if (_routers.contains(router))
+        geoPath->first.append(_routers.value(router));
     }
     geoPath->first.setTessellationFlags(Tessellate | RespectLatitudeCircle);
     _circuits.insert(circid, geoPath);
@@ -148,11 +144,8 @@
 TorMapWidget::removeCircuit(const CircuitId &circid)
 {
   CircuitGeoPath *path = _circuits.take(circid);
-  if (path) {
-    GeoDataLineString coords = path->first;
-    qDeleteAll(coords.begin(), coords.end());
+  if (path)
     delete path;
-  }
 
   repaint();
 }
@@ -207,13 +200,11 @@
 TorMapWidget::clear()
 {
   foreach (QString id, _routers.keys()) {
-    removePlaceMarkKey(id);
+    removePlacemarkKey(id);
   }
 
   foreach (CircuitId circid, _circuits.keys()) {
     CircuitGeoPath *path = _circuits.take(circid);
-    GeoDataLineString coords = path->first;
-    qDeleteAll(coords.begin(), coords.end());
     delete path;
   }