Final deprecation of: cup dmtlog dna igc itracku navitel nima raymari…

…ne s_and_t tef_xml tef_xml teletype teletype tomtom tomtom_asc tomtom_itn tomtom_itn_places wintec_tes wintec_tes xol (GPSBabel#884)

Second wave of Feb 28 gpsbabel-misc discussion, "RFC: Removing little used..."

CMakeLists.txt

@@ -83,7 +83,6 @@ set(MINIMAL_FMTS
 set(ALL_FMTS ${MINIMAL_FMTS}
   brauniger_iq.cc
   dg-100.cc
-  dmtlog.cc
   exif.cc
   garmin_fit.cc
   garmin_gpi.cc
@@ -99,33 +98,25 @@ set(ALL_FMTS ${MINIMAL_FMTS}
   html.cc
   humminbird.cc
   igc.cc
-  itracku.cc
   lowranceusr.cc
   mtk_logger.cc
   navilink.cc
-  navitel.cc
   osm.cc
   ozi.cc
   qstarz_bl_1000.cc
   random.cc
-  raymarine.cc
   sbn.cc
   sbp.cc
   shape.cc
   skytraq.cc
   subrip.cc
-  tef_xml.cc
-  teletype.cc
   text.cc
-  tomtom.cc
   tpg.cc
   tpo.cc
   unicsv.cc
   v900.cc
   vcf.cc
-  wintec_tes.cc
   xcsv.cc
-  xol.cc
 )
 
 # ALL_FMTS = $$MINIMAL_FMTS
@@ -256,13 +247,10 @@ set(HEADERS
   skytraq.h
   strptime.h
   subrip.h
-  tef_xml.h
-  teletype.h
   text.h
   unicsv.h
   units.h
   vecs.h
-  wintec_tes.h
   xcsv.h
   xmlgeneric.h
   jeeps/garminusb.h
@@ -375,8 +363,6 @@ set(TESTS
   classic-2
   classic-3
   dg100
-  dmtlog
-  dna
   dop_filter
   duplicate
   exif
@@ -402,7 +388,6 @@ set(TESTS
   iblue747
   igc
   interpolate
-  itracku
   kml-read
   kml
   lowranceusr
@@ -411,15 +396,13 @@ set(TESTS
   mtk
   multiurlgpx
   navilink
-  navitel
   nmea
   osm
   ozi
   polygon
   position
   qstarz_bl_1000
   radius
-  raymarine
   realtime
   resample
   route_reverse
@@ -434,11 +417,7 @@ set(TESTS
   stackfilter
   subrip
   swap
-  teletype
   text
-  tomtom_asc
-  tomtom_itn
-  tomtom
   tpg
   tpo
   track-discard
@@ -451,9 +430,7 @@ set(TESTS
   validate_formats
   validate
   vcard
-  wintec_tes
   xcsv
-  xol
 )
 
 list(SORT TESTS)

GPSBabel.pro

@@ -58,7 +58,6 @@ MINIMAL_FMTS = \
 ALL_FMTS = $$MINIMAL_FMTS \
   brauniger_iq.cc \
   dg-100.cc \
-  dmtlog.cc \
   exif.cc \
   f90g_track.cc \
   garmin_fit.cc \
@@ -75,33 +74,25 @@ ALL_FMTS = $$MINIMAL_FMTS \
   html.cc \
   humminbird.cc \
   igc.cc \
-  itracku.cc \
   lowranceusr.cc \
   mtk_logger.cc \
   navilink.cc \
-  navitel.cc \
   osm.cc \
   ozi.cc \
   qstarz_bl_1000.cc \
   random.cc \
-  raymarine.cc \
   sbn.cc \
   sbp.cc \
   shape.cc \
   skytraq.cc \
   subrip.cc \
-  tef_xml.cc \
-  teletype.cc \
   text.cc \
-  tomtom.cc \
   tpg.cc \
   tpo.cc \
   unicsv.cc \
   v900.cc \
   vcf.cc \
-  wintec_tes.cc \
   xcsv.cc \
-  xol.cc
 
 # ALL_FMTS = $$MINIMAL_FMTS
 
@@ -232,13 +223,10 @@ HEADERS =  \
   skytraq.h \
   strptime.h \
   subrip.h \
-  tef_xml.h \
-  teletype.h \
   text.h \
   unicsv.h \
   units.h \
   vecs.h \
-  wintec_tes.h \
   xcsv.h \
   xmlgeneric.h \
   jeeps/garminusb.h \

README.contrib

@@ -12,18 +12,18 @@ functions.
 You may find format_skeleton.c and filter_skeleton.c in the source tree
 to be helpful examples. Just add meat!
 
-Prefer Qt objects/classes to ISO C/POSIX services.  
- * QStrings are reference counted, implicitly shared, and have a 
-   robust supporting library.  
- * QDateTime supports sub-second time and a range of dates far 
-   beyond 1970->2038 and are much more pleasant to work with 
-   than ctime/mktime/struct tm.  
+Prefer Qt objects/classes to ISO C/POSIX services.
+ * QStrings are reference counted, implicitly shared, and have a
+   robust supporting library.
+ * QDateTime supports sub-second time and a range of dates far
+   beyond 1970->2038 and are much more pleasant to work with
+   than ctime/mktime/struct tm.
  * QXmlStreamReader and Writer eliminate the need to explictly quote data.
 "But I see strcpy, sprintf, and struct tm and such in the code!"  It's
-true; GPSBabel is a tenured project of well over ten years.  We have 
-code that predates our move to C++/Qt that isn't well tested or has a 
-low payoff to modernize and uses old constructs.  Our actively 
-maintained/strategic formats like GPX and KML tend to be better 
+true; GPSBabel is a tenured project of well over ten years.  We have
+code that predates our move to C++/Qt that isn't well tested or has a
+low payoff to modernize and uses old constructs.  Our actively
+maintained/strategic formats like GPX and KML tend to be better
 examples of modern programming and are generally better models to
 follow. New code shouldn't be using xstrdup and gbfprintf.
 
@@ -64,7 +64,7 @@ If you are creating a new target your work should include the following files:
   GPSBabel.
 * Makefile.in - an updated Makefile telling the compiler how to build and link
   your conversion into GPSBabel
-* testo.d/$TARGET - an updated script that tests your conversion (this should 
+* testo.d/$TARGET - an updated script that tests your conversion (this should
   produce no output if all is good, see the current testo script for examples)
 * YourOutput - a sample file of code produced by your function (used in testo
   and lives in a directory called "reference").
@@ -77,37 +77,37 @@ occur frequently!
 Documentation
 -------------
 
-HTML and text documentation are generated automatically from DocBook 
-source located in the "xmldoc" directory.  That directory contains 
+HTML and text documentation are generated automatically from DocBook
+source located in the "xmldoc" directory.  That directory contains
 two subdirectories of interest: "formats" and "filters".  If your
 contribution adds or affects a format, you'll want to be in the "formats"
 directory.  Otherwise, you'll want to be in the "filters" directory.
 
 You should contribute a file called "yourname.xml", where "yourname" is the
-name you would give on the command-line to invoke your new format or filter.  
+name you would give on the command-line to invoke your new format or filter.
 For example, the arc filter is documented in "filters/arc.xml".
 
-This file contains a general description of your format or filter, any 
-limitations in your support for it, and anything else the end user should 
-know.  For file formats, links to manufacturers' websites are encouraged.  
-The contents of this file are not valid or even well-formed XML on their own; 
-they are included into a larger framework.  If you know DocBook, you should 
+This file contains a general description of your format or filter, any
+limitations in your support for it, and anything else the end user should
+know.  For file formats, links to manufacturers' websites are encouraged.
+The contents of this file are not valid or even well-formed XML on their own;
+they are included into a larger framework.  If you know DocBook, you should
 ensure that the contents of this file will validate if included in a <section>.
-If you do not know DocBook, see the other files in this directory for examples 
-or see http://docbook.org/tdg/en/html/docbook.html for the gory details.  Tags 
-of interest will almost certainly include <para> for paragraphs, 
-<ulink url="..."> for web links, and <screen format="linespecific"> for 
+If you do not know DocBook, see the other files in this directory for examples
+or see http://docbook.org/tdg/en/html/docbook.html for the gory details.  Tags
+of interest will almost certainly include <para> for paragraphs,
+<ulink url="..."> for web links, and <screen format="linespecific"> for
 example command lines.
 
 For each option supported by your format or filter, you should also contribute
 a file in the "options" subdirectory called "yourname-youroption.xml", again
-using the names you would use on the command line to invoke your format or 
+using the names you would use on the command line to invoke your format or
 filter with that particular option.  For example, the "distance" option to the
-"arc" filter is documented in "filters/options/arc-distance.xml".  These 
+"arc" filter is documented in "filters/options/arc-distance.xml".  These
 files are similar to the general description above, and should meet the same
 validation requirements.
 
-As of this writing, there are two formats that violate this rule: Magellan 
+As of this writing, there are two formats that violate this rule: Magellan
 serial and Microsoft Streets & Trips.  Because those formats have the same
 names as other formats, their descriptions are located in "magellan1.xml" and
 "msroute1.xml" respectively.  These are special cases, and you should do your

gpsbabel.qrc

@@ -3,9 +3,7 @@
         <file>style/arc.style</file>
         <file>style/cambridge.style</file>
         <file>style/csv.style</file>
-        <file>style/cup.style</file>
         <file>style/custom.style</file>
-        <file>style/dna.style</file>
         <file>style/garmin301.style</file>
         <file>style/garmin_g1000.style</file>
         <file>style/garmin_poi.style</file>
@@ -14,14 +12,7 @@
         <file>style/iblue747.style</file>
         <file>style/iblue757.style</file>
         <file>style/land_air_sea.style</file>
-        <file>style/navigonwpt.style</file>
-        <file>style/nima.style</file>
         <file>style/openoffice.style</file>
-        <file>style/ricoh.style</file>
-        <file>style/s_and_t.style</file>
         <file>style/tabsep.style</file>
-        <file>style/tomtom_asc.style</file>
-        <file>style/tomtom_itn_places.style</file>
-        <file>style/tomtom_itn.style</file>
     </qresource>
 </RCC>

igc.cc

@@ -154,12 +154,14 @@ inline state_t& operator++(state_t& s) // prefix
 {
   return s = static_cast<state_t>(s + 1);
 }
+#if 0 // No callers.
 inline state_t operator++(state_t& s, int) // postfix
 {
   state_t ret(s);
   ++s;
   return ret;
 }
+#endif
 
 /**
  * Handle pre- or post-flight task declarations.

reference/format0.txt

@@ -39,45 +39,27 @@ lowranceusr	usr	Lowrance USR
 magellanx	upt	Magellan SD files (as for eXplorist)
 magellan		Magellan SD files (as for Meridian)
 magellan		Magellan serial protocol
-s_and_t	txt	Microsoft Streets and Trips 2002-2007
 miniHomer		MiniHomer, a skyTraq Venus 6 based logger (download tracks, waypoints and get/set POI)
 garmin_xt		Mobile Garmin XT Track files
 mtk-bin	bin	MTK Logger (iBlue 747,...) Binary File Format
 mtk		MTK Logger (iBlue 747,Qstarz BT-1000,...) download
 tpg	tpg	National Geographic Topo .tpg (waypoints)
 tpo2	tpo	National Geographic Topo 2.x .tpo
 tpo3	tpo	National Geographic Topo 3.x/4.x .tpo
-navigonwpt		Navigon Waypoints
 navilink		NaviGPS GT-11/BGT-11 Download
 sbp	sbp	NaviGPS GT-31/BGT-31 datalogger (.sbp)
 sbn	sbn	NaviGPS GT-31/BGT-31 SiRF binary logfile (.sbn)
-navitel_trk	bin	Navitel binary track (.bin)
-dna	dna	Navitrak DNA marker format
-nima		NIMA/GNIS Geographic Names File
 nmea		NMEA 0183 sentences
 osm	osm	OpenStreetMap data files
 ozi		OziExplorer
 qstarz_bl-1000		Qstarz BL-1000
-raymarine	rwf	Raymarine Waypoint File (.rwf)
-ricoh	log	Ricoh GPS Log File
-cup	cup	See You flight analysis data
 skytraq		SkyTraq Venus based loggers (download)
 skytraq-bin	bin	SkyTraq Venus based loggers Binary File Format
 subrip	srt	SubRip subtitles for video mapping (.srt)
-xol	xol	Swiss Map 25/50/100 (.xol)
 openoffice		Tab delimited fields useful for OpenOffice
-teletype		Teletype [ Get Jonathon Johnson to describe
 text	txt	Textual Output
-tomtom_itn	itn	TomTom Itineraries (.itn)
-tomtom_itn_places	itn	TomTom Places Itineraries (.itn)
-tomtom_asc	asc	TomTom POI file (.asc)
-tomtom	ov2	TomTom POI file (.ov2)
-dmtlog	trl	TrackLogs digital mapping (.trl)
 unicsv		Universal csv with field structure in first line
 vcard	vcf	Vcard Output (for iPod)
-wintec_tes	tes	Wintec TES file
 wbt-bin	bin	Wintec WBT-100/200 Binary File Format
 wbt		Wintec WBT-100/200 GPS Download
 wbt-tk1	tk1	Wintec WBT-201/G-Rays 2 Binary File Format
-itracku		XAiOX iTrackU Logger
-itracku-bin	bin	XAiOX iTrackU Logger Binary File Format