From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 6 Feb 2013 06:55:28 +0000 (+0000)
Subject: Move url_link and utf_string to be more C++-ish.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~679
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1b5b2a3089eba198589d11ad5f1e28c86dbf3c1e;p=gpsbabel.git

Move url_link and utf_string to be more C++-ish.
---

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 3d75d3e7e..5883400e7 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -262,10 +262,15 @@ typedef enum {
   gc_small
 } geocache_container;
 
-typedef struct {
-  int is_html;
+class utf_string{
+ public:
+  utf_string() :
+    is_html(false),
+    utfstring(NULL)
+  {};
+  bool is_html;
   char* utfstring;
-} utf_string;
+};
 
 typedef struct {
   int id; /* The decimal cache number */
@@ -346,11 +351,17 @@ fs_xml* fs_xml_alloc(long type);
 /*
  * Structures and functions for multiple URLs per waypoint.
  */
-typedef struct url_link {
+class url_link {
+ public: 
+    url_link() :
+    url_next(NULL),
+    url(NULL),
+    url_link_text(NULL)
+     {} ;
   struct url_link* url_next;
   char* url;
   char* url_link_text;
-} url_link;
+};
 
 /*
  * Misc bitfields inside struct waypoint;