misc cleanups (#1235)

GPSBabel · Nov 19, 2023 · c8f5179 · c8f5179
1 parent d9448e8
commit c8f5179
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -256,7 +256,6 @@ set(HEADERS
   jeeps/gpscom.h
   jeeps/gpsdatum.h
   jeeps/gpsdevice.h
-  jeeps/gpsfmt.h
   jeeps/gpsmath.h
   jeeps/gpsmem.h
   jeeps/gpsport.h

diff --git a/garmin_gpi.cc b/garmin_gpi.cc
@@ -452,7 +452,7 @@ GarminGPIFormat::read_tag(const char* caller, const int tag, Waypoint* wpt)
 
   case 0x8000b:  /* address (street/city...) */
     (void) gbfgetint32(fin);
-  // FALLTHROUGH
+    [[fallthrough]];
   case 0xb:  /* as seen in German POI files. */
     PP;
     mask = gbfgetint16(fin); /* address fields mask */

diff --git a/tpo.h b/tpo.h
@@ -138,7 +138,7 @@ class Tpo2Format : public Format, private TpoFormatBase
 public:
   QVector<arglist_t>* get_args() override
   {
-    return &tpo2_args;
+    return nullptr;
   }
 
   ff_type get_type() const override
@@ -165,19 +165,14 @@ class Tpo2Format : public Format, private TpoFormatBase
   {
     tpo_rd_deinit();
   }
-
-private:
-  /* Data Members */
-
-  QVector<arglist_t> tpo2_args = {};
 };
 
 class Tpo3Format : public Format, private TpoFormatBase
 {
 public:
   QVector<arglist_t>* get_args() override
   {
-    return &tpo3_args;
+    return nullptr;
   }
 
   ff_type get_type() const override
@@ -204,10 +199,5 @@ class Tpo3Format : public Format, private TpoFormatBase
   {
     tpo_rd_deinit();
   }
-
-private:
-  /* Data Members */
-
-  QVector<arglist_t> tpo3_args = {};
 };
 #endif // TPO_H_INCLUDED_
diff --git a/vecs.cc b/vecs.cc
@@ -706,7 +706,7 @@ void Vecs::disp_vec_options(const QString& vecname, const QVector<arglist_t>* ar
 {
   if (args) {
     for (const auto& arg : *args) {
-      if (*arg.argval && arg.argval) {
+      if (arg.argval && *arg.argval) {
         printf("options: module/option=value: %s/%s=\"%s\"",
                qPrintable(vecname), qPrintable(arg.argstring), *arg.argval);
         if (case_ignore_strcmp(arg.defaultvalue, *arg.argval) == 0) {