From d97ae3c38aba0db03009ad80c58caee07cdf1bbe Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Wed, 13 Feb 2013 09:01:20 +0000
Subject: [PATCH] Code Cleanup: Compiler nits

.. fix further XCode semantic warning messages (still some left)
.. WIN32 gcc builds
---
 src/ANT.cpp          | 6 ++----
 src/Bin2RideFile.cpp | 4 ++--
 src/Computrainer.cpp | 4 ++--
 src/NullController.h | 2 +-
 src/WorkoutWizard.h  | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/ANT.cpp b/src/ANT.cpp
index 0ca9ae269..a28597620 100644
--- a/src/ANT.cpp
+++ b/src/ANT.cpp
@@ -876,8 +876,6 @@ int ANT::rawWrite(uint8_t *bytes, int size) // unix!!
 
 int ANT::rawRead(uint8_t bytes[], int size)
 {
-    int rc=0;
-
 #ifdef WIN32
     switch (usbMode) {
     case USB1:
@@ -887,7 +885,6 @@ int ANT::rawRead(uint8_t bytes[], int size)
         return usb2->read((char *)bytes, size);
         break;
     default:
-        rc = 0;
         break;
     }
 
@@ -904,13 +901,14 @@ int ANT::rawRead(uint8_t bytes[], int size)
     // read one byte at a time sleeping when no data ready
     // until we timeout waiting then return error
     for (i=0; i<size; i++) {
-        rc = read(devicePort, &byte, 1);
+        int rc = read(devicePort, &byte, 1);
         if (rc == -1 || rc == 0) return -1; // error!
         else bytes[i] = byte;
     }
     return i;
 
 #endif
+    return -1; // keep compiler happy.
 }
 
 // convert 'p' 'c' etc into ANT values for device type
diff --git a/src/Bin2RideFile.cpp b/src/Bin2RideFile.cpp
index cf0274d25..a12cf2859 100644
--- a/src/Bin2RideFile.cpp
+++ b/src/Bin2RideFile.cpp
@@ -168,12 +168,12 @@ struct Bin2FileReaderState
         if (alt == 0x8000)
             alt = 0;
 
-        if (lat == -2147483648) //2147483648
+        if ((long)lat == -2147483648L) //2147483648
             lat = 0;
         else
             lat = lat/10000000.0;
 
-        if (lng == -2147483648) //0x80000000
+        if ((long)lng == -2147483648L) //0x80000000
             lng = 0;
         else
             lng = lng/10000000.0;
diff --git a/src/Computrainer.cpp b/src/Computrainer.cpp
index 73c0f358c..ea0d3b106 100644
--- a/src/Computrainer.cpp
+++ b/src/Computrainer.cpp
@@ -908,7 +908,7 @@ int Computrainer::openPort()
 
 int Computrainer::rawWrite(uint8_t *bytes, int size) // unix!!
 {
-    int rc=0,ibytes;
+    int rc=0;
 
 #ifdef WIN32
     DWORD cBytes;
@@ -917,7 +917,7 @@ int Computrainer::rawWrite(uint8_t *bytes, int size) // unix!!
     return rc;
 
 #else
-
+    int ibytes;
     ioctl(devicePort, FIONREAD, &ibytes);
 
     // timeouts are less critical for writing, since vols are low
diff --git a/src/NullController.h b/src/NullController.h
index 9f8ac5dc4..38cd8723f 100644
--- a/src/NullController.h
+++ b/src/NullController.h
@@ -47,7 +47,7 @@ class NullController : public RealtimeController
   int pause();
   int restart();
   bool find();
-  bool discover(char *) {  return true;  }
+  bool discover(QString) {  return true;  }
   bool doesPush() {  return false; }
   bool doesPull() {  return true; }
   bool doesLoad() {  return false; }
diff --git a/src/WorkoutWizard.h b/src/WorkoutWizard.h
index 786139947..a351cab18 100644
--- a/src/WorkoutWizard.h
+++ b/src/WorkoutWizard.h
@@ -324,7 +324,7 @@ public:
     enum { WW_WorkoutTypePage, WW_AbsWattagePage, WW_RelWattagePage, WW_GradientPage, WW_ImportPage };
 
     WorkoutWizard(QWidget *parent = NULL);
-    int nextId();
+
     // called at the end of the wizard...
     void accept();
 };