From 12f63e2b73be8baed4d04532c365e2d62184cb61 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sun, 14 Jul 2013 11:51:34 +0100 Subject: [PATCH] Move specialFields from MainWindow to Context .. and tidy up a few unneccessary references to mainWindow --- src/AerolabWindow.cpp | 1 - src/AllPlotWindow.cpp | 1 - src/BingMap.cpp | 1 - src/Context.h | 2 ++ src/DBAccess.cpp | 56 ++++++++++++++++---------------- src/DataFilter.cpp | 2 +- src/DiaryWindow.cpp | 5 --- src/GoogleMapControl.cpp | 1 - src/HelpWindow.cpp | 1 - src/HomeWindow.cpp | 2 +- src/HrPwWindow.cpp | 1 - src/LTMPlot.cpp | 2 -- src/Lucene.cpp | 4 +-- src/MainWindow.h | 2 -- src/Pages.cpp | 5 --- src/PerformanceManagerWindow.cpp | 1 - src/PfPvWindow.cpp | 1 - src/RideNavigator.cpp | 1 - src/SpecialFields.h | 6 ++-- 19 files changed, 36 insertions(+), 59 deletions(-) diff --git a/src/AerolabWindow.cpp b/src/AerolabWindow.cpp index 115e8746c..7473ead21 100644 --- a/src/AerolabWindow.cpp +++ b/src/AerolabWindow.cpp @@ -225,7 +225,6 @@ AerolabWindow::AerolabWindow(Context *context) : allZoomer->setMousePattern( QwtEventPattern::MouseSelect3, Qt::RightButton ); // SIGNALs to SLOTs: - //connect(mainWindow, SIGNAL(rideSelected()), this, SLOT(rideSelected())); connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected())); connect(crrSlider, SIGNAL(valueChanged(int)),this, SLOT(setCrrFromSlider())); connect(crrLineEdit, SIGNAL(textChanged(const QString)), this, SLOT(setCrrFromText(const QString))); diff --git a/src/AllPlotWindow.cpp b/src/AllPlotWindow.cpp index 723277f43..b5ba989ec 100644 --- a/src/AllPlotWindow.cpp +++ b/src/AllPlotWindow.cpp @@ -429,7 +429,6 @@ AllPlotWindow::AllPlotWindow(Context *context) : connect(scrollRight, SIGNAL(clicked()), this, SLOT(moveRight())); // GC signals - //connect(mainWindow, SIGNAL(rideSelected()), this, SLOT(rideSelected())); connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected())); connect(context, SIGNAL(rideDirty(RideItem*)), this, SLOT(rideSelected())); connect(context, SIGNAL(configChanged()), allPlot, SLOT(configChanged())); diff --git a/src/BingMap.cpp b/src/BingMap.cpp index 380e06e63..0917119ac 100644 --- a/src/BingMap.cpp +++ b/src/BingMap.cpp @@ -41,7 +41,6 @@ BingMap::BingMap(Context *context) : GcWindow(context), context(context), range( layout->setContentsMargins(2,0,2,2); setLayout(layout); - //XXX ???? parent = context->mainWindow; view = new QWebView(); view->setContentsMargins(0,0,0,0); view->page()->view()->setContentsMargins(0,0,0,0); diff --git a/src/Context.h b/src/Context.h index e25b045bc..82d23501e 100644 --- a/src/Context.h +++ b/src/Context.h @@ -21,6 +21,7 @@ #include "TimeUtils.h" // for class DateRange #include "RealtimeData.h" // for class RealtimeData +#include "SpecialFields.h" // for class RealtimeData class RideFile; class RideItem; @@ -54,6 +55,7 @@ class Context : public QObject DateRange _dr; // the currently selected date range ErgFile *workout; // the currently selected workout file long now; // point in time during train session + SpecialFields specialFields; // ********************************************* // APPLICATION EVENTS diff --git a/src/DBAccess.cpp b/src/DBAccess.cpp index c47234417..53ddad24a 100644 --- a/src/DBAccess.cpp +++ b/src/DBAccess.cpp @@ -178,15 +178,15 @@ bool DBAccess::createMetricsTable() // And all the metadata texts foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { - createMetricTable += QString(", Z%1 varchar").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (!context->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { + createMetricTable += QString(", Z%1 varchar").arg(context->specialFields.makeTechName(field.name)); } } // And all the metadata metrics foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { - createMetricTable += QString(", Z%1 double").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (!context->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { + createMetricTable += QString(", Z%1 double").arg(context->specialFields.makeTechName(field.name)); } } createMetricTable += " )"; @@ -245,12 +245,12 @@ bool DBAccess::createMeasuresTable() // And all the metadata texts foreach(FieldDefinition field, mfieldDefinitions) - if (field.type < 3 || field.type == 7) createMeasuresTable += QString(", Z%1 varchar").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (field.type < 3 || field.type == 7) createMeasuresTable += QString(", Z%1 varchar").arg(context->specialFields.makeTechName(field.name)); // And all the metadata measures foreach(FieldDefinition field, mfieldDefinitions) if (field.type == 3 || field.type == 4) - createMeasuresTable += QString(", Z%1 double").arg(context->mainWindow->specialFields.makeTechName(field.name)); + createMeasuresTable += QString(", Z%1 double").arg(context->specialFields.makeTechName(field.name)); createMeasuresTable += " )"; @@ -410,14 +410,14 @@ bool DBAccess::importRide(SummaryMetrics *summaryMetrics, RideFile *ride, QColor // And all the metadata texts foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { - insertStatement += QString(", Z%1 ").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (!context->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { + insertStatement += QString(", Z%1 ").arg(context->specialFields.makeTechName(field.name)); } } // And all the metadata metrics foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { - insertStatement += QString(", Z%1 ").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (!context->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { + insertStatement += QString(", Z%1 ").arg(context->specialFields.makeTechName(field.name)); } } @@ -425,7 +425,7 @@ bool DBAccess::importRide(SummaryMetrics *summaryMetrics, RideFile *ride, QColor for (int i=0; iathlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { + if (!context->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { insertStatement += ",?"; } } @@ -449,16 +449,16 @@ bool DBAccess::importRide(SummaryMetrics *summaryMetrics, RideFile *ride, QColor // And all the metadata texts foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 3 || field.type ==7)) { + if (!context->specialFields.isMetric(field.name) && (field.type < 3 || field.type ==7)) { query.addBindValue(ride->getTag(field.name, "")); } } // And all the metadata metrics foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { + if (!context->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { query.addBindValue(ride->getTag(field.name, "0.0").toDouble()); - } else if (!context->mainWindow->specialFields.isMetric(field.name)) { + } else if (!context->specialFields.isMetric(field.name)) { if (field.name == "Recording Interval") query.addBindValue(ride->recIntSecs()); } @@ -508,8 +508,8 @@ DBAccess::getRide(QString filename, SummaryMetrics &summaryMetrics, QColor&color for (int i=0; iathlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { - selectStatement += QString(", Z%1 ").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (!context->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { + selectStatement += QString(", Z%1 ").arg(context->specialFields.makeTechName(field.name)); } } selectStatement += " FROM metrics where filename = :name;"; @@ -535,11 +535,11 @@ DBAccess::getRide(QString filename, SummaryMetrics &summaryMetrics, QColor&color summaryMetrics.setForSymbol(factory.metricName(i), query.value(i+4).toDouble()); foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { + if (!context->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { QString underscored = field.name; summaryMetrics.setForSymbol(underscored.replace("_"," "), query.value(i+4).toDouble()); i++; - } else if (!context->mainWindow->specialFields.isMetric(field.name) && field.type < 3) { + } else if (!context->specialFields.isMetric(field.name) && field.type < 3) { QString underscored = field.name; summaryMetrics.setText(underscored.replace("_"," "), query.value(i+4).toString()); i++; @@ -564,8 +564,8 @@ QList DBAccess::getAllMetricsFor(QDateTime start, QDateTime end) for (int i=0; iathlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { - selectStatement += QString(", Z%1 ").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (!context->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { + selectStatement += QString(", Z%1 ").arg(context->specialFields.makeTechName(field.name)); } } selectStatement += " FROM metrics where DATE(ride_date) >=DATE(:start) AND DATE(ride_date) <=DATE(:end) " @@ -589,11 +589,11 @@ QList DBAccess::getAllMetricsFor(QDateTime start, QDateTime end) for (; iathlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { + if (!context->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { QString underscored = field.name; summaryMetrics.setForSymbol(underscored.replace("_"," "), query.value(i+3).toDouble()); i++; - } else if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { + } else if (!context->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { QString underscored = field.name; summaryMetrics.setText(underscored.replace("_"," "), query.value(i+3).toString()); i++; @@ -614,8 +614,8 @@ SummaryMetrics DBAccess::getRideMetrics(QString filename) for (int i=0; iathlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { - selectStatement += QString(", Z%1 ").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (!context->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { + selectStatement += QString(", Z%1 ").arg(context->specialFields.makeTechName(field.name)); } } selectStatement += " FROM metrics where filename == :filename ;"; @@ -634,11 +634,11 @@ SummaryMetrics DBAccess::getRideMetrics(QString filename) for (; iathlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { + if (!context->specialFields.isMetric(field.name) && (field.type == 3 || field.type == 4)) { QString underscored = field.name; summaryMetrics.setForSymbol(underscored.replace(" ","_"), query.value(i+2).toDouble()); i++; - } else if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { + } else if (!context->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { QString underscored = field.name; summaryMetrics.setText(underscored.replace("_"," "), query.value(i+2).toString()); i++; @@ -718,8 +718,8 @@ QList DBAccess::getAllMeasuresFor(QDateTime start, QDateTime end // construct the select statement QString selectStatement = "SELECT timestamp, measure_date"; foreach(FieldDefinition field, mfieldDefinitions) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { - selectStatement += QString(", Z%1 ").arg(context->mainWindow->specialFields.makeTechName(field.name)); + if (!context->specialFields.isMetric(field.name) && (field.type < 5 || field.type == 7)) { + selectStatement += QString(", Z%1 ").arg(context->specialFields.makeTechName(field.name)); } } selectStatement += " FROM measures where DATE(measure_date) >=DATE(:start) AND DATE(measure_date) <=DATE(:end) " diff --git a/src/DataFilter.cpp b/src/DataFilter.cpp index 59ba0ef1e..b9843cc7b 100644 --- a/src/DataFilter.cpp +++ b/src/DataFilter.cpp @@ -221,7 +221,7 @@ void DataFilter::configUpdate() // now add the ride metadata fields -- should be the same generally foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { QString underscored = field.name; - if (!context->mainWindow->specialFields.isMetric(underscored)) { + if (!context->specialFields.isMetric(underscored)) { lookupMap.insert(underscored.replace(" ","_"), field.name); lookupType.insert(underscored.replace(" ","_"), (field.type > 2)); // true if is number } diff --git a/src/DiaryWindow.cpp b/src/DiaryWindow.cpp index 2a5ac442c..163a3dad0 100644 --- a/src/DiaryWindow.cpp +++ b/src/DiaryWindow.cpp @@ -75,17 +75,12 @@ DiaryWindow::DiaryWindow(Context *context) : allViews = new QStackedWidget(this); allViews->addWidget(monthlyView); - //allViews->setCurrentIndex(viewMode->currentIndex()); allViews->setCurrentIndex(0); vlayout->addWidget(allViews); - //connect(viewMode, SIGNAL(currentIndexChanged(int)), allViews, SLOT(setCurrentIndex(int))); - //connect(viewMode, SIGNAL(currentIndexChanged(int)), this, SLOT(setDefaultView(int))); - //connect(viewMode, SIGNAL(currentIndexChanged(int)), this, SLOT(rideSelected())); connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected())); connect(context->mainWindow, SIGNAL(filterChanged(QStringList&)), this, SLOT(rideSelected())); - //connect(mainWindow, SIGNAL(rideSelected()), this, SLOT(rideSelected())); connect(context, SIGNAL(configChanged()), this, SLOT(configChanged())); connect(next, SIGNAL(clicked()), this, SLOT(nextClicked())); connect(prev, SIGNAL(clicked()), this, SLOT(prevClicked())); diff --git a/src/GoogleMapControl.cpp b/src/GoogleMapControl.cpp index 85243963f..e9cb71def 100644 --- a/src/GoogleMapControl.cpp +++ b/src/GoogleMapControl.cpp @@ -43,7 +43,6 @@ GoogleMapControl::GoogleMapControl(Context *context) : GcChartWindow(context), c layout->setContentsMargins(2,0,2,2); setChartLayout(layout); - //XXX ???? parent = context->mainWindow;; view = new QWebView(); view->setPage(new myWebPage()); view->setContentsMargins(0,0,0,0); diff --git a/src/HelpWindow.cpp b/src/HelpWindow.cpp index 8802d0566..629c52267 100644 --- a/src/HelpWindow.cpp +++ b/src/HelpWindow.cpp @@ -26,7 +26,6 @@ HelpWindow::HelpWindow(Context *context) : QDialog(context->mainWindow) setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint | Qt::Tool); setInstanceName("Help Window"); - //XXX ???? parent = context->mainWindow; view = new QWebView(); layout = new QVBoxLayout(); layout->addWidget(view); diff --git a/src/HomeWindow.cpp b/src/HomeWindow.cpp index 58e556404..1e9f9cb31 100644 --- a/src/HomeWindow.cpp +++ b/src/HomeWindow.cpp @@ -1063,7 +1063,7 @@ GcWindowDialog::GcWindowDialog(GcWinID type, Context *context) : context(context void GcWindowDialog::okClicked() { - // give back to mainWindow so we can re-use + // give back to owner so we can re-use // note that in reject they are not and will // get deleted (this has been verfied with // some debug statements in ~GcWindow). diff --git a/src/HrPwWindow.cpp b/src/HrPwWindow.cpp index c8a90b63a..375854705 100644 --- a/src/HrPwWindow.cpp +++ b/src/HrPwWindow.cpp @@ -189,7 +189,6 @@ HrPwWindow::HrPwWindow(Context *context) : connect(rSmoothSlider, SIGNAL(valueChanged(int)), this, SLOT(setrSmoothingFromSlider())); connect(rDelayEdit, SIGNAL(editingFinished()), this, SLOT(setrDelayFromLineEdit())); connect(rDelaySlider, SIGNAL(valueChanged(int)), this, SLOT(setrDelayFromSlider())); - //connect(mainWindow, SIGNAL(configChanged()), this, SLOT(configChanged())); connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected())); } diff --git a/src/LTMPlot.cpp b/src/LTMPlot.cpp index 663197d09..1d37d8210 100644 --- a/src/LTMPlot.cpp +++ b/src/LTMPlot.cpp @@ -1241,11 +1241,9 @@ class LTMPlotZoneLabel: public QwtPlotItem zone_number = _zone_number; const Zones *zones = parent->parent->context->athlete->zones(); - //int zone_range = 0; //parent->parent->context->mainWindow->zoneRange(); int zone_range = zones->whichRange(settings->start.addDays((settings->end.date().toJulianDay()-settings->start.date().toJulianDay())/2).date()); // which axis has watts? - //setAxis(QwtPlot::xBottom, axisid); setXAxis(axisid); // create new zone labels if we're shading diff --git a/src/Lucene.cpp b/src/Lucene.cpp index 3869434b5..fb3531c3e 100644 --- a/src/Lucene.cpp +++ b/src/Lucene.cpp @@ -81,9 +81,9 @@ bool Lucene::importRide(SummaryMetrics *, RideFile *ride, QColor , unsigned long // And all the metadata texts individually foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) { - if (!context->mainWindow->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { + if (!context->specialFields.isMetric(field.name) && (field.type < 3 || field.type == 7)) { - std::wstring name = context->mainWindow->specialFields.makeTechName(field.name).toStdWString(); + std::wstring name = context->specialFields.makeTechName(field.name).toStdWString(); std::wstring value = ride->getTag(field.name,"").toStdWString(); alltexts += ride->getTag(field.name,"") + " "; diff --git a/src/MainWindow.h b/src/MainWindow.h index 840a5ae99..2a358abad 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -24,7 +24,6 @@ #include #include #include "RideItem.h" -#include "SpecialFields.h" #include "TimeUtils.h" #ifdef Q_OS_MAC @@ -112,7 +111,6 @@ class MainWindow : public QMainWindow ChartSettings *chartSettings; // state data - SpecialFields specialFields; int session; bool init; // we built children (i.e. didn't quit at upgrade) diff --git a/src/Pages.cpp b/src/Pages.cpp index c9b174c64..51a544d29 100644 --- a/src/Pages.cpp +++ b/src/Pages.cpp @@ -491,14 +491,11 @@ CredentialsPage::saveClicked() appsettings->setCValue(context->athlete->cyclist, GC_TPURL, tpURL->text()); appsettings->setCValue(context->athlete->cyclist, GC_TPUSER, tpUser->text()); appsettings->setCValue(context->athlete->cyclist, GC_TPPASS, tpPass->text()); - //XXX deprecated appsettings->setCValue(mainWindow->cyclist, GC_STRUSER, stravaUser->text()); - //XXX deprecated appsettings->setCValue(mainWindow->cyclist, GC_STRPASS, stravaPass->text()); appsettings->setCValue(context->athlete->cyclist, GC_RWGPSUSER, rideWithGPSUser->text()); appsettings->setCValue(context->athlete->cyclist, GC_RWGPSPASS, rideWithGPSPass->text()); appsettings->setCValue(context->athlete->cyclist, GC_TTBUSER, ttbUser->text()); appsettings->setCValue(context->athlete->cyclist, GC_TTBPASS, ttbPass->text()); appsettings->setCValue(context->athlete->cyclist, GC_TPTYPE, tpType->currentIndex()); - //XXX deprecated appsettings->setCValue(mainWindow->cyclist, GC_TWURL, twitterURL->text()); appsettings->setCValue(context->athlete->cyclist, GC_WIURL, wiURL->text()); appsettings->setCValue(context->athlete->cyclist, GC_WIUSER, wiUser->text()); appsettings->setCValue(context->athlete->cyclist, GC_WIKEY, wiPass->text()); @@ -513,8 +510,6 @@ CredentialsPage::saveClicked() appsettings->setCValue(context->athlete->cyclist, GC_DVURL, url); appsettings->setCValue(context->athlete->cyclist, GC_DVUSER, dvUser->text()); appsettings->setCValue(context->athlete->cyclist, GC_DVPASS, dvPass->text()); - - //XXX deprecated saveTwitter(); // get secret key if PIN set } // diff --git a/src/PerformanceManagerWindow.cpp b/src/PerformanceManagerWindow.cpp index 012ddba63..0443e7bc9 100644 --- a/src/PerformanceManagerWindow.cpp +++ b/src/PerformanceManagerWindow.cpp @@ -113,7 +113,6 @@ PerformanceManagerWindow::PerformanceManagerWindow(Context *context) : connect(context, SIGNAL(configChanged()), perfplot, SLOT(configUpdate())); connect(context, SIGNAL(rideAdded(RideItem*)), this, SLOT(replot())); connect(context, SIGNAL(rideDeleted(RideItem*)), this, SLOT(replot())); - //connect(mainWindow, SIGNAL(rideSelected()), this, SLOT(rideSelected())); connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected())); #ifdef GC_HAVE_LUCENE connect(context->mainWindow, SIGNAL(filterChanged(QStringList&)), this, SLOT(filterChanged(QStringList&))); diff --git a/src/PfPvWindow.cpp b/src/PfPvWindow.cpp index 3260125ec..d50c6648f 100644 --- a/src/PfPvWindow.cpp +++ b/src/PfPvWindow.cpp @@ -189,7 +189,6 @@ PfPvWindow::PfPvWindow(Context *context) : this, SLOT(setFrameIntervalsPfPvFromCheckBox())); connect(rFrameInterval, SIGNAL(stateChanged(int)), this, SLOT(setrFrameIntervalsPfPvFromCheckBox())); - //connect(mainWindow, SIGNAL(rideSelected()), this, SLOT(rideSelected())); connect(doubleClickPicker, SIGNAL(doubleClicked(int, int)), this, SLOT(doubleClicked(int, int))); connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected())); connect(context, SIGNAL(intervalSelected()), this, SLOT(intervalSelected())); diff --git a/src/RideNavigator.cpp b/src/RideNavigator.cpp index cdacc5e30..38c002f09 100644 --- a/src/RideNavigator.cpp +++ b/src/RideNavigator.cpp @@ -113,7 +113,6 @@ RideNavigator::RideNavigator(Context *context, bool mainwindow) : context(contex connect(tableView->header(), SIGNAL(sectionResized(int,int,int)), this, SLOT(columnsChanged())); // user sorted by column connect(tableView->header(), SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(selectRow())); - // context menu is provided by mainWindow connect(tableView,SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(showTreeContextMenuPopup(const QPoint &))); connect(tableView->header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(setSortBy(int,Qt::SortOrder))); diff --git a/src/SpecialFields.h b/src/SpecialFields.h index 147fdbc08..1787cde60 100644 --- a/src/SpecialFields.h +++ b/src/SpecialFields.h @@ -20,10 +20,8 @@ #define _GC_SpecialFields_h #include "GoldenCheetah.h" -#include -#include -#include -#include "RideMetric.h" +class QStringListModel; +class RideMetric; class SpecialFields {