SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use QStringLiteral instead of direct comparison

Browse Source 
Trying to solve CI errors
This commit is contained in:
andresmmera 2024-10-10 19:49:00 +02:00
parent 6d3e8ed655
commit dec1949a56
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
qucs-s-spar-viewer/qucs-s-spar-viewer.cpp
View File

@ -2061,7 +2061,7 @@ void Qucs_S_SPAR_Viewer::updateMarkerTable(){
}; };
QString file = parts[0]; QString file = parts[0];
QString trace = parts[1]; QString trace = parts[1];
if (trace.at(0) == "S"){ if (trace.at(0) == 'S'){
trace.append("_dB"); trace.append("_dB");
} }
P = findClosestPoint(datasets[file]["frequency"], datasets[file][trace], targetX); P = findClosestPoint(datasets[file]["frequency"], datasets[file][trace], targetX);
@ -2896,17 +2896,17 @@ void Qucs_S_SPAR_Viewer::loadSession(QString session_file)
// If token is StartElement, check element name // If token is StartElement, check element name
if (token == QXmlStreamReader::StartElement) { if (token == QXmlStreamReader::StartElement) {
if (xml.name() == "trace") { if (xml.name() == QStringLiteral("trace")) {
while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == "trace")) { while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == QStringLiteral("trace"))) {
xml.readNext(); xml.readNext();
if (xml.tokenType() == QXmlStreamReader::StartElement) { if (xml.tokenType() == QXmlStreamReader::StartElement) {
if (xml.name() == "trace_name") { if (xml.name() == QStringLiteral("trace_name")) {
trace_name.append(xml.readElementText()); trace_name.append(xml.readElementText());
} else if (xml.name() == "trace_width") { } else if (xml.name() == QStringLiteral("trace_width")) {
trace_width.append(xml.readElementText().toInt()); trace_width.append(xml.readElementText().toInt());
} else if (xml.name() == "trace_color") { } else if (xml.name() == QStringLiteral("trace_color")) {
trace_color.append(xml.readElementText()); trace_color.append(xml.readElementText());
} else if (xml.name() == "trace_style") { } else if (xml.name() == QStringLiteral("trace_style")) {
trace_style.append(xml.readElementText()); trace_style.append(xml.readElementText());
} }
} }
@ -2938,53 +2938,53 @@ void Qucs_S_SPAR_Viewer::loadSession(QString session_file)
} else if (xml.name().toString().contains("lock_status")) { } else if (xml.name().toString().contains("lock_status")) {
lock_axis = xml.readElementText().toInt(); lock_axis = xml.readElementText().toInt();
lock_unlock_axis_settings(); lock_unlock_axis_settings();
} else if (xml.name() == "Limit") { } else if (xml.name() == QStringLiteral("Limit")) {
while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == "Limit")) { while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == QStringLiteral("Limit"))) {
xml.readNext(); xml.readNext();
if (xml.tokenType() == QXmlStreamReader::StartElement) { if (xml.tokenType() == QXmlStreamReader::StartElement) {
if (xml.name() == "fstart") { if (xml.name() == QStringLiteral("fstart")) {
Limit_Start_Freq.append(xml.readElementText().toDouble()); Limit_Start_Freq.append(xml.readElementText().toDouble());
} else if (xml.name() == "val_start") { } else if (xml.name() == QStringLiteral("val_start")) {
Limit_Start_Val.append(xml.readElementText().toDouble()); Limit_Start_Val.append(xml.readElementText().toDouble());
} else if (xml.name() == "fstop") { } else if (xml.name() == QStringLiteral("fstop")) {
Limit_Stop_Freq.append(xml.readElementText().toDouble()); Limit_Stop_Freq.append(xml.readElementText().toDouble());
} else if (xml.name() == "val_stop") { } else if (xml.name() == QStringLiteral("val_stop")) {
Limit_Stop_Val.append(xml.readElementText().toDouble()); Limit_Stop_Val.append(xml.readElementText().toDouble());
} else if (xml.name() == "fstart_unit") { } else if (xml.name() == QStringLiteral("fstart_unit")) {
Limit_Start_Freq_Unit.append(xml.readElementText()); Limit_Start_Freq_Unit.append(xml.readElementText());
} else if (xml.name() == "fstop_unit") { } else if (xml.name() == QStringLiteral("fstop_unit")) {
Limit_Stop_Freq_Unit.append(xml.readElementText()); Limit_Stop_Freq_Unit.append(xml.readElementText());
} else if (xml.name() == "couple_values") { } else if (xml.name() == QStringLiteral("couple_values")) {
Limit_Couple_Values.append(xml.readElementText().toInt()); Limit_Couple_Values.append(xml.readElementText().toInt());
} }
} }
} }
} else if (xml.name() == "MARKERS"){ } else if (xml.name() == QStringLiteral("MARKERS")){
while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == "MARKERS")) { while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == QStringLiteral("MARKERS"))) {
xml.readNext(); xml.readNext();
if (xml.tokenType() == QXmlStreamReader::StartElement) { if (xml.tokenType() == QXmlStreamReader::StartElement) {
double value = xml.readElementText().toDouble(); double value = xml.readElementText().toDouble();
Markers.append(value); Markers.append(value);
} }
} }
} else if (xml.name() == "file") { } else if (xml.name() == QStringLiteral("file")) {
// Load datasets // Load datasets
QString fileName, traceName; QString fileName, traceName;
while (!xml.atEnd() && !xml.hasError()) while (!xml.atEnd() && !xml.hasError())
{ {
if (xml.tokenType() == QXmlStreamReader::StartElement) if (xml.tokenType() == QXmlStreamReader::StartElement)
{ {
if (xml.name() == "file") if (xml.name() == QStringLiteral("file"))
{ {
fileName = xml.attributes().value("file_name").toString(); fileName = xml.attributes().value("file_name").toString();
//qDebug() << "File name:" << fileName; //qDebug() << "File name:" << fileName;
} }
else if (xml.name() == "trace") else if (xml.name() == QStringLiteral("trace"))
{ {
traceName = xml.attributes().value("trace_name").toString(); traceName = xml.attributes().value("trace_name").toString();
//qDebug() << "Trace name:" << traceName; //qDebug() << "Trace name:" << traceName;
} }
else if (xml.name() == "value") else if (xml.name() == QStringLiteral("value"))
{ {
QString value = xml.readElementText(); QString value = xml.readElementText();
//qDebug() << "Value:" << value; //qDebug() << "Value:" << value;