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

sort out qSort deprecation and an updates file creation time check one

Browse Source
This commit is contained in:
Mark Watkins 2018-06-08 08:09:05 +10:00
parent 90990ad66d
commit fd6644e382
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/SleepLib/calcs.cpp
View File

@ -1274,7 +1274,7 @@ void zMaskProfile::scanPressure(Session *session)
scanPressureList(session, CPAP_IPAP); scanPressureList(session, CPAP_IPAP);
// Sort by time // Sort by time
qSort(Pressure); std::sort(Pressure.begin(), Pressure.end());
} }
void zMaskProfile::scanLeakList(EventList *el) void zMaskProfile::scanLeakList(EventList *el)
{ {
@ -1970,7 +1970,7 @@ int calcSPO2Drop(Session *session)
EventDataType baseline = 0; EventDataType baseline = 0;
if (med.size() > 0) { if (med.size() > 0) {
qSort(med); std::sort(med.begin(), med.end());
int midx = float(med.size()) * 0.90; int midx = float(med.size()) * 0.90;

4
sleepyhead/SleepLib/day.cpp
View File

@ -379,7 +379,7 @@ EventDataType Day::percentile(ChannelID code, EventDataType percentile)
} }
// sort by weight, then value // sort by weight, then value
qSort(valcnt); std::sort(valcnt.begin(), valcnt.end());
//double SN=100.0/double(N); // 100% / overall sum //double SN=100.0/double(N); // 100% / overall sum
double p = 100.0 * percentile; double p = 100.0 * percentile;
@ -550,7 +550,7 @@ EventDataType Day::rangePercentile(ChannelID code, float p, qint64 st, qint64 et
} }
// TODO: use nth_element instead.. // TODO: use nth_element instead..
qSort(list); std::sort(list.begin(), list.end());
float b = float(idx) * p; float b = float(idx) * p;
int a = floor(b); int a = floor(b);

2
sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -285,7 +285,7 @@ int FPIconLoader::OpenMachine(Machine *mach, const QString & path)
// qDebug() << k << "-" <<j << ":" << zz << qRound(dur) << "minutes" << (b ? "*" : "") << (c ? QDateTime::fromTime_t(zz).toString() : ""); // qDebug() << k << "-" <<j << ":" << zz << qRound(dur) << "minutes" << (b ? "*" : "") << (c ? QDateTime::fromTime_t(zz).toString() : "");
// } // }
// } // }
// qSort(chunks); // std::sort(chunks.begin(), chunks.end());
// bool b,c; // bool b,c;
// for (int i=0;i<chunks.size();i++) { // for (int i=0;i<chunks.size();i++) {
// const FPWaveChunk & chunk=chunks.at(i); // const FPWaveChunk & chunk=chunks.at(i);

2
sleepyhead/SleepLib/profiles.cpp
View File

@ -1751,7 +1751,7 @@ EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, Mac
} }
// sort by weight, then value // sort by weight, then value
qSort(valcnt); std::sort(valcnt.begin(), valcnt.end());
//double SN=100.0/double(N); // 100% / overall sum //double SN=100.0/double(N); // 100% / overall sum
double p = 100.0 * percent; double p = 100.0 * percent;

4
sleepyhead/UpdaterWindow.cpp
View File

@ -99,7 +99,7 @@ void UpdaterWindow::checkForUpdates()
// Check updates.xml file if it's still recent.. // Check updates.xml file if it's still recent..
if (QFile::exists(filename)) { if (QFile::exists(filename)) {
QFileInfo fi(filename); QFileInfo fi(filename);
QDateTime created = fi.created(); QDateTime created = fi.birthTime();
int age = created.secsTo(QDateTime::currentDateTime()); int age = created.secsTo(QDateTime::currentDateTime());
if (age < 900) { if (age < 900) {
@ -525,7 +525,7 @@ void UpdaterWindow::ParseUpdatesXML(QIODevice *dev)
} }
// Um... not optimal. // Um... not optimal.
qSort(versions); std::sort(versions.begin(), versions.end());
QString platform = PlatformString.toLower(); QString platform = PlatformString.toLower();
release = nullptr; release = nullptr;

4
sleepyhead/statistics.cpp
View File

@ -475,7 +475,7 @@ void Statistics::updateRXChanges()
ri.value().highlight = 0; ri.value().highlight = 0;
} }
qSort(list.begin(), list.end(), rxAHILessThan); std::sort(list.begin(), list.end(), rxAHILessThan);
if (list.size() >= 4) { if (list.size() >= 4) {
list[0]->highlight = 1; // best list[0]->highlight = 1; // best
@ -1440,7 +1440,7 @@ void Statistics::UpdateRecordsBox()
ri.value().highlight = 0; ri.value().highlight = 0;
} }
qSort(list.begin(), list.end(), rxAHILessThan); std::sort(list.begin(), list.end(), rxAHILessThan);
if (list.size() >= 2) { if (list.size() >= 2) {