From 0ffdf84383892a4e13cd38962c8d812108ebe05f Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Wed, 13 Feb 2013 19:13:16 +0000 Subject: [PATCH] Code Cleanup: win32 fixups .. Bin2RideFile constants might be an issue? .. otherwise just unused variables --- src/ANT.cpp | 4 ++++ src/Bin2RideFile.cpp | 4 ++-- src/Computrainer.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ANT.cpp b/src/ANT.cpp index a28597620..08ffad869 100644 --- a/src/ANT.cpp +++ b/src/ANT.cpp @@ -504,6 +504,10 @@ ANT::associateControlChannels() { bool ANT::discover(QString name) { +#ifdef WIN32 +Q_UNUSED(name); +#endif + #ifdef Q_OS_LINUX // All we can do for USB1 sticks is see if the cp210x driver module diff --git a/src/Bin2RideFile.cpp b/src/Bin2RideFile.cpp index a12cf2859..96961629d 100644 --- a/src/Bin2RideFile.cpp +++ b/src/Bin2RideFile.cpp @@ -168,12 +168,12 @@ struct Bin2FileReaderState if (alt == 0x8000) alt = 0; - if ((long)lat == -2147483648L) //2147483648 + if ((long)lat == (long)0x80000000) //2147483648 lat = 0; else lat = lat/10000000.0; - if ((long)lng == -2147483648L) //0x80000000 + if ((long)lng == (long)0x80000000) //0x80000000 lng = 0; else lng = lng/10000000.0; diff --git a/src/Computrainer.cpp b/src/Computrainer.cpp index ea0d3b106..8e9fd2875 100644 --- a/src/Computrainer.cpp +++ b/src/Computrainer.cpp @@ -939,7 +939,7 @@ int Computrainer::rawRead(uint8_t bytes[], int size) int rc=0; #ifdef WIN32 - +Q_UNUSED(size); // Readfile deals with timeouts and readyread issues DWORD cBytes; rc = ReadFile(devicePort, bytes, 7, &cBytes, NULL);