chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-17 19:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1484a5e9334b9ef5ac6eca69a78ca926ddbd88c8'

Browse Source
This commit is contained in:
Mark Watkins 2016-01-05 16:00:30 +10:00
commit 1e20707edf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/Graphs/gLineChart.h
View File

@ -139,8 +139,8 @@ class gLineChart: public Layer
layer->m_report_empty = m_report_empty; layer->m_report_empty = m_report_empty;
layer->m_square_plot = m_square_plot; layer->m_square_plot = m_square_plot;
layer->m_disable_accel = m_disable_accel; layer->m_disable_accel = m_disable_accel;
layer->subtract_offset = layer->subtract_offset; layer->subtract_offset = subtract_offset;
layer->m_codes = layer->m_codes; layer->m_codes = m_codes;
layer->m_threshold = m_threshold; layer->m_threshold = m_threshold;
layer->m_square = m_square; layer->m_square = m_square;
layer->m_enabled = m_enabled; layer->m_enabled = m_enabled;

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

@ -134,7 +134,7 @@ int FPIconLoader::Open(QString path)
if (m) { if (m) {
c+=OpenMachine(m, npath); c+=OpenMachine(m, npath);
} }
} catch (OneTypePerDay e) { } catch (OneTypePerDay& e) {
Q_UNUSED(e) Q_UNUSED(e)
p_profile->DelMachine(m); p_profile->DelMachine(m);
MachList.erase(MachList.find(info.serial)); MachList.erase(MachList.find(info.serial));

2
sleepyhead/SleepLib/profiles.cpp
View File

@ -581,7 +581,7 @@ void Profile::LoadMachineData()
} else { } else {
try { try {
m->Load(); m->Load();
} catch (OldDBVersion e) { } catch (OldDBVersion& e) {
Q_UNUSED(e) Q_UNUSED(e)
DataFormatError(m); DataFormatError(m);
} }

2
sleepyhead/mainwindow.cpp
View File

@ -490,8 +490,8 @@ void loadChannels()
void MainWindow::on_aboutToQuit() void MainWindow::on_aboutToQuit()
{ {
Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("SleepyHead Reminder")); Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("SleepyHead Reminder"));
QThread::msleep(1000);
QApplication::processEvents(); QApplication::processEvents();
QThread::msleep(1000);
} }
void MainWindow::closeEvent(QCloseEvent * event) void MainWindow::closeEvent(QCloseEvent * event)