nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code Cleanup: Win compile with CLucene

Browse Source
This commit is contained in:
Mark Liversedge
2013-03-16 11:16:56 +00:00
parent 3313e9442d
commit 4d5dffbf34
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/DataFilter.cpp
View File

@@ -135,10 +135,10 @@ void Leaf::validateFilter(DataFilter *df, Leaf *leaf)
}
}
DataFilter::DataFilter(QObject *parent, MainWindow *main) : QObject(parent), main(main), treeRoot(NULL)
DataFilter::DataFilter(QObject *parent, MainWindow *mainWindow) : QObject(parent), mainWindow(mainWindow), treeRoot(NULL)
{
configUpdate();
connect(main, SIGNAL(configChanged()), this, SLOT(configUpdate()));
connect(mainWindow, SIGNAL(configChanged()), this, SLOT(configUpdate()));
}
QStringList DataFilter::parseFilter(QString query)
@@ -175,7 +175,7 @@ QStringList DataFilter::parseFilter(QString query)
emit parseGood();
// get all fields...
QList<SummaryMetrics> allRides = main->metricDB->getAllMetricsFor(QDateTime(), QDateTime());
QList<SummaryMetrics> allRides = mainWindow->metricDB->getAllMetricsFor(QDateTime(), QDateTime());
filenames.clear();
@@ -218,9 +218,9 @@ void DataFilter::configUpdate()
}
// now add the ride metadata fields -- should be the same generally
foreach(FieldDefinition field, main->rideMetadata()->getFields()) {
foreach(FieldDefinition field, mainWindow->rideMetadata()->getFields()) {
QString underscored = field.name;
if (!main->specialFields.isMetric(underscored)) {
if (!mainWindow->specialFields.isMetric(underscored)) {
lookupMap.insert(underscored.replace(" ","_"), field.name);
lookupType.insert(underscored.replace(" ","_"), (field.type > 2)); // true if is number
}

4
src/DataFilter.h
View File

@@ -72,7 +72,7 @@ class DataFilter : public QObject
Q_OBJECT
public:
DataFilter(QObject *parent, MainWindow *main);
DataFilter(QObject *parent, MainWindow *mainWindow);
QStringList &files() { return filenames; }
// used by Leaf
@@ -93,7 +93,7 @@ class DataFilter : public QObject
void results(QStringList);
private:
MainWindow *main;
MainWindow *mainWindow;
Leaf *treeRoot;
QStringList errors;

3
src/Serial.cpp
View File

@@ -75,7 +75,7 @@ bool
Serial::open(QString &err)
{
#ifndef Q_OS_WIN32
Q_UNUSED(err);
//
// Linux and Mac OSX use stdio / termio / tcsetattr
//
@@ -216,6 +216,7 @@ int
Serial::read(void *buf, size_t nbyte, QString &err)
{
#ifndef Q_OS_WIN32
Q_UNUSED(err);
//
// Mac and Linux use select and timevals to
// do non-blocking reads with a timeout