kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: Units: return std::string

Browse Source
This commit is contained in:
Ladislav Michl
2024-07-12 20:51:54 +02:00
committed by Yorik van Havre
parent 24f4deef70
commit 379d7ea9d5
24 changed files with 181 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Base/UnitsSchemaImperial1.cpp
View File

@@ -123,7 +123,7 @@ UnitsSchemaImperial1::schemaTranslate(const Quantity& quant, double& factor, QSt
}
else {
// default action for all cases without special treatment:
unitString = quant.getUnit().getString();
unitString = QString::fromStdString(quant.getUnit().getString());
factor = 1.0;
}
@@ -184,7 +184,7 @@ QString UnitsSchemaImperialDecimal::schemaTranslate(const Base::Quantity& quant,
}
else {
// default action for all cases without special treatment:
unitString = quant.getUnit().getString();
unitString = QString::fromStdString(quant.getUnit().getString());
factor = 1.0;
}
@@ -312,7 +312,7 @@ QString UnitsSchemaImperialBuilding::schemaTranslate(const Quantity& quant,
factor = 25.4 / 60;
}
else {
unitString = quant.getUnit().getString();
unitString = QString::fromStdString(quant.getUnit().getString());
factor = 1.0;
}
@@ -392,11 +392,11 @@ QString UnitsSchemaImperialCivil::schemaTranslate(const Base::Quantity& quant,
// output << std::setprecision(Base::UnitsApi::getDecimals()) << std::fixed <<
// rawSeconds << secondString.toStdString();
// }
return QString::fromUtf8(output.str().c_str());
return QString::fromStdString(output.str());
}
else {
// default action for all cases without special treatment:
unitString = quant.getUnit().getString();
unitString = QString::fromStdString(quant.getUnit().getString());
factor = 1.0;
}