From 79e889d0a6f5e14d4e331a494f5e288252307398 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 9 May 2014 17:05:54 +1000
Subject: [PATCH] More MSVC stuff

---
 sleepyhead/Graphs/gLineChart.cpp |  4 ++--
 sleepyhead/Graphs/glcommon.cpp   |  3 +++
 sleepyhead/Graphs/glcommon.h     |  5 +++--
 sleepyhead/sleepyhead.pro        | 27 ++++++++++++---------------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 93879da4..9e696430 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -295,8 +295,9 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
 
             QVector<EventList *> &evec = ci.value();
             num_points = 0;
+            int evecsize=evec.size();
 
-            for (int i = 0; i < evec.size(); i++) {
+            for (int i = 0; i < evecsize; i++) {
                 num_points += evec[i]->count();
             }
 
@@ -306,7 +307,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, int left, int top, int widt
             // Max number of samples taken from samples per pixel for better min/max values
             const int num_averages = 20;
 
-            int evecsize=evec.size();
             for (int n = 0; n < evecsize; ++n) { // for each segment
                 EventList &el = *evec[n];
 
diff --git a/sleepyhead/Graphs/glcommon.cpp b/sleepyhead/Graphs/glcommon.cpp
index 4bdf75f5..c97c81c3 100644
--- a/sleepyhead/Graphs/glcommon.cpp
+++ b/sleepyhead/Graphs/glcommon.cpp
@@ -13,9 +13,12 @@
 #include "glcommon.h"
 
 #ifdef BUILD_WITH_MSVC
+
+#if (_MSC_VER < 1800)
 double round(double number)
 {
     return number < 0.0 ? ceil(number - 0.5) : floor(number + 0.5);
 }
 #endif
+#endif
 
diff --git a/sleepyhead/Graphs/glcommon.h b/sleepyhead/Graphs/glcommon.h
index 8c8d86d8..49522075 100644
--- a/sleepyhead/Graphs/glcommon.h
+++ b/sleepyhead/Graphs/glcommon.h
@@ -61,9 +61,10 @@ const double M_PI = 3.141592653589793;
 #endif
 
 #ifdef BUILD_WITH_MSVC
-// Visual C++ doesn't have round in it's maths header..
-
+// Visual C++ earlier than 2013 doesn't have round in it's maths header..
+#if (_MSC_VER < 1800)
 double round(double number);
 #endif
+#endif
 
 #endif // GLCOMMON_H
diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro
index a87ab605..787abbaf 100644
--- a/sleepyhead/sleepyhead.pro
+++ b/sleepyhead/sleepyhead.pro
@@ -63,23 +63,20 @@ macx {
 }
 
 win32 {
-  DEFINES          += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this
-  RC_FILE          += win_icon.rc
-  LIBS             += -lsetupapi
+    DEFINES          += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this
+    RC_FILE          += win_icon.rc
+    LIBS             += -lsetupapi
 
-  INCLUDEPATH += $$PWD
-  INCLUDEPATH += $$[QT_INSTALL_PREFIX]/../src/qtbase/src/3rdparty/zlib
+    INCLUDEPATH += $$PWD
+    INCLUDEPATH += $$[QT_INSTALL_PREFIX]/../src/qtbase/src/3rdparty/zlib
 
-}
-if (win32-msvc2008|win32-msvc2010|win32-msvc2012) {
-!equals(TEMPLATE_PREFIX, "vc") {
-   LIBS += -ladvapi32
-   DEFINES += BUILD_WITH_MSVC=1
-
-}
-} else {
-    # MingW needs this
-    LIBS += -lz
+    if (*-msvc*):!equals(TEMPLATE_PREFIX, "vc") {
+        LIBS += -ladvapi32
+        DEFINES += BUILD_WITH_MSVC=1
+    } else {
+        # MingW needs this
+        LIBS += -lz
+    }
 }
 
 #include(..3rdparty/qextserialport/src/qextserialport.pri)