diff --git a/src/AddIntervalDialog.cpp b/src/AddIntervalDialog.cpp index e404a7c53..cfbb49a41 100644 --- a/src/AddIntervalDialog.cpp +++ b/src/AddIntervalDialog.cpp @@ -26,7 +26,7 @@ #include "WPrime.h" #include "HelpWhatsThis.h" #include -#include +#include // helper function static void clearResultsTable(QTableWidget *); diff --git a/src/Aerolab.cpp b/src/Aerolab.cpp index 67eee9d40..c18bc15cf 100644 --- a/src/Aerolab.cpp +++ b/src/Aerolab.cpp @@ -27,7 +27,7 @@ #include "Units.h" #include "Colors.h" -#include +#include #include #include #include diff --git a/src/BasicRideMetrics.cpp b/src/BasicRideMetrics.cpp index 640613f35..3889497a9 100644 --- a/src/BasicRideMetrics.cpp +++ b/src/BasicRideMetrics.cpp @@ -22,7 +22,7 @@ #include "Settings.h" #include "LTMOutliers.h" #include "Units.h" -#include "math.h" +#include "cmath" #include #include #include diff --git a/src/BestIntervalDialog.cpp b/src/BestIntervalDialog.cpp index df5e2c831..32366c8e5 100644 --- a/src/BestIntervalDialog.cpp +++ b/src/BestIntervalDialog.cpp @@ -24,7 +24,7 @@ #include "RideItem.h" #include "HelpWhatsThis.h" #include -#include +#include BestIntervalDialog::BestIntervalDialog(Context *context) : context(context) diff --git a/src/BikeScore.cpp b/src/BikeScore.cpp index 584086a98..f76e7ebe3 100644 --- a/src/BikeScore.cpp +++ b/src/BikeScore.cpp @@ -18,7 +18,7 @@ #include "RideMetric.h" #include "Zones.h" -#include +#include #include const double bikeScoreN = 4.0; diff --git a/src/Bin2RideFile.cpp b/src/Bin2RideFile.cpp index 5d2cefe8a..b74349fbe 100644 --- a/src/Bin2RideFile.cpp +++ b/src/Bin2RideFile.cpp @@ -17,7 +17,7 @@ */ #include "Bin2RideFile.h" -#include +#include #define START 0x210 #define UNIT_VERSION 0x2000 diff --git a/src/Coggan.cpp b/src/Coggan.cpp index 224cd4c42..22495e637 100644 --- a/src/Coggan.cpp +++ b/src/Coggan.cpp @@ -18,7 +18,7 @@ #include "RideMetric.h" #include "Zones.h" -#include +#include #include class NP : public RideMetric { diff --git a/src/Computrainer3dpFile.cpp b/src/Computrainer3dpFile.cpp index c53db8380..befa116a8 100644 --- a/src/Computrainer3dpFile.cpp +++ b/src/Computrainer3dpFile.cpp @@ -35,7 +35,7 @@ #include // for int8_t, int16_t, etc. #include -#include "math.h" +#include "cmath" #include "Units.h" diff --git a/src/CsvRideFile.cpp b/src/CsvRideFile.cpp index 9fa95f0e5..220eedffa 100644 --- a/src/CsvRideFile.cpp +++ b/src/CsvRideFile.cpp @@ -24,7 +24,7 @@ #include #include #include // for std::sort -#include "math.h" +#include "cmath" static int csvFileReaderRegistered = RideFileFactory::instance().registerReader( diff --git a/src/DanielsPoints.cpp b/src/DanielsPoints.cpp index aa308f4ec..1b889ace1 100644 --- a/src/DanielsPoints.cpp +++ b/src/DanielsPoints.cpp @@ -18,7 +18,7 @@ #include "RideMetric.h" #include "Zones.h" -#include +#include #include // The idea: Fit a curve to the points system in Table 2.2 of "Daniel's Running diff --git a/src/ExtendedCriticalPower.h b/src/ExtendedCriticalPower.h index faaa9f340..f863d5e76 100644 --- a/src/ExtendedCriticalPower.h +++ b/src/ExtendedCriticalPower.h @@ -24,7 +24,7 @@ #include "Athlete.h" #include "Zones.h" #include "RideMetric.h" -#include +#include #include #include diff --git a/src/FitlogParser.cpp b/src/FitlogParser.cpp index 175d7a274..aa7a753ea 100644 --- a/src/FitlogParser.cpp +++ b/src/FitlogParser.cpp @@ -24,7 +24,7 @@ // use stc strtod to bypass Qt toDouble() issues #include -#include +#include FitlogParser::FitlogParser (RideFile* rideFile, QList *rides) : rideFile(rideFile), rides(rides) diff --git a/src/GOVSS.cpp b/src/GOVSS.cpp index a6c25be17..69a88a609 100644 --- a/src/GOVSS.cpp +++ b/src/GOVSS.cpp @@ -20,7 +20,7 @@ #include "RideMetric.h" #include "PaceZones.h" #include "Units.h" -#include +#include #include #include @@ -362,4 +362,4 @@ static bool addAllGOVSS() { return true; } -static bool GOVSSAdded = addAllGOVSS(); \ No newline at end of file +static bool GOVSSAdded = addAllGOVSS(); diff --git a/src/GpxParser.cpp b/src/GpxParser.cpp index 3b3fb9d62..ec95bb956 100644 --- a/src/GpxParser.cpp +++ b/src/GpxParser.cpp @@ -25,7 +25,7 @@ #include "GpxParser.h" #include "TimeUtils.h" -#include +#include // use stc strtod to bypass Qt toDouble() issues #include diff --git a/src/HrPwWindow.cpp b/src/HrPwWindow.cpp index 51fffdd4e..996dc0cf1 100644 --- a/src/HrPwWindow.cpp +++ b/src/HrPwWindow.cpp @@ -24,7 +24,7 @@ #include "SmallPlot.h" #include "RideItem.h" #include "HelpWhatsThis.h" -#include +#include #include #include #include diff --git a/src/HrTimeInZone.cpp b/src/HrTimeInZone.cpp index 5e1e5e75e..60faeb25b 100644 --- a/src/HrTimeInZone.cpp +++ b/src/HrTimeInZone.cpp @@ -20,7 +20,7 @@ #include "RideMetric.h" #include "BestIntervalDialog.h" #include "HrZones.h" -#include +#include #include class HrZoneTime : public RideMetric { diff --git a/src/HrZones.cpp b/src/HrZones.cpp index ac4e29f77..b06b3315f 100644 --- a/src/HrZones.cpp +++ b/src/HrZones.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include // the infinity endpoints are indicated with extreme date ranges @@ -447,7 +447,7 @@ int HrZones::whichZone(int rnum, double value) const } // if we got here either it is negative, nan, inf or way high - if (value < 0 || isnan(value)) return 0; + if (value < 0 || std::isnan(value)) return 0; else return range.zones.size()-1; } diff --git a/src/JouleDevice.cpp b/src/JouleDevice.cpp index 8fc7f3b82..f5ab26a9b 100644 --- a/src/JouleDevice.cpp +++ b/src/JouleDevice.cpp @@ -20,7 +20,7 @@ #include "DownloadRideDialog.h" #include "PowerTapUtil.h" #include "Device.h" -#include +#include #include //#include diff --git a/src/LTMOutliers.cpp b/src/LTMOutliers.cpp index e49b74d1d..f24f53faa 100644 --- a/src/LTMOutliers.cpp +++ b/src/LTMOutliers.cpp @@ -16,7 +16,7 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include #include "LTMOutliers.h" diff --git a/src/LTMPlot.cpp b/src/LTMPlot.cpp index bd65530a9..fe9b11aae 100644 --- a/src/LTMPlot.cpp +++ b/src/LTMPlot.cpp @@ -46,7 +46,7 @@ #include #include -#include // for isinf() isnan() +#include // for isinf() isnan() LTMPlot::LTMPlot(LTMWindow *parent, Context *context, bool first) : bg(NULL), parent(parent), context(context), highlighter(NULL), first(first), isolation(false) @@ -2228,7 +2228,7 @@ LTMPlot::createTODCurveData(Context *context, LTMSettings *settings, MetricDetai double value = ride->getForSymbol(metricDetail.symbol); // check values are bounded to stop QWT going berserk - if (isnan(value) || isinf(value)) value = 0; + if (std::isnan(value) || std::isinf(value)) value = 0; // Special computed metrics (LTS/STS) have a null metric pointer if (metricDetail.metric) { @@ -2335,7 +2335,7 @@ LTMPlot::createMetricData(Context *context, LTMSettings *settings, MetricDetail value = ride->getForSymbol(metricDetail.symbol); // check values are bounded to stop QWT going berserk - if (isnan(value) || isinf(value)) value = 0; + if (std::isnan(value) || std::isinf(value)) value = 0; // set aggZero to false and value to zero if is temperature and -255 if (metricDetail.metric && metricDetail.metric->symbol() == "average_temp" && value == RideFile::NoTemp) { @@ -2446,7 +2446,7 @@ LTMPlot::createBestsData(Context *, LTMSettings *settings, MetricDetail metricDe value = best.getForSymbol(metricDetail.bestSymbol); // check values are bounded to stop QWT going berserk - if (isnan(value) || isinf(value)) value = 0; + if (std::isnan(value) || std::isinf(value)) value = 0; // set aggZero to false and value to zero if is temperature and -255 if (metricDetail.metric && metricDetail.metric->symbol() == "average_temp" && value == RideFile::NoTemp) { diff --git a/src/LTMTrend.cpp b/src/LTMTrend.cpp index 5138af880..3b9e3d9b6 100644 --- a/src/LTMTrend.cpp +++ b/src/LTMTrend.cpp @@ -16,7 +16,7 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include #include "LTMTrend.h" diff --git a/src/LTMWindow.cpp b/src/LTMWindow.cpp index aca09c793..85c8a701a 100644 --- a/src/LTMWindow.cpp +++ b/src/LTMWindow.cpp @@ -27,7 +27,7 @@ #include "RideCache.h" #include "RideFileCache.h" #include "Settings.h" -#include "math.h" +#include "cmath" #include "Units.h" // for MILES_PER_KM #include "HelpWhatsThis.h" diff --git a/src/LTMWindow.h b/src/LTMWindow.h index c8c0aaa02..cca0ec8cf 100644 --- a/src/LTMWindow.h +++ b/src/LTMWindow.h @@ -34,7 +34,7 @@ #include "LTMCanvasPicker.h" #include "GcPane.h" -#include +#include class QwtPlotPanner; class QwtPlotPicker; diff --git a/src/LeftRightBalance.cpp b/src/LeftRightBalance.cpp index 3160ec3dd..bcb0eb1ec 100644 --- a/src/LeftRightBalance.cpp +++ b/src/LeftRightBalance.cpp @@ -18,7 +18,7 @@ #include "RideMetric.h" #include "Zones.h" -#include +#include #include class LeftRightBalance : public RideMetric { diff --git a/src/MUPlot.h b/src/MUPlot.h index 7ca9b17ba..ed9aee62b 100644 --- a/src/MUPlot.h +++ b/src/MUPlot.h @@ -21,7 +21,7 @@ #define _GC_MUPlot_h 1 #include "GoldenCheetah.h" #include "MUPool.h" -#include // for erf() +#include // for erf() #include "CriticalPowerWindow.h" diff --git a/src/MacroDevice.cpp b/src/MacroDevice.cpp index 358d99359..2d21484ee 100644 --- a/src/MacroDevice.cpp +++ b/src/MacroDevice.cpp @@ -20,7 +20,7 @@ #include "DownloadRideDialog.h" #include "PowerTapUtil.h" #include "Device.h" -#include +#include #include #define MACRO_DEBUG false diff --git a/src/ManualRideDialog.cpp b/src/ManualRideDialog.cpp index 7c5b682e7..309e46500 100644 --- a/src/ManualRideDialog.cpp +++ b/src/ManualRideDialog.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "Units.h" #include "HelpWhatsThis.h" diff --git a/src/ManualRideFile.cpp b/src/ManualRideFile.cpp index 4cc08c69d..0b2430d7a 100644 --- a/src/ManualRideFile.cpp +++ b/src/ManualRideFile.cpp @@ -22,7 +22,7 @@ #include #include #include // for std::sort -#include "math.h" +#include "cmath" static int manualFileReaderRegistered = RideFileFactory::instance().registerReader("man", "Manual Ride File", new ManualFileReader()); diff --git a/src/ModelWindow.cpp b/src/ModelWindow.cpp index 339db4aa2..5926740ff 100644 --- a/src/ModelWindow.cpp +++ b/src/ModelWindow.cpp @@ -22,7 +22,7 @@ #include "Athlete.h" #include "RideItem.h" #include "IntervalItem.h" -#include "math.h" +#include "cmath" #include "Units.h" // for MILES_PER_KM #include "Colors.h" // for MILES_PER_KM #include "HelpWhatsThis.h" diff --git a/src/MoxyDevice.cpp b/src/MoxyDevice.cpp index d59247673..396e46864 100644 --- a/src/MoxyDevice.cpp +++ b/src/MoxyDevice.cpp @@ -22,7 +22,7 @@ #include "Device.h" #include "RideFile.h" -#include +#include #include #include diff --git a/src/NullController.cpp b/src/NullController.cpp index 89a61b468..9177c0e98 100644 --- a/src/NullController.cpp +++ b/src/NullController.cpp @@ -22,7 +22,7 @@ #include "NullController.h" #include "RealtimeData.h" -#include +#include NullController::NullController(TrainSidebar *parent, DeviceConfiguration *dc) diff --git a/src/PaceTimeInZone.cpp b/src/PaceTimeInZone.cpp index c4f454ca8..941599c27 100644 --- a/src/PaceTimeInZone.cpp +++ b/src/PaceTimeInZone.cpp @@ -24,7 +24,7 @@ #include "BestIntervalDialog.h" #include "PaceZones.h" -#include +#include #include class PaceZoneTime : public RideMetric { diff --git a/src/PaceZones.cpp b/src/PaceZones.cpp index 70182263c..714c97e84 100644 --- a/src/PaceZones.cpp +++ b/src/PaceZones.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include // the infinity endpoints are indicated with extreme date ranges @@ -509,7 +509,7 @@ int PaceZones::whichZone(int rnum, double value) const } // if we got here either it is negative, nan, inf or way high - if (value < 0 || isnan(value)) return 0; else return range.zones.size()-1; + if (value < 0 || std::isnan(value)) return 0; else return range.zones.size()-1; } void PaceZones::zoneInfo(int rnum, int znum, QString &name, QString &description, double &low, double &high) const diff --git a/src/PeakPower.cpp b/src/PeakPower.cpp index 037ec93cf..bea7114a0 100644 --- a/src/PeakPower.cpp +++ b/src/PeakPower.cpp @@ -19,7 +19,7 @@ #include "RideMetric.h" #include "BestIntervalDialog.h" #include "Zones.h" -#include +#include #include class FatigueIndex : public RideMetric { diff --git a/src/PfPvPlot.cpp b/src/PfPvPlot.cpp index 57fde4088..86abb402c 100644 --- a/src/PfPvPlot.cpp +++ b/src/PfPvPlot.cpp @@ -27,7 +27,7 @@ #include "Zones.h" #include "Colors.h" -#include +#include #include #include #include diff --git a/src/PolarRideFile.cpp b/src/PolarRideFile.cpp index a486bd9bb..90976cc42 100644 --- a/src/PolarRideFile.cpp +++ b/src/PolarRideFile.cpp @@ -21,7 +21,7 @@ #include #include #include // for std::sort -#include "math.h" +#include "cmath" static int polarFileReaderRegistered = diff --git a/src/PowerHist.cpp b/src/PowerHist.cpp index 44d8f4660..0ebf747c1 100644 --- a/src/PowerHist.cpp +++ b/src/PowerHist.cpp @@ -1643,7 +1643,7 @@ PowerHist::setData(Specification specification, QString totalMetric, QString dis if ((distMetric == "average_temp" || distMetric == "max_temp") && v == RideFile::NoTemp) continue; // clean up dodgy values - if (isnan(v) || isinf(v)) v = 0; + if (std::isnan(v) || std::isinf(v)) v = 0; // seconds to minutes if (m->units(context->athlete->useMetricUnits) == "seconds" || @@ -1681,7 +1681,7 @@ PowerHist::setData(Specification specification, QString totalMetric, QString dis if ((distMetric == "average_temp" || distMetric == "max_temp") && v == RideFile::NoTemp) continue; // clean up dodgy values - if (isnan(v) || isinf(v)) v = 0; + if (std::isnan(v) || std::isinf(v)) v = 0; // seconds to minutes if (m->units(context->athlete->useMetricUnits) == "seconds" || diff --git a/src/PowerTapDevice.cpp b/src/PowerTapDevice.cpp index 5f5caa73d..2403fa272 100644 --- a/src/PowerTapDevice.cpp +++ b/src/PowerTapDevice.cpp @@ -18,7 +18,7 @@ #include "PowerTapDevice.h" #include "PowerTapUtil.h" -#include +#include #include "assert.h" #define PT_DEBUG false diff --git a/src/PowerTapUtil.cpp b/src/PowerTapUtil.cpp index f0015ec8f..389ca7dec 100644 --- a/src/PowerTapUtil.cpp +++ b/src/PowerTapUtil.cpp @@ -20,7 +20,7 @@ #include "RideFile.h" #include "Units.h" #include -#include +#include #include bool diff --git a/src/RawRideFile.cpp b/src/RawRideFile.cpp index d89dded46..d89282c01 100644 --- a/src/RawRideFile.cpp +++ b/src/RawRideFile.cpp @@ -20,7 +20,7 @@ #include "RawRideFile.h" #include "PowerTapUtil.h" #include "Units.h" -#include +#include static int rawFileReaderRegistered = RideFileFactory::instance().registerReader( diff --git a/src/RideCache.cpp b/src/RideCache.cpp index 0857867a1..d371b195b 100644 --- a/src/RideCache.cpp +++ b/src/RideCache.cpp @@ -375,7 +375,7 @@ RideCache::getAggregate(QString name, Specification spec, bool useMetricUnits, b double count = item->getForSymbol("workout_time"); // for averaging // check values are bounded, just in case - if (isnan(value) || isinf(value)) value = 0; + if (std::isnan(value) || std::isinf(value)) value = 0; // imperial / metric conversion if (useMetricUnits == false) { diff --git a/src/RideFile.cpp b/src/RideFile.cpp index 59239460f..f1cba98a7 100644 --- a/src/RideFile.cpp +++ b/src/RideFile.cpp @@ -31,7 +31,7 @@ #include #include // for std::lower_bound #include -#include +#include #include #define mark() \ @@ -785,23 +785,23 @@ void RideFile::appendPoint(double secs, double cad, double hr, double km, { // negative values are not good, make them zero // although alt, lat, lon, headwind, slope and temperature can be negative of course! - if (!isfinite(secs) || secs<0) secs=0; - if (!isfinite(cad) || cad<0) cad=0; - if (!isfinite(hr) || hr<0) hr=0; - if (!isfinite(km) || km<0) km=0; - if (!isfinite(kph) || kph<0) kph=0; - if (!isfinite(nm) || nm<0) nm=0; - if (!isfinite(watts) || watts<0) watts=0; - if (!isfinite(interval) || interval<0) interval=0; - if (!isfinite(lps) || lps<0) lps=0; - if (!isfinite(rps) || rps<0) rps=0; - if (!isfinite(lte) || lte<0) lte=0; - if (!isfinite(rte) || rte<0) rte=0; - if (!isfinite(smo2) || smo2<0) smo2=0; - if (!isfinite(thb) || thb<0) thb=0; - if (!isfinite(rvert) || rvert<0) rvert=0; - if (!isfinite(rcad) || rcad<0) rcad=0; - if (!isfinite(rcontact) || rcontact<0) rcontact=0; + if (!std::isfinite(secs) || secs<0) secs=0; + if (!std::isfinite(cad) || cad<0) cad=0; + if (!std::isfinite(hr) || hr<0) hr=0; + if (!std::isfinite(km) || km<0) km=0; + if (!std::isfinite(kph) || kph<0) kph=0; + if (!std::isfinite(nm) || nm<0) nm=0; + if (!std::isfinite(watts) || watts<0) watts=0; + if (!std::isfinite(interval) || interval<0) interval=0; + if (!std::isfinite(lps) || lps<0) lps=0; + if (!std::isfinite(rps) || rps<0) rps=0; + if (!std::isfinite(lte) || lte<0) lte=0; + if (!std::isfinite(rte) || rte<0) rte=0; + if (!std::isfinite(smo2) || smo2<0) smo2=0; + if (!std::isfinite(thb) || thb<0) thb=0; + if (!std::isfinite(rvert) || rvert<0) rvert=0; + if (!std::isfinite(rcad) || rcad<0) rcad=0; + if (!std::isfinite(rcontact) || rcontact<0) rcontact=0; // truncate alt out of bounds -- ? should do for all, but uncomfortable about // setting an absolute max. At least We know the highest diff --git a/src/RideFileCache.cpp b/src/RideFileCache.cpp index 3751f7135..8dbe5e48b 100644 --- a/src/RideFileCache.cpp +++ b/src/RideFileCache.cpp @@ -26,7 +26,7 @@ #include "PaceZones.h" #include "LTMSettings.h" // getAllBestsFor needs this -#include // for pow() +#include // for pow() #include #include #include diff --git a/src/RideFileCommand.cpp b/src/RideFileCommand.cpp index 0f3934011..9d1b04fce 100644 --- a/src/RideFileCommand.cpp +++ b/src/RideFileCommand.cpp @@ -19,7 +19,7 @@ #include "RideFile.h" #include "RideFileCommand.h" #include "RideEditor.h" -#include +#include #include // comparing doubles is nasty diff --git a/src/RideItem.cpp b/src/RideItem.cpp index e6b5df7d6..de35c38f6 100644 --- a/src/RideItem.cpp +++ b/src/RideItem.cpp @@ -28,7 +28,7 @@ #include "Settings.h" #include "Colors.h" // for ColorEngine -#include +#include #include #include #include @@ -492,7 +492,7 @@ RideItem::getStringForSymbol(QString name, bool useMetricUnits) if (m) { double value = metrics_[m->index()]; - if (isinf(value) || isnan(value)) value=0; + if (std::isinf(value) || std::isnan(value)) value=0; const_cast(m)->setValue(value); returning = m->toString(useMetricUnits); } diff --git a/src/RideMetric.h b/src/RideMetric.h index b72d79856..6012ea70b 100644 --- a/src/RideMetric.h +++ b/src/RideMetric.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "RideFile.h" diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp index 954c8c695..5be07bc4d 100644 --- a/src/RideSummaryWindow.cpp +++ b/src/RideSummaryWindow.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include RideSummaryWindow::RideSummaryWindow(Context *context, bool ridesummary) : GcChartWindow(context), context(context), ridesummary(ridesummary), useCustom(false), useToToday(false), filtered(false), bestsCache(NULL), force(false) diff --git a/src/RouteItem.cpp b/src/RouteItem.cpp index cb3b4bd14..3b650d287 100644 --- a/src/RouteItem.cpp +++ b/src/RouteItem.cpp @@ -27,7 +27,7 @@ #include "Zones.h" #include "HrZones.h" #include -#include +#include /*RouteItem::RouteItem(RouteSegment *route, int type, QString path, QString fileName, const QDateTime &dateTime, diff --git a/src/ScatterPlot.h b/src/ScatterPlot.h index bb4eb80eb..10eeb963a 100644 --- a/src/ScatterPlot.h +++ b/src/ScatterPlot.h @@ -29,7 +29,7 @@ #include "RideItem.h" #include "RideFile.h" #include "Units.h" -#include "math.h" +#include "cmath" #include #include diff --git a/src/ScatterWindow.h b/src/ScatterWindow.h index f7886db3b..9f4c5579b 100644 --- a/src/ScatterWindow.h +++ b/src/ScatterWindow.h @@ -29,7 +29,7 @@ #include "Context.h" #include "RideItem.h" #include "IntervalItem.h" -#include "math.h" +#include "cmath" #include "Units.h" // for MILES_PER_KM diff --git a/src/Serial.cpp b/src/Serial.cpp index 1df83832d..99e37c671 100644 --- a/src/Serial.cpp +++ b/src/Serial.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/SrmRideFile.cpp b/src/SrmRideFile.cpp index 9c6988a04..e563e0e84 100644 --- a/src/SrmRideFile.cpp +++ b/src/SrmRideFile.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #ifdef WIN32 #include diff --git a/src/Statistic.cpp b/src/Statistic.cpp index 000725f45..573c7ec43 100644 --- a/src/Statistic.cpp +++ b/src/Statistic.cpp @@ -16,7 +16,7 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include #include "Statistic.h" diff --git a/src/SyncRideFile.cpp b/src/SyncRideFile.cpp index f5eef27d0..3a2ea9748 100644 --- a/src/SyncRideFile.cpp +++ b/src/SyncRideFile.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include static int syncFileReaderRegistered = diff --git a/src/TRIMPPoints.cpp b/src/TRIMPPoints.cpp index 4f46a927f..976446d53 100644 --- a/src/TRIMPPoints.cpp +++ b/src/TRIMPPoints.cpp @@ -20,7 +20,7 @@ #include "Settings.h" #include "Zones.h" #include "HrZones.h" -#include +#include #include "Context.h" #include "Athlete.h" #include diff --git a/src/TimeInZone.cpp b/src/TimeInZone.cpp index e11f4a86e..a3c157eea 100644 --- a/src/TimeInZone.cpp +++ b/src/TimeInZone.cpp @@ -20,7 +20,7 @@ #include "RideMetric.h" #include "BestIntervalDialog.h" #include "Zones.h" -#include +#include #include class ZoneTime : public RideMetric { diff --git a/src/TimeUtils.cpp b/src/TimeUtils.cpp index dfeb9f85a..756e1b455 100644 --- a/src/TimeUtils.cpp +++ b/src/TimeUtils.cpp @@ -18,7 +18,7 @@ */ #include "TimeUtils.h" -#include +#include #include #include #include diff --git a/src/TrainSidebar.cpp b/src/TrainSidebar.cpp index b0054eb33..6815e621b 100644 --- a/src/TrainSidebar.cpp +++ b/src/TrainSidebar.cpp @@ -57,7 +57,7 @@ #include #endif -#include // isnan and isinf +#include // isnan and isinf #include "TrainDB.h" #include "Library.h" @@ -1186,7 +1186,7 @@ void TrainSidebar::guiUpdate() // refreshes the telemetry (3.*pow(2,0.3333333333333333)*ad*cdA)); // just in case... - if (isnan(vs) || isinf(vs)) vs = 0.00f; + if (std::isnan(vs) || std::isinf(vs)) vs = 0.00f; rtData.setVirtualSpeed(vs); // W'bal on the fly diff --git a/src/TrainSidebar.h b/src/TrainSidebar.h index 7c06d6ed7..967e7169d 100644 --- a/src/TrainSidebar.h +++ b/src/TrainSidebar.h @@ -41,7 +41,7 @@ #include #include -#include "math.h" // for round() +#include "cmath" // for round() #include "Units.h" // for MILES_PER_KM // Status settings diff --git a/src/TreeMapPlot.cpp b/src/TreeMapPlot.cpp index 26c1252b6..6267e18fe 100644 --- a/src/TreeMapPlot.cpp +++ b/src/TreeMapPlot.cpp @@ -27,7 +27,7 @@ #include "Colors.h" #include -#include // for isinf() isnan() +#include // for isinf() isnan() // Treemap sorter - reversed to do descending bool TreeMapLessThan(const TreeMap *a, const TreeMap *b) { diff --git a/src/TreeMapWindow.cpp b/src/TreeMapWindow.cpp index de7cd112c..f2643eba6 100644 --- a/src/TreeMapWindow.cpp +++ b/src/TreeMapWindow.cpp @@ -24,7 +24,7 @@ #include "Athlete.h" #include "RideCache.h" #include "Settings.h" -#include "math.h" +#include "cmath" #include "Units.h" // for MILES_PER_KM #include "HelpWhatsThis.h" diff --git a/src/TreeMapWindow.h b/src/TreeMapWindow.h index 2cac1bbd7..68346531c 100644 --- a/src/TreeMapWindow.h +++ b/src/TreeMapWindow.h @@ -30,7 +30,7 @@ #include "SpecialFields.h" #include "Specification.h" -#include +#include #include #include diff --git a/src/TxtRideFile.cpp b/src/TxtRideFile.cpp index 3e209fb3f..55ef1bfc9 100644 --- a/src/TxtRideFile.cpp +++ b/src/TxtRideFile.cpp @@ -23,7 +23,7 @@ #include #include #include // for std::sort -#include "math.h" +#include "cmath" static int txtFileReaderRegistered = RideFileFactory::instance().registerReader( diff --git a/src/Units.cpp b/src/Units.cpp index 87301135c..62060f234 100644 --- a/src/Units.cpp +++ b/src/Units.cpp @@ -17,7 +17,7 @@ */ #include "Units.h" -#include +#include QString kphToPace(double kph, bool metric) { diff --git a/src/WPrime.h b/src/WPrime.h index a198287b1..ca60c2c60 100644 --- a/src/WPrime.h +++ b/src/WPrime.h @@ -28,7 +28,7 @@ #include #include #include // smoothing -#include +#include struct Match { int start, stop, secs; // all in whole seconds diff --git a/src/WattsPerKilogram.cpp b/src/WattsPerKilogram.cpp index de5d76a4b..c6ac47ac6 100644 --- a/src/WattsPerKilogram.cpp +++ b/src/WattsPerKilogram.cpp @@ -20,7 +20,7 @@ #include "BestIntervalDialog.h" #include "Zones.h" #include "Settings.h" -#include +#include #include class AverageWPK : public RideMetric { diff --git a/src/WkoRideFile.cpp b/src/WkoRideFile.cpp index b79180cba..4bd9d4f73 100644 --- a/src/WkoRideFile.cpp +++ b/src/WkoRideFile.cpp @@ -22,7 +22,7 @@ #include #include #include // for std::sort -#include "math.h" +#include "cmath" static int wkoFileReaderRegistered = RideFileFactory::instance().registerReader( "wko", "WKO+ Files", new WkoFileReader()); diff --git a/src/WkoRideFile.h b/src/WkoRideFile.h index 9fa8fdfda..6d9611bf9 100644 --- a/src/WkoRideFile.h +++ b/src/WkoRideFile.h @@ -24,7 +24,7 @@ #include "RideFile.h" #include #include -#include +#include #include #include diff --git a/src/Zones.cpp b/src/Zones.cpp index c76689f30..64f3c2a64 100644 --- a/src/Zones.cpp +++ b/src/Zones.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include // the infinity endpoints are indicated with extreme date ranges @@ -514,7 +514,7 @@ int Zones::whichZone(int rnum, double value) const } // if we got here either it is negative, nan, inf or way high - if (value < 0 || isnan(value)) return 0; else return range.zones.size()-1; + if (value < 0 || std::isnan(value)) return 0; else return range.zones.size()-1; } void Zones::zoneInfo(int rnum, int znum, QString &name, QString &description, int &low, int &high) const