Remove XCSV_ENABLED, MAXIMAL_ENABLED, MINIMAL_ENABLED

CMakeLists.txt

@@ -352,10 +352,8 @@ list(SORT HEADERS)
 target_sources(gpsbabel PRIVATE ${SOURCES} ${HEADERS})
 
 # We don't care about stripping things out of the build.  Full monty, baby.
-target_compile_definitions(gpsbabel PRIVATE MAXIMAL_ENABLED)
 target_compile_definitions(gpsbabel PRIVATE FILTERS_ENABLED)
 target_compile_definitions(gpsbabel PRIVATE SHAPELIB_ENABLED)
-target_compile_definitions(gpsbabel PRIVATE CSVFMTS_ENABLED)
 
 target_link_libraries(gpsbabel PRIVATE ${QT_LIBRARIES} ${LIBS})
 

garmin_txt.cc

@@ -23,7 +23,6 @@
 
 #include "defs.h"
 
-#if CSVFMTS_ENABLED
 #include <algorithm>               // for sort
 #include <cctype>                  // for toupper
 #include <cmath>                   // for fabs, floor
@@ -1433,5 +1432,3 @@ ff_vecs_t garmin_txt_vecs = {
   &garmin_txt_args,
   NULL_POS_OPS
 };
-
-#endif // CSVFMTS_ENABLED

main.cc

@@ -182,10 +182,6 @@ print_extended_info()
     "FILTERS_ENABLED "
 #endif
 
-#if CSVFMTS_ENABLED
-    "CSVFMTS_ENABLED "
-#endif
-
 #if SHAPELIB_ENABLED
     "SHAPELIB_ENABLED "
 #endif

vecs.cc

@@ -74,7 +74,6 @@
 extern ff_vecs_t geo_vecs;
 extern ff_vecs_t garmin_vecs;
 extern ff_vecs_t ozi_vecs;
-#if MAXIMAL_ENABLED
 extern ff_vecs_t holux_vecs;
 extern ff_vecs_t tpg_vecs;
 extern ff_vecs_t tpo2_vecs;
@@ -85,23 +84,18 @@ extern ff_vecs_t mtk_vecs;
 extern ff_vecs_t mtk_fvecs;
 extern ff_vecs_t mtk_m241_vecs;
 extern ff_vecs_t mtk_m241_fvecs;
-#endif // MAXIMAL_ENABLED
 extern ff_vecs_t wbt_svecs;
-#if MAXIMAL_ENABLED
 extern ff_vecs_t wbt_fvecs;
 //extern ff_vecs_t wbt_fvecs;
 extern ff_vecs_t vcf_vecs;
 extern ff_vecs_t gtm_vecs;
-#if CSVFMTS_ENABLED
 extern ff_vecs_t garmin_txt_vecs;
-#endif // CSVFMTS_ENABLED
 extern ff_vecs_t ggv_log_vecs;
 extern ff_vecs_t navilink_vecs;
 extern ff_vecs_t sbp_vecs;
 extern ff_vecs_t sbn_vecs;
 extern ff_vecs_t v900_vecs;
 extern ff_vecs_t format_garmin_xt_vecs;
-#endif // MAXIMAL_ENABLED
 
 #define MYNAME "vecs"
 
@@ -126,7 +120,6 @@ struct Vecs::Impl {
   NmeaFormat nmea_fmt;
   LegacyFormat ozi_fmt {ozi_vecs};
   KmlFormat kml_fmt;
-#if MAXIMAL_ENABLED
   LowranceusrFormat lowranceusr_fmt;
   LegacyFormat holux_fmt {holux_vecs};
   LegacyFormat tpg_fmt {tpg_vecs};
@@ -143,17 +136,13 @@ struct Vecs::Impl {
   LegacyFormat mtk_ffmt {mtk_fvecs};
   LegacyFormat mtk_m241_fmt {mtk_m241_vecs};
   LegacyFormat mtk_m241_ffmt {mtk_m241_fvecs};
-#endif // MAXIMAL_ENABLED
   LegacyFormat wbt_sfmt {wbt_svecs};
-#if MAXIMAL_ENABLED
   LegacyFormat wbt_ffmt {wbt_fvecs};
 //LegacyFormat wbt_ffmt {wbt_fvecs};
   LegacyFormat vcf_fmt {vcf_vecs};
   UnicsvFormat unicsv_fmt;
   LegacyFormat gtm_fmt {gtm_vecs};
-#if CSVFMTS_ENABLED
   LegacyFormat garmin_txt_fmt {garmin_txt_vecs};
-#endif // CSVFMTS_ENABLED
   GtrnctrFormat gtc_fmt;
   GarminGPIFormat garmin_gpi_fmt;
   RandomFormat random_fmt;
@@ -178,10 +167,8 @@ struct Vecs::Impl {
   GeoJsonFormat geojson_fmt;
   GlobalsatSportFormat globalsat_sport_fmt;
   QstarzBL1000Format qstarz_bl_1000_fmt;
-#endif // MAXIMAL_ENABLED
 
   const QVector<vecs_t> vec_list {
-#if CSVFMTS_ENABLED
     /* XCSV must be the first entry in this table. */
     {
       nullptr,
@@ -191,7 +178,6 @@ struct Vecs::Impl {
       nullptr,
       &fmtfactory<XcsvFormat>
     },
-#endif
     {
       nullptr,
       "geo",
@@ -242,7 +228,6 @@ struct Vecs::Impl {
       "kml",
       nullptr,
     },
-#if MAXIMAL_ENABLED
     {
       &lowranceusr_fmt,
       "lowranceusr",
@@ -343,15 +328,13 @@ struct Vecs::Impl {
       "bin",
       nullptr,
     },
-#endif // MAXIMAL_ENABLED
     {
       &wbt_sfmt,
       "wbt",
       "Wintec WBT-100/200 GPS Download",
       nullptr,
       nullptr,
     },
-#if MAXIMAL_ENABLED
     {
       &wbt_ffmt,
       "wbt-bin",
@@ -387,15 +370,13 @@ struct Vecs::Impl {
       "gtm",
       nullptr,
     },
-#if CSVFMTS_ENABLED
     {
       &garmin_txt_fmt,
       "garmin_txt",
       "Garmin MapSource - txt (tab delimited)",
       "txt",
       nullptr,
     },
-#endif // CSVFMTS_ENABLED
     {
       &gtc_fmt,
       "gtrnctr",
@@ -564,7 +545,6 @@ struct Vecs::Impl {
       nullptr,
       nullptr,
     }
-#endif // MAXIMAL_ENABLED
   };
 };
 
@@ -842,7 +822,6 @@ void Vecs::prepare_format(const fmtinfo_t& fmtdata)
     disp_vec_options(fmtdata.fmtname, args);
   }
 
-#if CSVFMTS_ENABLED
   /*
    * For style based formats let xcsv know the style file.  Otherwise
    * make sure xcsv knows no style file is in use. This covers the case
@@ -853,7 +832,6 @@ void Vecs::prepare_format(const fmtinfo_t& fmtdata)
   if (xcsvfmt != nullptr) {
     xcsvfmt->xcsv_setup_internal_style(fmtdata.style_filename);
   }
-#endif // CSVFMTS_ENABLED
 }
 
 Vecs::fmtinfo_t Vecs::find_vec(const QString& fmtargstring)
@@ -982,7 +960,6 @@ QVector<Vecs::vecinfo_t> Vecs::sort_and_unify_vecs() const
     }
   }
 
-#if CSVFMTS_ENABLED
   /* The style formats are based on the xcsv format,
    * Make sure we know which entry in the vector list that is.
    */
@@ -1040,7 +1017,6 @@ QVector<Vecs::vecinfo_t> Vecs::sort_and_unify_vecs() const
   if (d_ptr_->vec_list.at(0).factory != nullptr) {
     delete xcsvfmt;
   }
-#endif // CSVFMTS_ENABLED
 
   /*
    *  Display the available formats in a format that's easy for humans to

xcsv.cc

@@ -62,8 +62,6 @@
 #include "strptime.h"              // for strptime
 
 
-#if CSVFMTS_ENABLED
-
 #define MYNAME	"XCSV"
 
 const QHash<QString, XcsvStyle::xcsv_token> XcsvStyle::xcsv_tokens {
@@ -2007,4 +2005,3 @@ XcsvFormat::wr_position(Waypoint* wpt)
 
   xcsv_file->stream.flush();
 }
-#endif //CSVFMTS_ENABLED

xcsv.h

@@ -39,8 +39,6 @@
 #include "src/core/datetime.h"    // for DateTime
 #include "src/core/textstream.h"  // for TextStream
 
-#if CSVFMTS_ENABLED
-
 /*
  * Class describing an xcsv format.
  */
@@ -432,5 +430,4 @@ class XcsvFormat : public Format
 
 };
 
-#endif // CSVFMTS_ENABLED
 #endif // XCSV_H_INCLUDED_