From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 25 Mar 2013 02:06:13 +0000 (+0000)
Subject: Minor cleanups in geo's new reader.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~593
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b9b79711eb95e1a8d249242a923db10644c2197b;p=gpsbabel.git

Minor cleanups in geo's new reader.
---

diff --git a/gpsbabel/geo.cc b/gpsbabel/geo.cc
index f77136f28..09d1c9235 100644
--- a/gpsbabel/geo.cc
+++ b/gpsbabel/geo.cc
@@ -57,6 +57,10 @@ char * ShimString(QString s)
 {
   return xstrdup(s.toUtf8().data());
 }
+char * ShimString(QStringRef s) 
+{
+  return xstrdup(s.toString().toUtf8().data());
+}
 
 double ShimAttributeDouble(QXmlStreamAttributes a, QString v) 
 {
@@ -78,7 +82,7 @@ void GeoReadLoc()
       }
       if (reader.name() == "name") {
         QXmlStreamAttributes a = reader.attributes();
-        wpt->shortname = ShimString(a.value("id").toString());
+        wpt->shortname = ShimString(a.value("id"));
         wpt->description = ShimString(reader.readElementText());
       }
       if (reader.name() == "coord") {
@@ -327,7 +331,6 @@ void wpt_container(const char* args, const char** unused)
   }
   waypt_alloc_gc_data(wpt_tmp)->container = v;
 }
-#endif
 void wpt_diff(const char* args, const char** unused)
 {
   if (!args) {
@@ -343,6 +346,7 @@ void wpt_terr(const char* args, const char** unused)
   }
   waypt_alloc_gc_data(wpt_tmp)->terr = atof(args) * 10;
 }
+#endif
 
 static void
 geo_rd_init(const char* fname)