From 7ce407f6e9526f1978c3e46ddebf8794d82790be Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Thu, 17 Apr 2014 14:56:04 +1000
Subject: [PATCH] Cleanup some unused variable, Qt4 build fix

---
 sleepyhead/Graphs/gLineChart.cpp                     | 7 -------
 sleepyhead/SleepLib/day.cpp                          | 2 +-
 sleepyhead/SleepLib/loader_plugins/icon_loader.cpp   | 7 ++-----
 sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp   | 6 +++---
 sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp | 9 +--------
 sleepyhead/SleepLib/machine.cpp                      | 2 +-
 sleepyhead/daily.cpp                                 | 2 --
 sleepyhead/newprofile.h                              | 1 +
 sleepyhead/preferencesdialog.cpp                     | 2 +-
 sleepyhead/sessionbar.cpp                            | 2 +-
 10 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 877b9123..64b05577 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -68,9 +68,6 @@ void gLineChart::SetDay(Day *d)
         for (int i=0;i<d->size();i++) {
             Session *sess=d->getSessions()[i];
             if (!sess->channelExists(code)) continue;
-            if (code==CPAP_FLG) {
-                int i=5;
-            }
             if (first) {
                 m_miny=sess->Min(code);
                 m_maxy=sess->Max(code);
@@ -132,10 +129,6 @@ EventDataType gLineChart::Maxy()
 // Time Domain Line Chart
 void gLineChart::paint(gGraph & w,int left, int top, int width, int height)
 {
-
-    if (w.title()=="Flow Limit") {
-        int i=5;
-    }
     if (!m_visible)
         return;
 
diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp
index e84a555a..528de188 100644
--- a/sleepyhead/SleepLib/day.cpp
+++ b/sleepyhead/SleepLib/day.cpp
@@ -756,6 +756,6 @@ qint64 Day::last()
 void Day::removeSession(Session * sess)
 {
     if (sessions.removeAll(sess)<1) {
-        int i=5;
+//        int i=5;
     }
 }
diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
index 97a4c85c..1d4cbb39 100644
--- a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
@@ -168,8 +168,8 @@ int FPIconLoader::OpenMachine(Machine *mach, QString & path, Profile * profile)
     for (int i=0;i<flw.size();i++) {
         OpenFLW(mach,flw[i],profile);
     }
-    SessionID zz,sid;//,st;
-    float hours,dur,mins;
+    SessionID sid;//,st;
+    float hours,mins;
 
     qDebug() << "Last 20 Sessions";
 
@@ -379,7 +379,6 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
     }
 
     ti=qint64(ts)*1000L;
-    qint64 st=ti;
 
     EventStoreType pbuf[256];
 
@@ -437,8 +436,6 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
     EventDataType val;
     qint16 tmp;
 
-    bool corrupt=false;
-
     do {
         quint8 * p=buf;
         // Scan ahead looking for end of block, marked by ff ff
diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
index d99158f8..97e87c3e 100644
--- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
@@ -25,9 +25,9 @@
 
 
 const int PRS1_MAGIC_NUMBER=2;
-const int PRS1_SUMMARY_FILE=1;
-const int PRS1_EVENT_FILE=2;
-const int PRS1_WAVEFORM_FILE=5;
+//const int PRS1_SUMMARY_FILE=1;
+//const int PRS1_EVENT_FILE=2;
+//const int PRS1_WAVEFORM_FILE=5;
 
 
 //********************************************************************************************
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index 7f52e1e6..60f5802d 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -79,7 +79,7 @@ EDFParser::~EDFParser()
 }
 qint16 EDFParser::Read16()
 {
-    if ((pos + sizeof(qint16)) > filesize)
+    if ((pos + long(sizeof(qint16))) > filesize)
         return 0;
 
     qint16 res = *(qint16 *)&buffer[pos];
@@ -1237,9 +1237,6 @@ int ResmedLoader::Open(QString & path,Profile *profile)
             dif=sess->first()-stredf.startdate;
 
             dn=dif/86400000L;
-            if (dn>=days-2) {
-                int i=5;
-            }
             if ((dn>=0) && (dn<days)) {
                 sig=stredf.lookupSignal(CPAP_Mode);
                 if (sig) {
@@ -1260,7 +1257,6 @@ int ResmedLoader::Open(QString & path,Profile *profile)
                         // Kaart's data has -1 here.. Not sure what it means.
                         prmode=0;
                     } else if (prmode > sig->physical_maximum) {
-                        int i=5;
                         prmode=sig->physical_maximum;
                     }
                     // My VPAP (using EasyBreathe) and JM's Elite (using none) have 0
@@ -1963,9 +1959,6 @@ void ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal & es, Cha
                     }
                 }
                 tmp=EventDataType(c) * es.gain;
-                if (tmp<0) {
-                    int i=5;
-                }
                 if ((tmp >= t_min) && (tmp <= t_max)) {
                     if (tmp < min)
                         min=tmp;
diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp
index e9dc406b..24700355 100644
--- a/sleepyhead/SleepLib/machine.cpp
+++ b/sleepyhead/SleepLib/machine.cpp
@@ -243,7 +243,7 @@ bool Machine::Purge(int secret)
     return true;
 }
 
-const quint32 channel_version=1;
+//const quint32 channel_version=1;
 
 
 bool Machine::Load()
diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index a68aeda5..033ab50b 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -46,8 +46,6 @@
 //extern QProgressBar *qprogress;
 extern MainWindow * mainwin;
 
-const int min_height=150;
-
 Daily::Daily(QWidget *parent,gGraphView * shared)
     :QWidget(parent), ui(new Ui::Daily)
 {
diff --git a/sleepyhead/newprofile.h b/sleepyhead/newprofile.h
index e554933e..cc641c9f 100644
--- a/sleepyhead/newprofile.h
+++ b/sleepyhead/newprofile.h
@@ -13,6 +13,7 @@
 #define NEWPROFILE_H
 
 #include <QDialog>
+#include <QUrl>
 
 namespace Ui {
     class NewProfile;
diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp
index 3708494b..8cc2608c 100644
--- a/sleepyhead/preferencesdialog.cpp
+++ b/sleepyhead/preferencesdialog.cpp
@@ -806,7 +806,7 @@ void PreferencesDialog::on_resetGraphButton_clicked()
             continue;
 
         // Iterate over all contained graphs.
-        for (unsigned i = 0; i < view->size(); i++) {
+        for (int i = 0; i < view->size(); i++) {
             gGraph *g = (*view)[i];
             g->setRecMaxY(0); // FIXME: should be g->reset(), but need other patches to land.
             g->setRecMinY(0);
diff --git a/sleepyhead/sessionbar.cpp b/sleepyhead/sessionbar.cpp
index bf7324dc..cc57fff3 100644
--- a/sleepyhead/sessionbar.cpp
+++ b/sleepyhead/sessionbar.cpp
@@ -201,7 +201,7 @@ void SessionBar::paintEvent(QPaintEvent *)
         int len=L/1000L;
         int h=len/3600;
         int m=(len/60) % 60;
-        int s=len % 60;
+        //int s=len % 60;
 
         QString msg=QString("%1h %2m").arg((short)h,1,10,QChar('0')).arg((short)m,1,10,QChar('0'));//.arg((short)s,2,10,QChar('0'));
         //painter.setBrush(QBrush((*i).color);