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

A couple more Qt 4.6 compatability fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-09-02 10:46:34 +10:00
parent c531f31243
commit e27dbb3208
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Graphs/gGraphView.cpp
View File

@ -2,8 +2,6 @@
#include <QFontMetrics> #include <QFontMetrics>
#include "gGraphView.h" #include "gGraphView.h"
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
//#include <QtConcurrentRun>
#include <QElapsedTimer>
bool _graph_init=false; bool _graph_init=false;
QFont * defaultfont=NULL; QFont * defaultfont=NULL;
@ -1256,7 +1254,7 @@ void gGraphView::paintGL()
if (width()<=0) return; if (width()<=0) return;
if (height()<=0) return; if (height()<=0) return;
QElapsedTimer time; QTime time;
time.start(); time.start();
glClearColor(255,255,255,255); glClearColor(255,255,255,255);

4
oximetry.cpp
View File

@ -189,7 +189,7 @@ void Oximetry::on_RunButton_toggled(bool checked)
ev_spo2->getTime().clear(); ev_spo2->getTime().clear();
ev_spo2->setCount(0); ev_spo2->setCount(0);
lasttime=QDateTime::currentMSecsSinceEpoch(); lasttime=qint64(QDateTime::currentDateTime().toTime_t())*1000L; // utc??
starttime=lasttime; starttime=lasttime;
session->SetSessionID(lasttime/1000L); session->SetSessionID(lasttime/1000L);
@ -622,7 +622,7 @@ void Oximetry::on_ImportButton_clicked()
if (done) { if (done) {
if (oneoff) bytes--; // this is retarded.. if (oneoff) bytes--; // this is retarded..
QDateTime date=QDateTime::currentDateTimeUtc(); QDateTime date=QDateTime::currentDateTime().toUTC();
SessionID sid=date.toTime_t(); SessionID sid=date.toTime_t();
session->SetSessionID(sid); session->SetSessionID(sid);
qDebug() << "Read " << bytes << "Bytes"; qDebug() << "Read " << bytes << "Bytes";