From 37c4083261680ba5b4ee5d9c8ea49028d02bcec5 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Mon, 4 Oct 2021 11:21:42 -0600 Subject: [PATCH] Don't use Qt module names in include directives. (#727) This simplifies migration to Qt6 where some classes moved. This was done mostly by an ed script, although mkstyle.sh took some hand holding. 1,$g/#include ]*\)>/<\1> / 1,$g/#include ]*\)>/<\1> / 1,$g/#include ]*\)>/<\1> / 1,$g/#include ]*\)>/<\1> / 1,$g/ *$/ s/ *$// w q --- arcdist.cc | 6 ++-- arcdist.h | 2 +- bcr.cc | 6 ++-- bend.cc | 4 +-- bend.h | 2 +- cet_util.cc | 6 ++-- cet_util.h | 2 +- coverity_model.cc | 6 ++-- csv_util.cc | 4 +-- csv_util.h | 2 +- defs.h | 18 +++++----- destinator.cc | 20 +++++------ dg-100.cc | 18 +++++----- dg-100.h | 8 ++--- discard.cc | 2 +- discard.h | 4 +-- dmtlog.cc | 10 +++--- duplicate.cc | 4 +-- duplicate.h | 2 +- energympro.cc | 14 ++++---- energympro.h | 6 ++-- enigma.cc | 2 +- exif.cc | 32 ++++++++--------- f90g_track.cc | 4 +-- filter_vecs.cc | 12 +++---- filter_vecs.h | 4 +-- formspec.cc | 2 +- formspec.h | 2 +- garmin.cc | 12 +++---- garmin_device_xml.cc | 4 +-- garmin_fit.cc | 14 ++++---- garmin_fit.h | 8 ++--- garmin_fs.cc | 10 +++--- garmin_fs.h | 4 +-- garmin_gpi.cc | 16 ++++----- garmin_tables.cc | 6 ++-- garmin_tables.h | 2 +- garmin_txt.cc | 16 ++++----- gbfile.cc | 16 ++++----- gbfile.h | 4 +-- gbser_win.cc | 2 +- gdb.cc | 12 +++---- geo.cc | 6 ++-- geojson.cc | 16 ++++----- geojson.h | 10 +++--- ggv_bin.cc | 10 +++--- ggv_log.cc | 6 ++-- ggv_ovl.cc | 8 ++--- globalsat_sport.cc | 16 ++++----- globalsat_sport.h | 6 ++-- glogbook.cc | 4 +-- googledir.cc | 2 +- gopal.cc | 6 ++-- gpx.cc | 38 ++++++++++---------- gpx.h | 16 ++++----- gtm.cc | 2 +- gtrnctr.cc | 2 +- gui/aboutdlg.cc | 6 ++-- gui/aboutdlg.h | 6 ++-- gui/coretool/coretool.cc | 4 +-- gui/filterdata.cc | 2 +- gui/filterdata.h | 6 ++-- gui/formatload.cc | 28 +++++++-------- gui/formatload.h | 4 +-- gui/gpx.h | 2 +- gui/help.cc | 8 ++--- gui/help.h | 2 +- gui/main.cc | 6 ++-- gui/mainwindow.cc | 70 ++++++++++++++++++------------------- gui/mainwindow.h | 32 ++++++++--------- gui/processwait.cc | 12 +++---- gui/processwait.h | 22 ++++++------ gui/runmachine.cc | 10 +++--- gui/runmachine.h | 10 +++--- gui/serial_unix.cc | 10 +++--- gui/upgrade.cc | 28 +++++++-------- gui/upgrade.h | 16 ++++----- height.h | 2 +- hiketech.cc | 10 +++--- html.cc | 6 ++-- humminbird.cc | 2 +- igc.cc | 14 ++++---- ignrando.cc | 2 +- igo8.cc | 8 ++--- ik3d.cc | 2 +- inifile.cc | 20 +++++------ inifile.h | 6 ++-- internal_styles.cc | 2 +- interpolate.cc | 4 +-- interpolate.h | 4 +-- itracku.cc | 16 ++++----- jeeps/gpsapp.cc | 8 ++--- jeeps/gpsserial.cc | 2 +- jeeps/gpsusbread.cc | 2 +- jogmap.cc | 2 +- jtr.cc | 2 +- kml.cc | 28 +++++++-------- kml.h | 8 ++--- lmx.cc | 4 +-- lowranceusr.cc | 24 ++++++------- lowranceusr.h | 12 +++---- magellan.h | 2 +- maggeo.cc | 2 +- magproto.cc | 30 ++++++++-------- main.cc | 32 ++++++++--------- mapasia.cc | 12 +++---- mapbar_track.cc | 10 +++--- mapfactor.cc | 6 ++-- mapsend.cc | 8 ++--- mkicondoc.cc | 4 +-- mkshort.cc | 6 ++-- mkstyle.sh | 4 +-- mmo.cc | 26 +++++++------- mtk_logger.cc | 6 ++-- mynav.cc | 12 +++---- mynav.h | 4 +-- navicache.cc | 2 +- navilink.cc | 2 +- nmea.cc | 26 +++++++------- nmea.h | 14 ++++---- nukedata.h | 2 +- osm.cc | 14 ++++---- osm.h | 12 +++---- ozi.cc | 26 +++++++------- pcx.cc | 22 ++++++------ pocketfms_fp.cc | 4 +-- polygon.cc | 2 +- polygon.h | 2 +- position.cc | 4 +-- position.h | 2 +- qstarz_bl_1000.cc | 10 +++--- qstarz_bl_1000.h | 8 ++--- radius.cc | 4 +-- radius.h | 2 +- random.cc | 10 +++--- random.h | 6 ++-- raymarine.cc | 2 +- reverse_route.cc | 2 +- reverse_route.h | 2 +- route.cc | 8 ++--- session.cc | 2 +- session.h | 2 +- shape.cc | 14 ++++---- shape.h | 4 +-- shortname.cc | 4 +-- skytraq.cc | 2 +- smplrout.cc | 2 +- smplrout.h | 2 +- sort.cc | 6 ++-- sort.h | 2 +- src/core/datetime.h | 8 ++--- src/core/file.h | 8 ++--- src/core/logging.h | 6 ++-- src/core/optionaldouble.h | 2 +- src/core/textstream.cc | 6 ++-- src/core/textstream.h | 8 ++--- src/core/usasciicodec.cc | 10 +++--- src/core/usasciicodec.h | 2 +- src/core/xmlstreamwriter.cc | 6 ++-- src/core/xmlstreamwriter.h | 4 +-- src/core/xmltag.h | 4 +-- src/core/ziparchive.cc | 4 +-- src/core/ziparchive.h | 4 +-- stackfilter.h | 2 +- stmsdf.cc | 16 ++++----- stmwpp.cc | 8 ++--- subrip.cc | 12 +++---- subrip.h | 8 ++--- swapdata.h | 2 +- tef_xml.cc | 18 +++++----- text.cc | 6 ++-- tomtom.cc | 4 +-- tpo.cc | 16 ++++----- trackfilter.cc | 24 ++++++------- trackfilter.h | 8 ++--- transform.cc | 2 +- transform.h | 4 +-- unicsv.cc | 28 +++++++-------- unicsv.h | 6 ++-- util.cc | 30 ++++++++-------- v900.cc | 4 +-- validate.h | 2 +- vecs.cc | 12 +++---- vecs.h | 6 ++-- waypt.cc | 12 +++---- wfff_xml.cc | 6 ++-- xcsv.cc | 26 +++++++------- xcsv.h | 14 ++++---- xmlgeneric.cc | 22 ++++++------ xmlgeneric.h | 8 ++--- xmltag.cc | 4 +-- xol.cc | 4 +-- yahoo.cc | 2 +- yahoo.h | 8 ++--- 194 files changed, 870 insertions(+), 870 deletions(-) diff --git a/arcdist.cc b/arcdist.cc index 06eea1928..c4663f353 100644 --- a/arcdist.cc +++ b/arcdist.cc @@ -24,9 +24,9 @@ #include // for strtod #include // for strchr, strlen, strncmp, strspn -#include // for QByteArray -#include // for QString -#include // for foreach, qPrintable, qint64 +#include // for QByteArray +#include // for QString +#include // for foreach, qPrintable, qint64 #include "defs.h" #include "arcdist.h" diff --git a/arcdist.h b/arcdist.h index b70628b36..6c9d982f2 100644 --- a/arcdist.h +++ b/arcdist.h @@ -22,7 +22,7 @@ #ifndef ARCDIST_H_INCLUDED_ #define ARCDIST_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for ARG_NOMINMAX, ARGTYPE_BOOL, Waypoint (ptr only) #include "filter.h" // for Filter diff --git a/bcr.cc b/bcr.cc index 411577b75..1954ced34 100644 --- a/bcr.cc +++ b/bcr.cc @@ -30,9 +30,9 @@ #include // for printf, snprintf, sscanf #include // for atof, atoi -#include // for QString, operator+ -#include // for CaseInsensitive -#include // for foreach +#include // for QString, operator+ +#include // for CaseInsensitive +#include // for foreach #include "defs.h" #include "csv_util.h" // for csv_stringclean diff --git a/bend.cc b/bend.cc index 0001ea991..1bfb7060e 100644 --- a/bend.cc +++ b/bend.cc @@ -23,8 +23,8 @@ #include // macos wants abs from here! #include // for strtod, abs -#include // for QString -#include // for qAsConst, QAddConst<>::Type, foreach +#include // for QString +#include // for qAsConst, QAddConst<>::Type, foreach #include "defs.h" #include "bend.h" diff --git a/bend.h b/bend.h index ef55ddeb8..a87d8c758 100644 --- a/bend.h +++ b/bend.h @@ -23,7 +23,7 @@ #ifndef BEND_H_INCLUDED_ #define BEND_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for route_head (ptr only), ARGTYPE_FLOAT, ARG_NOMINMAX #include "filter.h" // for Filter diff --git a/cet_util.cc b/cet_util.cc index 62bb3d269..b3451c6b9 100644 --- a/cet_util.cc +++ b/cet_util.cc @@ -19,9 +19,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include // for QByteArray -#include // for QDebug -#include // for QTextCodec +#include // for QByteArray +#include // for QDebug +#include // for QTextCodec #include "defs.h" #include "cet_util.h" diff --git a/cet_util.h b/cet_util.h index 4d8c93a50..cc0e4f545 100644 --- a/cet_util.h +++ b/cet_util.h @@ -22,7 +22,7 @@ #ifndef CET_UTIL_H_INCLUDED_ #define CET_UTIL_H_INCLUDED_ -#include +#include #include "defs.h" diff --git a/coverity_model.cc b/coverity_model.cc index 4f03cf103..52bb12ddf 100644 --- a/coverity_model.cc +++ b/coverity_model.cc @@ -7,12 +7,12 @@ void fatal(const char *msg, ...) { } // Forward decls to make the signature match. -class Waypoint; +class Waypoint; class route_head; class QString; class route; -// These functions "claim" their arguments +// These functions "claim" their arguments void waypt_add(Waypoint* wpt) { __coverity_escape__(wpt); @@ -31,7 +31,7 @@ void route_add_wpt(route_head* rte, Waypoint* wpt) { void track_add_wpt(route_head* rte, Waypoint* wpt) { __coverity_escape__(wpt); } -void route_add_wpt_named(route_head* rte, Waypoint* wpt, +void route_add_wpt_named(route_head* rte, Waypoint* wpt, const QString& namepart, int number_digits) { __coverity_escape__(wpt); } diff --git a/csv_util.cc b/csv_util.cc index 4743bfe63..70bad0d66 100644 --- a/csv_util.cc +++ b/csv_util.cc @@ -26,8 +26,8 @@ #include // for isspace #include // for strlen, strchr, strncmp, strcmp, memmove, strcpy, strcspn, strncpy -#include // for QRegExp -#include // for QString +#include // for QRegExp +#include // for QString #include "defs.h" #include "csv_util.h" diff --git a/csv_util.h b/csv_util.h index 4d7c4bf6c..3980db4ce 100644 --- a/csv_util.h +++ b/csv_util.h @@ -21,7 +21,7 @@ #ifndef CSV_UTIL_H_INCLUDED_ #define CSV_UTIL_H_INCLUDED_ -#include // for QString +#include // for QString #include "defs.h" diff --git a/defs.h b/defs.h index cbfb06cb1..a9c43b29b 100644 --- a/defs.h +++ b/defs.h @@ -35,14 +35,14 @@ #include "zlib.h" // doesn't really belong here, but is missing elsewhere. #endif -#include // for QDebug -#include // for QList, QList<>::const_reverse_iterator, QList<>::reverse_iterator -#include // for QScopedPointer -#include // for QString -#include // for QTextCodec -#include // for QVector -#include // for CaseInsensitive -#include // for foreach +#include // for QDebug +#include // for QList, QList<>::const_reverse_iterator, QList<>::reverse_iterator +#include // for QScopedPointer +#include // for QString +#include // for QTextCodec +#include // for QVector +#include // for CaseInsensitive +#include // for foreach #include "formspec.h" // for FormatSpecificData #include "inifile.h" // for inifile_t @@ -742,7 +742,7 @@ class RouteList : private QList void disp_all(std::nullptr_t /* rh */, std::nullptr_t /* rt */, T3 wc); // Only expose methods from our underlying container that won't corrupt our private data. - // Our contained element (route_head) also contains a container (waypoint_list), + // Our contained element (route_head) also contains a container (waypoint_list), // and we maintain a total count the elements in these contained containers, i.e. // the total number of waypoints in all the routes in the RouteList. // public types diff --git a/destinator.cc b/destinator.cc index 27d1f175e..8f14a28a2 100644 --- a/destinator.cc +++ b/destinator.cc @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include // for assert #include // for fabs, lround @@ -30,14 +30,14 @@ #include // for strcmp, memmove, memset, strlen #include // for gmtime -#include // for QByteArray -#include // for QScopedPointer -#include // for QString -#include // for QTextCodec, QTextCodec::IgnoreHeader -#include // for QTextDecoder -#include // for QTextEncoder -#include // for QTime -#include // for QVector +#include // for QByteArray +#include // for QScopedPointer +#include // for QString +#include // for QTextCodec, QTextCodec::IgnoreHeader +#include // for QTextDecoder +#include // for QTextEncoder +#include // for QTime +#include // for QVector #include "defs.h" #include "garmin_fs.h" // for garmin_fs_t, garmin_fs_flags_t, GMSD_GET, GMSD_SETSTRQ, garmin_fs_alloc, GMSD_FIND @@ -109,7 +109,7 @@ read_until_wcstr(const QString& str) QScopedPointer encoder(utf16le_codec->makeEncoder(QTextCodec::IgnoreHeader)); QByteArray target = encoder->fromUnicode(str).append(2, 0); assert((target.size() % 2) == 0); - + int eos = 0; int sz = target.size(); diff --git a/dg-100.cc b/dg-100.cc index e452997c0..e43f1e33b 100644 --- a/dg-100.cc +++ b/dg-100.cc @@ -36,15 +36,15 @@ #include // for abs #include // for memcpy, memcmp, strcmp -#include // for QByteArray -#include // for QDate -#include // for QDateTime -#include // for QList -#include // for QScopedArrayPointer -#include // for QString -#include // for QTime -#include // for TextDate, UTC -#include // for qPrintable +#include // for QByteArray +#include // for QDate +#include // for QDateTime +#include // for QList +#include // for QScopedArrayPointer +#include // for QString +#include // for QTime +#include // for TextDate, UTC +#include // for qPrintable #include "defs.h" #include "dg-100.h" diff --git a/dg-100.h b/dg-100.h index 9e09db46e..7d471477d 100644 --- a/dg-100.h +++ b/dg-100.h @@ -33,10 +33,10 @@ #include // for uint8_t, int16_t, uint16_t #include // for size_t -#include // for QDateTime -#include // for QList -#include // for QString -#include // for QVector +#include // for QDateTime +#include // for QList +#include // for QString +#include // for QVector #include "defs.h" #include "format.h" // for Format diff --git a/discard.cc b/discard.cc index d23a80e2e..a052e3663 100644 --- a/discard.cc +++ b/discard.cc @@ -23,7 +23,7 @@ #include "discard.h" #include // Can't use QRegularExpression because Linux won't get Qt 5 for years. -#include +#include #include #include diff --git a/discard.h b/discard.h index fd6b369cb..1dbb234f8 100644 --- a/discard.h +++ b/discard.h @@ -23,8 +23,8 @@ #define DISCARD_H_INCLUDED_ // Can't use QRegularExpression because Linux won't get Qt 5 for years. -#include // for QRegExp -#include // for QVector +#include // for QRegExp +#include // for QVector #include "defs.h" // for ARG_NOMINMAX, ARGTYPE_BEGIN_REQ, ARGTYPE_S... #include "filter.h" // for Filter diff --git a/dmtlog.cc b/dmtlog.cc index 7c338d5b0..37cbbf574 100644 --- a/dmtlog.cc +++ b/dmtlog.cc @@ -25,10 +25,10 @@ #include // for atoi #include // for strncmp, memcpy, strcmp, strlen -#include // for QByteArray -#include // for QString, operator+ -#include // for QXmlStreamAttributes -#include // for qPrintable +#include // for QByteArray +#include // for QString, operator+ +#include // for QXmlStreamAttributes +#include // for qPrintable #include "defs.h" #include "gbfile.h" // for gbfgetdbl, gbfgetint32, gbfputint32, gbfgetint16, gbfputdbl, gbfputc, gbfread, gbfseek, gbfgetc, gbfile, gbfclose, gbfungetc, gbfeof, gbfputs, gbfwrite, gbfopen_le, gbfgetuint32, gbfputuint16, gbfputuint32 @@ -707,7 +707,7 @@ write_header(const route_head* trk) write_str(trk->rte_name, fout); } - // This fails for internationalization, but as this text is in the + // This fails for internationalization, but as this text is in the // file itself, it shouldn't be localized. QString cout = QString::number(count) + " trackpoints and " + QString::number(waypt_count()) + " waypoints"; diff --git a/duplicate.cc b/duplicate.cc index 7d0cd8304..2cd880fda 100644 --- a/duplicate.cc +++ b/duplicate.cc @@ -23,8 +23,8 @@ #include // for qsort #include // for memset, strncpy -#include // for QDateTime -#include // for foreach +#include // for QDateTime +#include // for foreach #include "defs.h" #include "duplicate.h" diff --git a/duplicate.h b/duplicate.h index 1cce51029..087482193 100644 --- a/duplicate.h +++ b/duplicate.h @@ -22,7 +22,7 @@ #ifndef DUPLICATE_H_INCLUDED_ #define DUPLICATE_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, Waypoint (ptr only) #include "filter.h" // for Filter diff --git a/energympro.cc b/energympro.cc index 67391b17f..b085e87a5 100644 --- a/energympro.cc +++ b/energympro.cc @@ -23,13 +23,13 @@ #include // for int32_t #include // for printf, SEEK_SET, SEEK_CUR, SEEK_END -#include // for QDate -#include // for QDateTime -#include // for QDebug -#include // for QString -#include // for QTime -#include // for QTimeZone -#include // for UTC +#include // for QDate +#include // for QDateTime +#include // for QDebug +#include // for QString +#include // for QTime +#include // for QTimeZone +#include // for UTC #include "defs.h" #include "energympro.h" diff --git a/energympro.h b/energympro.h index d5e9a5996..fa0e868e1 100644 --- a/energympro.h +++ b/energympro.h @@ -24,9 +24,9 @@ #include // for uint8_t, uint16_t, uint32_t, int16_t -#include // for QString -#include // for QTimeZone -#include // for QVector +#include // for QString +#include // for QTimeZone +#include // for QVector #include "defs.h" #include "format.h" // for Format diff --git a/enigma.cc b/enigma.cc index 32fea92d6..32b2707e6 100644 --- a/enigma.cc +++ b/enigma.cc @@ -26,7 +26,7 @@ #include // for abs #include // for strlen, memcpy, memset -#include // for QString +#include // for QString #include "defs.h" #include "gbfile.h" // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile diff --git a/exif.cc b/exif.cc index 9957938a9..a2e217efb 100644 --- a/exif.cc +++ b/exif.cc @@ -40,22 +40,22 @@ #include "jeeps/gpsmath.h" // for GPS_Math_WGS84_To_Known_Datum_M #include "src/core/datetime.h" // for DateTime -#include // for QByteArray -#include // for QDate -#include // for QDateTime -#include // for QFile -#include // for QFileInfo -#include // for QList<>::iterator, QList -#include // for QPair -#include // for QRegularExpression -#include // for QRegularExpressionMatch -#include // for QString -#include // for QTextCodec -#include // for QTime -#include // for QVariant -#include // for QVector -#include // for UTC, ISODate -#include // for qSwap, qPrintable, qint64 +#include // for QByteArray +#include // for QDate +#include // for QDateTime +#include // for QFile +#include // for QFileInfo +#include // for QList<>::iterator, QList +#include // for QPair +#include // for QRegularExpression +#include // for QRegularExpressionMatch +#include // for QString +#include // for QTextCodec +#include // for QTime +#include // for QVariant +#include // for QVector +#include // for UTC, ISODate +#include // for qSwap, qPrintable, qint64 #include // for sort, min #include // for assert diff --git a/f90g_track.cc b/f90g_track.cc index a949f4713..77e50a5e7 100644 --- a/f90g_track.cc +++ b/f90g_track.cc @@ -28,8 +28,8 @@ #include "defs.h" #include "gbfile.h" -#include -#include +#include +#include #define MYNAME "f90g_track" #define TTRECORDSIZE 249 diff --git a/filter_vecs.cc b/filter_vecs.cc index 2f42409f1..a8973e7dd 100644 --- a/filter_vecs.cc +++ b/filter_vecs.cc @@ -19,12 +19,12 @@ */ -#include // for QByteArray -#include // for QString -#include // for QStringList -#include // for QVector<>::iterator, QVector -#include // for CaseInsensitive -#include // for qPrintable +#include // for QByteArray +#include // for QString +#include // for QStringList +#include // for QVector<>::iterator, QVector +#include // for CaseInsensitive +#include // for qPrintable #include // for sort #include // for assert diff --git a/filter_vecs.h b/filter_vecs.h index b3489a7bc..b52bd19c8 100644 --- a/filter_vecs.h +++ b/filter_vecs.h @@ -21,8 +21,8 @@ #ifndef FILTER_VECS_H_INCLUDED_ #define FILTER_VECS_H_INCLUDED_ -#include // for QString -#include // for QVector<>::iterator, QVector +#include // for QString +#include // for QVector<>::iterator, QVector #include "defs.h" // for arglist_t #include "arcdist.h" // for ArcDistanceFilter diff --git a/formspec.cc b/formspec.cc index 446241a67..19ed82e9b 100644 --- a/formspec.cc +++ b/formspec.cc @@ -19,7 +19,7 @@ */ -#include // for QList +#include // for QList #include "defs.h" #include "formspec.h" // for FormatSpecificData, FsChainAdd, FsChainCopy, FsChainDestroy, FsChainFind diff --git a/formspec.h b/formspec.h index 7b2665529..e3e091d34 100644 --- a/formspec.h +++ b/formspec.h @@ -21,7 +21,7 @@ #ifndef FORMSPEC_H_INCLUDED_ #define FORMSPEC_H_INCLUDED_ -#include // for QList +#include // for QList enum FsType { kFsUnknown = 0L, diff --git a/garmin.cc b/garmin.cc index 871626e68..3f207a124 100644 --- a/garmin.cc +++ b/garmin.cc @@ -28,11 +28,11 @@ #include // for memcpy, strlen, strncpy, strchr #include // for time_t -#include // for QByteArray -#include // for QChar -#include // for QString -#include // for CaseInsensitive -#include // for qPrintable, foreach +#include // for QByteArray +#include // for QChar +#include // for QString +#include // for CaseInsensitive +#include // for qPrintable, foreach #include "defs.h" #include "cet_util.h" // for cet_convert_init, cet_cs_vec_utf8 @@ -357,7 +357,7 @@ rw_deinit() gps_baud_rate = baud; } } - + if (mkshort_handle) { mkshort_del_handle(&mkshort_handle); } diff --git a/garmin_device_xml.cc b/garmin_device_xml.cc index 459149525..f880d0c96 100644 --- a/garmin_device_xml.cc +++ b/garmin_device_xml.cc @@ -28,8 +28,8 @@ #include "defs.h" #include "garmin_device_xml.h" #include "xmlgeneric.h" -#include -#include +#include +#include #include #define MYNAME "whatever" diff --git a/garmin_fit.cc b/garmin_fit.cc index 8022911c4..550f26159 100644 --- a/garmin_fit.cc +++ b/garmin_fit.cc @@ -30,13 +30,13 @@ #include // for pair #include // for vector -#include // for QByteArray -#include // for QDateTime -#include // for QFileInfo -#include // for QLatin1Char -#include // for QString -#include // for CaseInsensitive -#include // for qint64 +#include // for QByteArray +#include // for QDateTime +#include // for QFileInfo +#include // for QLatin1Char +#include // for QString +#include // for CaseInsensitive +#include // for qint64 #include "defs.h" #include "garmin_fit.h" diff --git a/garmin_fit.h b/garmin_fit.h index 6fc6ab69b..ccef26c59 100644 --- a/garmin_fit.h +++ b/garmin_fit.h @@ -30,10 +30,10 @@ #include // for pair #include // for vector -#include // for QHash -#include // for QList -#include // for QString -#include // for QVector +#include // for QHash +#include // for QList +#include // for QString +#include // for QVector #include "defs.h" #include "format.h" // for Format diff --git a/garmin_fs.cc b/garmin_fs.cc index 9c8245970..136e4ce8b 100644 --- a/garmin_fs.cc +++ b/garmin_fs.cc @@ -25,11 +25,11 @@ #include // for atof #include // for strncpy -#include // for QByteArray -#include // for QStaticStringData -#include // for QString, QStringLiteral -#include // for QXmlStreamWriter -#include // for CaseInsensitive +#include // for QByteArray +#include // for QStaticStringData +#include // for QString, QStringLiteral +#include // for QXmlStreamWriter +#include // for CaseInsensitive #include "defs.h" #include "garmin_fs.h" diff --git a/garmin_fs.h b/garmin_fs.h index 26f25673c..13e8d4039 100644 --- a/garmin_fs.h +++ b/garmin_fs.h @@ -27,8 +27,8 @@ #include // for size_t #include // for int32_t, int16_t, uint16_t -#include // for QString -#include // for QXmlStreamWriter +#include // for QString +#include // for QXmlStreamWriter #include "defs.h" #include "formspec.h" // for FsChainFind, kFsGmsd, FormatSpecificData diff --git a/garmin_gpi.cc b/garmin_gpi.cc index b6edec728..717f98c51 100644 --- a/garmin_gpi.cc +++ b/garmin_gpi.cc @@ -52,14 +52,14 @@ #include // for strlen, strncmp #include // for time, time_t, gmtime -#include // for QByteArray, operator== -#include // for QByteRef -#include // for QList<>::iterator, QList -#include // for QString, operator+, operator< -#include // for QThread -#include // for QVector -#include // for CaseInsensitive -#include // for foreach, Q_UNUSED +#include // for QByteArray, operator== +#include // for QByteRef +#include // for QList<>::iterator, QList +#include // for QString, operator+, operator< +#include // for QThread +#include // for QVector +#include // for CaseInsensitive +#include // for foreach, Q_UNUSED #include "defs.h" #include "garmin_gpi.h" diff --git a/garmin_tables.cc b/garmin_tables.cc index b6f5c59b4..3220f20bc 100644 --- a/garmin_tables.cc +++ b/garmin_tables.cc @@ -22,9 +22,9 @@ #include // for int32_t #include // for strncpy, strchr, strlen, strncmp -#include // for operator==, QChar -#include // for QDebug -#include // for CaseInsensitive +#include // for operator==, QChar +#include // for QDebug +#include // for CaseInsensitive #include "defs.h" #include "garmin_tables.h" #include "jeeps/gpsmath.h" // for GPS_Lookup_Datum_Index, GPS_Math_Get_Datum_Name diff --git a/garmin_tables.h b/garmin_tables.h index 1dbfa37d5..47dc7b2e0 100644 --- a/garmin_tables.h +++ b/garmin_tables.h @@ -24,7 +24,7 @@ #define GARMIN_TABLES_H #include // for uint32_t -#include // for QString +#include // for QString #include "defs.h" // for grid_type #define DEFAULT_ICON_DESCR "Waypoint" diff --git a/garmin_txt.cc b/garmin_txt.cc index bf4c91f42..485bf3c9e 100644 --- a/garmin_txt.cc +++ b/garmin_txt.cc @@ -31,14 +31,14 @@ #include // for memset, strstr, strcat, strchr, strlen, strcmp, strcpy, strncpy #include // for gmtime, localtime, strftime -#include // for QByteArray -#include // for QChar, QChar::Other_Control -#include // for QIODevice, QIODevice::ReadOnly, QIODevice::WriteOnly -#include // for QString, operator!= -#include // for QTextStream -#include // for QVector -#include // for CaseInsensitive -#include // for qPrintable +#include // for QByteArray +#include // for QChar, QChar::Other_Control +#include // for QIODevice, QIODevice::ReadOnly, QIODevice::WriteOnly +#include // for QString, operator!= +#include // for QTextStream +#include // for QVector +#include // for CaseInsensitive +#include // for qPrintable #include "csv_util.h" // for csv_lineparse #include "garmin_fs.h" // for garmin_fs_t, garmin_fs_alloc, garmin_fs_convert_category, GMSD_SECTION_CATEGORIES diff --git a/gbfile.cc b/gbfile.cc index a4bbfec31..fe056dcd9 100644 --- a/gbfile.cc +++ b/gbfile.cc @@ -20,9 +20,9 @@ */ -#include // for QByteArray -#include // for QString -#include // for qPrintable +#include // for QByteArray +#include // for QString +#include // for qPrintable #include // for assert #include // for tolower @@ -647,7 +647,7 @@ gbfgetc(gbfile* file) * gbfgets: (as fgets) */ -QString +QString gbfgets(char* buf, int len, gbfile* file) { char* result = buf; @@ -695,8 +695,8 @@ gbfread(void* buf, const gbsize_t size, const gbsize_t members, gbfile* file) // goofy) calling signature. gbsize_t -gbfread(QString& buf, const gbsize_t size, - const gbsize_t members, gbfile* file) +gbfread(QString& buf, const gbsize_t size, + const gbsize_t members, gbfile* file) { QByteArray tmp; tmp.resize(members * size); @@ -1018,7 +1018,7 @@ gbfgetcstr(gbfile* file) char* result = gbfgetcstr_old(file); QString rv(result); xfree(result); - return rv; + return rv; } QByteArray @@ -1027,7 +1027,7 @@ gbfgetnativecstr(gbfile* file) char* result = gbfgetcstr_old(file); QByteArray rv(result); xfree(result); - return rv; + return rv; } /* diff --git a/gbfile.h b/gbfile.h index 1a65418ef..2e2d0460b 100644 --- a/gbfile.h +++ b/gbfile.h @@ -23,8 +23,8 @@ #ifndef GBFILE_H #define GBFILE_H -#include // for QByteArray -#include // for QString +#include // for QByteArray +#include // for QString #include // for va_list #include // for int32_t, int16_t, uint32_t diff --git a/gbser_win.cc b/gbser_win.cc index 66271cd9a..f47ea88c3 100644 --- a/gbser_win.cc +++ b/gbser_win.cc @@ -70,7 +70,7 @@ DWORD mkspeed(unsigned br) return CBR_115200; case 230400: // Per https://msdn.microsoft.com/en-us/library/windows/desktop/aa363214 - // "This member can be an actual baud rate value, or one of the + // "This member can be an actual baud rate value, or one of the // following indexes." // They provide a CBR_25600, which would be programmable on a 16450 only // with a bizarre oscillator crystal, but don't provide a 230400, such diff --git a/gdb.cc b/gdb.cc index c8a331421..dd901bdf9 100644 --- a/gdb.cc +++ b/gdb.cc @@ -31,12 +31,12 @@ #include // for strftime #include // for next -#include // for QByteArray -#include // for QList -#include // for QString, operator!=, operator== -#include // for QVector -#include // for CaseInsensitive -#include // for qPrintable, Q_UNUSED, foreach +#include // for QByteArray +#include // for QList +#include // for QString, operator!=, operator== +#include // for QVector +#include // for CaseInsensitive +#include // for qPrintable, Q_UNUSED, foreach #include "defs.h" diff --git a/geo.cc b/geo.cc index 4f619def6..bd84344e2 100644 --- a/geo.cc +++ b/geo.cc @@ -18,9 +18,9 @@ */ #include "defs.h" #include "src/core/file.h" -#include -#include -#include +#include +#include +#include static char* deficon = nullptr; static char* nuke_placer; diff --git a/geojson.cc b/geojson.cc index 2e0f27f73..1c914dcdf 100644 --- a/geojson.cc +++ b/geojson.cc @@ -17,14 +17,14 @@ */ -#include // for QByteArray -#include // for operator|, QIODevice, QIODevice::ReadOnly, QIODevice::Text -#include // for QJsonArray -#include // for QJsonDocument, QJsonDocument::Compact, QJsonDocument::Indented, QJsonDocument::JsonFormat -#include // for QJsonObject -#include // for QJsonParseError -#include // for QJsonValue -#include // for QJsonValueRef +#include // for QByteArray +#include // for operator|, QIODevice, QIODevice::ReadOnly, QIODevice::Text +#include // for QJsonArray +#include // for QJsonDocument, QJsonDocument::Compact, QJsonDocument::Indented, QJsonDocument::JsonFormat +#include // for QJsonObject +#include // for QJsonParseError +#include // for QJsonValue +#include // for QJsonValueRef #include "defs.h" #include "geojson.h" diff --git a/geojson.h b/geojson.h index 26c729dbb..f059ba7df 100644 --- a/geojson.h +++ b/geojson.h @@ -19,11 +19,11 @@ #ifndef GEOJSON_H_INCLUDED_ #define GEOJSON_H_INCLUDED_ -#include // for QJsonArray -#include // for QJsonObject -#include // for QStaticStringData -#include // for QString, QStringLiteral -#include // for QVector +#include // for QJsonArray +#include // for QJsonObject +#include // for QStaticStringData +#include // for QString, QStringLiteral +#include // for QVector #include "defs.h" #include "format.h" // for Format diff --git a/ggv_bin.cc b/ggv_bin.cc index 40b0b18c3..45c152a3a 100644 --- a/ggv_bin.cc +++ b/ggv_bin.cc @@ -21,11 +21,11 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "ggv_bin.h" diff --git a/ggv_log.cc b/ggv_log.cc index 1df0824a8..0faef6224 100644 --- a/ggv_log.cc +++ b/ggv_log.cc @@ -26,9 +26,9 @@ #include // for int16_t #include // for gmtime -#include // for QString -#include // for QTime -#include // for foreach +#include // for QString +#include // for QTime +#include // for foreach #include "defs.h" #include "gbfile.h" // for gbfputint16, gbfclose, gbfopen, gbfputflt, gbfgetc, gbfputcstr, gbfputdbl, gbfread, gbfile diff --git a/ggv_ovl.cc b/ggv_ovl.cc index 98e10ceeb..21f03e553 100644 --- a/ggv_ovl.cc +++ b/ggv_ovl.cc @@ -22,9 +22,9 @@ #include // for sin, cos, acos -#include // for QString -#include // for QVector -#include // for foreach +#include // for QString +#include // for QVector +#include // for foreach #include "defs.h" #include "gbfile.h" // for gbfprintf, gbfclose, gbfopen, gbfile @@ -356,7 +356,7 @@ write_bounds() } static void -draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, +draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, const OVL_COLOR_TYP point_color, const Waypoint* wpt) { symbol_ct++; diff --git a/globalsat_sport.cc b/globalsat_sport.cc index fceea5505..f1a90318f 100644 --- a/globalsat_sport.cc +++ b/globalsat_sport.cc @@ -39,14 +39,14 @@ #include // for printf #include // for free, malloc -#include // for QByteArray -#include // for QDate -#include // for QDateTime -#include // for QString -#include // for QTime -#include // for QTimeZone -#include // for LocalTime -#include // for qPrintable +#include // for QByteArray +#include // for QDate +#include // for QDateTime +#include // for QString +#include // for QTime +#include // for QTimeZone +#include // for LocalTime +#include // for qPrintable #include "defs.h" #include "globalsat_sport.h" diff --git a/globalsat_sport.h b/globalsat_sport.h index 2b02a49c5..ce04e3a7c 100644 --- a/globalsat_sport.h +++ b/globalsat_sport.h @@ -39,9 +39,9 @@ #include // for uint32_t, uint8_t, uint16_t, int16_t -#include // for QString -#include // for QTimeZone -#include // for QVector +#include // for QString +#include // for QTimeZone +#include // for QVector #include "defs.h" #include "format.h" // for Format diff --git a/glogbook.cc b/glogbook.cc index 833229873..8dd0ba788 100644 --- a/glogbook.cc +++ b/glogbook.cc @@ -23,8 +23,8 @@ #include "src/core/file.h" #include "xmlgeneric.h" -#include -#include +#include +#include static gbfile* ofd; static QString ostring; diff --git a/googledir.cc b/googledir.cc index f1d6b2f4d..bf5897627 100644 --- a/googledir.cc +++ b/googledir.cc @@ -28,7 +28,7 @@ #include "defs.h" #include "xmlgeneric.h" -#include +#include static QString encoded_points; static QString instructions; diff --git a/gopal.cc b/gopal.cc index d71c0054a..d80e7750d 100644 --- a/gopal.cc +++ b/gopal.cc @@ -57,8 +57,8 @@ #include #include #include -#include -#include +#include +#include #define MYNAME "gopal" @@ -174,7 +174,7 @@ gopal_read() char tbuffer[64]; struct tm tm2; double lat_old = 0; - + auto* route = new route_head; QDateTime qtx = QDateTime::fromSecsSinceEpoch(tx, Qt::UTC); diff --git a/gpx.cc b/gpx.cc index 2a5450b49..bc99de205 100644 --- a/gpx.cc +++ b/gpx.cc @@ -24,25 +24,25 @@ #include // for atoi, strtod #include // for strchr, strncpy -#include // for QDate -#include // for QDateTime -#include // for QHash -#include // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Text, QIODevice::WriteOnly -#include // for QLatin1Char -#include // for QLatin1String -#include // for QStaticStringData -#include // for QString, QStringLiteral, operator+, operator== -#include // for QStringList -#include // for QStringView -#include // for QTime -#include // for QVersionNumber -#include // for QXmlStreamAttribute -#include // for QXmlStreamAttributes -#include // for QXmlStreamNamespaceDeclaration -#include // for QXmlStreamNamespaceDeclarations -#include // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndDocument, QXmlStreamReader::EndElement, QXmlStreamReader::Invalid, QXmlStreamReader::StartElement -#include // for CaseInsensitive, UTC -#include // for qAsConst, QAddConst<>::Type +#include // for QDate +#include // for QDateTime +#include // for QHash +#include // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Text, QIODevice::WriteOnly +#include // for QLatin1Char +#include // for QLatin1String +#include // for QStaticStringData +#include // for QString, QStringLiteral, operator+, operator== +#include // for QStringList +#include // for QStringView +#include // for QTime +#include // for QVersionNumber +#include // for QXmlStreamAttribute +#include // for QXmlStreamAttributes +#include // for QXmlStreamNamespaceDeclaration +#include // for QXmlStreamNamespaceDeclarations +#include // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndDocument, QXmlStreamReader::EndElement, QXmlStreamReader::Invalid, QXmlStreamReader::StartElement +#include // for CaseInsensitive, UTC +#include // for qAsConst, QAddConst<>::Type #include "defs.h" #include "gpx.h" diff --git a/gpx.h b/gpx.h index f378a3260..cc8baa75b 100644 --- a/gpx.h +++ b/gpx.h @@ -21,14 +21,14 @@ #ifndef GPX_H_INCLUDED_ #define GPX_H_INCLUDED_ -#include // for QHash -#include // for QString -#include // for QStringList -#include // for QStringView -#include // for QVector -#include // for QVersionNumber -#include // for QXmlStreamAttributes -#include // for QXmlStreamReader +#include // for QHash +#include // for QString +#include // for QStringList +#include // for QStringView +#include // for QVector +#include // for QVersionNumber +#include // for QXmlStreamAttributes +#include // for QXmlStreamReader #include "defs.h" #include "format.h" // for Format diff --git a/gtm.cc b/gtm.cc index 09615b898..82c23766c 100644 --- a/gtm.cc +++ b/gtm.cc @@ -26,7 +26,7 @@ #include "defs.h" #include "jeeps/gpsmath.h" -#include +#include static gbfile* file_in, *file_out; static int indatum; diff --git a/gtrnctr.cc b/gtrnctr.cc index efd134b80..693199fd1 100644 --- a/gtrnctr.cc +++ b/gtrnctr.cc @@ -24,7 +24,7 @@ * http://www8.garmin.com/xmlschemas/ActivityExtensionv2.xsd */ -#include +#include #include "defs.h" #include "xmlgeneric.h" diff --git a/gui/aboutdlg.cc b/gui/aboutdlg.cc index 2a4087050..3e92bbe4f 100644 --- a/gui/aboutdlg.cc +++ b/gui/aboutdlg.cc @@ -21,9 +21,9 @@ // #include "aboutdlg.h" -#include // for QTextCursor -#include // for QTextDocument -#include // for QTextEdit +#include // for QTextCursor +#include // for QTextDocument +#include // for QTextEdit #include "appname.h" // for appName #include "upgrade.h" // for UpgradeCheck diff --git a/gui/aboutdlg.h b/gui/aboutdlg.h index e08c71e4d..a93ac2a6d 100644 --- a/gui/aboutdlg.h +++ b/gui/aboutdlg.h @@ -23,9 +23,9 @@ #ifndef ABOUTDLG_H #define ABOUTDLG_H -#include // for QString -#include // for QDialog -#include // for QWidget +#include // for QString +#include // for QDialog +#include // for QWidget #include "ui_aboutui.h" // for Ui_AboutDlg class AboutDlg: public QDialog diff --git a/gui/coretool/coretool.cc b/gui/coretool/coretool.cc index c6cedbde7..fe562e3fa 100644 --- a/gui/coretool/coretool.cc +++ b/gui/coretool/coretool.cc @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "format.h" #include "formatload.h" diff --git a/gui/filterdata.cc b/gui/filterdata.cc index 3c4d6715c..f0ff55f9b 100644 --- a/gui/filterdata.cc +++ b/gui/filterdata.cc @@ -227,7 +227,7 @@ QStringList MiscFltFilterData::makeOptionString() s += QString(",%1").arg(trkopts.at(sortTrkBy_)); } args << s; - + } return args; } diff --git a/gui/filterdata.h b/gui/filterdata.h index 954b3f2d5..730187347 100644 --- a/gui/filterdata.h +++ b/gui/filterdata.h @@ -136,7 +136,7 @@ class TrackFilterData: public FilterData class WayPtsFilterData: public FilterData { public: - WayPtsFilterData(): + WayPtsFilterData(): duplicates(false), shortNames(true), locations(false), position(false), radius(false), positionVal(0.0), radiusVal(0.0), @@ -175,7 +175,7 @@ class WayPtsFilterData: public FilterData class RtTrkFilterData: public FilterData { public: - RtTrkFilterData(): + RtTrkFilterData(): simplify_(false), reverse_(false), limitTo_(100) @@ -200,7 +200,7 @@ class RtTrkFilterData: public FilterData class MiscFltFilterData: public FilterData { public: - MiscFltFilterData(): + MiscFltFilterData(): nukeRoutes_(false), nukeTracks_(false), nukeWaypoints_(false), diff --git a/gui/formatload.cc b/gui/formatload.cc index dbd5629b6..9b2b329e0 100644 --- a/gui/formatload.cc +++ b/gui/formatload.cc @@ -22,22 +22,22 @@ //------------------------------------------------------------------------ #include "formatload.h" -#include // for QByteArray -#include // for operator==, QChar -#include // for QCharRef -#include // for QCoreApplication +#include // for QByteArray +#include // for operator==, QChar +#include // for QCharRef +#include // for QCoreApplication #ifdef GENERATE_CORE_STRINGS -#include // for QDebug, operator<< +#include // for QDebug, operator<< #endif -#include // for QObject -#include // for QProcess -#include // for QRegularExpression -#include // for QRegularExpressionMatch -#include // for QString, operator+ -#include // for QTextStream -#include // for QVariant -#include // for QApplication -#include // for QMessageBox +#include // for QObject +#include // for QProcess +#include // for QRegularExpression +#include // for QRegularExpressionMatch +#include // for QString, operator+ +#include // for QTextStream +#include // for QVariant +#include // for QApplication +#include // for QMessageBox #include "appname.h" // for appName diff --git a/gui/formatload.h b/gui/formatload.h index 5f24e62c6..2bcacd130 100644 --- a/gui/formatload.h +++ b/gui/formatload.h @@ -25,8 +25,8 @@ #ifndef FORMATLOAD_H #define FORMATLOAD_H -#include // for QList -#include // for QStringList +#include // for QList +#include // for QStringList #include "format.h" // for Format diff --git a/gui/gpx.h b/gui/gpx.h index a09d40dbe..0096fdd32 100644 --- a/gui/gpx.h +++ b/gui/gpx.h @@ -373,7 +373,7 @@ class GpxTrack: public GpxItem class GpxWaypoint: public GpxItem { public: - GpxWaypoint(): + GpxWaypoint(): location_(LatLng(0, 0)), elevation_(-1.0E-100), name_(QString()), diff --git a/gui/help.cc b/gui/help.cc index 85aea4f01..bf05187d0 100644 --- a/gui/help.cc +++ b/gui/help.cc @@ -22,10 +22,10 @@ //------------------------------------------------------------------------ #include "help.h" -#include // for QRegularExpression -#include // for QString -#include // for QUrl -#include // for QDesktopServices +#include // for QRegularExpression +#include // for QString +#include // for QUrl +#include // for QDesktopServices #include "format.h" // for Format diff --git a/gui/help.h b/gui/help.h index 5d3dae63a..d7b8b1370 100644 --- a/gui/help.h +++ b/gui/help.h @@ -22,7 +22,7 @@ #ifndef HELP_H #define HELP_H -#include // for QString +#include // for QString extern void ShowHelp(const QString& name); diff --git a/gui/main.cc b/gui/main.cc index cb204d159..60788074e 100644 --- a/gui/main.cc +++ b/gui/main.cc @@ -20,9 +20,9 @@ // USA. // //------------------------------------------------------------------------ -#include // for QT_VERSION, QT_VERSION_CHECK -#include // for QIcon -#include // for QApplication +#include // for QT_VERSION, QT_VERSION_CHECK +#include // for QIcon +#include // for QApplication #include "mainwindow.h" // for MainWindow diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc index 1c5af45af..63b1a2400 100644 --- a/gui/mainwindow.cc +++ b/gui/mainwindow.cc @@ -19,41 +19,41 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, // USA. // -#include // for QByteArray -#include // for QDate -#include // for QDateTime -#include // for QDir -#include // for QEvent (& QEvent::LanguageChange, QEvent::LocaleChange) -#include // for QFile -#include // for QFileInfo -#include // for QLibraryInfo, QLibraryInfo::TranslationsPath -#include // for QLocale -#include // for QMimeData -#include // for QProcess, QProcess::NotRunning -#include // for QSettings -#include // for QString -#include // for QStringList -#include // for QTemporaryFile -#include // for QTime -#include // for QUrl -#include // for QVariant -#include // for SmoothTransformation, WaitCursor -#include // for foreach -#include // for QCursor -#include // for QDesktopServices -#include // for QIcon -#include // for QImage -#include // for QTextCharFormat -#include // for QAbstractButton -#include // for QApplication, qApp -#include // for QCheckBox -#include // for QDialogButtonBox -#include // for QFileDialog -#include // for QMessageBox, operator|, QMessageBox::Yes, QMessageBox::No -#include // for QPlainTextEdit -#include // for QPushButton -#include // for QRadioButton -#include // for QStackedWidget +#include // for QByteArray +#include // for QDate +#include // for QDateTime +#include // for QDir +#include // for QEvent (& QEvent::LanguageChange, QEvent::LocaleChange) +#include // for QFile +#include // for QFileInfo +#include // for QLibraryInfo, QLibraryInfo::TranslationsPath +#include // for QLocale +#include // for QMimeData +#include // for QProcess, QProcess::NotRunning +#include // for QSettings +#include // for QString +#include // for QStringList +#include // for QTemporaryFile +#include // for QTime +#include // for QUrl +#include // for QVariant +#include // for SmoothTransformation, WaitCursor +#include // for foreach +#include // for QCursor +#include // for QDesktopServices +#include // for QIcon +#include // for QImage +#include // for QTextCharFormat +#include // for QAbstractButton +#include // for QApplication, qApp +#include // for QCheckBox +#include // for QDialogButtonBox +#include // for QFileDialog +#include // for QMessageBox, operator|, QMessageBox::Yes, QMessageBox::No +#include // for QPlainTextEdit +#include // for QPushButton +#include // for QRadioButton +#include // for QStackedWidget #include // for exit diff --git a/gui/mainwindow.h b/gui/mainwindow.h index c3539a502..d899ff02c 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -22,22 +22,22 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include // for QEvent -#include // for QList -#include // for QObject (& Q_OBJECT, slots) -#include // for QString -#include // for QStringList -#include // for QTranslator -#include // for QCloseEvent -#include // for QDragEnterEvent -#include // for QDropEvent -#include // for QPixmap -#include // for QAction -#include // for QComboBox -#include // for QLabel -#include // for QLineEdit -#include // for QMainWindow -#include // for QWidget +#include // for QEvent +#include // for QList +#include // for QObject (& Q_OBJECT, slots) +#include // for QString +#include // for QStringList +#include // for QTranslator +#include // for QCloseEvent +#include // for QDragEnterEvent +#include // for QDropEvent +#include // for QPixmap +#include // for QAction +#include // for QComboBox +#include // for QLabel +#include // for QLineEdit +#include // for QMainWindow +#include // for QWidget #include "babeldata.h" // for BabelData #include "filterdata.h" // for AllFiltersData diff --git a/gui/processwait.cc b/gui/processwait.cc index 3492bbe67..5337dba21 100644 --- a/gui/processwait.cc +++ b/gui/processwait.cc @@ -22,12 +22,12 @@ //------------------------------------------------------------------------ #include "processwait.h" -#include // for QByteArray -#include // for Horizontal, WindowContextHelpButtonHint -#include // for QTextCursor, QTextCursor::End -#include // for QAbstractButton -#include // for QPushButton -#include // for QVBoxLayout +#include // for QByteArray +#include // for Horizontal, WindowContextHelpButtonHint +#include // for QTextCursor, QTextCursor::End +#include // for QAbstractButton +#include // for QPushButton +#include // for QVBoxLayout #include // for abs #include // for string diff --git a/gui/processwait.h b/gui/processwait.h index b9eaa8e7d..334e8e54d 100644 --- a/gui/processwait.h +++ b/gui/processwait.h @@ -23,17 +23,17 @@ #ifndef PROCESSWAIT_H #define PROCESSWAIT_H -#include // for QByteArray -#include // for QObject -#include // for QProcess, QProcess::ExitStatus, QProcess::ProcessError -#include // for QString -#include // for QTimer -#include // for QCloseEvent -#include // for QDialog -#include // for QDialogButtonBox -#include // for QPlainTextEdit -#include // for QProgressBar -#include // for QWidget +#include // for QByteArray +#include // for QObject +#include // for QProcess, QProcess::ExitStatus, QProcess::ProcessError +#include // for QString +#include // for QTimer +#include // for QCloseEvent +#include // for QDialog +#include // for QDialogButtonBox +#include // for QPlainTextEdit +#include // for QProgressBar +#include // for QWidget //------------------------------------------------------------------------ diff --git a/gui/runmachine.cc b/gui/runmachine.cc index 7fbe49c9e..6bc3eceb0 100644 --- a/gui/runmachine.cc +++ b/gui/runmachine.cc @@ -19,11 +19,11 @@ #include "runmachine.h" -#include // for qDebug -#include // for QEventLoop -#include // for QNonConstOverload -#include // for QOverload, qOverload -#include // for QDialog +#include // for qDebug +#include // for QEventLoop +#include // for QNonConstOverload +#include // for QOverload, qOverload +#include // for QDialog #include "appname.h" // for appName diff --git a/gui/runmachine.h b/gui/runmachine.h index 27b81698b..0c5da6371 100644 --- a/gui/runmachine.h +++ b/gui/runmachine.h @@ -20,11 +20,11 @@ #ifndef RUNMACHINE_H #define RUNMACHINE_H -#include // for QObject -#include // for QProcess, QProcess::ExitStatus, QProcess::ProcessError, qt_getEnumName -#include // for QString -#include // for QStringList -#include // for QWidget +#include // for QObject +#include // for QProcess, QProcess::ExitStatus, QProcess::ProcessError, qt_getEnumName +#include // for QString +#include // for QStringList +#include // for QWidget #include // for optional, nullopt diff --git a/gui/serial_unix.cc b/gui/serial_unix.cc index 1b5af93c6..ce44710f5 100644 --- a/gui/serial_unix.cc +++ b/gui/serial_unix.cc @@ -23,11 +23,11 @@ #ifdef HAVE_UDEV #include // for udev_device_get_property_value, udev_device_get_devnode, udev_device_new_from_syspath, udev_device_unref, udev_enumerate_add_match_subsystem, udev_enumerate_get_list_entry, udev_enumerate_new, udev_enumerate_scan_devices, udev_enumerate_unref, udev_list_ent... -#include // for QDebug -#include // for QSet -#include // for QString, operator== -#include // for QStringList -#include // for QComboBox +#include // for QDebug +#include // for QSet +#include // for QString, operator== +#include // for QStringList +#include // for QComboBox #include "mainwindow.h" // for MainWindow diff --git a/gui/upgrade.cc b/gui/upgrade.cc index 5674a08ac..2affa3dd4 100644 --- a/gui/upgrade.cc +++ b/gui/upgrade.cc @@ -20,20 +20,20 @@ */ #include "upgrade.h" -#include // for qDebug -#include // for QByteArray -#include // for QDebug -#include // for QLocale -#include // for QSysInfo -#include // for QUrl -#include // for QVariant -#include // for QVersionNumber, operator<, operator== -#include // for ISODate, RichText -#include // for QDesktopServices -#include // for QNetworkAccessManager -#include // for QNetworkReply, QNetworkReply::NoError -#include // for QNetworkRequest, QNetworkRequest::ContentTypeHeader, QNetworkRequest::HttpReasonPhraseAttribute, QNetworkRequest::HttpStatusCodeAttribute, QNetworkRequest::NoLessSafeRedirectPolicy, QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::Redi... -#include // for QMessageBox, QMessageBox::Yes, operator|, QMessageBox::No +#include // for qDebug +#include // for QByteArray +#include // for QDebug +#include // for QLocale +#include // for QSysInfo +#include // for QUrl +#include // for QVariant +#include // for QVersionNumber, operator<, operator== +#include // for ISODate, RichText +#include // for QDesktopServices +#include // for QNetworkAccessManager +#include // for QNetworkReply, QNetworkReply::NoError +#include // for QNetworkRequest, QNetworkRequest::ContentTypeHeader, QNetworkRequest::HttpReasonPhraseAttribute, QNetworkRequest::HttpStatusCodeAttribute, QNetworkRequest::NoLessSafeRedirectPolicy, QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::Redi... +#include // for QMessageBox, QMessageBox::Yes, operator|, QMessageBox::No #include // for QDomDocument #include // for QDomElement #include // for QDomNode diff --git a/gui/upgrade.h b/gui/upgrade.h index e9984a2d4..d5a3780d1 100644 --- a/gui/upgrade.h +++ b/gui/upgrade.h @@ -19,14 +19,14 @@ */ -#include // for QDateTime -#include // for QList -#include // for QObject -#include // for QString -#include // for QUrl -#include // for QNetworkAccessManager -#include // for QNetworkReply -#include // for QWidget +#include // for QDateTime +#include // for QList +#include // for QObject +#include // for QString +#include // for QUrl +#include // for QNetworkAccessManager +#include // for QNetworkReply +#include // for QWidget #include "babeldata.h" // for BabelData #include "format.h" // for Format diff --git a/height.h b/height.h index 67aff6052..b59ffe94c 100644 --- a/height.h +++ b/height.h @@ -26,7 +26,7 @@ #include // for int8_t in heightgrid.h -#include // for QVector +#include // for QVector #include "defs.h" // for arglist_t, ARG_NOMINMAX, ARGTYPE_BEGIN_REQ, ARGTYPE_BOOL, ARGTYPE_END_REQ, ARGTYPE_FLOAT, Waypoint #include "filter.h" // for Filter diff --git a/hiketech.cc b/hiketech.cc index 2dee6dab7..b86d43d90 100644 --- a/hiketech.cc +++ b/hiketech.cc @@ -22,7 +22,7 @@ #include "defs.h" #include "src/core/xmlstreamwriter.h" #include "xmlgeneric.h" -#include +#include #include static gbfile* ofd; @@ -134,9 +134,9 @@ hiketech_format_time(const QDateTime& t) static void hiketech_trkpt_pr(const Waypoint* waypointp) { - writer.writeStartElement(QStringLiteral("pnt")); + writer.writeStartElement(QStringLiteral("pnt")); if (waypointp->creation_time.isValid()) { - writer.writeTextElement(QStringLiteral("utc"), + writer.writeTextElement(QStringLiteral("utc"), hiketech_format_time(waypointp->GetCreationTime())); } writer.writeTextElement(QStringLiteral("lat"), QString::number(waypointp->latitude,'f', 6)); @@ -150,13 +150,13 @@ hiketech_trkpt_pr(const Waypoint* waypointp) static void hiketech_waypt_pr(const Waypoint* wpt) { - writer.writeStartElement(QStringLiteral("wpt")); + writer.writeStartElement(QStringLiteral("wpt")); writer.setAutoFormattingIndent(-1); writer.writeTextElement(QStringLiteral("ident"), wpt->shortname); writer.writeTextElement(QStringLiteral("sym"), wpt->icon_descr); writer.writeTextElement(QStringLiteral("lat"), QString::number(wpt->latitude, 'f', 6)); writer.writeTextElement(QStringLiteral("long"), QString::number(wpt->longitude, 'f', 6)); - writer.writeStartElement(QStringLiteral("color")); + writer.writeStartElement(QStringLiteral("color")); writer.writeTextElement(QStringLiteral("lbl"), QStringLiteral("FAFFB4")); writer.writeTextElement(QStringLiteral("obj"), QStringLiteral("FF8000")); writer.writeEndElement(); // color diff --git a/html.cc b/html.cc index 20c33cb9d..53b9da72c 100644 --- a/html.cc +++ b/html.cc @@ -22,9 +22,9 @@ #include #include // for localtime -#include // for QString, operator!= -#include // for QVector -#include // for CaseInsensitive +#include // for QString, operator!= +#include // for QVector +#include // for CaseInsensitive #include "defs.h" #include "formspec.h" // for FsChainFind, kFsGpx diff --git a/humminbird.cc b/humminbird.cc index 7a5adf5bb..403393708 100644 --- a/humminbird.cc +++ b/humminbird.cc @@ -20,7 +20,7 @@ */ #include "defs.h" -#include +#include #include #include diff --git a/igc.cc b/igc.cc index 1f5d772a5..53e4b6dec 100644 --- a/igc.cc +++ b/igc.cc @@ -31,11 +31,11 @@ #include // for reverse_iterator, operator==, prev, next #include // for optional -#include // for QByteArray -#include // for QList<>::const_iterator -#include // for QStaticStringData -#include // for QString, operator+, QStringLiteral -#include // for foreach, qPrintable +#include // for QByteArray +#include // for QList<>::const_iterator +#include // for QStaticStringData +#include // for QString, operator+, QStringLiteral +#include // for foreach, qPrintable #include "defs.h" #include "cet_util.h" // for cet_convert_init @@ -501,7 +501,7 @@ static void detect_other_track(const route_head* rh) } // Find other track with the most waypoints if (rh->rte_waypt_ct > max_waypt_ct && - (rh->rte_name.isEmpty() || + (rh->rte_name.isEmpty() || (!rh->rte_name.startsWith(PRESTRKNAME) && !rh->rte_name.startsWith(GNSSTRKNAME)))) { head = rh; @@ -683,7 +683,7 @@ static void wr_task_hdr(const route_head* rte) } if (!rte->rte_desc.isEmpty()) { - // desc will be something like "IGCDATE160701: 500KTri" + // desc will be something like "IGCDATE160701: 500KTri" sscanf(CSTR(rte->rte_desc), DATEMAGIC "%6[0-9]: %s", flight_date, task_desc); } diff --git a/ignrando.cc b/ignrando.cc index e9dbfb868..f5e5b3855 100644 --- a/ignrando.cc +++ b/ignrando.cc @@ -21,7 +21,7 @@ #include "defs.h" #include "xmlgeneric.h" -#include +#include #include #define MYNAME "IGNRando" diff --git a/igo8.cc b/igo8.cc index fc984c8c0..8b361a794 100644 --- a/igo8.cc +++ b/igo8.cc @@ -67,10 +67,10 @@ #include // for atoi #include // for memset -#include // for QChar -#include // for QString -#include // for QVector -#include // for ushort +#include // for QChar +#include // for QString +#include // for QVector +#include // for ushort #include "defs.h" #include "gbfile.h" // for gbfwrite, gbfclose, gbfseek, gbfgetint32, gbfread, gbfile, gbfopen_le diff --git a/ik3d.cc b/ik3d.cc index 449113ecf..ea2991947 100644 --- a/ik3d.cc +++ b/ik3d.cc @@ -23,7 +23,7 @@ #include "defs.h" #include "xmlgeneric.h" -#include +#include static QVector ikt_args = { }; diff --git a/inifile.cc b/inifile.cc index e529f86f5..4f22fdce3 100644 --- a/inifile.cc +++ b/inifile.cc @@ -21,16 +21,16 @@ #include "defs.h" // for fatal, ugetenv, warning #include "inifile.h" #include "src/core/file.h" // for File -#include // for QByteArray -#include // for operator==, QChar -#include // for QDir -#include // for QFile -#include // for QFileInfo -#include // for QHash -#include // for QIODevice::ReadOnly, QIODevice -#include // for QTextStream -#include // for CaseInsensitive -#include // for qPrintable +#include // for QByteArray +#include // for operator==, QChar +#include // for QDir +#include // for QFile +#include // for QFileInfo +#include // for QHash +#include // for QIODevice::ReadOnly, QIODevice +#include // for QTextStream +#include // for CaseInsensitive +#include // for qPrintable #include #define MYNAME "inifile" diff --git a/inifile.h b/inifile.h index 5706775af..e1aa6afd4 100644 --- a/inifile.h +++ b/inifile.h @@ -21,9 +21,9 @@ #ifndef HAVE_INIFILE_H #define HAVE_INIFILE_H -#include // for QHash -#include // for QList -#include // for QString +#include // for QHash +#include // for QList +#include // for QString class InifileSection; struct inifile_t { diff --git a/internal_styles.cc b/internal_styles.cc index d89785ffb..81ce883da 100644 --- a/internal_styles.cc +++ b/internal_styles.cc @@ -1,7 +1,7 @@ /* This file is machine-generated from the contents of style/ */ /* by mkstyle.sh. Editing it by hand is an exceedingly bad idea. */ -#include +#include #include "defs.h" #if CSVFMTS_ENABLED static char arc[] = diff --git a/interpolate.cc b/interpolate.cc index ad1232e79..8ebe34276 100644 --- a/interpolate.cc +++ b/interpolate.cc @@ -24,8 +24,8 @@ #include // for abs, atoi, strtod #include // for optional -#include // for QString -#include // for qAsConst, QAddConst<>::Type +#include // for QString +#include // for qAsConst, QAddConst<>::Type #include "defs.h" #include "interpolate.h" diff --git a/interpolate.h b/interpolate.h index e2590228e..99b3ea147 100644 --- a/interpolate.h +++ b/interpolate.h @@ -24,8 +24,8 @@ #include // for optional -#include // for QVector -#include // for qint64 +#include // for QVector +#include // for qint64 #include "defs.h" // for ARG_NOMINMAX, arglist_t, ARGTYPE_BEGIN_EXCL, ARG... #include "filter.h" // for Filter diff --git a/itracku.cc b/itracku.cc index fe4d08f2d..1f85397e7 100644 --- a/itracku.cc +++ b/itracku.cc @@ -36,13 +36,13 @@ #include // for memcpy, strcmp, strlen, strncmp #include // for gmtime -#include // for QByteArray -#include // for QDate -#include // for QDateTime -#include // for QString -#include // for QTime -#include // for UTC -#include // for qPrintable +#include // for QByteArray +#include // for QDate +#include // for QDateTime +#include // for QString +#include // for QTime +#include // for UTC +#include // for qPrintable #include "defs.h" #include "gbser.h" // for gbser_read_line, gbser_write, gbser_deinit, gbser_flush, gbser_init, gbser_is_serial, gbser_read_wait, gbser_ERROR, gbser_OK @@ -276,7 +276,7 @@ decode_itracku_time(uint32_t date) int day = (date >> 17) & 31; int month = ((date >> 22) & 15); int year = ((date >> 26) & 63) + 2000; - QDate qdate(year, month, day); + QDate qdate(year, month, day); return QDateTime(qdate, qtime, Qt::UTC); } diff --git a/jeeps/gpsapp.cc b/jeeps/gpsapp.cc index 6390cbce7..fcfbead39 100644 --- a/jeeps/gpsapp.cc +++ b/jeeps/gpsapp.cc @@ -30,7 +30,7 @@ #include #include -#include +#include /* * This violates the layering design, but is needed for device discovery. @@ -329,7 +329,7 @@ static int32 GPS_A000(const char* port) // Garmin 276C serial - not USB - sees a zero here, so we changed // <= 0 to <0 on 2014-06-29 per Pierre Brial. - + if (GPS_Packet_Read(fd, &rec) < 0) { goto carry_on; } @@ -7590,7 +7590,7 @@ int32 GPS_Set_Baud_Rate(const char* port, int br) { gpsdevh* fd; - + if (!GPS_Device_On(port, &fd)) { return gps_errno; } @@ -7601,7 +7601,7 @@ int32 GPS_Set_Baud_Rate(const char* port, int br) if (!GPS_Device_Off(fd)) { return gps_errno; } - + return 0; } diff --git a/jeeps/gpsserial.cc b/jeeps/gpsserial.cc index 5aee770da..4bbd488d5 100644 --- a/jeeps/gpsserial.cc +++ b/jeeps/gpsserial.cc @@ -26,7 +26,7 @@ #include "jeeps/gps.h" #include "gbser.h" #include "jeeps/gpsserial.h" -#include +#include #include #include #include diff --git a/jeeps/gpsusbread.cc b/jeeps/gpsusbread.cc index 5b6cc996d..97bb7c035 100644 --- a/jeeps/gpsusbread.cc +++ b/jeeps/gpsusbread.cc @@ -75,7 +75,7 @@ int32 GPS_Packet_Read_usb(gpsdevh*, GPS_PPacket* packet, int eat_bulk) * haven't been observed so far. * 484 = Forerunner 305 * 450 = Edge 205, confirmed with Ian Dent on 2015/11/16. - * All Edge, Forerunner, and Foretracker [23]05 are probably + * All Edge, Forerunner, and Foretracker [23]05 are probably * similarly affected, but we don't know their device ID. */ if ((gps_save_id == 484 || gps_save_id == 450) diff --git a/jogmap.cc b/jogmap.cc index 1cc326400..e590a419f 100644 --- a/jogmap.cc +++ b/jogmap.cc @@ -25,7 +25,7 @@ #include "garmin_tables.h" #include "jeeps/gpsmath.h" #include "xmlgeneric.h" -#include +#include static route_head* trk; diff --git a/jtr.cc b/jtr.cc index fd5167ec6..6d507f3ac 100644 --- a/jtr.cc +++ b/jtr.cc @@ -21,7 +21,7 @@ */ #include "defs.h" #include "csv_util.h" -#include +#include //#include #include #include diff --git a/kml.cc b/kml.cc index 48aa830c0..8112d456b 100644 --- a/kml.cc +++ b/kml.cc @@ -28,20 +28,20 @@ #include // for optional #include // for tuple, make_tuple, tie -#include // for QByteArray -#include // for QChar -#include // for QDate -#include // for QDateTime -#include // for QFile -#include // for operator|, QIODevice, QIODevice::Text, QIODevice::WriteOnly -#include // for QList -#include // for QStaticStringData -#include // for QString, QStringLiteral, operator+, operator!= -#include // for QStringList -#include // for QVector -#include // for QXmlStreamAttributes -#include // for ISODate -#include // for foreach, qint64, qPrintable +#include // for QByteArray +#include // for QChar +#include // for QDate +#include // for QDateTime +#include // for QFile +#include // for operator|, QIODevice, QIODevice::Text, QIODevice::WriteOnly +#include // for QList +#include // for QStaticStringData +#include // for QString, QStringLiteral, operator+, operator!= +#include // for QStringList +#include // for QVector +#include // for QXmlStreamAttributes +#include // for ISODate +#include // for foreach, qint64, qPrintable #include "defs.h" #include "kml.h" diff --git a/kml.h b/kml.h index bfa993e4c..d324b167f 100644 --- a/kml.h +++ b/kml.h @@ -24,10 +24,10 @@ #include // for tuple, make_tuple, tie -#include // for QList -#include // for QString, QStringLiteral, operator+, operator!= -#include // for QVector -#include // for QXmlStreamAttributes +#include // for QList +#include // for QString, QStringLiteral, operator+, operator!= +#include // for QVector +#include // for QXmlStreamAttributes #include "defs.h" #include "format.h" diff --git a/lmx.cc b/lmx.cc index 2ed8186db..a8164f3b7 100644 --- a/lmx.cc +++ b/lmx.cc @@ -26,8 +26,8 @@ * we don't implement that at this time in GPSBabel. */ -#include // for QString -#include // for QXmlStreamAttributes +#include // for QString +#include // for QXmlStreamAttributes #include "defs.h" #include "gbfile.h" // for gbfputc, gbfprintf, gbfclose, gbfopen, gbfputcstr, gbfputs, gbfile, gbfputuint16 diff --git a/lowranceusr.cc b/lowranceusr.cc index a4244d51a..8d816bb37 100644 --- a/lowranceusr.cc +++ b/lowranceusr.cc @@ -92,18 +92,18 @@ #include // for strcmp, strlen #include // for time_t -#include // for QByteArray -#include // for QDate -#include // for QDateTime -#include // for QLatin1String -#include // for QList -#include // for QScopedPointer -#include // for QString, operator+, operator==, operator!= -#include // for QTextCodec, QTextCodec::IgnoreHeader -#include // for QTextEncoder -#include // for QTime -#include // for CaseInsensitive, UTC -#include // for qPrintable, uint, qAsConst, QAddConst<>::Type +#include // for QByteArray +#include // for QDate +#include // for QDateTime +#include // for QLatin1String +#include // for QList +#include // for QScopedPointer +#include // for QString, operator+, operator==, operator!= +#include // for QTextCodec, QTextCodec::IgnoreHeader +#include // for QTextEncoder +#include // for QTime +#include // for CaseInsensitive, UTC +#include // for qPrintable, uint, qAsConst, QAddConst<>::Type #include "defs.h" #include "lowranceusr.h" diff --git a/lowranceusr.h b/lowranceusr.h index 3f2bfc495..ce082b720 100644 --- a/lowranceusr.h +++ b/lowranceusr.h @@ -90,12 +90,12 @@ #include // for M_PI, round, atan, exp, log, tan #include // for time_t -#include // for QList -#include // for QString -#include // for QTextCodec -#include // for QVector -#include // for CaseInsensitive -#include // for uint +#include // for QList +#include // for QString +#include // for QTextCodec +#include // for QVector +#include // for CaseInsensitive +#include // for uint #include "defs.h" #include "format.h" diff --git a/magellan.h b/magellan.h index 4a2b7aec3..67f062625 100644 --- a/magellan.h +++ b/magellan.h @@ -20,7 +20,7 @@ #ifndef MAGELLAN_H_INCLUDED_ #define MAGELLAN_H_INCLUDED_ -#include +#include #include "defs.h" /* diff --git a/maggeo.cc b/maggeo.cc index 004dc9964..f1b199ccd 100644 --- a/maggeo.cc +++ b/maggeo.cc @@ -22,7 +22,7 @@ #include "defs.h" #include "csv_util.h" #include "magellan.h" -#include +#include #include #include #include diff --git a/magproto.cc b/magproto.cc index bbd84d539..ed707aec1 100644 --- a/magproto.cc +++ b/magproto.cc @@ -27,20 +27,20 @@ #include // for atoi, atof, strtoul #include // for strchr, strncmp, strlen, memmove, strrchr, memset -#include // for QByteArray -#include // for QDateTime -#include // for QDir, operator|, QDir::Files, QDir::Name, QDir::Readable -#include // for QFileInfo -#include // for QFileInfoList -#include // for QLatin1String -#include // for QList -#include // for QScopedPointer -#include // for QString, operator== -#include // for QStringList -#include // for QTime -#include // for QVector -#include // for CaseInsensitive -#include // for qPrintable, foreach +#include // for QByteArray +#include // for QDateTime +#include // for QDir, operator|, QDir::Files, QDir::Name, QDir::Readable +#include // for QFileInfo +#include // for QFileInfoList +#include // for QLatin1String +#include // for QList +#include // for QScopedPointer +#include // for QString, operator== +#include // for QStringList +#include // for QTime +#include // for QVector +#include // for CaseInsensitive +#include // for qPrintable, foreach #include "defs.h" #include "explorist_ini.h" // for explorist_ini_done, explorist_ini_get, mag_info @@ -1409,7 +1409,7 @@ void mag_track_disp(const Waypoint* waypointp) double ilat = waypointp->latitude; double ilon = waypointp->longitude; - + QByteArray dmy(""); QByteArray hms(""); if (waypointp->creation_time.isValid()) { diff --git a/main.cc b/main.cc index 8847115f3..c3d2aa490 100644 --- a/main.cc +++ b/main.cc @@ -22,21 +22,21 @@ #include // for printf, fflush, fgetc, fprintf, stderr, stdin, stdout #include // for strcmp -#include // for QByteArray -#include // for QChar -#include // for QCoreApplication -#include // for QFile -#include // for QIODevice::ReadOnly -#include // for QLocale -#include // for QMessageLogContext -#include // for QStack -#include // for QString -#include // for QStringList -#include // for QSysInfo -#include // for QTextCodec -#include // for QTextStream -#include // for QT_VERSION_STR -#include // for qPrintable, qVersion, QT_VERSION, QT_VERSION_CHECK +#include // for QByteArray +#include // for QChar +#include // for QCoreApplication +#include // for QFile +#include // for QIODevice::ReadOnly +#include // for QLocale +#include // for QMessageLogContext +#include // for QStack +#include // for QString +#include // for QStringList +#include // for QSysInfo +#include // for QTextCodec +#include // for QTextStream +#include // for QT_VERSION_STR +#include // for qPrintable, qVersion, QT_VERSION, QT_VERSION_CHECK #ifdef AFL_INPUT_FUZZING #include "argv-fuzz-inl.h" @@ -231,7 +231,7 @@ class FallbackOutput qPrintable(wpt->shortname), qPrintable(wpt->description)); } - + if (wpt->altitude != unknown_alt) { printf(" %f", wpt->altitude); } diff --git a/mapasia.cc b/mapasia.cc index baaa5b718..42c350701 100644 --- a/mapasia.cc +++ b/mapasia.cc @@ -23,12 +23,12 @@ #include // for fabs #include // for memset -#include // for QDate -#include // for QDateTime -#include // for QString -#include // for QTime -#include // for UTC -#include // for foreach +#include // for QDate +#include // for QDateTime +#include // for QString +#include // for QTime +#include // for UTC +#include // for foreach #include "defs.h" #include "gbfile.h" // for gbfclose, gbfeof, gbfgetint32, gbfputint32, gbfread, gbfwrite, gbfile, gbfopen_le diff --git a/mapbar_track.cc b/mapbar_track.cc index 3efc4fd88..be272179c 100644 --- a/mapbar_track.cc +++ b/mapbar_track.cc @@ -23,11 +23,11 @@ #include // for SEEK_CUR -#include // for QChar -#include // for QDate -#include // for QString -#include // for QTime -#include // for QVector +#include // for QChar +#include // for QDate +#include // for QString +#include // for QTime +#include // for QVector #include "defs.h" #include "gbfile.h" // for gbfgetint16, gbfgetint32, gbfseek, gbfclose, gbfopen, gbfile diff --git a/mapfactor.cc b/mapfactor.cc index 5aa1e590f..4611eae98 100644 --- a/mapfactor.cc +++ b/mapfactor.cc @@ -19,9 +19,9 @@ #include "defs.h" #include "src/core/file.h" #include "src/core/xmlstreamwriter.h" -#include -#include -#include +#include +#include +#include static gpsbabel::File* oqfile; static QXmlStreamWriter* writer; diff --git a/mapsend.cc b/mapsend.cc index d529f34d0..055541b24 100644 --- a/mapsend.cc +++ b/mapsend.cc @@ -24,10 +24,10 @@ #include // for strncpy #include -#include // for QCharRef -#include // for QString -#include // for QTime -#include // for Q_UNUSED +#include // for QCharRef +#include // for QString +#include // for QTime +#include // for Q_UNUSED #include "defs.h" #include "mapsend.h" diff --git a/mkicondoc.cc b/mkicondoc.cc index dea143374..afeb6f73a 100644 --- a/mkicondoc.cc +++ b/mkicondoc.cc @@ -6,7 +6,7 @@ #include // for printf #include // for strcmp -#include // for QVector<>::iterator, QVector +#include // for QVector<>::iterator, QVector #include "garmin_icon_tables.h" // for garmin_icon_table, garmin_smart_icon_table #include "garmin_tables.h" // for icon_mapping_t @@ -21,7 +21,7 @@ int main() for (const icon_mapping_t* entry = garmin_smart_icon_table; entry->icon; entry++) { table.append(*entry); } - + auto sort_lambda = [](const icon_mapping_t& a, const icon_mapping_t& b)->bool { return strcmp(a.icon, b.icon) < 0; }; diff --git a/mkshort.cc b/mkshort.cc index e29dc0808..3936b813d 100644 --- a/mkshort.cc +++ b/mkshort.cc @@ -23,9 +23,9 @@ #include // for sprintf, size_t #include // for strlen, memmove, strchr, strcpy, strncmp, strcat, strncpy -#include // for QList -#include // for QString -#include // for foreach +#include // for QList +#include // for QString +#include // for foreach #include "defs.h" #include "cet.h" // for cet_utf8_strdup, cet_utf8_strlen, cet_utf8_strndup diff --git a/mkstyle.sh b/mkstyle.sh index af821b0d1..68509f96c 100755 --- a/mkstyle.sh +++ b/mkstyle.sh @@ -2,7 +2,7 @@ echo "/* This file is machine-generated from the contents of style/ */" echo "/* by mkstyle.sh. Editing it by hand is an exceedingly bad idea. */" -echo +echo # set the locale for sorting so that the collate order doesn't depend # on the users environment. @@ -30,7 +30,7 @@ else exit 1 fi -echo "#include " +echo "#include " echo "#include \"defs.h\"" echo "#if CSVFMTS_ENABLED" for i in "$(dirname "$0")"/style/*.style diff --git a/mmo.cc b/mmo.cc index 9e91e16a1..a5d693f36 100644 --- a/mmo.cc +++ b/mmo.cc @@ -29,19 +29,19 @@ #include // for strcmp, strlen, memset, strchr, strncmp #include -#include // for QByteArray -#include // for operator==, QChar -#include // for QCharRef -#include // for QDateTime -#include // for QHash, QHash<>::const_iterator -#include // for QLatin1String -#include // for QScopedPointer -#include // for QString, operator== -#include // for QTextCodec, QTextCodec::IgnoreHeader -#include // for QTextEncoder -#include // for QVector -#include // for CaseInsensitive -#include // for qAsConst, QAddConst<>::Type, foreach, Q_UNUSED +#include // for QByteArray +#include // for operator==, QChar +#include // for QCharRef +#include // for QDateTime +#include // for QHash, QHash<>::const_iterator +#include // for QLatin1String +#include // for QScopedPointer +#include // for QString, operator== +#include // for QTextCodec, QTextCodec::IgnoreHeader +#include // for QTextEncoder +#include // for QVector +#include // for CaseInsensitive +#include // for qAsConst, QAddConst<>::Type, foreach, Q_UNUSED #include "defs.h" #include "gbfile.h" // for gbfputc, gbfgetuint16, gbfgetc, gbfgetdbl, gbfgetuint32, gbfputflt, gbfputuint32, gbfgetint16, gbfputdbl, gbfputuint16, gbfclose, gbfread, gbfseek, gbfputint16, gbfwrite, gbfcopyfrom, gbfeof, gbfgetflt, gbfgetint32, gbfile, gbfopen, gbfrewind, gbsize_t diff --git a/mtk_logger.cc b/mtk_logger.cc index 6a36421bc..af4ead854 100644 --- a/mtk_logger.cc +++ b/mtk_logger.cc @@ -57,9 +57,9 @@ #include "defs.h" #include "gbfile.h" /* used for csv output */ #include "gbser.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/mynav.cc b/mynav.cc index 9643daeea..f2fbf982e 100644 --- a/mynav.cc +++ b/mynav.cc @@ -23,12 +23,12 @@ */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/mynav.h b/mynav.h index 7276fe4c6..998d4bf95 100644 --- a/mynav.h +++ b/mynav.h @@ -23,8 +23,8 @@ #ifndef MYNAV_H_INCLUDED_ #define MYNAV_H_INCLUDED_ -#include -#include +#include +#include #include "defs.h" #include "format.h" diff --git a/navicache.cc b/navicache.cc index 6ffb0f368..41aa365f7 100644 --- a/navicache.cc +++ b/navicache.cc @@ -19,7 +19,7 @@ #include "defs.h" #include "cet_util.h" #include "src/core/file.h" -#include +#include static char* noretired = nullptr; static QString read_fname; diff --git a/navilink.cc b/navilink.cc index 6ca53362b..739ae123d 100644 --- a/navilink.cc +++ b/navilink.cc @@ -26,7 +26,7 @@ #include "gbser.h" #include "jeeps/gpsmath.h" #include "navilink.h" -#include +#include #define MYNAME "NAVILINK" diff --git a/nmea.cc b/nmea.cc index c9d793fd9..733e9967b 100644 --- a/nmea.cc +++ b/nmea.cc @@ -27,18 +27,18 @@ #include // for strncmp, strchr, strlen, strstr, memset, strrchr #include // for operator!=, reverse_iterator -#include // for QByteArray -#include // for QChar, operator==, operator!= -#include // for QDateTime -#include // for QDebug -#include // for QList -#include // for QString -#include // for QStringList -#include // for hex -#include // for QThread -#include // for QTime -#include // for UTC -#include // for qPrintable, foreach +#include // for QByteArray +#include // for QChar, operator==, operator!= +#include // for QDateTime +#include // for QDebug +#include // for QList +#include // for QString +#include // for QStringList +#include // for hex +#include // for QThread +#include // for QTime +#include // for UTC +#include // for qPrintable, foreach #include "defs.h" #include "nmea.h" @@ -643,7 +643,7 @@ NmeaFormat::gpgsa_parse(const QString& ibuf) const fix = fields[2][0]; } - // 12 fields, index 3 through 14. + // 12 fields, index 3 through 14. for (int cnt = 0; cnt <= 11; cnt++) { if (nfields > cnt + 3) prn[cnt] = fields[cnt + 3].toInt(); } diff --git a/nmea.h b/nmea.h index 3da5acf60..df91ca921 100644 --- a/nmea.h +++ b/nmea.h @@ -22,13 +22,13 @@ #ifndef NMEA_H_INCLUDED_ #define NMEA_H_INCLUDED_ -#include // for QByteArray -#include // for QDate -#include // for QDateTime -#include // for QList -#include // for QString -#include // for QTime -#include // for QVector +#include // for QByteArray +#include // for QDate +#include // for QDateTime +#include // for QList +#include // for QString +#include // for QTime +#include // for QVector #include "defs.h" #include "format.h" // for Format diff --git a/nukedata.h b/nukedata.h index 30ee59715..ec05dd64e 100644 --- a/nukedata.h +++ b/nukedata.h @@ -23,7 +23,7 @@ #ifndef NUKEDATA_H_INCLUDED_ #define NUKEDATA_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI... #include "filter.h" // for Filter diff --git a/osm.cc b/osm.cc index 92e000123..30b85a2b2 100644 --- a/osm.cc +++ b/osm.cc @@ -22,13 +22,13 @@ #include // for strlen, strchr, strcmp -#include // for QByteArray -#include // for QHash -#include // for QLatin1String -#include // for QPair, operator== -#include // for QString, operator==, operator+ -#include // for QXmlStreamAttributes -#include // for qPrintable, QAddConst<>::Type +#include // for QByteArray +#include // for QHash +#include // for QLatin1String +#include // for QPair, operator== +#include // for QString, operator==, operator+ +#include // for QXmlStreamAttributes +#include // for qPrintable, QAddConst<>::Type #include "defs.h" #include "osm.h" diff --git a/osm.h b/osm.h index 609a0f419..89996399b 100644 --- a/osm.h +++ b/osm.h @@ -22,12 +22,12 @@ #ifndef OSM_H_INCLUDED_ #define OSM_H_INCLUDED_ -#include // for QHash -#include // for QList -#include // for QPair -#include // for QString -#include // for QVector -#include // for QXmlStreamAttributes +#include // for QHash +#include // for QList +#include // for QPair +#include // for QString +#include // for QVector +#include // for QXmlStreamAttributes #include "defs.h" #include "format.h" // for Format diff --git a/ozi.cc b/ozi.cc index 4c3058409..d934bd8d0 100644 --- a/ozi.cc +++ b/ozi.cc @@ -40,18 +40,18 @@ #include // for lround #include // for atoi -#include // for QByteArray -#include // for operator==, QChar -#include // for QCharRef -#include // for QFile -#include // for QFileInfo -#include // for operator|, QIODevice::WriteOnly, QIODevice::ReadOnly, QIODevice, QIODevice::OpenModeFlag -#include // for QString -#include // for QStringList -#include // for QTextStream, operator<<, qSetRealNumberPrecision, QTextStream::FixedNotation -#include // for QVector -#include // for CaseInsensitive -#include // for qPrintable +#include // for QByteArray +#include // for operator==, QChar +#include // for QCharRef +#include // for QFile +#include // for QFileInfo +#include // for operator|, QIODevice::WriteOnly, QIODevice::ReadOnly, QIODevice, QIODevice::OpenModeFlag +#include // for QString +#include // for QStringList +#include // for QTextStream, operator<<, qSetRealNumberPrecision, QTextStream::FixedNotation +#include // for QVector +#include // for CaseInsensitive +#include // for qPrintable #include "defs.h" #include "csv_util.h" // for csv_stringclean @@ -263,7 +263,7 @@ ozi_openfile(const QString& fname) if (stream != nullptr) { ozi_close_io(); } - + ozi_open_io(tmpname, QFile::WriteOnly); } diff --git a/pcx.cc b/pcx.cc index 289e04f94..e4a55e45a 100644 --- a/pcx.cc +++ b/pcx.cc @@ -23,17 +23,17 @@ #include // for atoi #include // for strstr, strncmp -#include // for operator==, QChar -#include // for QCharRef -#include // for QDate -#include // for QDateTime -#include // for QList -#include // for QRegularExpression -#include // for QString, QString::SectionSkipEmpty -#include // for QStringList -#include // for QTime -#include // for QVector -#include // for CaseInsensitive, UTC +#include // for operator==, QChar +#include // for QCharRef +#include // for QDate +#include // for QDateTime +#include // for QList +#include // for QRegularExpression +#include // for QString, QString::SectionSkipEmpty +#include // for QStringList +#include // for QTime +#include // for QVector +#include // for CaseInsensitive, UTC #include "defs.h" #include "cet_util.h" // for cet_convert_init diff --git a/pocketfms_fp.cc b/pocketfms_fp.cc index fbf6d0fa1..79508f8d3 100644 --- a/pocketfms_fp.cc +++ b/pocketfms_fp.cc @@ -19,8 +19,8 @@ */ -#include // for QString -#include // for QXmlStreamAttributes +#include // for QString +#include // for QXmlStreamAttributes #include "defs.h" #include "xmlgeneric.h" // for cb_cdata, xg_callback, xg_string, cb_start, cb_end, xg_cb_type, xml_deinit, xml_init, xml_read, xg_tag_mapping diff --git a/polygon.cc b/polygon.cc index 629c0d5aa..d2eae29a9 100644 --- a/polygon.cc +++ b/polygon.cc @@ -22,7 +22,7 @@ #include // for sscanf #include // for strchr, strlen, strspn -#include // for foreach +#include // for foreach #include "defs.h" #include "polygon.h" diff --git a/polygon.h b/polygon.h index 78e529603..8849c1b96 100644 --- a/polygon.h +++ b/polygon.h @@ -22,7 +22,7 @@ #ifndef POLYGON_H_INCLUDED_ #define POLYGON_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for ARG_NOMINMAX, arglist_t, ARGTYPE_BOOL, ARGTYPE_FILE #include "filter.h" // for Filter diff --git a/position.cc b/position.cc index f02006317..bb372f956 100644 --- a/position.cc +++ b/position.cc @@ -22,8 +22,8 @@ #include // for fabs #include // for strtod -#include // for QList -#include // for qAsConst, QAddConst<>::Type +#include // for QList +#include // for qAsConst, QAddConst<>::Type #include "defs.h" #include "grtcirc.h" // for RAD, gcdist, radtometers diff --git a/position.h b/position.h index dc9479e90..a88348da1 100644 --- a/position.h +++ b/position.h @@ -22,7 +22,7 @@ #ifndef POSITION_H_INCLUDED_ #define POSITION_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for route_head (ptr only), ARG_NOMINMAX, ARGTYPE_FLOAT #include "filter.h" // for Filter diff --git a/qstarz_bl_1000.cc b/qstarz_bl_1000.cc index f9a40db71..ebd488f5e 100644 --- a/qstarz_bl_1000.cc +++ b/qstarz_bl_1000.cc @@ -26,11 +26,11 @@ #include "qstarz_bl_1000.h" #include // for round -#include // for QChar -#include // for QDataStream, QDataStream::SinglePrecision, QDataStream::DoublePrecision, QDataStream::LittleEndian, QDataStream::Ok -#include // for QDebug -#include // for QFile -#include // for QIODevice, QIODevice::ReadOnly +#include // for QChar +#include // for QDataStream, QDataStream::SinglePrecision, QDataStream::DoublePrecision, QDataStream::LittleEndian, QDataStream::Ok +#include // for QDebug +#include // for QFile +#include // for QIODevice, QIODevice::ReadOnly #include "defs.h" // for Waypoint, ddmm2degrees, route_head, track_add_head, track_add_wpt, waypt_add, waypt_count, wp_flags, fix_unknown, fix_2d, fix_3d, fix_dgps, fix_none, fix_pps, fix_type, global_options, global_opts #include "src/core/logging.h" // for Fatal diff --git a/qstarz_bl_1000.h b/qstarz_bl_1000.h index 695cd8314..b251efb51 100644 --- a/qstarz_bl_1000.h +++ b/qstarz_bl_1000.h @@ -26,10 +26,10 @@ #ifndef QSTARZ_BL1000_H_INCLUDED_ #define QSTARZ_BL1000_H_INCLUDED_ -#include // for QDataStream -#include // for QString -#include // for QVector -#include // for qint8, quint16, quint8 +#include // for QDataStream +#include // for QString +#include // for QVector +#include // for qint8, quint16, quint8 #include "defs.h" // for ff_cap, ff_cap_read, ff_cap_none, CET_CHARSET_ASCII, ff_type, ff_type_file, route_head #include "format.h" // for Format diff --git a/radius.cc b/radius.cc index e71f25594..c08533666 100644 --- a/radius.cc +++ b/radius.cc @@ -21,8 +21,8 @@ #include // for atoi, strtod -#include // for QString -#include // for qAsConst, QAddConst<>::Type, foreach +#include // for QString +#include // for qAsConst, QAddConst<>::Type, foreach #include "defs.h" // for Waypoint, waypt_del, route_add_head, route_add_wpt, route_head, waypt_add, waypt_count, xcalloc, xfree, kMilesPerKilometer #include "radius.h" diff --git a/radius.h b/radius.h index 5935c105a..41945eb85 100644 --- a/radius.h +++ b/radius.h @@ -22,7 +22,7 @@ #ifndef RADIUS_H_INCLUDED_ #define RADIUS_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for ARG_NOMINMAX, ARGTYPE_FLOAT, ARGTYPE_REQUIRED #include "filter.h" // for Filter diff --git a/random.cc b/random.cc index 5b1690eb7..0c3c049b7 100644 --- a/random.cc +++ b/random.cc @@ -21,11 +21,11 @@ #include // for atoi #include // for mt19937 -#include // for QByteArray -#include // for QByteRef -#include // for QDateTime -#include // for QString -#include // for QThread +#include // for QByteArray +#include // for QByteRef +#include // for QDateTime +#include // for QString +#include // for QThread #include "defs.h" #include "random.h" diff --git a/random.h b/random.h index 0c53db0b3..53e5dd25d 100644 --- a/random.h +++ b/random.h @@ -22,9 +22,9 @@ #include // for mt19937 -#include // for QDateTime -#include // for QString -#include // for QVector +#include // for QDateTime +#include // for QString +#include // for QVector #include "defs.h" #include "format.h" diff --git a/raymarine.cc b/raymarine.cc index 2ae07a2c3..75fc6ec7a 100644 --- a/raymarine.cc +++ b/raymarine.cc @@ -47,7 +47,7 @@ #include "csv_util.h" #include "inifile.h" -#include +#include #include #include #include diff --git a/reverse_route.cc b/reverse_route.cc index 68ef7f15e..ebb80d895 100644 --- a/reverse_route.cc +++ b/reverse_route.cc @@ -20,7 +20,7 @@ */ #include // for reverse -#include // for QList<>::iterator +#include // for QList<>::iterator #include "defs.h" #include "reverse_route.h" diff --git a/reverse_route.h b/reverse_route.h index 3ad948d55..4834c78b8 100644 --- a/reverse_route.h +++ b/reverse_route.h @@ -21,7 +21,7 @@ #ifndef REVERSE_ROUTE_H_INCLUDED_ #define REVERSE_ROUTE_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for Waypoint (ptr only), arglist_t, route_head (ptr ... #include "filter.h" // for Filter diff --git a/route.cc b/route.cc index 6beddea05..ee03684e7 100644 --- a/route.cc +++ b/route.cc @@ -23,10 +23,10 @@ #include #include // for optional, operator>, operator< -#include // for QDateTime -#include // for QList<>::iterator -#include // for QString -#include // for foreach +#include // for QDateTime +#include // for QList<>::iterator +#include // for QString +#include // for foreach #include "defs.h" #include "grtcirc.h" // for RAD, gcdist, heading_true_degrees, radtometers diff --git a/session.cc b/session.cc index 2ce888832..8f3efc996 100644 --- a/session.cc +++ b/session.cc @@ -22,7 +22,7 @@ #include "defs.h" #include "session.h" -#include // for QList +#include // for QList static QList session_list; diff --git a/session.h b/session.h index 006a9f624..adc7a1764 100644 --- a/session.h +++ b/session.h @@ -22,7 +22,7 @@ #ifndef SESSION_H_INCLUDED_ #define SESSION_H_INCLUDED_ -#include // for QString +#include // for QString #include struct session_t { diff --git a/shape.cc b/shape.cc index 1c732153c..6a11e022a 100644 --- a/shape.cc +++ b/shape.cc @@ -22,13 +22,13 @@ #include // for assert -#include // for QByteArray -#include // for QLatin1String -#include // for QString, QString::SkipEmptyParts -#include // for QStringList -#include // for QVector -#include // for CaseInsensitive -#include // for qPrintable +#include // for QByteArray +#include // for QLatin1String +#include // for QString, QString::SkipEmptyParts +#include // for QStringList +#include // for QVector +#include // for CaseInsensitive +#include // for qPrintable #include "defs.h" #include "shape.h" diff --git a/shape.h b/shape.h index 38c1208c0..4832d7d70 100644 --- a/shape.h +++ b/shape.h @@ -22,8 +22,8 @@ #ifndef SHAPE_H_INCLUDED_ #define SHAPE_H_INCLUDED_ -#include // for QString -#include // for QVector +#include // for QString +#include // for QVector #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file #include "format.h" // for Format diff --git a/shortname.cc b/shortname.cc index 06e829f1e..f2d278980 100644 --- a/shortname.cc +++ b/shortname.cc @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "shortname.h" diff --git a/skytraq.cc b/skytraq.cc index b0c7b2eda..2a15b9725 100644 --- a/skytraq.cc +++ b/skytraq.cc @@ -25,7 +25,7 @@ #include "defs.h" #include "gbser.h" -#include +#include #include #include #include diff --git a/smplrout.cc b/smplrout.cc index 172033483..eb67a2fa5 100644 --- a/smplrout.cc +++ b/smplrout.cc @@ -59,7 +59,7 @@ #include // for qsort, strtol #include // for swap -#include // for QDateTime +#include // for QDateTime #include "defs.h" #include "smplrout.h" diff --git a/smplrout.h b/smplrout.h index d78a25c93..2386432ca 100644 --- a/smplrout.h +++ b/smplrout.h @@ -59,7 +59,7 @@ #ifndef SMPLROUT_H_INCLUDED_ #define SMPLROUT_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for route_head (ptr only), Waypoint (ptr only), ARGT... #include "filter.h" // for Filter diff --git a/sort.cc b/sort.cc index 417520f17..f3f182e89 100644 --- a/sort.cc +++ b/sort.cc @@ -19,8 +19,8 @@ */ -#include // for QDateTime -#include // for operator<, QString +#include // for QDateTime +#include // for operator<, QString #include "defs.h" #include "src/core/datetime.h" // for DateTime @@ -85,7 +85,7 @@ void SortFilter::process() fatal(MYNAME ": unknown waypoint sort mode."); } } - + if (rte_sort_mode != SortModeRteHd::none) { switch (rte_sort_mode) { case SortModeRteHd::description: diff --git a/sort.h b/sort.h index 79131d9b4..2c4ddf01a 100644 --- a/sort.h +++ b/sort.h @@ -22,7 +22,7 @@ #ifndef SORT_H_INCLUDED_ #define SORT_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI... #include "filter.h" // for Filter diff --git a/src/core/datetime.h b/src/core/datetime.h index 0c7581b3a..a334043fa 100644 --- a/src/core/datetime.h +++ b/src/core/datetime.h @@ -25,14 +25,14 @@ #include -#include -#include -#include +#include +#include +#include // As this code began in C, we have several hundred places that set and // read creation_time as a time_t. Provide some operator overloads to make // that less painful. -// Probably all of these should eventually go away and be replaced by +// Probably all of these should eventually go away and be replaced by // "Better" code in the callers. // Consider putting in a namespace instead of prefixing 'gb'. diff --git a/src/core/file.h b/src/core/file.h index ba130a04a..47121e75f 100644 --- a/src/core/file.h +++ b/src/core/file.h @@ -20,10 +20,10 @@ #ifndef SRC_CORE_FILE_INCLUDED_H_ #define SRC_CORE_FILE_INCLUDED_H_ -#include -#include -#include -#include +#include +#include +#include +#include #include #include "src/core/logging.h" #include "defs.h" diff --git a/src/core/logging.h b/src/core/logging.h index 08480b762..d020e3093 100644 --- a/src/core/logging.h +++ b/src/core/logging.h @@ -22,8 +22,8 @@ // A wrapper for QDebug that provides a sensible Warning() and FatalMsg() // with convenient functions, stream operators and manipulators. -#include // for QDebug -#include // for QtCriticalMsg, QtWarningMsg +#include // for QDebug +#include // for QtCriticalMsg, QtWarningMsg class Warning : public QDebug @@ -41,7 +41,7 @@ class Warning : public QDebug * tools such as cppcheck. * 2) allows fatal to throw an exception instead of calling exit. * This could be caught by main for a cleaner exit from a fatal error. - */ + */ class FatalMsg : public QDebug { public: diff --git a/src/core/optionaldouble.h b/src/core/optionaldouble.h index 88e0495c7..ee9ec60bb 100644 --- a/src/core/optionaldouble.h +++ b/src/core/optionaldouble.h @@ -27,7 +27,7 @@ STATUS: experimental // As this code began in C, we have several hundred places that set and // read creation_time as a time_t. Provide some operator overloads to make // that less painful. -// Probably all of these should eventually go away and be replaced by +// Probably all of these should eventually go away and be replaced by // "Better" code in the callers. // Consider putting in a namespace instead of prefixing 'gb'. diff --git a/src/core/textstream.cc b/src/core/textstream.cc index 7e646658f..2a9adf5a7 100644 --- a/src/core/textstream.cc +++ b/src/core/textstream.cc @@ -17,9 +17,9 @@ */ -#include // for QFile -#include // for QFlags -#include // for QIODevice, QIODevice::OpenMode, QIODevice::ReadOnly, QIODevice::WriteOnly +#include // for QFile +#include // for QFlags +#include // for QIODevice, QIODevice::OpenMode, QIODevice::ReadOnly, QIODevice::WriteOnly #include "defs.h" // for fatal, list_codecs #include "src/core/textstream.h" diff --git a/src/core/textstream.h b/src/core/textstream.h index 5c1bb1c61..a1f1c8fba 100644 --- a/src/core/textstream.h +++ b/src/core/textstream.h @@ -19,10 +19,10 @@ #ifndef SRC_CORE_TEXTSTREAM_INCLUDED_H_ #define SRC_CORE_TEXTSTREAM_INCLUDED_H_ -#include // for QIODevice, QIODevice::OpenMode -#include // for QString -#include // for QTextCodec -#include // for QTextStream +#include // for QIODevice, QIODevice::OpenMode +#include // for QString +#include // for QTextCodec +#include // for QTextStream #include "src/core/file.h" // for File diff --git a/src/core/usasciicodec.cc b/src/core/usasciicodec.cc index fe04b8d46..236d7b1c6 100644 --- a/src/core/usasciicodec.cc +++ b/src/core/usasciicodec.cc @@ -18,11 +18,11 @@ */ #include "src/core/usasciicodec.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // The availability of a US-ASCII codec is not promised by QTextCodec. // On Mac OS X is is likely one will not be available. diff --git a/src/core/usasciicodec.h b/src/core/usasciicodec.h index a800e3a23..db002278c 100644 --- a/src/core/usasciicodec.h +++ b/src/core/usasciicodec.h @@ -20,7 +20,7 @@ #ifndef QUSASCIICODEC_H #define QUSASCIICODEC_H -#include +#include namespace gpsbabel { diff --git a/src/core/xmlstreamwriter.cc b/src/core/xmlstreamwriter.cc index 6f6839ec1..307dc6ffb 100644 --- a/src/core/xmlstreamwriter.cc +++ b/src/core/xmlstreamwriter.cc @@ -19,9 +19,9 @@ #include "src/core/xmlstreamwriter.h" -#include // for QString -#include // for QXmlStreamWriter -#include // for QT_VERSION, QT_VERSION_CHECK +#include // for QString +#include // for QXmlStreamWriter +#include // for QT_VERSION, QT_VERSION_CHECK // As this code began in C, we have several hundred places that write // c strings. Add a test that the string contains anything useful diff --git a/src/core/xmlstreamwriter.h b/src/core/xmlstreamwriter.h index a96ed982c..24097da6b 100644 --- a/src/core/xmlstreamwriter.h +++ b/src/core/xmlstreamwriter.h @@ -20,8 +20,8 @@ #ifndef XMLSTREAMWRITER_H #define XMLSTREAMWRITER_H -#include // for QString -#include // for QXmlStreamWriter +#include // for QString +#include // for QXmlStreamWriter namespace gpsbabel { diff --git a/src/core/xmltag.h b/src/core/xmltag.h index 7563eba65..6e276a161 100644 --- a/src/core/xmltag.h +++ b/src/core/xmltag.h @@ -19,8 +19,8 @@ #ifndef SRC_CORE_XMLTAG_H #define SRC_CORE_XMLTAG_H -#include // for QString -#include // for QXmlStreamAttributes +#include // for QString +#include // for QXmlStreamAttributes #include "defs.h" diff --git a/src/core/ziparchive.cc b/src/core/ziparchive.cc index c742ccb03..ffa98805e 100644 --- a/src/core/ziparchive.cc +++ b/src/core/ziparchive.cc @@ -29,8 +29,8 @@ #include "zlib/contrib/minizip/zip.h" #endif -#include -#include +#include +#include ZipArchive::ZipArchive(QString filename) : filename_(filename), valid_(false) { diff --git a/src/core/ziparchive.h b/src/core/ziparchive.h index 9a9d5a813..93fb4c657 100644 --- a/src/core/ziparchive.h +++ b/src/core/ziparchive.h @@ -19,8 +19,8 @@ */ -#include -#include +#include +#include #include "defs.h" #ifdef HAVE_LIBMINIZIP #include diff --git a/stackfilter.h b/stackfilter.h index 3d8cdcc46..2b2a70ecb 100644 --- a/stackfilter.h +++ b/stackfilter.h @@ -22,7 +22,7 @@ #ifndef STACKFILTER_H_INCLUDED_ #define STACKFILTER_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for ARGTYPE_BOOL, ARG_NOMINMAX, ARGTYPE_BEGIN_EXCL #include "filter.h" // for Filter diff --git a/stmsdf.cc b/stmsdf.cc index 3d2ba6f88..a7e3e7c17 100644 --- a/stmsdf.cc +++ b/stmsdf.cc @@ -36,14 +36,14 @@ #include // for strchr #include // for localtime, strftime -#include // for QDate -#include // for QDateTime -#include // for QList<>::iterator, QList -#include // for QRegularExpression -#include // for QString, operator+ -#include // for QStringList -#include // for QTime -#include // for qAsConst, QAddConst<>::Type +#include // for QDate +#include // for QDateTime +#include // for QList<>::iterator, QList +#include // for QRegularExpression +#include // for QString, operator+ +#include // for QStringList +#include // for QTime +#include // for qAsConst, QAddConst<>::Type #include "cet_util.h" // for cet_convert_init #include "csv_util.h" // for csv_lineparse diff --git a/stmwpp.cc b/stmwpp.cc index b7e130f72..f1e962fbc 100644 --- a/stmwpp.cc +++ b/stmwpp.cc @@ -25,10 +25,10 @@ #include // for memset #include // for tm -#include // for QDateTime -#include // for QString -#include // for QTime -#include // for QVector +#include // for QDateTime +#include // for QString +#include // for QTime +#include // for QVector #include "defs.h" #include "cet_util.h" // for cet_convert_init diff --git a/subrip.cc b/subrip.cc index 707f7c1bc..3ced5b26d 100644 --- a/subrip.cc +++ b/subrip.cc @@ -19,12 +19,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include // for QDate -#include // for QDateTime, operator<< -#include // for QDebug -#include // for QString -#include // for QTime -#include // for UTC +#include // for QDate +#include // for QDateTime, operator<< +#include // for QDebug +#include // for QString +#include // for QTime +#include // for UTC #include "defs.h" #include "subrip.h" diff --git a/subrip.h b/subrip.h index 15befa497..e54ebee99 100644 --- a/subrip.h +++ b/subrip.h @@ -22,10 +22,10 @@ #ifndef SUBRIP_H_INCLUDED_ #define SUBRIP_H_INCLUDED_ -#include // for QDateTime, operator<< -#include // for QString -#include // for QTime -#include // for QVector +#include // for QDateTime, operator<< +#include // for QString +#include // for QTime +#include // for QVector #include "defs.h" #include "format.h" // for Format diff --git a/swapdata.h b/swapdata.h index 498dbdc51..58dd9e99a 100644 --- a/swapdata.h +++ b/swapdata.h @@ -23,7 +23,7 @@ #ifndef SWAPDATA_H_INCLUDED_ #define SWAPDATA_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for arglist_t, Waypoint #include "filter.h" // for Filter diff --git a/tef_xml.cc b/tef_xml.cc index 34a10ad43..e6a9d5d54 100644 --- a/tef_xml.cc +++ b/tef_xml.cc @@ -23,13 +23,13 @@ */ -#include // for QLatin1String -#include // for QString -#include // for QStringView -#include // for QVector -#include // for QXmlStreamAttribute -#include // for QXmlStreamAttributes -#include // for CaseInsensitive +#include // for QLatin1String +#include // for QString +#include // for QStringView +#include // for QVector +#include // for QXmlStreamAttribute +#include // for QXmlStreamAttributes +#include // for CaseInsensitive #include "defs.h" #include "xmlgeneric.h" // for cb_start, cb_end, xg_callback, xg_string, xg_cb_type, xml_deinit, xml_init, xml_read, xg_tag_mapping @@ -121,7 +121,7 @@ tef_list_start(xg_string, const QXmlStreamAttributes* attrv) /* * TODO: this whole horrible mess is not covered at all in the test suite, - * so just stub it all out until someone cares. (TEF is rarely used from + * so just stub it all out until someone cares. (TEF is rarely used from * what we can tell.) */ @@ -184,7 +184,7 @@ Xfix_notes(const QString& name, const QString& notes) return r; } #else -static QString +static QString fix_notes(const QString&, const QString& notes){ return notes; } diff --git a/text.cc b/text.cc index bc1aa866a..143b037f6 100644 --- a/text.cc +++ b/text.cc @@ -22,9 +22,9 @@ #include #include // for localtime -#include // for QString, operator!= -#include // for QVector -#include // for CaseInsensitive +#include // for QString, operator!= +#include // for QVector +#include // for CaseInsensitive #include "defs.h" #include "formspec.h" // for FsChainFind, kFsGpx diff --git a/tomtom.cc b/tomtom.cc index 9d04f1461..d72ad4a2b 100644 --- a/tomtom.cc +++ b/tomtom.cc @@ -41,8 +41,8 @@ #include // for qsort #include // for strlen -#include // for QString -#include // for foreach +#include // for QString +#include // for foreach #include "defs.h" #include "gbfile.h" // for gbfgetint32, gbfputint32, gbfclose, gbfgetc, gbfputc, gbfseek, gbfile, gbfeof, gbfread, gbftell, gbfwrite, gbfopen_le diff --git a/tpo.cc b/tpo.cc index 763709124..6dc26b64e 100644 --- a/tpo.cc +++ b/tpo.cc @@ -77,12 +77,12 @@ #include // for strncmp, strlen, memset #include // for vector -#include // for QByteArray -#include // for operator==, QChar -#include // for QCharRef -#include // for QScopedArrayPointer -#include // for QString -#include // for qPrintable, Q_UNUSED +#include // for QByteArray +#include // for operator==, QChar +#include // for QCharRef +#include // for QScopedArrayPointer +#include // for QString +#include // for qPrintable, Q_UNUSED #include "defs.h" #include "gbfile.h" // for gbfread, gbfgetc, gbfgetint32, gbfwrite, gbfputint16, gbfseek, gbfgetdbl, gbfgetint16, gbfputdbl, gbfclose, gbfputint32, gbfile, gbfopen_le, gbfgetuint16 @@ -644,13 +644,13 @@ static void tpo_process_tracks() track_temp->line_width = styles[track_style].wide; if (DEBUG) printf("Track Name: %s, ?Type?: %u, Style Name: %s, Width: %d, Dashed: %d, Color: #%s\n", - qPrintable(track_name), line_type, + qPrintable(track_name), line_type, qPrintable(styles[track_style].name), styles[track_style].wide, styles[track_style].dash,rgb); // Track description - track_temp->rte_desc = + track_temp->rte_desc = QString("Style=%1, Width=%2, Dashed=%3, Color=#%4") .arg(styles[track_style].name) .arg(styles[track_style].wide) diff --git a/trackfilter.cc b/trackfilter.cc index 3433e0cbc..6d2ab94af 100644 --- a/trackfilter.cc +++ b/trackfilter.cc @@ -32,20 +32,20 @@ #include // for sort, stable_sort -#include // for QByteArray -#include // for QChar -#include // for QDate -#include // for QDateTime +#include // for QByteArray +#include // for QChar +#include // for QDate +#include // for QDateTime #ifdef TRACKF_DBG -#include +#include #endif -#include // for QList<>::iterator, QList, QList<>::const_iterator -#include // for QRegExp, QRegExp::WildcardUnix -#include // for QRegularExpression, QRegularExpression::CaseInsensitiveOption, QRegularExpression::PatternOptions -#include // for QRegularExpressionMatch -#include // for QString -#include // for UTC, CaseInsensitive -#include // for qAsConst, foreach, qPrintable, QAddConst<>::Type, qint64 +#include // for QList<>::iterator, QList, QList<>::const_iterator +#include // for QRegExp, QRegExp::WildcardUnix +#include // for QRegularExpression, QRegularExpression::CaseInsensitiveOption, QRegularExpression::PatternOptions +#include // for QRegularExpressionMatch +#include // for QString +#include // for UTC, CaseInsensitive +#include // for qAsConst, foreach, qPrintable, QAddConst<>::Type, qint64 #include "defs.h" #include "trackfilter.h" diff --git a/trackfilter.h b/trackfilter.h index 5ecc9de39..721f02d9f 100644 --- a/trackfilter.h +++ b/trackfilter.h @@ -22,10 +22,10 @@ #ifndef TRACKFILTER_H_INCLUDED_ #define TRACKFILTER_H_INCLUDED_ -#include // for QDateTime -#include // for QList -#include // for QVector -#include // for qint64 +#include // for QDateTime +#include // for QList +#include // for QVector +#include // for qint64 #include "defs.h" // for ARG_NOMINMAX, route_head (ptr only), ARG... #include "filter.h" // for Filter diff --git a/transform.cc b/transform.cc index e53ddb7f1..93a78aece 100644 --- a/transform.cc +++ b/transform.cc @@ -23,7 +23,7 @@ #include // for toupper #include // for atoi -#include // for foreach +#include // for foreach #include "defs.h" #include "transform.h" diff --git a/transform.h b/transform.h index 34c12efde..717d0f004 100644 --- a/transform.h +++ b/transform.h @@ -23,8 +23,8 @@ #ifndef TRANSFORM_H_INCLUDED_ #define TRANSFORM_H_INCLUDED_ -#include // for QString -#include // for QVector +#include // for QString +#include // for QVector #include "defs.h" // for route_head (ptr only), ARG_NOMINMAX, ARGTY... #include "filter.h" // for Filter diff --git a/unicsv.cc b/unicsv.cc index 19d25b097..a55c9fc1a 100644 --- a/unicsv.cc +++ b/unicsv.cc @@ -26,20 +26,20 @@ #include // for memset, strchr, strncpy #include // for gmtime -#include // for QByteArray -#include // for QChar -#include // for QCharRef -#include // for QDateTime -#include // for QIODevice, QIODevice::ReadOnly, QIODevice::WriteOnly -#include // for QLatin1Char -#include // for QLatin1String -#include // for QString, operator!=, operator== -#include // for QStringList -#include // for QTextStream, operator<<, qSetRealNumberPrecision, qSetFieldWidth, QTextStream::FixedNotation -#include // for QTime -#include // for QVector -#include // for CaseInsensitive -#include // for qPrintable +#include // for QByteArray +#include // for QChar +#include // for QCharRef +#include // for QDateTime +#include // for QIODevice, QIODevice::ReadOnly, QIODevice::WriteOnly +#include // for QLatin1Char +#include // for QLatin1String +#include // for QString, operator!=, operator== +#include // for QStringList +#include // for QTextStream, operator<<, qSetRealNumberPrecision, qSetFieldWidth, QTextStream::FixedNotation +#include // for QTime +#include // for QVector +#include // for CaseInsensitive +#include // for qPrintable #include "defs.h" #include "unicsv.h" diff --git a/unicsv.h b/unicsv.h index b6151eb0a..1a0e249d8 100644 --- a/unicsv.h +++ b/unicsv.h @@ -24,9 +24,9 @@ #include #include // for gmtime -#include // for QDateTime -#include // for QString, operator!=, operator== -#include // for QVector +#include // for QDateTime +#include // for QString, operator!=, operator== +#include // for QVector #include "defs.h" #include "format.h" // for Format diff --git a/util.cc b/util.cc index 611bb8d96..2efb0b5c4 100644 --- a/util.cc +++ b/util.cc @@ -30,21 +30,21 @@ #include // for strlen, strcat, strstr, memcpy, strcmp, strcpy, strdup, strchr, strerror #include // for mktime, localtime -#include // for QByteArray -#include // for QChar, operator<=, operator>= -#include // for QCharRef -#include // for QDateTime -#include // for QFileInfo -#include // for QList -#include // for QScopedPointer -#include // for QString -#include // for QTextCodec -#include // for operator<<, QTextStream, qSetFieldWidth, endl, QTextStream::AlignLeft -#include // for QXmlStreamAttribute -#include // for QXmlStreamAttributes -#include // for CaseInsensitive -#include // for QTimeZone -#include // for qAsConst, QAddConst<>::Type, qPrintable +#include // for QByteArray +#include // for QChar, operator<=, operator>= +#include // for QCharRef +#include // for QDateTime +#include // for QFileInfo +#include // for QList +#include // for QScopedPointer +#include // for QString +#include // for QTextCodec +#include // for operator<<, QTextStream, qSetFieldWidth, endl, QTextStream::AlignLeft +#include // for QXmlStreamAttribute +#include // for QXmlStreamAttributes +#include // for CaseInsensitive +#include // for QTimeZone +#include // for qAsConst, QAddConst<>::Type, qPrintable #include "defs.h" #include "cet.h" // for cet_utf8_to_ucs4 diff --git a/v900.cc b/v900.cc index 18f3a1f32..b8e5d6c00 100644 --- a/v900.cc +++ b/v900.cc @@ -191,10 +191,10 @@ bintime2utc(int date, int time) { int day = date % 100; date /= 100; int month = date % 100; - date /= 100; + date /= 100; // What's left in 'date' is year. QDate dt(date + 2000, month, day); - + return QDateTime(dt, tm, Qt::UTC); } diff --git a/validate.h b/validate.h index e8fbfedc3..ad47720fb 100644 --- a/validate.h +++ b/validate.h @@ -23,7 +23,7 @@ #ifndef VALIDATE_H_INCLUDED_ #define VALIDATE_H_INCLUDED_ -#include // for QVector +#include // for QVector #include "defs.h" // for route_head (ptr only), ARGTYPE_BOOL, ARG_NOMINMAX #include "filter.h" // for Filter diff --git a/vecs.cc b/vecs.cc index 1a91991c7..b050ef03f 100644 --- a/vecs.cc +++ b/vecs.cc @@ -19,12 +19,12 @@ */ -#include // for QByteArray -#include // for QString -#include // for QStringList -#include // for QVector<>::iterator, QVector -#include // for CaseInsensitive -#include // for qPrintable +#include // for QByteArray +#include // for QString +#include // for QStringList +#include // for QVector<>::iterator, QVector +#include // for CaseInsensitive +#include // for qPrintable #include // for sort #include // for assert diff --git a/vecs.h b/vecs.h index 8caeadde7..67eaed96b 100644 --- a/vecs.h +++ b/vecs.h @@ -23,9 +23,9 @@ #include -#include // for QString -#include // for QStringList -#include // for QVector<>::iterator, QVector +#include // for QString +#include // for QStringList +#include // for QVector<>::iterator, QVector #include "defs.h" #include "dg-100.h" diff --git a/waypt.cc b/waypt.cc index e8f72709a..59c518dc8 100644 --- a/waypt.cc +++ b/waypt.cc @@ -24,12 +24,12 @@ #include // for printf, fflush, fprintf, stdout #include // for stable_sort -#include // for QChar -#include // for QDateTime -#include // for QList -#include // for QString, operator== -#include // for QTime -#include // for qPrintable +#include // for QChar +#include // for QDateTime +#include // for QList +#include // for QString, operator== +#include // for QTime +#include // for qPrintable #include "defs.h" #include "garmin_fs.h" // for garmin_ilink_t, garmin_fs_t, GMSD_FIND diff --git a/wfff_xml.cc b/wfff_xml.cc index 44428c0f9..3f082d778 100644 --- a/wfff_xml.cc +++ b/wfff_xml.cc @@ -19,7 +19,7 @@ #include "defs.h" #include "xmlgeneric.h" -#include +#include #include /* argument storage */ @@ -107,8 +107,8 @@ void wfff_s(xg_string, const QXmlStreamAttributes*) ap_lon=0.0; } -void wfff_mac(const QString& args, const QXmlStreamAttributes*) { - ap_mac = args; +void wfff_mac(const QString& args, const QXmlStreamAttributes*) { + ap_mac = args; } void wfff_ssid(const QString& args, const QXmlStreamAttributes*) { ap_ssid = args; diff --git a/xcsv.cc b/xcsv.cc index 7e5a6009d..5e413ea79 100644 --- a/xcsv.cc +++ b/xcsv.cc @@ -32,19 +32,19 @@ #include // for gmtime, localtime, time_t, mktime, strftime #include // for optional -#include // for QByteArray -#include // for QChar -#include // for QDate -#include // for QDateTime -#include // for QDebug -#include // for QHash -#include // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Text, QIODevice::WriteOnly -#include // for QList -#include // for QRegularExpression -#include // for QString, operator+, operator== -#include // for QStringList -#include // for QTextStream -#include // for qAsConst, qPrintable +#include // for QByteArray +#include // for QChar +#include // for QDate +#include // for QDateTime +#include // for QDebug +#include // for QHash +#include // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Text, QIODevice::WriteOnly +#include // for QList +#include // for QRegularExpression +#include // for QString, operator+, operator== +#include // for QStringList +#include // for QTextStream +#include // for qAsConst, qPrintable #include "defs.h" #include "csv_util.h" // for csv_stringtrim, dec_to_human, csv_stringclean, human_to_dec, ddmmdir_to_degrees, dec_to_intdeg, decdir_to_dec, intdeg_to_dec, csv_linesplit diff --git a/xcsv.h b/xcsv.h index 2b43010ae..cc07b9fad 100644 --- a/xcsv.h +++ b/xcsv.h @@ -25,13 +25,13 @@ #include // for optional #include // for move -#include // for QByteArray -#include // for QDateTime -#include // for QHash -#include // for QList -#include // for QString -#include // for QStringList -#include // for QVector +#include // for QByteArray +#include // for QDateTime +#include // for QHash +#include // for QList +#include // for QString +#include // for QStringList +#include // for QVector #include "defs.h" #include "format.h" diff --git a/xmlgeneric.cc b/xmlgeneric.cc index 7bf166a37..540b1f474 100644 --- a/xmlgeneric.cc +++ b/xmlgeneric.cc @@ -19,16 +19,16 @@ */ -#include // for QByteArray -#include // for QHash -#include // for QIODevice, QIODevice::ReadOnly -#include // for QLatin1Char -#include -#include // for QStringView -#include // for QTextCodec -#include // for QXmlStreamAttributes -#include // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndElement, QXmlStreamReader::IncludeChildElements, QXmlStreamReader::StartDocument, QXmlStreamReader::StartElement -#include // for qPrintable +#include // for QByteArray +#include // for QHash +#include // for QIODevice, QIODevice::ReadOnly +#include // for QLatin1Char +#include +#include // for QStringView +#include // for QTextCodec +#include // for QXmlStreamAttributes +#include // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndElement, QXmlStreamReader::IncludeChildElements, QXmlStreamReader::StartDocument, QXmlStreamReader::StartElement +#include // for qPrintable #include "defs.h" #include "xmlgeneric.h" @@ -36,7 +36,7 @@ #define DEBUG_TAG 0 #if DEBUG_TAG -#include +#include #endif enum xg_shortcut { diff --git a/xmlgeneric.h b/xmlgeneric.h index c4e14dfe2..18580108e 100644 --- a/xmlgeneric.h +++ b/xmlgeneric.h @@ -22,8 +22,8 @@ #ifndef XMLGENERIC_H_INCLUDED_ #define XMLGENERIC_H_INCLUDED_ -#include // for QString -#include // for QXmlStreamAttributes +#include // for QString +#include // for QXmlStreamAttributes // Maybe the XmlGeneric string callback really shouldn't have a type // of its own; this was a crutch during the move from char* to QString. @@ -81,7 +81,7 @@ class XgFunctionPtrCallback : public XgCallbackBase }; // xml processing uses a QList. -// You may generated this yourself. See method 1 below. +// You may generated this yourself. See method 1 below. // Or it may be generated for you using one of the subsequent // methods. struct xg_tag_map_entry { @@ -147,7 +147,7 @@ QList* build_xg_tag_map(MyFormat* instance, const QList* tbl, const char* encoding, const char** ignorelist = nullptr, const char** skiplist = nullptr, bool dynamic_tbl = false); diff --git a/xmltag.cc b/xmltag.cc index da2f71d9b..d01594d56 100644 --- a/xmltag.cc +++ b/xmltag.cc @@ -19,8 +19,8 @@ */ -#include // for QString -#include // for QXmlStreamAttributes +#include // for QString +#include // for QXmlStreamAttributes #include "defs.h" #include "src/core/xmltag.h" diff --git a/xol.cc b/xol.cc index 6b2569f18..474a8f87f 100644 --- a/xol.cc +++ b/xol.cc @@ -27,8 +27,8 @@ #include "src/core/xmlstreamwriter.h" #include "xmlgeneric.h" -#include -#include +#include +#include static Waypoint* wpt_; static route_head* trk_; diff --git a/yahoo.cc b/yahoo.cc index 21c520056..8b02367a7 100644 --- a/yahoo.cc +++ b/yahoo.cc @@ -20,7 +20,7 @@ */ -#include // for QXmlStreamAttributes +#include // for QXmlStreamAttributes #include "defs.h" #include "yahoo.h" diff --git a/yahoo.h b/yahoo.h index f3bf2dd9d..bc0e3554a 100644 --- a/yahoo.h +++ b/yahoo.h @@ -21,10 +21,10 @@ #ifndef YAHOO_H_INCLUDED_ #define YAHOO_H_INCLUDED_ -#include // for QList -#include // for QString -#include // for QVector -#include // for QXmlStreamAttributes +#include // for QList +#include // for QString +#include // for QVector +#include // for QXmlStreamAttributes #include "defs.h" #include "format.h" // for Format