Attachment #555322 for bug #634792

View | Details | Raw Unified | Return to bug 634792
Collapse All | Expand All

Lines 205-211 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/profileselect.cpp (-1 / +1 lines)
205	if (confirmdlg.exec() != QDialog::Accepted)	205	if (confirmdlg.exec() != QDialog::Accepted)
206	return;	206	return;
207		207
208	if (lineedit.text().compare("DELETE")!=0) {	208	if (lineedit.text().compare(QLatin1String("DELETE"))!=0) {
209	QMessageBox::information(NULL, tr("Sorry"), tr("You need to enter DELETE in capital letters."), QMessageBox::Ok);	209	QMessageBox::information(NULL, tr("Sorry"), tr("You need to enter DELETE in capital letters."), QMessageBox::Ok);
210	return;	210	return;
211	}	211	}





    // Cheating using path for two serial oximetry modes

    if (path.compare(QLatin1String("import")) == 0) {
        serial.clear();

        sequence = 0;

        setStatus(IMPORTING);

        return 1;
    } else if (path.compare(QLatin1String("live")) == 0) {
        return 0;
    }
    QString ext = path.section(".",1);
    if ((ext.compare(QLatin1String("spo2"), Qt::CaseInsensitive)==0) || (ext.compare(QLatin1String("spo"), Qt::CaseInsensitive)==0) || (ext.compare(QLatin1String("spor"), Qt::CaseInsensitive)==0)) {
        // try to read and process SpoR file..
        return readSpoRFile(path) ? 1 : 0;
    }


    bool spo2header = false;
    QString ext = path.section('.', -1);
    if (ext.compare(QLatin1String("spo2"),Qt::CaseInsensitive) == 0) {
        spo2header = true;
    }






    // Cheating using path for two serial oximetry modes

    if (path.compare(QLatin1String("import")) == 0) {
        for (int i=0; i<5; ++i) {
            resetDevice();
            serial.flush();

        startTimer.stop();
        startImportTimeout();
        return 1;
    } else if (path.compare(QLatin1String("live")) == 0) {
        for (int i=0; i<5; ++i) {
            resetDevice();
            serial.flush();

        return 1;
    }
    QString ext = path.section(".",1);
    if ((ext.compare(QLatin1String("spo2"), Qt::CaseInsensitive)==0) || (ext.compare(QLatin1String("spo"), Qt::CaseInsensitive)==0) || (ext.compare(QLatin1String("spor"), Qt::CaseInsensitive)==0)) {
        // try to read and process SpoR file..
        return readSpoRFile(path) ? 1 : 0;
    }


    bool spo2header = false;
    QString ext = path.section('.', -1);
    if (ext.compare(QLatin1String("spo2"),Qt::CaseInsensitive) == 0) {
        spo2header = true;
    }






    // Cheating using path for two serial oximetry modes

    if (path.compare(QLatin1String("import")) == 0) {
        setStatus(IMPORTING);

        startTimer.stop();
        startImportTimeout();
        return 1;
    } else if (path.compare(QLatin1String("live")) == 0) {
        m_startTime = oxitime = QDateTime::currentDateTime();
        setStatus(LIVE);
        return 1;
    }
    QString ext = path.section(".",1);
    if (ext.compare(QLatin1String("dat"), Qt::CaseInsensitive)==0) {
        // try to read and process SpoR file..
        return readDATFile(path) ? 1 : 0;
    }

Lines 530-538 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp (-2 / +2 lines)
530	// Error files..	530	// Error files..
531	// Reminder: I have been given some info about these. should check it over.	531	// Reminder: I have been given some info about these. should check it over.
532	}	532	}
533	} else if (filename.compare("properties.txt",Qt::CaseInsensitive) == 0) {	533	} else if (filename.compare(QLatin1String("properties.txt"),Qt::CaseInsensitive) == 0) {
534	propertyfile = fi.canonicalFilePath();	534	propertyfile = fi.canonicalFilePath();
535	} else if (filename.compare("PROP.TXT",Qt::CaseInsensitive) == 0) {	535	} else if (filename.compare(QLatin1String("PROP.TXT"),Qt::CaseInsensitive) == 0) {
536	sessionid_base = 16;	536	sessionid_base = 16;
537	propertyfile = fi.canonicalFilePath();	537	propertyfile = fi.canonicalFilePath();
538	}	538	}




    int hdr_size = headers.size();

    for (int i = 0; i < hdr_size; i++) {
        if (headers.at(i).compare(QLatin1String("timestamp"), Qt::CaseInsensitive) == 0) {
            col_timestamp = i;
        }

        if (headers.at(i).compare(QLatin1String("inclination"), Qt::CaseInsensitive) == 0) {
            col_inclination = i;
        }

        if (headers.at(i).compare(QLatin1String("orientation"), Qt::CaseInsensitive) == 0) {
            col_orientation = i;
        }
    }

Lines 900-906 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/SleepLib/machine.cpp (-1 / +1 lines)
900		900
901	QDomElement root = doc.documentElement();	901	QDomElement root = doc.documentElement();
902		902
903	if (root.tagName().compare("sessions", Qt::CaseInsensitive) != 0) {	903	if (root.tagName().compare(QLatin1String("sessions"), Qt::CaseInsensitive) != 0) {
904	qDebug() << "Summaries cache messed up, recreating...";	904	qDebug() << "Summaries cache messed up, recreating...";
905	return false;	905	return false;
906	}	906	}





    StatCalcType lookupCalc(QString calc)
    {
        if (calc.compare(QLatin1String("avg"),Qt::CaseInsensitive)==0) {
            return SC_AVG;
        } else if (calc.compare(QLatin1String("w-avg"),Qt::CaseInsensitive)==0) {
            return SC_WAVG;
        } else if (calc.compare(QLatin1String("median"),Qt::CaseInsensitive)==0) {
            return SC_MEDIAN;
        } else if (calc.compare(QLatin1String("90%"),Qt::CaseInsensitive)==0) {
            return SC_90P;
        } else if (calc.compare(QLatin1String("min"), Qt::CaseInsensitive)==0) {
            return SC_MIN;
        } else if (calc.compare(QLatin1String("max"), Qt::CaseInsensitive)==0) {
            return SC_MAX;
        } else if (calc.compare(QLatin1String("cph"), Qt::CaseInsensitive)==0) {
            return SC_CPH;
        } else if (calc.compare(QLatin1String("sph"), Qt::CaseInsensitive)==0) {
            return SC_SPH;
        } else if (calc.compare(QLatin1String("ahi"), Qt::CaseInsensitive)==0) {
            return SC_AHI;
        } else if (calc.compare(QLatin1String("hours"), Qt::CaseInsensitive)==0) {
            return SC_HOURS;
        } else if (calc.compare(QLatin1String("compliance"), Qt::CaseInsensitive)==0) {
            return SC_COMPLIANCE;
        } else if (calc.compare(QLatin1String("days"), Qt::CaseInsensitive)==0) {
            return SC_DAYS;
        } else if (calc.compare(QLatin1String("heading"), Qt::CaseInsensitive)==0) {
            return SC_HEADING;
        } else if (calc.compare(QLatin1String("subheading"), Qt::CaseInsensitive)==0) {
            return SC_SUBHEADING;
        }
        return SC_UNDEFINED;

    {
        if (type.compare("cpap", Qt::CaseInsensitive)==0) {
            return MT_CPAP;
        } else if (type.compare(QLatin1String("oximeter"), Qt::CaseInsensitive)==0) {
            return MT_OXIMETER;
        } else if (type.compare(QLatin1String("sleepstage"), Qt::CaseInsensitive)==0) {
            return MT_SLEEPSTAGE;
        }
        return MT_UNKNOWN;




    Q_ASSERT(xml.isStartElement() && xml.name() == "Updates");

    while (xml.readNextStartElement()) {
        if (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)==0) {
            readPackageUpdate();
        } else {
            qDebug() << "Skipping Updates.xml tag" << xml.name();


void UpdatesParser::readPackageUpdate()
{
    Q_ASSERT(xml.isStartElement() && (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)==0));
    package = PackageUpdate();

    while (xml.readNextStartElement()) {
        if (xml.name().compare(QLatin1String("Name"),Qt::CaseInsensitive)==0) {
            package.name = xml.readElementText().toLower();
        } else if (xml.name().compare(QLatin1String("DisplayName"),Qt::CaseInsensitive)==0) {
            package.displayName = xml.readElementText();
        } else if (xml.name().compare(QLatin1String("Description"),Qt::CaseInsensitive)==0) {
            package.description = xml.readElementText();
        } else if (xml.name().compare(QLatin1String("Version"),Qt::CaseInsensitive)==0) {
            package.versionString = xml.readElementText();
        } else if (xml.name().compare(QLatin1String("ReleaseDate"),Qt::CaseInsensitive)==0) {
            package.releaseDate = QDate().fromString(xml.readElementText(), "yyyy-MM-dd");
        } else if (xml.name().compare(QLatin1String("Default"),Qt::CaseInsensitive)==0) {
            package.defaultInstall = xml.readElementText().compare("true") == 0;
        } else if (xml.name().compare(QLatin1String("ForcedInstallation"),Qt::CaseInsensitive)==0) {
            package.forcedInstall = xml.readElementText().compare("true") == 0;
        } else if (xml.name().compare(QLatin1String("Script"),Qt::CaseInsensitive)==0) {
            package.script = xml.readElementText();
        } else if (xml.name().compare(QLatin1String("Dependencies"),Qt::CaseInsensitive)==0) {
            package.dependencies = xml.readElementText().split(",");
        } else if (xml.name().compare(QLatin1String("UpdateFile"),Qt::CaseInsensitive)==0) {
            for (int i=0; i<xml.attributes().size(); ++i) {
                const QXmlStreamAttribute & at = xml.attributes().at(i);
                if (at.name().compare(QLatin1String("CompressedSize"), Qt::CaseInsensitive)==0) {
                    package.compressedSize = at.value().toLong();
                } else if (at.name().compare(QLatin1String("UncompressedSize"),Qt::CaseInsensitive)==0) {
                    package.uncompressedSize = at.value().toLong();
                } else if (at.name().compare(QLatin1String("OS"),Qt::CaseInsensitive)==0) {
                    package.os = at.value().toString();
                }
            }
            xml.skipCurrentElement();
        } else if (xml.name().compare(QLatin1String("DownloadableArchives"))==0) {
            package.downloadArchives = xml.readElementText().split(",");
        } else if (xml.name().compare(QLatin1String("Licenses"),Qt::CaseInsensitive)==0) {
           while (xml.readNextStartElement()) {
                if (xml.name().compare(QLatin1String("License"),Qt::CaseInsensitive)==0) {
                    QString name;
                    QString file;
                    for (int i=0; i<xml.attributes().size(); ++i) {
                        const QXmlStreamAttribute & at = xml.attributes().at(i);
                        if (at.name().compare(QLatin1String("name"), Qt::CaseInsensitive)==0) {
                            name = at.value().toString();
                        } else if (at.name().compare(QLatin1String("file"),Qt::CaseInsensitive)==0) {
                            file = at.value().toString();
                        }
                    }

                     xml.skipCurrentElement();
                }
            }
        } else if (xml.name().compare(QLatin1String("SHA1"),Qt::CaseInsensitive)==0) {
            package.sha1 = xml.readElementText();
        } else {
            qDebug() << "UP Skipping Updates.xml tag" << xml.name();

Lines 279-288 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/UpdaterWindow.cpp (-4 / +4 lines)
279	return v;	279	return v;
280	}	280	}
281		281
282	if (statusstr.compare("testing", Qt::CaseInsensitive) == 0) return 0;	282	if (statusstr.compare(QLatin1String("testing"), Qt::CaseInsensitive) == 0) return 0;
283	else if (statusstr.compare("beta", Qt::CaseInsensitive) == 0) return 1;	283	else if (statusstr.compare(QLatin1String("beta"), Qt::CaseInsensitive) == 0) return 1;
284	else if (statusstr.compare("rc", Qt::CaseInsensitive) == 0) return 2;	284	else if (statusstr.compare(QLatin1String("rc"), Qt::CaseInsensitive) == 0) return 2;
285	else if (statusstr.compare("r", Qt::CaseInsensitive) == 0) return 3;	285	else if (statusstr.compare(QLatin1String("r"), Qt::CaseInsensitive) == 0) return 3;
286		286
287	return 0;	287	return 0;
288	}	288	}

Return to bug 634792

Lines 138-144 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp (-4 / +4 lines)
138		138
139	// Cheating using path for two serial oximetry modes	139	// Cheating using path for two serial oximetry modes
140		140
141	if (path.compare("import") == 0) {	141	if (path.compare(QLatin1String("import")) == 0) {
142	serial.clear();	142	serial.clear();
143		143
144	sequence = 0;	144	sequence = 0;
Lines 148-158 Link Here
148	setStatus(IMPORTING);	148	setStatus(IMPORTING);
149		149
150	return 1;	150	return 1;
151	} else if (path.compare("live") == 0) {	151	} else if (path.compare(QLatin1String("live")) == 0) {
152	return 0;	152	return 0;
153	}	153	}
154	QString ext = path.section(".",1);	154	QString ext = path.section(".",1);
155	if ((ext.compare("spo2", Qt::CaseInsensitive)==0) \|\| (ext.compare("spo", Qt::CaseInsensitive)==0) \|\| (ext.compare("spor", Qt::CaseInsensitive)==0)) {	155	if ((ext.compare(QLatin1String("spo2"), Qt::CaseInsensitive)==0) \|\| (ext.compare(QLatin1String("spo"), Qt::CaseInsensitive)==0) \|\| (ext.compare(QLatin1String("spor"), Qt::CaseInsensitive)==0)) {
156	// try to read and process SpoR file..	156	// try to read and process SpoR file..
157	return readSpoRFile(path) ? 1 : 0;	157	return readSpoRFile(path) ? 1 : 0;
158	}	158	}
Lines 829-835 Link Here
829		829
830	bool spo2header = false;	830	bool spo2header = false;
831	QString ext = path.section('.', -1);	831	QString ext = path.section('.', -1);
832	if (ext.compare("spo2",Qt::CaseInsensitive) == 0) {	832	if (ext.compare(QLatin1String("spo2"),Qt::CaseInsensitive) == 0) {
833	spo2header = true;	833	spo2header = true;
834	}	834	}
835		835

Lines 91-97 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp (-4 / +4 lines)
91		91
92	// Cheating using path for two serial oximetry modes	92	// Cheating using path for two serial oximetry modes
93		93
94	if (path.compare("import") == 0) {	94	if (path.compare(QLatin1String("import")) == 0) {
95	for (int i=0; i<5; ++i) {	95	for (int i=0; i<5; ++i) {
96	resetDevice();	96	resetDevice();
97	serial.flush();	97	serial.flush();
Lines 105-111 Link Here
105	startTimer.stop();	105	startTimer.stop();
106	startImportTimeout();	106	startImportTimeout();
107	return 1;	107	return 1;
108	} else if (path.compare("live") == 0) {	108	} else if (path.compare(QLatin1String("live")) == 0) {
109	for (int i=0; i<5; ++i) {	109	for (int i=0; i<5; ++i) {
110	resetDevice();	110	resetDevice();
111	serial.flush();	111	serial.flush();
Lines 122-128 Link Here
122	return 1;	122	return 1;
123	}	123	}
124	QString ext = path.section(".",1);	124	QString ext = path.section(".",1);
125	if ((ext.compare("spo2", Qt::CaseInsensitive)==0) \|\| (ext.compare("spo", Qt::CaseInsensitive)==0) \|\| (ext.compare("spor", Qt::CaseInsensitive)==0)) {	125	if ((ext.compare(QLatin1String("spo2"), Qt::CaseInsensitive)==0) \|\| (ext.compare(QLatin1String("spo"), Qt::CaseInsensitive)==0) \|\| (ext.compare(QLatin1String("spor"), Qt::CaseInsensitive)==0)) {
126	// try to read and process SpoR file..	126	// try to read and process SpoR file..
127	return readSpoRFile(path) ? 1 : 0;	127	return readSpoRFile(path) ? 1 : 0;
128	}	128	}
Lines 545-551 Link Here
545		545
546	bool spo2header = false;	546	bool spo2header = false;
547	QString ext = path.section('.', -1);	547	QString ext = path.section('.', -1);
548	if (ext.compare("spo2",Qt::CaseInsensitive) == 0) {	548	if (ext.compare(QLatin1String("spo2"),Qt::CaseInsensitive) == 0) {
549	spo2header = true;	549	spo2header = true;
550	}	550	}
551		551

Lines 250-256 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/updateparser.cpp (-21 / +21 lines)
250	Q_ASSERT(xml.isStartElement() && xml.name() == "Updates");	250	Q_ASSERT(xml.isStartElement() && xml.name() == "Updates");
251		251
252	while (xml.readNextStartElement()) {	252	while (xml.readNextStartElement()) {
253	if (xml.name().compare("PackageUpdate",Qt::CaseInsensitive)==0) {	253	if (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)==0) {
254	readPackageUpdate();	254	readPackageUpdate();
255	} else {	255	} else {
256	qDebug() << "Skipping Updates.xml tag" << xml.name();	256	qDebug() << "Skipping Updates.xml tag" << xml.name();
Lines 262-313 Link Here
262		262
263	void UpdatesParser::readPackageUpdate()	263	void UpdatesParser::readPackageUpdate()
264	{	264	{
265	Q_ASSERT(xml.isStartElement() && (xml.name().compare("PackageUpdate",Qt::CaseInsensitive)==0));	265	Q_ASSERT(xml.isStartElement() && (xml.name().compare(QLatin1String("PackageUpdate"),Qt::CaseInsensitive)==0));
266	package = PackageUpdate();	266	package = PackageUpdate();
267		267
268	while (xml.readNextStartElement()) {	268	while (xml.readNextStartElement()) {
269	if (xml.name().compare("Name",Qt::CaseInsensitive)==0) {	269	if (xml.name().compare(QLatin1String("Name"),Qt::CaseInsensitive)==0) {
270	package.name = xml.readElementText().toLower();	270	package.name = xml.readElementText().toLower();
271	} else if (xml.name().compare("DisplayName",Qt::CaseInsensitive)==0) {	271	} else if (xml.name().compare(QLatin1String("DisplayName"),Qt::CaseInsensitive)==0) {
272	package.displayName = xml.readElementText();	272	package.displayName = xml.readElementText();
273	} else if (xml.name().compare("Description",Qt::CaseInsensitive)==0) {	273	} else if (xml.name().compare(QLatin1String("Description"),Qt::CaseInsensitive)==0) {
274	package.description = xml.readElementText();	274	package.description = xml.readElementText();
275	} else if (xml.name().compare("Version",Qt::CaseInsensitive)==0) {	275	} else if (xml.name().compare(QLatin1String("Version"),Qt::CaseInsensitive)==0) {
276	package.versionString = xml.readElementText();	276	package.versionString = xml.readElementText();
277	} else if (xml.name().compare("ReleaseDate",Qt::CaseInsensitive)==0) {	277	} else if (xml.name().compare(QLatin1String("ReleaseDate"),Qt::CaseInsensitive)==0) {
278	package.releaseDate = QDate().fromString(xml.readElementText(), "yyyy-MM-dd");	278	package.releaseDate = QDate().fromString(xml.readElementText(), "yyyy-MM-dd");
279	} else if (xml.name().compare("Default",Qt::CaseInsensitive)==0) {	279	} else if (xml.name().compare(QLatin1String("Default"),Qt::CaseInsensitive)==0) {
280	package.defaultInstall = xml.readElementText().compare("true") == 0;	280	package.defaultInstall = xml.readElementText().compare("true") == 0;
281	} else if (xml.name().compare("ForcedInstallation",Qt::CaseInsensitive)==0) {	281	} else if (xml.name().compare(QLatin1String("ForcedInstallation"),Qt::CaseInsensitive)==0) {
282	package.forcedInstall = xml.readElementText().compare("true") == 0;	282	package.forcedInstall = xml.readElementText().compare("true") == 0;
283	} else if (xml.name().compare("Script",Qt::CaseInsensitive)==0) {	283	} else if (xml.name().compare(QLatin1String("Script"),Qt::CaseInsensitive)==0) {
284	package.script = xml.readElementText();	284	package.script = xml.readElementText();
285	} else if (xml.name().compare("Dependencies",Qt::CaseInsensitive)==0) {	285	} else if (xml.name().compare(QLatin1String("Dependencies"),Qt::CaseInsensitive)==0) {
286	package.dependencies = xml.readElementText().split(",");	286	package.dependencies = xml.readElementText().split(",");
287	} else if (xml.name().compare("UpdateFile",Qt::CaseInsensitive)==0) {	287	} else if (xml.name().compare(QLatin1String("UpdateFile"),Qt::CaseInsensitive)==0) {
288	for (int i=0; i<xml.attributes().size(); ++i) {	288	for (int i=0; i<xml.attributes().size(); ++i) {
289	const QXmlStreamAttribute & at = xml.attributes().at(i);	289	const QXmlStreamAttribute & at = xml.attributes().at(i);
290	if (at.name().compare("CompressedSize", Qt::CaseInsensitive)==0) {	290	if (at.name().compare(QLatin1String("CompressedSize"), Qt::CaseInsensitive)==0) {
291	package.compressedSize = at.value().toLong();	291	package.compressedSize = at.value().toLong();
292	} else if (at.name().compare("UncompressedSize",Qt::CaseInsensitive)==0) {	292	} else if (at.name().compare(QLatin1String("UncompressedSize"),Qt::CaseInsensitive)==0) {
293	package.uncompressedSize = at.value().toLong();	293	package.uncompressedSize = at.value().toLong();
294	} else if (at.name().compare("OS",Qt::CaseInsensitive)==0) {	294	} else if (at.name().compare(QLatin1String("OS"),Qt::CaseInsensitive)==0) {
295	package.os = at.value().toString();	295	package.os = at.value().toString();
296	}	296	}
297	}	297	}
298	xml.skipCurrentElement();	298	xml.skipCurrentElement();
299	} else if (xml.name().compare("DownloadableArchives")==0) {	299	} else if (xml.name().compare(QLatin1String("DownloadableArchives"))==0) {
300	package.downloadArchives = xml.readElementText().split(",");	300	package.downloadArchives = xml.readElementText().split(",");
301	} else if (xml.name().compare("Licenses",Qt::CaseInsensitive)==0) {	301	} else if (xml.name().compare(QLatin1String("Licenses"),Qt::CaseInsensitive)==0) {
302	while (xml.readNextStartElement()) {	302	while (xml.readNextStartElement()) {
303	if (xml.name().compare("License",Qt::CaseInsensitive)==0) {	303	if (xml.name().compare(QLatin1String("License"),Qt::CaseInsensitive)==0) {
304	QString name;	304	QString name;
305	QString file;	305	QString file;
306	for (int i=0; i<xml.attributes().size(); ++i) {	306	for (int i=0; i<xml.attributes().size(); ++i) {
307	const QXmlStreamAttribute & at = xml.attributes().at(i);	307	const QXmlStreamAttribute & at = xml.attributes().at(i);
308	if (at.name().compare("name", Qt::CaseInsensitive)==0) {	308	if (at.name().compare(QLatin1String("name"), Qt::CaseInsensitive)==0) {
309	name = at.value().toString();	309	name = at.value().toString();
310	} else if (at.name().compare("file",Qt::CaseInsensitive)==0) {	310	} else if (at.name().compare(QLatin1String("file"),Qt::CaseInsensitive)==0) {
311	file = at.value().toString();	311	file = at.value().toString();
312	}	312	}
313	}	313	}
Lines 319-325 Link Here
319	xml.skipCurrentElement();	319	xml.skipCurrentElement();
320	}	320	}
321	}	321	}
322	} else if (xml.name().compare("SHA1",Qt::CaseInsensitive)==0) {	322	} else if (xml.name().compare(QLatin1String("SHA1"),Qt::CaseInsensitive)==0) {
323	package.sha1 = xml.readElementText();	323	package.sha1 = xml.readElementText();
324	} else {	324	} else {
325	qDebug() << "UP Skipping Updates.xml tag" << xml.name();	325	qDebug() << "UP Skipping Updates.xml tag" << xml.name();

Lines 77-91 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/SleepLib/loader_plugins/somnopose_loader.cpp (-3 / +3 lines)
77	int hdr_size = headers.size();	77	int hdr_size = headers.size();
78		78
79	for (int i = 0; i < hdr_size; i++) {	79	for (int i = 0; i < hdr_size; i++) {
80	if (headers.at(i).compare("timestamp", Qt::CaseInsensitive) == 0) {	80	if (headers.at(i).compare(QLatin1String("timestamp"), Qt::CaseInsensitive) == 0) {
81	col_timestamp = i;	81	col_timestamp = i;
82	}	82	}
83		83
84	if (headers.at(i).compare("inclination", Qt::CaseInsensitive) == 0) {	84	if (headers.at(i).compare(QLatin1String("inclination"), Qt::CaseInsensitive) == 0) {
85	col_inclination = i;	85	col_inclination = i;
86	}	86	}
87		87
88	if (headers.at(i).compare("orientation", Qt::CaseInsensitive) == 0) {	88	if (headers.at(i).compare(QLatin1String("orientation"), Qt::CaseInsensitive) == 0) {
89	col_orientation = i;	89	col_orientation = i;
90	}	90	}
91	}	91	}

Lines 42-74 Link Here

(-)sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2.orig/sleepyhead/statistics.h (-16 / +16 lines)
42		42
43	StatCalcType lookupCalc(QString calc)	43	StatCalcType lookupCalc(QString calc)
44	{	44	{
45	if (calc.compare("avg",Qt::CaseInsensitive)==0) {	45	if (calc.compare(QLatin1String("avg"),Qt::CaseInsensitive)==0) {
46	return SC_AVG;	46	return SC_AVG;
47	} else if (calc.compare("w-avg",Qt::CaseInsensitive)==0) {	47	} else if (calc.compare(QLatin1String("w-avg"),Qt::CaseInsensitive)==0) {
48	return SC_WAVG;	48	return SC_WAVG;
49	} else if (calc.compare("median",Qt::CaseInsensitive)==0) {	49	} else if (calc.compare(QLatin1String("median"),Qt::CaseInsensitive)==0) {
50	return SC_MEDIAN;	50	return SC_MEDIAN;
51	} else if (calc.compare("90%",Qt::CaseInsensitive)==0) {	51	} else if (calc.compare(QLatin1String("90%"),Qt::CaseInsensitive)==0) {
52	return SC_90P;	52	return SC_90P;
53	} else if (calc.compare("min", Qt::CaseInsensitive)==0) {	53	} else if (calc.compare(QLatin1String("min"), Qt::CaseInsensitive)==0) {
54	return SC_MIN;	54	return SC_MIN;
55	} else if (calc.compare("max", Qt::CaseInsensitive)==0) {	55	} else if (calc.compare(QLatin1String("max"), Qt::CaseInsensitive)==0) {
56	return SC_MAX;	56	return SC_MAX;
57	} else if (calc.compare("cph", Qt::CaseInsensitive)==0) {	57	} else if (calc.compare(QLatin1String("cph"), Qt::CaseInsensitive)==0) {
58	return SC_CPH;	58	return SC_CPH;
59	} else if (calc.compare("sph", Qt::CaseInsensitive)==0) {	59	} else if (calc.compare(QLatin1String("sph"), Qt::CaseInsensitive)==0) {
60	return SC_SPH;	60	return SC_SPH;
61	} else if (calc.compare("ahi", Qt::CaseInsensitive)==0) {	61	} else if (calc.compare(QLatin1String("ahi"), Qt::CaseInsensitive)==0) {
62	return SC_AHI;	62	return SC_AHI;
63	} else if (calc.compare("hours", Qt::CaseInsensitive)==0) {	63	} else if (calc.compare(QLatin1String("hours"), Qt::CaseInsensitive)==0) {
64	return SC_HOURS;	64	return SC_HOURS;
65	} else if (calc.compare("compliance", Qt::CaseInsensitive)==0) {	65	} else if (calc.compare(QLatin1String("compliance"), Qt::CaseInsensitive)==0) {
66	return SC_COMPLIANCE;	66	return SC_COMPLIANCE;
67	} else if (calc.compare("days", Qt::CaseInsensitive)==0) {	67	} else if (calc.compare(QLatin1String("days"), Qt::CaseInsensitive)==0) {
68	return SC_DAYS;	68	return SC_DAYS;
69	} else if (calc.compare("heading", Qt::CaseInsensitive)==0) {	69	} else if (calc.compare(QLatin1String("heading"), Qt::CaseInsensitive)==0) {
70	return SC_HEADING;	70	return SC_HEADING;
71	} else if (calc.compare("subheading", Qt::CaseInsensitive)==0) {	71	} else if (calc.compare(QLatin1String("subheading"), Qt::CaseInsensitive)==0) {
72	return SC_SUBHEADING;	72	return SC_SUBHEADING;
73	}	73	}
74	return SC_UNDEFINED;	74	return SC_UNDEFINED;
Lines 78-86 Link Here
78	{	78	{
79	if (type.compare("cpap", Qt::CaseInsensitive)==0) {	79	if (type.compare("cpap", Qt::CaseInsensitive)==0) {
80	return MT_CPAP;	80	return MT_CPAP;
81	} else if (type.compare("oximeter", Qt::CaseInsensitive)==0) {	81	} else if (type.compare(QLatin1String("oximeter"), Qt::CaseInsensitive)==0) {
82	return MT_OXIMETER;	82	return MT_OXIMETER;
83	} else if (type.compare("sleepstage", Qt::CaseInsensitive)==0) {	83	} else if (type.compare(QLatin1String("sleepstage"), Qt::CaseInsensitive)==0) {
84	return MT_SLEEPSTAGE;	84	return MT_SLEEPSTAGE;
85	}	85	}
86	return MT_UNKNOWN;	86	return MT_UNKNOWN;