From eee006117e545cb38d8a8e217ac6bbf376c1b6a9 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Sun, 19 Nov 2023 22:12:30 -0600 Subject: [PATCH] Remove mkshort options. Fixes #982 --- garmin.cc | 10 ----- ozi.cc | 27 ------------ reference/format3.txt | 98 ------------------------------------------- reference/help.txt | 44 +------------------ xcsv.cc | 12 ------ xcsv.h | 15 ------- 6 files changed, 2 insertions(+), 204 deletions(-) diff --git a/garmin.cc b/garmin.cc index fb9a8cdae..ef476e35c 100644 --- a/garmin.cc +++ b/garmin.cc @@ -71,7 +71,6 @@ static char* poweroff = nullptr; static char* eraset = nullptr; static char* resettime = nullptr; static char* snlen = nullptr; -static char* snwhiteopt = nullptr; static char* deficon = nullptr; static char* category = nullptr; static char* categorybitsopt = nullptr; @@ -94,10 +93,6 @@ QVector garmin_args = { "snlen", &snlen, "Length of generated shortnames", nullptr, ARGTYPE_INT, "1", nullptr, nullptr }, - { - "snwhite", &snwhiteopt, "Allow whitespace synth. shortnames", - nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr - }, { "deficon", &deficon, "Default icon name", nullptr, ARGTYPE_STRING, ARG_NOMINMAX, nullptr }, { "get_posn", &getposn, "Return current position as a waypoint", @@ -265,7 +260,6 @@ rw_init(const QString& fname) case 786: /* HC model */ case 957: /* Legend HC */ receiver_short_length = 14; - snwhiteopt = xstrdup("1"); receiver_must_upper = 0; /* This might be 8859-1 */ receiver_charset = "windows-1252"; @@ -323,10 +317,6 @@ rw_init(const QString& fname) setshort_length(mkshort_handle, receiver_short_length); } - if (snwhiteopt) { - setshort_whitespace_ok(mkshort_handle, xstrtoi(snwhiteopt, nullptr, 10)); - } - /* * Until Garmins documents how to determine valid character space * for the new models, we just release this safety check manually. diff --git a/ozi.cc b/ozi.cc index 83d5e3a61..fc255ba3c 100644 --- a/ozi.cc +++ b/ozi.cc @@ -87,9 +87,6 @@ static int route_wpt_count; static int new_track; static char* snlenopt = nullptr; -static char* snwhiteopt = nullptr; -static char* snupperopt = nullptr; -static char* snuniqueopt = nullptr; static char* wptfgcolor = nullptr; static char* wptbgcolor = nullptr; static char* pack_opt = nullptr; @@ -114,18 +111,6 @@ QVector ozi_args = { "snlen", &snlenopt, "Max synthesized shortname length", "32", ARGTYPE_INT, "1", nullptr, nullptr }, - { - "snwhite", &snwhiteopt, "Allow whitespace synth. shortnames", - nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr - }, - { - "snupper", &snupperopt, "UPPERCASE synth. shortnames", - nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr - }, - { - "snunique", &snuniqueopt, "Make synth. shortnames unique", - nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr - }, { "wptfgcolor", &wptfgcolor, "Waypoint foreground color", "black", ARGTYPE_STRING, ARG_NOMINMAX, nullptr @@ -467,18 +452,6 @@ wr_init(const QString& fname) setshort_length(mkshort_handle, xstrtoi(snlenopt, nullptr, 10)); - if (snwhiteopt) { - setshort_whitespace_ok(mkshort_handle, xstrtoi(snwhiteopt, nullptr, 10)); - } - - if (snupperopt) { - setshort_mustupper(mkshort_handle, xstrtoi(snupperopt, nullptr, 10)); - } - - if (snuniqueopt) { - setshort_mustuniq(mkshort_handle, xstrtoi(snuniqueopt, nullptr, 10)); - } - setshort_badchars(mkshort_handle, "\","); } diff --git a/reference/format3.txt b/reference/format3.txt index fe814dd92..9c4fe5777 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -4,12 +4,6 @@ option xcsv style Full path to XCSV style file file https://www.gpsbabel.org/ option xcsv snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xcsv.html#fmt_xcsv_o_snlen -option xcsv snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xcsv.html#fmt_xcsv_o_snwhite - -option xcsv snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xcsv.html#fmt_xcsv_o_snupper - -option xcsv snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xcsv.html#fmt_xcsv_o_snunique - option xcsv urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xcsv.html#fmt_xcsv_o_urlbase option xcsv prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xcsv.html#fmt_xcsv_o_prefer_shortnames @@ -20,12 +14,6 @@ internal rw---- tabsep All database fields on one tab-separated line xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tabsep.html option tabsep snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tabsep.html#fmt_tabsep_o_snlen -option tabsep snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tabsep.html#fmt_tabsep_o_snwhite - -option tabsep snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tabsep.html#fmt_tabsep_o_snupper - -option tabsep snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tabsep.html#fmt_tabsep_o_snunique - option tabsep urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tabsep.html#fmt_tabsep_o_urlbase option tabsep prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_tabsep.html#fmt_tabsep_o_prefer_shortnames @@ -38,12 +26,6 @@ file rw---- cambridge dat Cambridge/Winpilot glider software xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html option cambridge snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_snlen -option cambridge snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_snwhite - -option cambridge snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_snupper - -option cambridge snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_snunique - option cambridge urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_urlbase option cambridge prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_cambridge.html#fmt_cambridge_o_prefer_shortnames @@ -56,12 +38,6 @@ file rw---- csv Comma separated values xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_csv.html option csv snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_csv.html#fmt_csv_o_snlen -option csv snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_csv.html#fmt_csv_o_snwhite - -option csv snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_csv.html#fmt_csv_o_snupper - -option csv snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_csv.html#fmt_csv_o_snunique - option csv urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_csv.html#fmt_csv_o_urlbase option csv prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_csv.html#fmt_csv_o_prefer_shortnames @@ -72,12 +48,6 @@ internal rw---- custom Custom "Everything" Style xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_custom.html option custom snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_custom.html#fmt_custom_o_snlen -option custom snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_custom.html#fmt_custom_o_snwhite - -option custom snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_custom.html#fmt_custom_o_snupper - -option custom snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_custom.html#fmt_custom_o_snunique - option custom urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_custom.html#fmt_custom_o_urlbase option custom prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_custom.html#fmt_custom_o_prefer_shortnames @@ -88,12 +58,6 @@ file --rw-- iblue747 csv Data Logger iBlue747 csv xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue747.html option iblue747 snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue747.html#fmt_iblue747_o_snlen -option iblue747 snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue747.html#fmt_iblue747_o_snwhite - -option iblue747 snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue747.html#fmt_iblue747_o_snupper - -option iblue747 snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue747.html#fmt_iblue747_o_snunique - option iblue747 urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue747.html#fmt_iblue747_o_urlbase option iblue747 prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue747.html#fmt_iblue747_o_prefer_shortnames @@ -104,12 +68,6 @@ file --rw-- iblue757 csv Data Logger iBlue757 csv xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html option iblue757 snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html#fmt_iblue757_o_snlen -option iblue757 snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html#fmt_iblue757_o_snwhite - -option iblue757 snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html#fmt_iblue757_o_snupper - -option iblue757 snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html#fmt_iblue757_o_snunique - option iblue757 urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html#fmt_iblue757_o_urlbase option iblue757 prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_iblue757.html#fmt_iblue757_o_prefer_shortnames @@ -148,12 +106,6 @@ file rw---- garmin301 Garmin 301 Custom position and heartrate xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin301.html option garmin301 snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin301.html#fmt_garmin301_o_snlen -option garmin301 snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin301.html#fmt_garmin301_o_snwhite - -option garmin301 snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin301.html#fmt_garmin301_o_snupper - -option garmin301 snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin301.html#fmt_garmin301_o_snunique - option garmin301 urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin301.html#fmt_garmin301_o_urlbase option garmin301 prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin301.html#fmt_garmin301_o_prefer_shortnames @@ -164,12 +116,6 @@ file --rw-- garmin_g1000 csv Garmin G1000 datalog input filter file xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html option garmin_g1000 snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html#fmt_garmin_g1000_o_snlen -option garmin_g1000 snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html#fmt_garmin_g1000_o_snwhite - -option garmin_g1000 snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html#fmt_garmin_g1000_o_snupper - -option garmin_g1000 snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html#fmt_garmin_g1000_o_snunique - option garmin_g1000 urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html#fmt_garmin_g1000_o_urlbase option garmin_g1000 prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html#fmt_garmin_g1000_o_prefer_shortnames @@ -212,12 +158,6 @@ file rw---- garmin_poi Garmin POI database xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_poi.html option garmin_poi snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_poi.html#fmt_garmin_poi_o_snlen -option garmin_poi snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_poi.html#fmt_garmin_poi_o_snwhite - -option garmin_poi snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_poi.html#fmt_garmin_poi_o_snupper - -option garmin_poi snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_poi.html#fmt_garmin_poi_o_snunique - option garmin_poi urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_poi.html#fmt_garmin_poi_o_urlbase option garmin_poi prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_poi.html#fmt_garmin_poi_o_prefer_shortnames @@ -258,8 +198,6 @@ serial rwrwrw garmin Garmin serial/USB protocol garmin https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin.html option garmin snlen Length of generated shortnames integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin.html#fmt_garmin_o_snlen -option garmin snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin.html#fmt_garmin_o_snwhite - option garmin deficon Default icon name string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin.html#fmt_garmin_o_deficon option garmin get_posn Return current position as a waypoint boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin.html#fmt_garmin_o_get_posn @@ -364,12 +302,6 @@ file --rw-- land_air_sea txt GPS Tracking Key Pro text xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html option land_air_sea snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html#fmt_land_air_sea_o_snlen -option land_air_sea snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html#fmt_land_air_sea_o_snwhite - -option land_air_sea snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html#fmt_land_air_sea_o_snupper - -option land_air_sea snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html#fmt_land_air_sea_o_snunique - option land_air_sea urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html#fmt_land_air_sea_o_urlbase option land_air_sea prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html#fmt_land_air_sea_o_prefer_shortnames @@ -382,12 +314,6 @@ file rw---- arc txt GPSBabel arc filter file xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_arc.html option arc snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_arc.html#fmt_arc_o_snlen -option arc snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_arc.html#fmt_arc_o_snwhite - -option arc snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_arc.html#fmt_arc_o_snupper - -option arc snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_arc.html#fmt_arc_o_snunique - option arc urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_arc.html#fmt_arc_o_urlbase option arc prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_arc.html#fmt_arc_o_prefer_shortnames @@ -398,12 +324,6 @@ file rw---- gpsdrive GpsDrive Format xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrive.html option gpsdrive snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrive.html#fmt_gpsdrive_o_snlen -option gpsdrive snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrive.html#fmt_gpsdrive_o_snwhite - -option gpsdrive snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrive.html#fmt_gpsdrive_o_snupper - -option gpsdrive snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrive.html#fmt_gpsdrive_o_snunique - option gpsdrive urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrive.html#fmt_gpsdrive_o_urlbase option gpsdrive prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrive.html#fmt_gpsdrive_o_prefer_shortnames @@ -414,12 +334,6 @@ file rw---- gpsdrivetrack GpsDrive Format for Tracks xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrivetrack.html option gpsdrivetrack snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrivetrack.html#fmt_gpsdrivetrack_o_snlen -option gpsdrivetrack snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrivetrack.html#fmt_gpsdrivetrack_o_snwhite - -option gpsdrivetrack snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrivetrack.html#fmt_gpsdrivetrack_o_snupper - -option gpsdrivetrack snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrivetrack.html#fmt_gpsdrivetrack_o_snunique - option gpsdrivetrack urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrivetrack.html#fmt_gpsdrivetrack_o_urlbase option gpsdrivetrack prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpsdrivetrack.html#fmt_gpsdrivetrack_o_prefer_shortnames @@ -624,12 +538,6 @@ option ozi pack Write all tracks into one file boolean https://www.gpsbabel.o option ozi snlen Max synthesized shortname length integer 32 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ozi.html#fmt_ozi_o_snlen -option ozi snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ozi.html#fmt_ozi_o_snwhite - -option ozi snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ozi.html#fmt_ozi_o_snupper - -option ozi snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ozi.html#fmt_ozi_o_snunique - option ozi wptfgcolor Waypoint foreground color string black https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ozi.html#fmt_ozi_o_wptfgcolor option ozi wptbgcolor Waypoint background color string yellow https://www.gpsbabel.org/WEB_DOC_DIR/fmt_ozi.html#fmt_ozi_o_wptbgcolor @@ -694,12 +602,6 @@ file rw---- openoffice Tab delimited fields useful for OpenOffice xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_openoffice.html option openoffice snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_openoffice.html#fmt_openoffice_o_snlen -option openoffice snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_openoffice.html#fmt_openoffice_o_snwhite - -option openoffice snupper UPPERCASE synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_openoffice.html#fmt_openoffice_o_snupper - -option openoffice snunique Make synth. shortnames unique boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_openoffice.html#fmt_openoffice_o_snunique - option openoffice urlbase Basename prepended to URL on output string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_openoffice.html#fmt_openoffice_o_urlbase option openoffice prefer_shortnames Use shortname instead of description boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_openoffice.html#fmt_openoffice_o_prefer_shortnames diff --git a/reference/help.txt b/reference/help.txt index e118164f5..5e64e7bf7 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -35,34 +35,22 @@ File Types (-i and -o options): baroiq Brauniger IQ Series Barograph Download cambridge Cambridge/Winpilot glider software snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) v900 Columbus/Visiontac V900 files (.csv) csv Comma separated values snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) iblue747 Data Logger iBlue747 csv snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) iblue757 Data Logger iBlue757 csv snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) @@ -82,17 +70,11 @@ File Types (-i and -o options): recoverymode (0/1) Attempt to recovery data from corrupt file garmin301 Garmin 301 Custom position and heartrate snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) garmin_g1000 Garmin G1000 datalog input filter file snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) @@ -114,9 +96,6 @@ File Types (-i and -o options): utc Write timestamps with offset x to UTC time garmin_poi Garmin POI database snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) @@ -137,9 +116,8 @@ File Types (-i and -o options): languagecode language code to use for reading dual language fil garmin Garmin serial/USB protocol snlen Length of generated shortnames - snwhite (0/1) Allow whitespace synth. shortnames - deficon Default icon name - get_posn (0/1) Return current position as a waypoint + deficon Default icon name + get_posn (0/1) Return current position as a waypoint power_off (0/1) Command unit to power itself down erase_t (0/1) Erase existing courses when writing new ones resettime (0/1) Sync GPS time to computer time @@ -184,34 +162,22 @@ File Types (-i and -o options): prec Precision of coordinates, number of decimals land_air_sea GPS Tracking Key Pro text snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) gtm GPS TrackMaker arc GPSBabel arc filter file snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) gpsdrive GpsDrive Format snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) gpsdrivetrack GpsDrive Format for Tracks snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) @@ -310,9 +276,6 @@ File Types (-i and -o options): ozi OziExplorer pack (0/1) Write all tracks into one file snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique wptfgcolor Waypoint foreground color wptbgcolor Waypoint background color proximity Proximity distance @@ -345,9 +308,6 @@ File Types (-i and -o options): format Format for subtitles openoffice Tab delimited fields useful for OpenOffice snlen Max synthesized shortname length - snwhite (0/1) Allow whitespace synth. shortnames - snupper (0/1) UPPERCASE synth. shortnames - snunique (0/1) Make synth. shortnames unique urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) diff --git a/xcsv.cc b/xcsv.cc index 717f55c83..5a3d5e3a7 100644 --- a/xcsv.cc +++ b/xcsv.cc @@ -1936,18 +1936,6 @@ XcsvFormat::wr_init(const QString& fname) setshort_length(xcsv_file->mkshort_handle, xstrtoi(snlenopt, nullptr, 10)); } - if (snwhiteopt) { - setshort_whitespace_ok(xcsv_file->mkshort_handle, xstrtoi(snwhiteopt, nullptr, 10)); - } - - if (snupperopt) { - setshort_mustupper(xcsv_file->mkshort_handle, xstrtoi(snupperopt, nullptr, 10)); - } - - if (snuniqueopt) { - setshort_mustuniq(xcsv_file->mkshort_handle, xstrtoi(snuniqueopt, nullptr, 10)); - } - setshort_badchars(xcsv_file->mkshort_handle, CSTR(xcsv_style->badchars)); } diff --git a/xcsv.h b/xcsv.h index 97d581f79..19bbad92b 100644 --- a/xcsv.h +++ b/xcsv.h @@ -385,9 +385,6 @@ class XcsvFormat : public Format char* styleopt = nullptr; char* snlenopt = nullptr; - char* snwhiteopt = nullptr; - char* snupperopt = nullptr; - char* snuniqueopt = nullptr; char* prefer_shortnames = nullptr; char* xcsv_urlbase = nullptr; char* opt_datum = nullptr; @@ -403,18 +400,6 @@ class XcsvFormat : public Format "snlen", &snlenopt, "Max synthesized shortname length", nullptr, ARGTYPE_INT, "1", nullptr, nullptr }, - { - "snwhite", &snwhiteopt, "Allow whitespace synth. shortnames", - nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr - }, - { - "snupper", &snupperopt, "UPPERCASE synth. shortnames", - nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr - }, - { - "snunique", &snuniqueopt, "Make synth. shortnames unique", - nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr - }, { "urlbase", &xcsv_urlbase, "Basename prepended to URL on output", nullptr, ARGTYPE_STRING, ARG_NOMINMAX, nullptr