chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

MSVC2010 build fixes

Browse Source
This commit is contained in:
Mark Watkins 2013-01-18 08:10:15 +10:00
parent ea55c36323
commit 13fc0a69af
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SleepLib/common.h
View File

@ -29,7 +29,7 @@ struct ValueCount {
// Primarily sort by value // Primarily sort by value
bool operator <(const ValueCount & a, const ValueCount & b); 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; const float pound_convert=ounce_convert*16;
QString weightString(float kg, UnitSystem us=US_Undefined); QString weightString(float kg, UnitSystem us=US_Undefined);

3
common_gui.cpp
View File

@ -6,7 +6,10 @@
#include "common_gui.h" #include "common_gui.h"
#include "qglobal.h" #include "qglobal.h"
#ifndef BUILD_WITH_MSVC
#include <unistd.h> #include <unistd.h>
#endif
#ifdef Q_WS_WIN32 #ifdef Q_WS_WIN32
#include "windows.h" #include "windows.h"

2
daily.cpp
View File

@ -957,7 +957,7 @@ void Daily::Load(QDate date)
float percentile=PROFILE.general->prefCalcPercentile()/100.0; float percentile=PROFILE.general->prefCalcPercentile()/100.0;
SummaryType ST_max=PROFILE.general->prefCalcMax() ? ST_MAX : ST_PERC; SummaryType ST_max=PROFILE.general->prefCalcMax() ? ST_MAX : ST_PERC;
const EventDataType maxperc=0.995; const EventDataType maxperc=0.995F;
QString midname; QString midname;
if (ST_mid==ST_WAVG) midname=tr("Avg"); if (ST_mid==ST_WAVG) midname=tr("Avg");

2
exportcsv.cpp
View File

@ -174,7 +174,7 @@ void ExportCSV::on_exportButton_clicked()
p90list.append(CPAP_Pressure); p90list.append(CPAP_Pressure);
p90list.append(CPAP_IPAP); p90list.append(CPAP_IPAP);
p90list.append(CPAP_EPAP); p90list.append(CPAP_EPAP);
EventDataType percent=0.90; EventDataType percent=0.90F;
// Not sure this section should be translateable.. :-/ // Not sure this section should be translateable.. :-/
if (ui->rb1_details->isChecked()) { if (ui->rb1_details->isChecked()) {

6
mainwindow.cpp
View File

@ -672,7 +672,7 @@ void MainWindow::on_summaryButton_clicked()
int cpapyeardays=PROFILE.countDays(MT_CPAP,cpapyear,lastcpap); int cpapyeardays=PROFILE.countDays(MT_CPAP,cpapyear,lastcpap);
int cpap6monthdays=PROFILE.countDays(MT_CPAP,cpap6month,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; float percentile=PROFILE.general->prefCalcPercentile()/100.0;
@ -944,9 +944,9 @@ void MainWindow::on_summaryButton_clicked()
ahi/=hours; ahi/=hours;
AHI.push_back(UsageData(date,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)); 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; mach=day->machine;
if (mode>=MODE_ASV) { if (mode>=MODE_ASV) {
min=day->settings_min(CPAP_EPAP); min=day->settings_min(CPAP_EPAP);

2
overview.cpp
View File

@ -108,7 +108,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
if (mididx==2) ST_mid=ST_AVG; if (mididx==2) ST_mid=ST_AVG;
SummaryType ST_max=PROFILE.general->prefCalcMax() ? ST_MAX : ST_PERC; 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); US=createGraph(tr("Session Times"),tr("Session Times\n(hours)"),YT_Time);

3
quazip/zconf.h
View File

@ -356,7 +356,8 @@ typedef uLong FAR uLongf;
typedef Byte *voidp; typedef Byte *voidp;
#endif #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 # define Z_HAVE_UNISTD_H
#endif #endif