diff --git a/sleepyhead/Graphs/gdailysummary.cpp b/sleepyhead/Graphs/gdailysummary.cpp index db4e5296..76ef8c64 100644 --- a/sleepyhead/Graphs/gdailysummary.cpp +++ b/sleepyhead/Graphs/gdailysummary.cpp @@ -191,7 +191,7 @@ void gDailySummary::paint(QPainter &painter, gGraph &w, const QRegion ®ion) int top = rect.top()-10; int left = rect.left(); - int width = rect.width(); + //int width = rect.width(); int height = rect.height()+10; // Draw bounding box diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp index e58ed01b..a55a3465 100644 --- a/sleepyhead/SleepLib/common.cpp +++ b/sleepyhead/SleepLib/common.cpp @@ -126,7 +126,6 @@ void copyPath(QString src, QString dst) } - QString STR_UNIT_CM; QString STR_UNIT_INCH; QString STR_UNIT_FOOT; diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h index 30b351e4..15a08865 100644 --- a/sleepyhead/SleepLib/common.h +++ b/sleepyhead/SleepLib/common.h @@ -123,9 +123,6 @@ const QString STR_GEN_UpdatesAutoCheck = "Updates_AutoCheck"; const QString STR_GEN_UpdateCheckFrequency = "Updates_CheckFrequency"; const QString STR_GEN_DataFolder = "DataFolder"; -const QString STR_GEN_On = QObject::tr("On"); -const QString STR_GEN_Off = QObject::tr("Off"); - const QString STR_PREF_AllowEarlyUpdates = "AllowEarlyUpdates"; const QString STR_PREF_ReimportBackup = "ReimportBackup"; const QString STR_PREF_LastCPAPPath = "LastCPAPPath"; diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index 2d4c4325..1c047555 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -101,14 +101,14 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : if (val > 0) { ui->combineLCD->display(val); - } else { ui->combineLCD->display(STR_GEN_Off); } + } else { ui->combineLCD->display(STR_TR_Off); } val = profile->session->ignoreShortSessions(); ui->IgnoreSlider->setValue(val); if (val > 0) { ui->IgnoreLCD->display(val); - } else { ui->IgnoreLCD->display(STR_GEN_Off); } + } else { ui->IgnoreLCD->display(STR_TR_Off); } ui->LockSummarySessionSplitting->setChecked(profile->session->lockSummarySessions()); @@ -923,22 +923,21 @@ void PreferencesDialog::on_combineSlider_valueChanged(int position) { if (position > 0) { ui->combineLCD->display(position); - } else { ui->combineLCD->display(STR_GEN_Off); } + } else { ui->combineLCD->display(STR_TR_Off); } } void PreferencesDialog::on_IgnoreSlider_valueChanged(int position) { if (position > 0) { ui->IgnoreLCD->display(position); - } else { ui->IgnoreLCD->display(STR_GEN_Off); } + } else { ui->IgnoreLCD->display(STR_TR_Off); } } #include "mainwindow.h" extern MainWindow *mainwin; void PreferencesDialog::RefreshLastChecked() { - ui->updateLastChecked->setText(PREF[STR_GEN_UpdatesLastChecked].toDateTime().toString( - Qt::SystemLocaleLongDate)); + ui->updateLastChecked->setText(PREF[STR_GEN_UpdatesLastChecked].toDateTime().toString(Qt::SystemLocaleLongDate)); } void PreferencesDialog::on_checkForUpdatesButton_clicked() diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index ba2429da..0a7893dc 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -51,7 +51,7 @@ - 1 + 0 @@ -308,7 +308,7 @@ p, li { white-space: pre-wrap; } - <html><head/><body><p><span style=" font-weight:600;">This setting should be used with caution...</span> Switching it off comes with consequences involving accuracy of summary only days, as certain calculations only work properly provided summary only sessions that came from individual day records are kept together. </p><p><span style=" font-weight:600;">ResMed users:</span> Just because it seems natural to you and I that the 12 noon session restart should be in the previous day, does not mean ResMed's data agrees with us. The STF.edf summary index format has serious weaknesses that make doing this not a good idea.</p><p>This option exists to pacify those who don't care and want to see this &quot;fixed&quot; no matter the costs, but know it comes with a cost. If you keep your SD card in every night, and import at least once a week, and you won't see problems with this very often.</p></body></html> + <html><head/><body><p><span style=" font-weight:600;">This setting should be used with caution...</span> Switching it off comes with consequences involving accuracy of summary only days, as certain calculations only work properly provided summary only sessions that came from individual day records are kept together. </p><p><span style=" font-weight:600;">ResMed users:</span> Just because it seems natural to you and I that the 12 noon session restart should be in the previous day, does not mean ResMed's data agrees with us. The STF.edf summary index format has serious weaknesses that make doing this not a good idea.</p><p>This option exists to pacify those who don't care and want to see this &quot;fixed&quot; no matter the costs, but know it comes with a cost. If you keep your SD card in every night, and import at least once a week, you won't see problems with this very often.</p></body></html> Don't Split Summary Days (Warning: read the tooltip!) diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index 85c52a5f..de31d554 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -30,6 +30,10 @@ DEFINES += LOCK_RESMED_SESSIONS CONFIG += rtti +*-g++* { + QMAKE_CXXFLAGS += -no-unused-variable +} + #static { # CONFIG += static # QTPLUGIN += qsvg qgif qpng