diff --git a/defs.h b/defs.h index 662ba59d5..99ea2945b 100644 --- a/defs.h +++ b/defs.h @@ -1092,12 +1092,9 @@ QString get_filename(const QString& fname); /* extract the filename portion */ * Character encoding transformations. */ -#define CET_NOT_CONVERTABLE_DEFAULT '$' #define CET_CHARSET_ASCII "US-ASCII" #define CET_CHARSET_UTF8 "UTF-8" -#define CET_CHARSET_HEBREW "ISO-8859-8" #define CET_CHARSET_MS_ANSI "windows-1252" -#define CET_CHARSET_LATIN1 "ISO-8859-1" /* this lives in gpx.c */ gpsbabel::DateTime xml_parse_time(const QString& dateTimeString); diff --git a/exif.h b/exif.h index a16267254..ee50de1de 100644 --- a/exif.h +++ b/exif.h @@ -152,7 +152,7 @@ class ExifFormat : public Format public: T num; T den; - + Rational() = default; Rational(T n, T d) : num{n}, den{d} {} }; diff --git a/formspec.h b/formspec.h index e3e091d34..893e3c642 100644 --- a/formspec.h +++ b/formspec.h @@ -26,9 +26,6 @@ enum FsType { kFsUnknown = 0L, kFsGpx = 0x67707800L, - kFsAn1W = 0x616e3177L, - kFsAn1L = 0x616e316cL, - kFsAn1V = 0x616e3176L, kFsOzi = 0x6f7a6900L, kFsGmsd = 0x474d5344L, /* GMSD = Garmin specific data */ kFsQstarzBl1000 = 0x5173747aL, diff --git a/kml.h b/kml.h index 59f57dab9..3ea9688bf 100644 --- a/kml.h +++ b/kml.h @@ -107,7 +107,7 @@ class KmlFormat : public Format "Folder", nullptr }; - + static constexpr const char* kml_tags_to_skip[] = { "Camera", "LookAt", diff --git a/vecs.cc b/vecs.cc index 62e34d480..580df7228 100644 --- a/vecs.cc +++ b/vecs.cc @@ -130,8 +130,6 @@ extern ff_vecs_t mapasia_tr7_vecs; extern ff_vecs_t gnav_trl_vecs; extern ff_vecs_t navitel_trk_vecs; extern ff_vecs_t ggv_ovl_vecs; -#if CSVFMTS_ENABLED -#endif // CSVFMTS_ENABLED extern ff_vecs_t itracku_vecs; extern ff_vecs_t itracku_fvecs; extern ff_vecs_t sbp_vecs;