diff --git a/src/DataFilter.h b/src/DataFilter.h index 1520644c7..ef50da515 100644 --- a/src/DataFilter.h +++ b/src/DataFilter.h @@ -65,10 +65,6 @@ class Leaf { Leaf *l; } lvalue, rvalue; int op; - - private: - - SymbolDef symbol; // hold information about symbols }; class DataFilter : public QObject diff --git a/src/GcCalendarModel.h b/src/GcCalendarModel.h index ada0d453c..c246682d4 100644 --- a/src/GcCalendarModel.h +++ b/src/GcCalendarModel.h @@ -63,8 +63,6 @@ private: QMap * > dateToRows; // map a date to SQL rows - QxtScheduleView *rideNavigator; - QList *fieldDefinitions; QList columns; // what columns in the sql model MainWindow *mainWindow; int filenameIndex, durationIndex, dateIndex, textIndex, colorIndex; @@ -126,7 +124,7 @@ public slots: public: - GcCalendarModel(QWidget *parent, QList *fields, MainWindow *main) : QAbstractProxyModel(parent), fieldDefinitions(fields), mainWindow(main) { + GcCalendarModel(QWidget *parent, QList *, MainWindow *main) : QAbstractProxyModel(parent), mainWindow(main) { setParent(parent); QDate today = QDateTime::currentDateTime().date(); diff --git a/src/RealtimePlot.h b/src/RealtimePlot.h index 081f6f4e0..98c6cb480 100644 --- a/src/RealtimePlot.h +++ b/src/RealtimePlot.h @@ -38,7 +38,6 @@ class Realtime30PwrData : public QwtSeriesData { int pwrCur_; int &pwrCur; - double pwr30; double pwrData_[150]; double (&pwrData)[150]; diff --git a/src/RideWindow.h b/src/RideWindow.h index a547e7691..59a102c4e 100644 --- a/src/RideWindow.h +++ b/src/RideWindow.h @@ -72,7 +72,6 @@ public: class Rider { private: - Bike bike; Route route; }; @@ -86,15 +85,11 @@ class BikePhysicsEngine double weight; // kg rider + bike double wind; // head wind only double cda; // areo - double alt; double temp; // C double air; // air pressure double speed; double grade; - // calcuated values - double f_air; - double f_roll; protected: double calcFAir(double speed) @@ -283,7 +278,6 @@ class RealtimeRider: public RiderBridge Q_OBJECT; //Route route; BikePhysicsEngine engine; - double prevMSecs; protected: int findCurrentPosition() diff --git a/src/SlfParser.h b/src/SlfParser.h index e389559de..713ea767b 100644 --- a/src/SlfParser.h +++ b/src/SlfParser.h @@ -48,12 +48,10 @@ private: int wheelSize; double samplingRate; - double lastDistance; double distance; int lap; double hr; - double lastAltitude; double alt; double speed; double rotations; diff --git a/src/SmfParser.h b/src/SmfParser.h index 219010dc1..4cc087d65 100644 --- a/src/SmfParser.h +++ b/src/SmfParser.h @@ -45,18 +45,6 @@ private: QDateTime start_time; QDateTime last_time; QDateTime time; - double lastDistance; - double distance; - - int lap; - double power; - double cadence; - double hr; - double lastAltitude; - double alt; - double lat; - double lon; - double headwind; }; #endif // _SmfParser_h diff --git a/src/TcxParser.h b/src/TcxParser.h index 73dea2b90..9dc9b12aa 100644 --- a/src/TcxParser.h +++ b/src/TcxParser.h @@ -61,7 +61,6 @@ private: double hr; double speed; double torque; - double lastAltitude; double alt; double lat; double lon; diff --git a/src/WkoRideFile.cpp b/src/WkoRideFile.cpp index c5a12bec4..be04ab65b 100644 --- a/src/WkoRideFile.cpp +++ b/src/WkoRideFile.cpp @@ -240,7 +240,7 @@ WkoParser::parseRawData(WKO_UCHAR *fb) for (i=0; WKO_GRAPHS[i] != '\0'; i++) { WKO_nullval[i] = nullvals(WKO_GRAPHS[i], version); // setup nullvalue if ((WKO_graphbits[i] = bitsize(WKO_GRAPHS[i], WKO_device, version)) == 0) { // setup & check field size - errors << ("Unknown channel " + WKO_GRAPHS[i]); + errors << QString("Unknown channel %1").arg(WKO_GRAPHS[i]); return (NULL); } }