diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 1268cf76c..c9a275b67 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -3,7 +3,6 @@ #include "DBAccess.h" #include "MetricAggregator.h" #include -#include #ifndef GC_VERSION #define GC_VERSION "(developer build)" @@ -221,26 +220,24 @@ VersionPage::VersionPage(MainWindow *main, QDir home) : main(main), home(home) "" "" "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" #ifdef Q_OS_MAC - "" + "" #endif "
QT%1
QWT%2
BOOST%3
GCC%4
SRMIO%5
OAUTH%6
D2XX%7
QWTPLOT3D%8
KML%9
ICAL%10
USBXPRESS%11
LIBUSB%12
VLC%13
LUCENE%14
GCC%3
SRMIO%4
OAUTH%5
D2XX%6
QWTPLOT3D%7
KML%8
ICAL%9
USBXPRESS%10
LIBUSB%11
VLC%12
LUCENE%13
LION SUPPORT%15
LION SUPPORT%14
" ) .arg(QT_VERSION_STR) .arg(QWT_VERSION_STR) - .arg(BOOST_LIB_VERSION) .arg(GCC_VERSION) .arg(srmio) .arg(oauth) diff --git a/src/DBAccess.cpp b/src/DBAccess.cpp index f1032f289..fb6cc7bc9 100644 --- a/src/DBAccess.cpp +++ b/src/DBAccess.cpp @@ -34,8 +34,6 @@ #include "RideMetadata.h" #include "SpecialFields.h" -#include - // DB Schema Version - YOU MUST UPDATE THIS IF THE SCHEMA VERSION CHANGES!!! // Schema version will change if a) the default metadata.xml is updated // or b) new metrics are added / old changed @@ -139,12 +137,7 @@ computeFileCRC(QString filename) rawstream->readRawData(&data[0], file.size()); file.close(); - // calculate the CRC - boost::crc_optimal<16, 0x1021, 0xFFFF, 0, false, false> CRC; - - CRC.process_bytes(&data[0], file.size()); - - return CRC.checksum(); + return qChecksum(&data[0], file.size()); } bool DBAccess::createMetricsTable() diff --git a/src/HrZones.cpp b/src/HrZones.cpp index c4ee3d9c3..29bad1ce3 100644 --- a/src/HrZones.cpp +++ b/src/HrZones.cpp @@ -25,7 +25,6 @@ #include #include #include -#include // the infinity endpoints are indicated with extreme date ranges @@ -850,29 +849,27 @@ int HrZones::insertRangeAtDate(QDate date, int lt) { return rnum; } -unsigned long +quint16 HrZones::getFingerprint() const { - boost::crc_optimal<16, 0x1021, 0xFFFF, 0, false, false> CRC; + quint64 x = 0; for (int i=0; igetFingerprint() + hrzones->getFingerprint(); // crc of *all* zone data (HR and Power) + unsigned long zoneFingerPrint = static_cast(zones->getFingerprint()) + + static_cast(hrzones->getFingerprint()); // checksum of *all* zone data (HR and Power) // update statistics for ride files which are out of date // showing a progress bar as we go diff --git a/src/Zones.cpp b/src/Zones.cpp index 0fcb439ba..cb1f5c83d 100644 --- a/src/Zones.cpp +++ b/src/Zones.cpp @@ -26,7 +26,6 @@ #include #include #include -#include // the infinity endpoints are indicated with extreme date ranges @@ -826,29 +825,26 @@ int Zones::insertRangeAtDate(QDate date, int cp) { return rnum; } -unsigned long +quint16 Zones::getFingerprint() const { - boost::crc_optimal<16, 0x1021, 0xFFFF, 0, false, false> CRC; + quint64 x = 0; for (int i=0; ivalue(this, GC_ELEVATION_HYSTERESIS).toDouble()*10); + QByteArray ba = QByteArray::number(x); + return qChecksum(ba, ba.length()) + (appsettings->value(this, GC_ELEVATION_HYSTERESIS).toDouble()*10); } diff --git a/src/Zones.h b/src/Zones.h index f7c7bdb5a..9a285dfd5 100644 --- a/src/Zones.h +++ b/src/Zones.h @@ -193,7 +193,7 @@ class Zones : public QObject // calculate a CRC for the zones data - used to see if zones // data is changed since last referenced in Metric code // could also be used in Configuration pages (later) - unsigned long getFingerprint() const; + quint16 getFingerprint() const; }; QColor zoneColor(int zone, int num_zones); diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in index f7e87f81d..fbd5c5c3b 100644 --- a/src/gcconfig.pri.in +++ b/src/gcconfig.pri.in @@ -32,12 +32,6 @@ # QMAKE_DEL_FILE = rm -f #} -# Set path to the root of the boost include files. -# If the files are in /usr/include/boost then set -# BOOST_INCLUDE = /usr/include -# If you do not define BOOST_INCLUDE the application may or may not compile. -BOOST_INCLUDE = - # If you want SRM download support you must install SRMIO # http://www.zuto.de/project/srmio/ # Set path to the root of the SRMIO installation diff --git a/src/src.pro b/src/src.pro index 9b300e568..99a632933 100644 --- a/src/src.pro +++ b/src/src.pro @@ -8,8 +8,6 @@ TARGET = GoldenCheetah !isEmpty( APP_NAME ) { TARGET = $${APP_NAME} } DEPENDPATH += . -!isEmpty( BOOST_INCLUDE ) { INCLUDEPATH += $${BOOST_INCLUDE} } - INCLUDEPATH += ../qwt/src ../qxt/src $${LIBZ_INCLUDE} QT += xml sql network webkit script LIBS += ../qwt/lib/libqwt.a