diff --git a/3rdparty/quazip/quazip/unzip.c b/3rdparty/quazip/quazip/unzip.c index 86d0037b..bf518ec6 100644 --- a/3rdparty/quazip/quazip/unzip.c +++ b/3rdparty/quazip/quazip/unzip.c @@ -205,8 +205,8 @@ local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) voidpf filestream; uLong *pX; { - uLong x ; - int i; + uLong x; + int i=0; int err; err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -233,8 +233,8 @@ local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) voidpf filestream; uLong *pX; { - uLong x ; - int i; + uLong x; + int i=0; int err; err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -730,6 +730,7 @@ local int unzlocal_GetCurrentFileInfoInternal (file, else uSeek+=file_info.size_file_comment; + (void)uSeek; if ((err==UNZ_OK) && (pfile_info!=NULL)) *pfile_info=file_info; @@ -1117,8 +1118,10 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password) } if ((s->cur_file_info.compression_method!=0) && - (s->cur_file_info.compression_method!=Z_DEFLATED)) + (s->cur_file_info.compression_method!=Z_DEFLATED)) { err=UNZ_BADZIPFILE; + (void)err; //MW: Shuttup warnings + } pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc; pfile_in_zip_read_info->crc32=0; diff --git a/3rdparty/quazip/quazip/zip.c b/3rdparty/quazip/quazip/zip.c index 2a78ef86..649edad6 100644 --- a/3rdparty/quazip/quazip/zip.c +++ b/3rdparty/quazip/quazip/zip.c @@ -379,7 +379,7 @@ local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX) uLong *pX; { uLong x ; - int i; + int i=0; int err; err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -407,7 +407,7 @@ local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX) uLong *pX; { uLong x ; - int i; + int i=0; int err; err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -1077,8 +1077,10 @@ extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32) uLong uTotalOutBefore; if (zi->ci.stream.avail_out == 0) { - if (zipFlushWriteBuffer(zi) == ZIP_ERRNO) + if (zipFlushWriteBuffer(zi) == ZIP_ERRNO) { err = ZIP_ERRNO; + (void)err; //MW: Shuttup warnings + } zi->ci.stream.avail_out = (uInt)Z_BUFSIZE; zi->ci.stream.next_out = zi->ci.buffered_data; } diff --git a/README b/README index 20350793..3e0b9e7c 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ which are devices used in the treatment of Sleep Disorders like Obstructive Slee SleepyHead is written by Mark Watkins (aka Jedimark), an Australian software developer afflicted with sleep apnea. -SleepyHead is copyright (C) 2011-2016 Mark Watkins +SleepyHead is copyright (C) 2011-2018 Mark Watkins Requirements: ------------- diff --git a/sleepyhead/Graphs/MinutesAtPressure.cpp b/sleepyhead/Graphs/MinutesAtPressure.cpp index 42a62e4e..55c76cf6 100644 --- a/sleepyhead/Graphs/MinutesAtPressure.cpp +++ b/sleepyhead/Graphs/MinutesAtPressure.cpp @@ -1,6 +1,6 @@ /* MinutesAtPressure Graph Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/MinutesAtPressure.h b/sleepyhead/Graphs/MinutesAtPressure.h index de6d8fee..26e22e64 100644 --- a/sleepyhead/Graphs/MinutesAtPressure.h +++ b/sleepyhead/Graphs/MinutesAtPressure.h @@ -1,6 +1,6 @@ /* Minutes At Pressure Graph Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gFlagsLine.h b/sleepyhead/Graphs/gFlagsLine.h index 75352bce..c525c673 100644 --- a/sleepyhead/Graphs/gFlagsLine.h +++ b/sleepyhead/Graphs/gFlagsLine.h @@ -1,6 +1,6 @@ /* gFlagsLine Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gFooBar.cpp b/sleepyhead/Graphs/gFooBar.cpp index 71289fd2..3f9afe38 100644 --- a/sleepyhead/Graphs/gFooBar.cpp +++ b/sleepyhead/Graphs/gFooBar.cpp @@ -1,6 +1,6 @@ /* gFooBar Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gFooBar.h b/sleepyhead/Graphs/gFooBar.h index ab5a03c0..0d5410cc 100644 --- a/sleepyhead/Graphs/gFooBar.h +++ b/sleepyhead/Graphs/gFooBar.h @@ -1,6 +1,6 @@ /* gFooBar Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gGraph.h b/sleepyhead/Graphs/gGraph.h index c1a9d885..758e22eb 100644 --- a/sleepyhead/Graphs/gGraph.h +++ b/sleepyhead/Graphs/gGraph.h @@ -1,6 +1,6 @@ /* gGraph Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index 896acaed..e431573b 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -1,6 +1,6 @@ /* gGraphView Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp index 36cc69c1..27945bc9 100644 --- a/sleepyhead/Graphs/gLineChart.cpp +++ b/sleepyhead/Graphs/gLineChart.cpp @@ -1,6 +1,6 @@ /* gLineChart Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gLineChart.h b/sleepyhead/Graphs/gLineChart.h index 8f826acf..b71cb896 100644 --- a/sleepyhead/Graphs/gLineChart.h +++ b/sleepyhead/Graphs/gLineChart.h @@ -1,6 +1,6 @@ /* gLineChart Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gLineOverlay.cpp b/sleepyhead/Graphs/gLineOverlay.cpp index 0f900de8..43daac94 100644 --- a/sleepyhead/Graphs/gLineOverlay.cpp +++ b/sleepyhead/Graphs/gLineOverlay.cpp @@ -1,6 +1,6 @@ /* gLineOverlayBar Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gLineOverlay.h b/sleepyhead/Graphs/gLineOverlay.h index 988cb3e3..71523aed 100644 --- a/sleepyhead/Graphs/gLineOverlay.h +++ b/sleepyhead/Graphs/gLineOverlay.h @@ -1,6 +1,6 @@ /* gLineOverlayBar Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gSegmentChart.cpp b/sleepyhead/Graphs/gSegmentChart.cpp index aa76b872..a92ef36f 100644 --- a/sleepyhead/Graphs/gSegmentChart.cpp +++ b/sleepyhead/Graphs/gSegmentChart.cpp @@ -1,6 +1,6 @@ /* gSegmentChart Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gSegmentChart.h b/sleepyhead/Graphs/gSegmentChart.h index cb35c2cb..8f1f03e4 100644 --- a/sleepyhead/Graphs/gSegmentChart.h +++ b/sleepyhead/Graphs/gSegmentChart.h @@ -1,6 +1,6 @@ /* gSegmentChart Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gSessionTimesChart.cpp b/sleepyhead/Graphs/gSessionTimesChart.cpp index f28068e6..a1c0ec29 100644 --- a/sleepyhead/Graphs/gSessionTimesChart.cpp +++ b/sleepyhead/Graphs/gSessionTimesChart.cpp @@ -1,6 +1,6 @@ /* gSessionTimesChart Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gSessionTimesChart.h b/sleepyhead/Graphs/gSessionTimesChart.h index 148db904..19ab4112 100644 --- a/sleepyhead/Graphs/gSessionTimesChart.h +++ b/sleepyhead/Graphs/gSessionTimesChart.h @@ -1,6 +1,6 @@ /* gSessionTimesChart Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gStatsLine.cpp b/sleepyhead/Graphs/gStatsLine.cpp index 59665fc6..45ce4214 100644 --- a/sleepyhead/Graphs/gStatsLine.cpp +++ b/sleepyhead/Graphs/gStatsLine.cpp @@ -1,6 +1,6 @@ /* gStatsLine Implementation * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gStatsLine.h b/sleepyhead/Graphs/gStatsLine.h index ec0a1178..8781e073 100644 --- a/sleepyhead/Graphs/gStatsLine.h +++ b/sleepyhead/Graphs/gStatsLine.h @@ -1,6 +1,6 @@ /* gStatsLine * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gSummaryChart.cpp b/sleepyhead/Graphs/gSummaryChart.cpp index ca7924a3..ca894fd2 100644 --- a/sleepyhead/Graphs/gSummaryChart.cpp +++ b/sleepyhead/Graphs/gSummaryChart.cpp @@ -1,6 +1,6 @@ /* gSummaryChart Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gSummaryChart.h b/sleepyhead/Graphs/gSummaryChart.h index cf2101ed..d4d975f9 100644 --- a/sleepyhead/Graphs/gSummaryChart.h +++ b/sleepyhead/Graphs/gSummaryChart.h @@ -1,6 +1,6 @@ /* gSummaryChart Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gXAxis.cpp b/sleepyhead/Graphs/gXAxis.cpp index 8ccb97da..e6fc40b1 100644 --- a/sleepyhead/Graphs/gXAxis.cpp +++ b/sleepyhead/Graphs/gXAxis.cpp @@ -1,6 +1,6 @@ /* gXAxis Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gXAxis.h b/sleepyhead/Graphs/gXAxis.h index 80371252..8528d40b 100644 --- a/sleepyhead/Graphs/gXAxis.h +++ b/sleepyhead/Graphs/gXAxis.h @@ -1,6 +1,6 @@ /* gXAxis Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gYAxis.cpp b/sleepyhead/Graphs/gYAxis.cpp index 807d2b46..b45005c4 100644 --- a/sleepyhead/Graphs/gYAxis.cpp +++ b/sleepyhead/Graphs/gYAxis.cpp @@ -1,6 +1,6 @@ /* gYAxis Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gYAxis.h b/sleepyhead/Graphs/gYAxis.h index 69749f9d..30fb209a 100644 --- a/sleepyhead/Graphs/gYAxis.h +++ b/sleepyhead/Graphs/gYAxis.h @@ -1,6 +1,6 @@ /* gYAxis Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gdailysummary.h b/sleepyhead/Graphs/gdailysummary.h index 89cb3819..726a659c 100644 --- a/sleepyhead/Graphs/gdailysummary.h +++ b/sleepyhead/Graphs/gdailysummary.h @@ -1,6 +1,6 @@ /* gDailySummary Graph Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/glcommon.cpp b/sleepyhead/Graphs/glcommon.cpp index 7e883677..47320e38 100644 --- a/sleepyhead/Graphs/glcommon.cpp +++ b/sleepyhead/Graphs/glcommon.cpp @@ -1,6 +1,6 @@ /* glcommon GL code & font stuff * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/glcommon.h b/sleepyhead/Graphs/glcommon.h index 5c3351b7..5c7791a5 100644 --- a/sleepyhead/Graphs/glcommon.h +++ b/sleepyhead/Graphs/glcommon.h @@ -1,6 +1,6 @@ /* glcommon GL code & font stuff Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gspacer.cpp b/sleepyhead/Graphs/gspacer.cpp index 968e1b83..2bbccb8e 100644 --- a/sleepyhead/Graphs/gspacer.cpp +++ b/sleepyhead/Graphs/gspacer.cpp @@ -1,6 +1,6 @@ /* graph spacer Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/gspacer.h b/sleepyhead/Graphs/gspacer.h index 54c98de3..48ffff13 100644 --- a/sleepyhead/Graphs/gspacer.h +++ b/sleepyhead/Graphs/gspacer.h @@ -1,6 +1,6 @@ /* graph spacer Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/layer.cpp b/sleepyhead/Graphs/layer.cpp index 4fdf291f..2b8bb955 100644 --- a/sleepyhead/Graphs/layer.cpp +++ b/sleepyhead/Graphs/layer.cpp @@ -1,6 +1,6 @@ /* Graph Layer Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/Graphs/layer.h b/sleepyhead/Graphs/layer.h index fbdc9608..d744d6eb 100644 --- a/sleepyhead/Graphs/layer.h +++ b/sleepyhead/Graphs/layer.h @@ -1,6 +1,6 @@ /* Graph Layer Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/calcs.cpp b/sleepyhead/SleepLib/calcs.cpp index 213049c0..d00bcbb2 100644 --- a/sleepyhead/SleepLib/calcs.cpp +++ b/sleepyhead/SleepLib/calcs.cpp @@ -1,6 +1,6 @@ /* Custom CPAP/Oximetry Calculations Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/calcs.h b/sleepyhead/SleepLib/calcs.h index c7342550..c0aefbbd 100644 --- a/sleepyhead/SleepLib/calcs.h +++ b/sleepyhead/SleepLib/calcs.h @@ -1,6 +1,6 @@ /* Custom CPAP/Oximetry Calculations Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h index 10cca4fe..004b15f3 100644 --- a/sleepyhead/SleepLib/common.h +++ b/sleepyhead/SleepLib/common.h @@ -1,6 +1,6 @@ /* Common code and junk * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/day.h b/sleepyhead/SleepLib/day.h index b13e752e..80189d88 100644 --- a/sleepyhead/SleepLib/day.h +++ b/sleepyhead/SleepLib/day.h @@ -1,6 +1,6 @@ /* SleepLib Day Class Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/event.h b/sleepyhead/SleepLib/event.h index 558911bf..e3bc3ea4 100644 --- a/sleepyhead/SleepLib/event.h +++ b/sleepyhead/SleepLib/event.h @@ -1,6 +1,6 @@ /* SleepLib Event Class Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/journal.cpp b/sleepyhead/SleepLib/journal.cpp index 839ad2c5..ab42779f 100644 --- a/sleepyhead/SleepLib/journal.cpp +++ b/sleepyhead/SleepLib/journal.cpp @@ -1,6 +1,6 @@ /* SleepLib Journal Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/journal.h b/sleepyhead/SleepLib/journal.h index 85f9fc79..430d520c 100644 --- a/sleepyhead/SleepLib/journal.h +++ b/sleepyhead/SleepLib/journal.h @@ -1,6 +1,6 @@ /* SleepLib Journal Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp index 64bb71ad..c1c3ec9f 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib CMS50X Loader Implementation * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/cms50_loader.h b/sleepyhead/SleepLib/loader_plugins/cms50_loader.h index 7726d199..8ab7a787 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/cms50_loader.h @@ -1,6 +1,6 @@ /* SleepLib CMS50X Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp index 5d1a1836..b21e2a38 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib CMS50X Loader Implementation * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h index 28e7ec2b..31ce3bae 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h @@ -1,6 +1,6 @@ /* SleepLib CMS50X Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp index 2487cca8..d52c5e61 100644 --- a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib Fisher & Paykel Icon Loader Implementation * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.h b/sleepyhead/SleepLib/loader_plugins/icon_loader.h index 43c6fffc..88c64e25 100644 --- a/sleepyhead/SleepLib/loader_plugins/icon_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.h @@ -1,6 +1,6 @@ /* SleepLib Fisher & Paykel Icon Loader Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp index f5452c88..9025fc1d 100644 --- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp @@ -1,8 +1,8 @@ /* SleepLib (DeVilbiss) Intellipap Loader Implementation * - * Notes: Intellipap requires the SmartLink attachment to access this data. + * Notes: Intellipap DV54 requires the SmartLink attachment to access this data. * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h index 99fe89f1..55652c2d 100644 --- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h @@ -1,6 +1,6 @@ /* Intellipap Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/md300w1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/md300w1_loader.cpp index 49b0d73a..ae67cec3 100644 --- a/sleepyhead/SleepLib/loader_plugins/md300w1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/md300w1_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib ChoiceMMed MD300W1 Oximeter Loader Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/md300w1_loader.h b/sleepyhead/SleepLib/loader_plugins/md300w1_loader.h index 00645556..63e7c1cd 100644 --- a/sleepyhead/SleepLib/loader_plugins/md300w1_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/md300w1_loader.h @@ -1,6 +1,6 @@ /* SleepLib ChoiceMMed MD300W1 Oximeter Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp b/sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp index 2ff1ab28..23f643cb 100644 --- a/sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib RemStar M-Series Loader Implementation * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux @@ -332,7 +332,7 @@ int MSeriesLoader::Open(QString path) } while (cb < endcard && !done); } while (cb < endcard && !done); - done = false; + // done = false; //bool first=true; //quint8 exch; cnt = 0; @@ -341,7 +341,7 @@ int MSeriesLoader::Open(QString path) u1 = cb[0] << 8 | cb[1]; if (u1 != 0xfe0b) { - done = true; + // done = true; break; } diff --git a/sleepyhead/SleepLib/loader_plugins/mseries_loader.h b/sleepyhead/SleepLib/loader_plugins/mseries_loader.h index d5601920..1dbd767c 100644 --- a/sleepyhead/SleepLib/loader_plugins/mseries_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/mseries_loader.h @@ -3,7 +3,7 @@ * * SleepLib RemStar M-Series Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index a3edb130..05291fa2 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib PRS1 Loader Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h index 328c63ed..ff240206 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h @@ -1,6 +1,6 @@ /* SleepLib PRS1 Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index 4c4a06fd..74aa26ab 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib ResMed Loader Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux @@ -2932,20 +2932,21 @@ void ResmedLoader::ToTimeDelta(Session *sess, EDFParser &edf, EDFSignal &es, Cha } #ifdef DEBUG_EFFICIENCY - qint64 t = time.nsecsElapsed(); - int cnt = el->count(); - int bytes = cnt * (sizeof(EventStoreType) + sizeof(quint32)); - int wvbytes = recs * (sizeof(EventStoreType)); - QHash::iterator it = channel_efficiency.find(code); + if (el != nullptr) { + qint64 t = time.nsecsElapsed(); + int cnt = el->count(); + int bytes = cnt * (sizeof(EventStoreType) + sizeof(quint32)); + int wvbytes = recs * (sizeof(EventStoreType)); + QHash::iterator it = channel_efficiency.find(code); - if (it == channel_efficiency.end()) { - channel_efficiency[code] = wvbytes - bytes; - channel_time[code] = t; - } else { - it.value() += wvbytes - bytes; - channel_time[code] += t; + if (it == channel_efficiency.end()) { + channel_efficiency[code] = wvbytes - bytes; + channel_time[code] = t; + } else { + it.value() += wvbytes - bytes; + channel_time[code] += t; + } } - #endif } diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.h b/sleepyhead/SleepLib/loader_plugins/resmed_loader.h index a010c7e4..c51037e8 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.h @@ -1,6 +1,6 @@ /* SleepLib RESMED Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp b/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp index cfb3f9e9..52d65c52 100644 --- a/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib Somnopose Loader Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2016 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/somnopose_loader.h b/sleepyhead/SleepLib/loader_plugins/somnopose_loader.h index d70261e5..7c9de809 100644 --- a/sleepyhead/SleepLib/loader_plugins/somnopose_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/somnopose_loader.h @@ -1,6 +1,6 @@ /* SleepLib Somnopose Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp index f4a6cf60..d0364b42 100644 --- a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib Weinmann SOMNOsoft/Balance Loader Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.h b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.h index 0cbb88ca..9ef6761f 100644 --- a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.h @@ -1,6 +1,6 @@ /* SleepLib Weinmann SOMNOsoft/Balance Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/zeo_loader.cpp b/sleepyhead/SleepLib/loader_plugins/zeo_loader.cpp index 0a19b120..0a1598b3 100644 --- a/sleepyhead/SleepLib/loader_plugins/zeo_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/zeo_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib ZEO Loader Implementation * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/loader_plugins/zeo_loader.h b/sleepyhead/SleepLib/loader_plugins/zeo_loader.h index e373d489..9a8c60b0 100644 --- a/sleepyhead/SleepLib/loader_plugins/zeo_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/zeo_loader.h @@ -1,6 +1,6 @@ /* SleepLib ZEO Loader Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp index f2f27f0e..d3170ba4 100644 --- a/sleepyhead/SleepLib/machine.cpp +++ b/sleepyhead/SleepLib/machine.cpp @@ -1,6 +1,6 @@ /* SleepLib Machine Class Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/machine.h b/sleepyhead/SleepLib/machine.h index 1f634dcf..835b1326 100644 --- a/sleepyhead/SleepLib/machine.h +++ b/sleepyhead/SleepLib/machine.h @@ -1,6 +1,6 @@ /* SleepLib Machine Class Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/machine_common.cpp b/sleepyhead/SleepLib/machine_common.cpp index ea1c3117..1aead6bd 100644 --- a/sleepyhead/SleepLib/machine_common.cpp +++ b/sleepyhead/SleepLib/machine_common.cpp @@ -1,6 +1,6 @@ /* SleepLib Common Machine Stuff * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/machine_common.h b/sleepyhead/SleepLib/machine_common.h index 2fcdc24b..8bc92a9a 100644 --- a/sleepyhead/SleepLib/machine_common.h +++ b/sleepyhead/SleepLib/machine_common.h @@ -1,6 +1,6 @@ /* SleepLib Common Machine Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/machine_loader.cpp b/sleepyhead/SleepLib/machine_loader.cpp index ccc6055e..a8fc838f 100644 --- a/sleepyhead/SleepLib/machine_loader.cpp +++ b/sleepyhead/SleepLib/machine_loader.cpp @@ -1,6 +1,6 @@ /* SleepLib Machine Loader Class Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/preferences.cpp b/sleepyhead/SleepLib/preferences.cpp index b988f13c..d026696c 100644 --- a/sleepyhead/SleepLib/preferences.cpp +++ b/sleepyhead/SleepLib/preferences.cpp @@ -1,6 +1,6 @@ /* SleepLib Preferences Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index 5b9b9afa..6180c072 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -1,6 +1,6 @@ /* SleepLib Profiles Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h index b365a753..26a382d8 100644 --- a/sleepyhead/SleepLib/profiles.h +++ b/sleepyhead/SleepLib/profiles.h @@ -1,6 +1,6 @@ /* SleepLib Profiles Header * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/progressdialog.cpp b/sleepyhead/SleepLib/progressdialog.cpp index f695a067..3902cb27 100644 --- a/sleepyhead/SleepLib/progressdialog.cpp +++ b/sleepyhead/SleepLib/progressdialog.cpp @@ -1,6 +1,6 @@ /* SleepLib Progress Dialog Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/progressdialog.h b/sleepyhead/SleepLib/progressdialog.h index 0f1983c2..a3e6a2d6 100644 --- a/sleepyhead/SleepLib/progressdialog.h +++ b/sleepyhead/SleepLib/progressdialog.h @@ -1,6 +1,6 @@ /* SleepLib Progress Dialog Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/schema.cpp b/sleepyhead/SleepLib/schema.cpp index 5ca366f8..9ca8d6d0 100644 --- a/sleepyhead/SleepLib/schema.cpp +++ b/sleepyhead/SleepLib/schema.cpp @@ -1,6 +1,6 @@ /* Channel / Schema Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/schema.h b/sleepyhead/SleepLib/schema.h index c09f45ed..b872d188 100644 --- a/sleepyhead/SleepLib/schema.h +++ b/sleepyhead/SleepLib/schema.h @@ -1,6 +1,6 @@ /* Schema Header (Parse Channel XML data) * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/serialoximeter.cpp b/sleepyhead/SleepLib/serialoximeter.cpp index 79cf3da4..09d979b4 100644 --- a/sleepyhead/SleepLib/serialoximeter.cpp +++ b/sleepyhead/SleepLib/serialoximeter.cpp @@ -1,6 +1,6 @@ /* SleepLib Machine Loader Class Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/serialoximeter.h b/sleepyhead/SleepLib/serialoximeter.h index 84fbb2c3..40b1ede2 100644 --- a/sleepyhead/SleepLib/serialoximeter.h +++ b/sleepyhead/SleepLib/serialoximeter.h @@ -1,6 +1,6 @@ /* SleepLib MachineLoader Base Class Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index 5daaef84..1a7edd65 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -1,7 +1,7 @@ /* SleepLib Session Implementation * This stuff contains the base calculation smarts * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/SleepLib/session.h b/sleepyhead/SleepLib/session.h index c11e6830..682d7913 100644 --- a/sleepyhead/SleepLib/session.h +++ b/sleepyhead/SleepLib/session.h @@ -2,7 +2,7 @@ * * This stuff contains the session calculation smarts * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/UpdaterWindow.cpp b/sleepyhead/UpdaterWindow.cpp index 90217bc7..e2f4ae89 100644 --- a/sleepyhead/UpdaterWindow.cpp +++ b/sleepyhead/UpdaterWindow.cpp @@ -1,6 +1,6 @@ /* UpdaterWindow * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/UpdaterWindow.h b/sleepyhead/UpdaterWindow.h index c57601a9..1d5f9e66 100644 --- a/sleepyhead/UpdaterWindow.h +++ b/sleepyhead/UpdaterWindow.h @@ -1,6 +1,6 @@ /* UpdaterWindow * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/common_gui.cpp b/sleepyhead/common_gui.cpp index 940b1d9c..633b2d0d 100644 --- a/sleepyhead/common_gui.cpp +++ b/sleepyhead/common_gui.cpp @@ -1,6 +1,6 @@ /* Common GUI Functions Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/common_gui.h b/sleepyhead/common_gui.h index ae00ce19..f1a7dcb4 100644 --- a/sleepyhead/common_gui.h +++ b/sleepyhead/common_gui.h @@ -1,6 +1,6 @@ /* Common GUI Functions Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 5d2d5c96..8ce2aa20 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -1,6 +1,6 @@ /* Daily Panel * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h index 8e19bdaa..c1a5bbe0 100644 --- a/sleepyhead/daily.h +++ b/sleepyhead/daily.h @@ -1,6 +1,6 @@ /* Daily GUI Headers * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/exportcsv.cpp b/sleepyhead/exportcsv.cpp index 49fb2fbc..a244b86f 100644 --- a/sleepyhead/exportcsv.cpp +++ b/sleepyhead/exportcsv.cpp @@ -1,6 +1,6 @@ /* ExportCSV module implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/exportcsv.h b/sleepyhead/exportcsv.h index 95217e15..72ebd6db 100644 --- a/sleepyhead/exportcsv.h +++ b/sleepyhead/exportcsv.h @@ -1,6 +1,6 @@ /* ExportCSV Module Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/logger.cpp b/sleepyhead/logger.cpp index a19cba6f..e06eb4c5 100644 --- a/sleepyhead/logger.cpp +++ b/sleepyhead/logger.cpp @@ -1,6 +1,6 @@ /* SleepyHead Logger module implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp index ef01a5a9..8256dbc8 100644 --- a/sleepyhead/main.cpp +++ b/sleepyhead/main.cpp @@ -1,6 +1,6 @@ /* SleepyHead Main * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 31796be9..6165980b 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -1,6 +1,6 @@ /* SleepyHead MainWindow Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index 58130630..811aa833 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -1,6 +1,6 @@ /* SleepyHead MainWindow Headers * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/newprofile.cpp b/sleepyhead/newprofile.cpp index f3830e0f..d93a5cbf 100644 --- a/sleepyhead/newprofile.cpp +++ b/sleepyhead/newprofile.cpp @@ -1,6 +1,6 @@ /* Create New Profile Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/newprofile.h b/sleepyhead/newprofile.h index 8ea0b107..cd95115b 100644 --- a/sleepyhead/newprofile.h +++ b/sleepyhead/newprofile.h @@ -1,6 +1,6 @@ /* Create New Profile Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp index e336cc3b..962afe9e 100644 --- a/sleepyhead/overview.cpp +++ b/sleepyhead/overview.cpp @@ -1,6 +1,6 @@ /* Overview GUI Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/overview.h b/sleepyhead/overview.h index e86888d8..aa6f727b 100644 --- a/sleepyhead/overview.h +++ b/sleepyhead/overview.h @@ -1,6 +1,6 @@ /* Overview GUI Headers * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp index 935e44e3..11cb305b 100644 --- a/sleepyhead/oximeterimport.cpp +++ b/sleepyhead/oximeterimport.cpp @@ -1,6 +1,6 @@ /* Oximeter Import Wizard Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index 4ea1ef7c..499683bc 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -1,6 +1,6 @@ /* SleepyHead Preferences Dialog Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/preferencesdialog.h b/sleepyhead/preferencesdialog.h index e975cf4f..22d676be 100644 --- a/sleepyhead/preferencesdialog.h +++ b/sleepyhead/preferencesdialog.h @@ -1,6 +1,6 @@ /* SleepyHead Preferences Dialog Headers * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/profileselect.cpp b/sleepyhead/profileselect.cpp index 2dd08857..f4e36075 100644 --- a/sleepyhead/profileselect.cpp +++ b/sleepyhead/profileselect.cpp @@ -1,6 +1,6 @@ /* Profile Select Implementation (Login Screen) * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/profileselect.h b/sleepyhead/profileselect.h index 69bf3687..070358bb 100644 --- a/sleepyhead/profileselect.h +++ b/sleepyhead/profileselect.h @@ -1,6 +1,6 @@ /* Profile Select Header (Login Screen) * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/reports.cpp b/sleepyhead/reports.cpp index 708ad7ea..39c23352 100644 --- a/sleepyhead/reports.cpp +++ b/sleepyhead/reports.cpp @@ -1,6 +1,6 @@ /* Reports/Printing Module * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/reports.h b/sleepyhead/reports.h index 0d6bc465..eb8e8aac 100644 --- a/sleepyhead/reports.h +++ b/sleepyhead/reports.h @@ -1,6 +1,6 @@ /* Reports Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/sessionbar.cpp b/sleepyhead/sessionbar.cpp index d71880c7..b0e1eb0b 100644 --- a/sleepyhead/sessionbar.cpp +++ b/sleepyhead/sessionbar.cpp @@ -1,6 +1,6 @@ /* SessionBar Graph Implementation * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/sessionbar.h b/sleepyhead/sessionbar.h index c2d3aaa3..8092bb69 100644 --- a/sleepyhead/sessionbar.h +++ b/sleepyhead/sessionbar.h @@ -1,6 +1,6 @@ /* SessionBar Graph Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index cc2f2678..41135de3 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -1,6 +1,6 @@ /* Statistics Report Generator Implementation * - * Copyright (c) 2011 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/statistics.h b/sleepyhead/statistics.h index 744fd429..8cef1f57 100644 --- a/sleepyhead/statistics.h +++ b/sleepyhead/statistics.h @@ -1,6 +1,6 @@ /* Statistics Report Generator Header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/translation.cpp b/sleepyhead/translation.cpp index 24637e91..8822f754 100644 --- a/sleepyhead/translation.cpp +++ b/sleepyhead/translation.cpp @@ -1,6 +1,6 @@ /* Multilingual Support files * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/translation.h b/sleepyhead/translation.h index 2a02378e..75900ca9 100644 --- a/sleepyhead/translation.h +++ b/sleepyhead/translation.h @@ -1,6 +1,6 @@ /* Multilingual Support header * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/updateparser.cpp b/sleepyhead/updateparser.cpp index 42fad337..3885d1e4 100644 --- a/sleepyhead/updateparser.cpp +++ b/sleepyhead/updateparser.cpp @@ -1,6 +1,6 @@ /* UpdateParser Implementation (Autoupdater component) * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/updateparser.h b/sleepyhead/updateparser.h index 07664dcd..008ec5ac 100644 --- a/sleepyhead/updateparser.h +++ b/sleepyhead/updateparser.h @@ -1,6 +1,6 @@ /* UpdateParser Header (Autoupdater component) * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/version.h b/sleepyhead/version.h index 80115ff7..7a8f379d 100644 --- a/sleepyhead/version.h +++ b/sleepyhead/version.h @@ -1,9 +1,6 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * vim: set ts=8 sts=4 et sw=4 tw=99: +/* Version.h * - * Version - * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux diff --git a/sleepyhead/welcome.cpp b/sleepyhead/welcome.cpp index e2a7915f..97fec947 100644 --- a/sleepyhead/welcome.cpp +++ b/sleepyhead/welcome.cpp @@ -1,6 +1,6 @@ /* Welcome Page Implementation * - * Copyright (c) 2011-2016 Mark Watkins + * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux @@ -125,13 +125,13 @@ QString GenerateWelcomeHTML() QDate date = p_profile->LastDay(MT_CPAP); Day *day = p_profile->GetDay(date, MT_CPAP); + Machine * cpap = nullptr; if (havecpapdata && day) { - QString cpapimage = ""; + cpap = day->machine(MT_CPAP); + } + if (day && (cpap != nullptr)) { + QString cpapimage = "qrc"+cpap->getPixmapPath(); - Machine * cpap = day->machine(MT_CPAP); - if (cpap) { - cpapimage = "qrc"+cpap->getPixmapPath(); - } html += "

"; html+="		"+