From 13fc0a69af97295cb655ebe55f81bc24c93c7c3e Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 18 Jan 2013 08:10:15 +1000
Subject: [PATCH] MSVC2010 build fixes

---
 SleepLib/common.h | 2 +-
 common_gui.cpp    | 3 +++
 daily.cpp         | 2 +-
 exportcsv.cpp     | 2 +-
 mainwindow.cpp    | 6 +++---
 overview.cpp      | 2 +-
 quazip/zconf.h    | 3 ++-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/SleepLib/common.h b/SleepLib/common.h
index 7a575f63..f278bb93 100644
--- a/SleepLib/common.h
+++ b/SleepLib/common.h
@@ -29,7 +29,7 @@ struct ValueCount {
 // Primarily sort by value
 bool operator <(const ValueCount & a, const ValueCount & b);
 
-const float ounce_convert=28.3495231; // grams
+const float ounce_convert=28.3495231F; // grams
 const float pound_convert=ounce_convert*16;
 
 QString weightString(float kg, UnitSystem us=US_Undefined);
diff --git a/common_gui.cpp b/common_gui.cpp
index 36b0b9e4..63def571 100644
--- a/common_gui.cpp
+++ b/common_gui.cpp
@@ -6,7 +6,10 @@
 
 #include "common_gui.h"
 #include "qglobal.h"
+
+#ifndef BUILD_WITH_MSVC
 #include <unistd.h>
+#endif
 
 #ifdef Q_WS_WIN32
 #include "windows.h"
diff --git a/daily.cpp b/daily.cpp
index f336db97..77a1b85b 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -957,7 +957,7 @@ void Daily::Load(QDate date)
     float percentile=PROFILE.general->prefCalcPercentile()/100.0;
 
     SummaryType ST_max=PROFILE.general->prefCalcMax() ? ST_MAX : ST_PERC;
-    const EventDataType maxperc=0.995;
+    const EventDataType maxperc=0.995F;
 
     QString midname;
     if (ST_mid==ST_WAVG) midname=tr("Avg");
diff --git a/exportcsv.cpp b/exportcsv.cpp
index e8d1d7b9..a1b3a77d 100644
--- a/exportcsv.cpp
+++ b/exportcsv.cpp
@@ -174,7 +174,7 @@ void ExportCSV::on_exportButton_clicked()
     p90list.append(CPAP_Pressure);
     p90list.append(CPAP_IPAP);
     p90list.append(CPAP_EPAP);
-    EventDataType percent=0.90;
+    EventDataType percent=0.90F;
 
     // Not sure this section should be translateable.. :-/
     if (ui->rb1_details->isChecked()) {
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ab7a0773..14ebab54 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -672,7 +672,7 @@ void MainWindow::on_summaryButton_clicked()
     int cpapyeardays=PROFILE.countDays(MT_CPAP,cpapyear,lastcpap);
     int cpap6monthdays=PROFILE.countDays(MT_CPAP,cpap6month,lastcpap);
 
-    CPAPMode cpapmode=(CPAPMode)p_profile->calcSettingsMax(CPAP_Mode,MT_CPAP,firstcpap,lastcpap);
+    CPAPMode cpapmode=(CPAPMode)(int)p_profile->calcSettingsMax(CPAP_Mode,MT_CPAP,firstcpap,lastcpap);
 
     float percentile=PROFILE.general->prefCalcPercentile()/100.0;
 
@@ -944,9 +944,9 @@ void MainWindow::on_summaryButton_clicked()
                 ahi/=hours;
                 AHI.push_back(UsageData(date,ahi,hours));
 
-                prelief=(PRTypes)round(day->settings_wavg(CPAP_PresReliefType));
+                prelief=(PRTypes)(int)round(day->settings_wavg(CPAP_PresReliefType));
                 prelset=round(day->settings_wavg(CPAP_PresReliefSet));
-                mode=(CPAPMode)round(day->settings_wavg(CPAP_Mode));
+                mode=(CPAPMode)(int)round(day->settings_wavg(CPAP_Mode));
                 mach=day->machine;
                 if (mode>=MODE_ASV) {
                     min=day->settings_min(CPAP_EPAP);
diff --git a/overview.cpp b/overview.cpp
index 83973e35..7ac4a254 100644
--- a/overview.cpp
+++ b/overview.cpp
@@ -108,7 +108,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     if (mididx==2) ST_mid=ST_AVG;
 
     SummaryType ST_max=PROFILE.general->prefCalcMax() ? ST_MAX : ST_PERC;
-    const EventDataType maxperc=0.995;
+    const EventDataType maxperc=0.995F;
 
 
     US=createGraph(tr("Session Times"),tr("Session Times\n(hours)"),YT_Time);
diff --git a/quazip/zconf.h b/quazip/zconf.h
index b2343874..f60d653d 100644
--- a/quazip/zconf.h
+++ b/quazip/zconf.h
@@ -356,7 +356,8 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-#if 1    /* was set to #if 1 by ./configure */
+
+#ifndef BUILD_WITH_MSVC    /* was set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif