Eliminiate redundant route_head data member (GPSBabel#764)

eliminate redundant route_head data member rte_waypt_ct, replacing it with a member function rte_waypt_ct() that gets the count from the waypoint_list container.

bcr.cc

@@ -297,7 +297,7 @@ bcr_data_read()
   }
 
   /* remove empty route */
-  if (route->rte_waypt_ct == 0) {
+  if (route->rte_waypt_ct() == 0) {
     route_del_head(route);
   } else {
     bcr_create_waypts_from_route(route);

defs.h

@@ -702,7 +702,6 @@ class route_head
   QString rte_desc;
   UrlList rte_urls;
   int rte_num;
-  int rte_waypt_ct;		/* # waypoints in waypoint list */
   FormatSpecificDataList fs;
   gb_color line_color;         /* Optional line color for rendering */
   int line_width;         /* in pixels (sigh).  < 0 is unknown. */
@@ -716,6 +715,8 @@ class route_head
   route_head(const route_head& other) = delete;
   route_head& operator=(const route_head& rhs) = delete;
   ~route_head();
+
+  int rte_waypt_ct() const {return waypoint_list.count();}		/* # waypoints in waypoint list */
 };
 
 using route_hdr = void (*)(const route_head*);

garmin_txt.cc

@@ -621,7 +621,7 @@ route_disp_hdr_cb(const route_head* rte)
   cur_info = &route_info[route_idx];
   cur_info->prev_wpt = nullptr;
   cur_info->total = 0;
-  if (rte->rte_waypt_ct <= 0) {
+  if (rte->rte_waypt_ct() <= 0) {
     return;
   }
 
@@ -675,7 +675,7 @@ track_disp_hdr_cb(const route_head* track)
   cur_info = &route_info[route_idx];
   cur_info->prev_wpt = nullptr;
   cur_info->total = 0;
-  if (track->rte_waypt_ct <= 0) {
+  if (track->rte_waypt_ct() <= 0) {
     return;
   }
 

gdb.cc

@@ -112,7 +112,7 @@ static int trk_ct;	/* informational: total number of tracks in/out */
 
 /*******************************************************************************/
 
-#define ELEMENTS(a) a->rte_waypt_ct
+#define ELEMENTS(a) a->rte_waypt_ct()
 #define NOT_EMPTY(a) (a && *a)
 
 static void

ggv_ovl.cc

@@ -266,7 +266,7 @@ waypt_disp_cb(const Waypoint* wpt)
 static void
 track_disp_cb(const route_head* trk)
 {
-  int waypt_ct = trk->rte_waypt_ct;
+  int waypt_ct = trk->rte_waypt_ct();
 
   if (waypt_ct <= 0) {
     return;
@@ -294,7 +294,7 @@ track_disp_cb(const route_head* trk)
 static void
 route_disp_cb(const route_head* rte)
 {
-  int waypt_ct = rte->rte_waypt_ct;
+  int waypt_ct = rte->rte_waypt_ct();
 
   if (waypt_ct <= 0) {
     return;

gtm.cc

@@ -416,7 +416,7 @@ gtm_rd_deinit()
 
 static void count_track_styles(const route_head* rte)
 {
-  if (rte->rte_waypt_ct > 0) {
+  if (rte->rte_waypt_ct() > 0) {
     ts_count++;
   }
 }
@@ -670,7 +670,7 @@ static void write_trk_waypt(const Waypoint* wpt)
 
 static void write_trk_style(const route_head* trk)
 {
-  if (trk->rte_waypt_ct > 0) {
+  if (trk->rte_waypt_ct() > 0) {
     fwrite_string(file_out, trk->rte_name);
     fwrite_byte(file_out, 1);
     fwrite_long(file_out, 0);

humminbird.cc

@@ -729,7 +729,7 @@ humminbird_track_head(const route_head* trk)
 
   trk_head = nullptr;
   last_time = 0;
-  if (trk->rte_waypt_ct > 0) {
+  if (trk->rte_waypt_ct() > 0) {
     trk_head = (humminbird_trk_header_t*) xcalloc(1, sizeof(humminbird_trk_header_t));
     trk_points = (humminbird_trk_point_t*) xcalloc(max_points, sizeof(humminbird_trk_point_t));
 
@@ -852,7 +852,7 @@ static void
 humminbird_rte_head(const route_head* rte)
 {
   humrte = nullptr;
-  if (rte->rte_waypt_ct > 0) {
+  if (rte->rte_waypt_ct() > 0) {
     humrte = (humminbird_rte_t*) xcalloc(1, sizeof(*humrte));
   }
 }

igc.cc

@@ -499,12 +499,12 @@ static void detect_other_track(const route_head* rh)
     max_waypt_ct = 0;
   }
   // Find other track with the most waypoints
-  if (rh->rte_waypt_ct > max_waypt_ct &&
+  if (rh->rte_waypt_ct() > max_waypt_ct &&
       (rh->rte_name.isEmpty() ||
        (!rh->rte_name.startsWith(PRESTRKNAME) &&
        !rh->rte_name.startsWith(GNSSTRKNAME)))) {
     head = rh;
-    max_waypt_ct = rh->rte_waypt_ct;
+    max_waypt_ct = rh->rte_waypt_ct();
   }
 }
 
@@ -651,7 +651,7 @@ static void wr_task_hdr(const route_head* rte)
   unsigned char have_takeoff = 0;
   char flight_date[7] = "000000";
   char task_desc[MAXRECLEN] = "";
-  int num_tps = rte->rte_waypt_ct - 2;
+  int num_tps = rte->rte_waypt_ct() - 2;
   struct tm* tm;
   time_t rte_time;
   static unsigned int task_num = 1;

ignrando.cc

@@ -219,7 +219,7 @@ ignr_write_track_hdr(const route_head* track_hdr)
   }
 
   gbfprintf(fout, "\t<INFORMATIONS>\n");
-  gbfprintf(fout, "\t\t<NB_ETAPES>%d</NB_ETAPES>\n", track_hdr->rte_waypt_ct);
+  gbfprintf(fout, "\t\t<NB_ETAPES>%d</NB_ETAPES>\n", track_hdr->rte_waypt_ct());
   if (!track_hdr->rte_desc.isEmpty()) {
     gbfprintf(fout, "\t\t<DESCRIPTION>%s</DESCRIPTION>\n", STRFROMUNICODE(track_hdr->rte_desc));
   }

kml.cc

@@ -251,12 +251,12 @@ void KmlFormat::trk_coord(xg_string args, const QXmlStreamAttributes* /*attrs*/)
   if (wpt_timespan_begin.isValid() && wpt_timespan_end.isValid()) {
 
     // If there are some Waypoints, then distribute the TimeSpan to all Waypoints
-    if (trk_head->rte_waypt_ct > 0) {
+    if (trk_head->rte_waypt_ct() > 0) {
       qint64 timespan_ms = wpt_timespan_begin.msecsTo(wpt_timespan_end);
-      if (trk_head->rte_waypt_ct < 2) {
+      if (trk_head->rte_waypt_ct() < 2) {
         fatal(MYNAME ": attempt to interpolate TimeSpan with too few points.");
       }
-      qint64 ms_per_waypoint = timespan_ms / (trk_head->rte_waypt_ct - 1);
+      qint64 ms_per_waypoint = timespan_ms / (trk_head->rte_waypt_ct() - 1);
       foreach (Waypoint* trackpoint, trk_head->waypoint_list) {
         trackpoint->SetCreationTime(wpt_timespan_begin);
         wpt_timespan_begin = wpt_timespan_begin.addMSecs(ms_per_waypoint);
@@ -315,7 +315,7 @@ void KmlFormat::gx_trk_e(xg_string /*args*/, const QXmlStreamAttributes* /*attrs
     }
   }
 
-  if (!gx_trk_head->rte_waypt_ct) {
+  if (!gx_trk_head->rte_waypt_ct()) {
     track_del_head(gx_trk_head);
   }
   delete gx_trk_times;
@@ -662,7 +662,7 @@ void KmlFormat::kml_output_header(const route_head* header, const computed_trkda
   writer->writeOptionalTextElement(QStringLiteral("name"), header->rte_name);
   kml_output_trkdescription(header, td);
 
-  if (export_points && header->rte_waypt_ct > 0) {
+  if (export_points && header->rte_waypt_ct() > 0) {
     // Put the points in a subfolder
     writer->writeStartElement(QStringLiteral("Folder"));
     writer->writeTextElement(QStringLiteral("name"), QStringLiteral("Points"));
@@ -880,12 +880,12 @@ void KmlFormat::kml_output_point(const Waypoint* waypointp, kml_point_type pt_ty
 void KmlFormat::kml_output_tailer(const route_head* header)
 {
 
-  if (export_points && header->rte_waypt_ct > 0) {
+  if (export_points && header->rte_waypt_ct() > 0) {
     writer->writeEndElement(); // Close Folder tag
   }
 
   // Add a linestring for this track?
-  if (export_lines && header->rte_waypt_ct > 0) {
+  if (export_lines && header->rte_waypt_ct() > 0) {
     int needs_multigeometry = 0;
 
     foreach (const Waypoint* tpt, header->waypoint_list) {
@@ -1459,7 +1459,7 @@ void KmlFormat::kml_waypt_pr(const Waypoint* waypointp) const
 void KmlFormat::kml_track_hdr(const route_head* header) const
 {
   computed_trkdata td = track_recompute(header);
-  if (header->rte_waypt_ct > 0 && (export_lines || export_points)) {
+  if (header->rte_waypt_ct() > 0 && (export_lines || export_points)) {
     kml_output_header(header, &td);
   }
 }
@@ -1471,7 +1471,7 @@ void KmlFormat::kml_track_disp(const Waypoint* waypointp) const
 
 void KmlFormat::kml_track_tlr(const route_head* header)
 {
-  if (header->rte_waypt_ct > 0 && (export_lines || export_points)) {
+  if (header->rte_waypt_ct() > 0 && (export_lines || export_points)) {
     kml_output_tailer(header);
   }
 }
@@ -2002,7 +2002,7 @@ void KmlFormat::wr_position(Waypoint* wpt)
    * head here.
    */
   while (max_position_points &&
-         (posn_trk_head->rte_waypt_ct >= max_position_points)) {
+         (posn_trk_head->rte_waypt_ct() >= max_position_points)) {
     Waypoint* tonuke = posn_trk_head->waypoint_list.front();
     track_del_wpt(posn_trk_head, tonuke);
   }

lowranceusr.cc

@@ -1560,7 +1560,7 @@ LowranceusrFormat::lowranceusr_trail_hdr(const route_head* trk)
   gbfputint32(text_len, file_out);
   gbfwrite(CSTR(name), 1, text_len, file_out);
 
-  auto num_trail_points = (short) trk->rte_waypt_ct;
+  auto num_trail_points = (short) trk->rte_waypt_ct();
   short max_trail_size = MAX_TRAIL_POINTS;
   if (num_trail_points > max_trail_size) {
     num_trail_points = max_trail_size;
@@ -1602,7 +1602,7 @@ LowranceusrFormat::lowranceusr_route_hdr(const route_head* rte)
   gbfputs(name, file_out);
 
   /* num legs */
-  auto num_legs = (short) rte->rte_waypt_ct;
+  auto num_legs = (short) rte->rte_waypt_ct();
   gbfputint16(num_legs, file_out);
   char route_reversed=0;
   gbfwrite(&route_reversed, 1, 1, file_out);
@@ -1617,7 +1617,7 @@ LowranceusrFormat::lowranceusr4_route_hdr(const route_head* rte)
 {
   if (global_opts.debug_level >= 1) {
     printf(MYNAME " writing route #%d (%s) with %d waypts\n",
-           route_uid, qPrintable(rte->rte_name), rte->rte_waypt_ct);
+           route_uid, qPrintable(rte->rte_name), rte->rte_waypt_ct());
   }
 
   const auto* fs = reinterpret_cast<lowranceusr4_fsdata*>(rte->fs.FsChainFind(kFsLowranceusr4));
@@ -1642,7 +1642,7 @@ LowranceusrFormat::lowranceusr4_route_hdr(const route_head* rte)
   lowranceusr4_writestr(rte->rte_name, file_out, 2);
 
   /* Num Legs */
-  gbfputint32(rte->rte_waypt_ct, file_out);
+  gbfputint32(rte->rte_waypt_ct(), file_out);
 }
 
 void
@@ -1720,7 +1720,7 @@ LowranceusrFormat::lowranceusr_merge_trail_hdr(const route_head* trk)
     }
   }
 
-  trail_point_count += (short) trk->rte_waypt_ct;
+  trail_point_count += (short) trk->rte_waypt_ct();
 }
 
 void
@@ -1756,7 +1756,7 @@ LowranceusrFormat::lowranceusr4_trail_hdr(const route_head* trail)
 {
   if (global_opts.debug_level >= 1) {
     printf(MYNAME " writing trail %d (%s) with %d trailpoints\n",
-           trail_uid, qPrintable(trail->rte_name), trail->rte_waypt_ct);
+           trail_uid, qPrintable(trail->rte_name), trail->rte_waypt_ct());
   }
 
   /* UID unit number */
@@ -1803,7 +1803,7 @@ LowranceusrFormat::lowranceusr4_trail_hdr(const route_head* trail)
 //  }
 
   /* Trackpoint count */
-  gbfputint32(trail->rte_waypt_ct, file_out);
+  gbfputint32(trail->rte_waypt_ct(), file_out);
 }
 
 void

magproto.cc

@@ -1471,7 +1471,7 @@ mag_route_trl(const route_head* rte)
   QString icon_token;
 
   /* count waypoints for this route */
-  int i = rte->rte_waypt_ct;
+  int i = rte->rte_waypt_ct();
 
   /* number of output PMGNRTE messages at 2 points per line */
   int numlines = (i / 2) + (i % 2);

mapsend.cc

@@ -359,7 +359,7 @@ mapsend_route_hdr(const route_head* rte)
   gbfputint32(rte->rte_num, mapsend_file_out);
 
   /* # of waypoints to follow... */
-  gbfputint32(rte->rte_waypt_ct, mapsend_file_out);
+  gbfputint32(rte->rte_waypt_ct(), mapsend_file_out);
 }
 
 static void

mmo.cc

@@ -350,7 +350,7 @@ mmo_end_of_route(mmo_data_t* data)
     DBG((sobj, "for \"%s\" \n", data->name));
   }
 
-  if (rte->rte_waypt_ct == 0) {	/* don't keep empty routes */
+  if (rte->rte_waypt_ct() == 0) {	/* don't keep empty routes */
     route_del_head(rte);
     data->data = nullptr;
   }
@@ -721,7 +721,7 @@ mmo_read_CObjTrack(mmo_data_t* data)
     }
   }
 
-  if (trk->rte_waypt_ct == 0) {
+  if (trk->rte_waypt_ct() == 0) {
     track_del_head(trk);
     data->data = nullptr;
   }
@@ -1127,7 +1127,7 @@ mmo_enum_waypt_cb(const Waypoint*)
 static void
 mmo_enum_route_cb(const route_head* rte)
 {
-  if (rte->rte_waypt_ct > 0) {
+  if (rte->rte_waypt_ct() > 0) {
     mmo_obj_ct++;
   }
 }
@@ -1293,7 +1293,7 @@ mmo_write_rte_head_cb(const route_head* rte)
 {
   time_t time = 0x7FFFFFFF;
 
-  if (rte->rte_waypt_ct <= 0) {
+  if (rte->rte_waypt_ct() <= 0) {
     return;
   }
 
@@ -1313,18 +1313,18 @@ mmo_write_rte_head_cb(const route_head* rte)
   mmo_register_object(objid, rte, rtedata);
   mmo_write_category("CCategory", "Route");
   gbfputc(0, fout); /* unknown */
-  gbfputuint16(rte->rte_waypt_ct, fout);
+  gbfputuint16(rte->rte_waypt_ct(), fout);
 }
 
 
 static void
 mmo_write_rte_tail_cb(const route_head* rte)
 {
-  if (rte->rte_waypt_ct <= 0) {
+  if (rte->rte_waypt_ct() <= 0) {
     return;
   }
 
-  DBG(("write", "route with %d point(s).\n", rte->rte_waypt_ct));
+  DBG(("write", "route with %d point(s).\n", rte->rte_waypt_ct()));
 
   if (mmo_version >= 0x12) {
     if (rte->line_color.bbggrr < 0) {
@@ -1350,14 +1350,14 @@ mmo_write_rte_tail_cb(const route_head* rte)
 static void
 mmo_write_trk_head_cb(const route_head* trk)
 {
-  if (trk->rte_waypt_ct <= 0) {
+  if (trk->rte_waypt_ct() <= 0) {
     return;
   }
   int objid = mmo_write_obj_head("CObjTrack",
                                  trk->rte_name.isEmpty() ? "Track" : CSTR(trk->rte_name), gpsbabel_time, obj_type_trk);
 
   mmo_write_category("CCategory", "Track");
-  gbfputuint16(trk->rte_waypt_ct, fout);
+  gbfputuint16(trk->rte_waypt_ct(), fout);
 
   mmo_register_object(objid, trk, trkdata);
 }
@@ -1366,7 +1366,7 @@ mmo_write_trk_head_cb(const route_head* trk)
 static void
 mmo_write_trk_tail_cb(const route_head* trk)
 {
-  if (trk->rte_waypt_ct <= 0) {
+  if (trk->rte_waypt_ct() <= 0) {
     return;
   }
 

navilink.cc

@@ -684,7 +684,7 @@ serial_read_routes(Waypoint** waypts)
 static void
 serial_write_route_start(const route_head* route)
 {
-  route_ids = (unsigned int*) xmalloc(route->rte_waypt_ct * sizeof(unsigned));
+  route_ids = (unsigned int*) xmalloc(route->rte_waypt_ct() * sizeof(unsigned));
   route_id_ptr = 0;
 }
 

osm.cc

@@ -803,7 +803,7 @@ OsmFormat::osm_waypt_disp(const Waypoint* waypoint)
 void
 OsmFormat::osm_rte_disp_head(const route_head* route)
 {
-  skip_rte = route->rte_waypt_ct <= 0;
+  skip_rte = route->rte_waypt_ct() <= 0;
 
   if (skip_rte) {
     return;