From 9ef0065a6d4895b53c690df65d6f7230593fa7ae Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 8 Dec 2011 23:41:43 +1000 Subject: [PATCH] Left out part of the last fixes --- SleepLib/machine.h | 2 +- mainwindow.cpp | 2 +- preferencesdialog.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SleepLib/machine.h b/SleepLib/machine.h index eba57b84..d75c19ac 100644 --- a/SleepLib/machine.h +++ b/SleepLib/machine.h @@ -68,7 +68,7 @@ public: void SetType(MachineType t) { m_type=t; } const QString & GetClass() { return m_class; } const MachineType & GetType() { return m_type; } - inline QString hexid() { return QString().sprintf("%08lx",m_id); } + QString hexid() { return QString().sprintf("%08lx",m_id); } SessionID CreateSessionID() { return highest_sessionid+1; } const MachineID & id() { return m_id; } const QDate & FirstDay() { return firstday; } diff --git a/mainwindow.cpp b/mainwindow.cpp index 499378fe..c72482c4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1016,7 +1016,7 @@ void MainWindow::on_actionPurge_Current_Day_triggered() m=day->machine; QString path=PROFILE.Get("DataFolder")+QDir::separator()+m->hexid()+QDir::separator(); - QVector::iterator s,km=day->end(); + QVector::iterator s; for (s=day->begin();s!=day->end();s++) { SessionID id=(*s)->session(); diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index e6c9dce7..8308e6da 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -632,7 +632,6 @@ void PreferencesDialog::resetGraphModel() graphModel->appendRow(daily); graphModel->appendRow(overview); - connect(graphModel,SIGNAL(itemChanged(QStandardItem*)),this,SLOT(graphModel_changed(QStandardItem*))); ui->graphView->setAlternatingRowColors(true); @@ -725,6 +724,7 @@ void PreferencesDialog::resetGraphModel() oximetry->insertRow(i,items); } } + connect(graphModel,SIGNAL(itemChanged(QStandardItem*)),this,SLOT(graphModel_changed(QStandardItem*))); ui->graphView->expandAll(); }