[Marble-commits] KDE/kdeedu/marble/src/lib/routing

Dennis Nienhüser earthwings at gentoo.org
Sat May 1 18:35:48 CEST 2010


SVN commit 1121546 by nienhueser:

Indent tags, write utf8 as indicated in the xml header.

 M  +6 -4      RoutingModel.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingModel.cpp #1121545:1121546
@@ -249,8 +249,10 @@
     QString content( "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\n" );
     content += "<gpx xmlns=\"http://www.topografix.com/GPX/1/1\" creator=\"Marble\" version=\"1.1\" ";
     content += "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ";
-    content += "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">\n";
-    content += "<metadata><link href=\"http://edu.kde.org/marble\"><text>Marble Virtual Globe</text></link></metadata>\n";
+    content += "xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 ";
+    content += "http://www.topografix.com/GPX/1/1/gpx.xsd\">\n";
+    content += "<metadata>\n  <link href=\"http://edu.kde.org/marble\">\n    ";
+    content += "<text>Marble Virtual Globe</text>\n  </link>\n</metadata>\n";
 
     QList<RouteElement> instructions;
     content += "<trk>\n<name>Route</name>\n<trkseg>\n";
@@ -263,7 +265,7 @@
             instructions << element;
         }
     }
-    content += "</trkseg></trk>";
+    content += "    </trkseg>\n  </trk>\n";
 
     content += "<rte>\n<name>Route</name>\n";
     foreach( const RouteElement &element, instructions ) {
@@ -276,7 +278,7 @@
     content += "</rte>\n";
     content += "</gpx>\n";
 
-    device->write( content.toLocal8Bit() );
+    device->write( content.toUtf8() );
 }
 
 void RoutingModel::clear()


More information about the Marble-commits mailing list