From 127b34e6249d5bd8b49aaf19f12fc1c396dea654 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 4 Jun 2011 13:52:53 +1000 Subject: [PATCH] Unused variable cleanup --- SleepyHead.depend | 12 ++++----- libs/sleeplib/machine.cpp | 46 ++++++----------------------------- libs/sleeplib/prs1_loader.cpp | 2 +- version.h | 12 ++++----- 4 files changed, 21 insertions(+), 51 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index b3cae092..173a9367 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7831,7 +7831,7 @@ 1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h -1307153810 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h +1307158795 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h "SleepyHeadApp.h" @@ -7839,7 +7839,7 @@ "sleeplib/machine.h" "graphs/graph.h" -1307151648 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h +1307158904 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h @@ -7877,7 +7877,7 @@ -1307158621 /home/mark/projects/git/sleepyhead/version.h +1307159485 /home/mark/projects/git/sleepyhead/version.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7894,7 +7894,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307158620 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1307158870 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7928,7 +7928,7 @@ -1307156731 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp +1307159409 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp @@ -7962,7 +7962,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1307083014 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp +1307159494 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp diff --git a/libs/sleeplib/machine.cpp b/libs/sleeplib/machine.cpp index fe59245f..cd856c44 100644 --- a/libs/sleeplib/machine.cpp +++ b/libs/sleeplib/machine.cpp @@ -399,8 +399,6 @@ EventDataType Day::summary_sum(MachineCode code) EventDataType Day::summary_max(MachineCode code) { EventDataType val=0,tmp; - bool fir=true; - // Cache this? vector::iterator s; for (s=sessions.begin();s!=sessions.end();s++) { @@ -437,8 +435,6 @@ EventDataType Day::summary_min(MachineCode code) EventDataType Day::summary_avg(MachineCode code) { EventDataType val=0,tmp=0; - bool fir=true; - // Cache this? int cnt=0; vector::iterator s; @@ -551,11 +547,8 @@ EventDataType Day::sum(MachineCode code,int field) EventDataType Day::count(MachineCode code) { EventDataType val=0; - // Cache this? - vector::iterator s; - // Don't assume sessions are in order. - for (s=sessions.begin();s!=sessions.end();s++) { + for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); if (sess.events.find(code)!=sess.events.end()) { val+=sess.count_events(code); @@ -565,12 +558,8 @@ EventDataType Day::count(MachineCode code) } EventDataType Day::weighted_avg(MachineCode code,int field) { - double val=0; - - vector::iterator s; - double s0=0,s1=0,s2=0; - for (s=sessions.begin();s!=sessions.end();s++) { + for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); if (sess.events.find(code)!=sess.events.end()) { s0=sess.hours(); @@ -583,29 +572,19 @@ EventDataType Day::weighted_avg(MachineCode code,int field) } wxTimeSpan Day::total_time() { - //if (d_totaltime>wxTimeSpan::Seconds(0)) return d_totaltime; - - vector::iterator s; - d_totaltime=wxTimeSpan::Seconds(0); - for (s=sessions.begin();s!=sessions.end();s++) { + for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); d_totaltime+=sess.last()-sess.first(); - if (d_totaltime>wxTimeSpan::Hours(15)) { - int c=1; - } } return d_totaltime; } EventDataType Day::percentile(MachineCode code,int field,double percent) { double val=0; - // Cache this? int cnt=0; - vector::iterator s; - // Don't assume sessions are in order. - for (s=sessions.begin();s!=sessions.end();s++) { + for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); if (sess.events.find(code)!=sess.events.end()) { val+=sess.percentile(code,field,percent); @@ -622,11 +601,8 @@ const wxDateTime & Day::first(MachineCode code) static wxDateTime date; wxDateTime tmp; bool fir=true; - // Cache this? - vector::iterator s; - // Don't assume sessions are in order. - for (s=sessions.begin();s!=sessions.end();s++) { + for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); if (sess.events.find(code)!=sess.events.end()) { tmp=sess.events[code][0]->time(); @@ -643,17 +619,11 @@ const wxDateTime & Day::first(MachineCode code) const wxDateTime & Day::last(MachineCode code) { - size_t cnt; static wxDateTime date; wxDateTime tmp; bool fir=true; - // Cache this? - // Don't assume sessions are in order. - vector::iterator s; - ; - - for (s=sessions.begin();s!=sessions.end();s++) { + for (vector::iterator s=sessions.begin();s!=sessions.end();s++) { Session & sess=*(*s); if (sess.events.find(code)!=sess.events.end()) { vector::reverse_iterator i=sess.events[code].rbegin(); @@ -871,8 +841,8 @@ double Session::percentile(MachineCode mc,int field,double percent) double a=array[j-1]; double b=array[j]; if (a==b) return a; - double c=(b-a); - double d=c*q; + //double c=(b-a); + //double d=c*q; return array[j]+q; } diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp index 2d05cc22..da1afd79 100644 --- a/libs/sleeplib/prs1_loader.cpp +++ b/libs/sleeplib/prs1_loader.cpp @@ -101,7 +101,6 @@ bool PRS1Loader::Open(wxString & path,Profile *profile) wxString filename; bool cont=dir.GetFirst(&filename); - int c=0; while (cont) { if ((filename[0]=='P') && (isdigit(filename[1])) && (isdigit(filename[2]))) { SerialNumbers.push_back(filename); @@ -483,6 +482,7 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,time_t int cnt=0; while (pos