From 4d5dffbf348a6817cb25758c990ba297b27c9b7a Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Sat, 16 Mar 2013 11:16:56 +0000
Subject: [PATCH] Code Cleanup: Win compile with CLucene

---
 src/DataFilter.cpp | 10 +++++-----
 src/DataFilter.h   |  4 ++--
 src/Serial.cpp     |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/DataFilter.cpp b/src/DataFilter.cpp
index a8674d58d..867607ec8 100644
--- a/src/DataFilter.cpp
+++ b/src/DataFilter.cpp
@@ -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
             }
diff --git a/src/DataFilter.h b/src/DataFilter.h
index ef50da515..3fd7e1ca0 100644
--- a/src/DataFilter.h
+++ b/src/DataFilter.h
@@ -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;
 
diff --git a/src/Serial.cpp b/src/Serial.cpp
index f16b762e2..2c1a8e445 100644
--- a/src/Serial.cpp
+++ b/src/Serial.cpp
@@ -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