kindred/create
1
1
Fork 0
Code Issues 53 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

14
src/Base/Unit.cpp
View File

@@ -125,10 +125,10 @@ Unit::Unit() //NOLINT
Val = 0;
}
Unit::Unit(const QString& expr) // NOLINT
Unit::Unit(const std::string& expr) // NOLINT
{
try {
*this = Quantity::parse(expr).getUnit();
*this = Quantity::parse(QString::fromStdString(expr)).getUnit();
}
catch (const Base::ParserError&) {
Val = 0;
@@ -358,7 +358,7 @@ Unit Unit::operator /(const Unit &right) const
return result;
}
QString Unit::getString() const
std::string Unit::getString() const
{
if (isEmpty()) {
return {};
@@ -582,10 +582,10 @@ QString Unit::getString() const
}
}
return QString::fromUtf8(ret.str().c_str());
return ret.str();
}
QString Unit::getTypeString() const
std::string Unit::getTypeString() const
{
static std::array<std::pair<Unit, std::string>, 55> unitSpecs {{
{ Unit::Acceleration, "Acceleration" },
@@ -651,9 +651,9 @@ QString Unit::getTypeString() const
});
if (spec == std::end(unitSpecs))
return QString();
return "";
return QString::fromStdString(spec->second);
return spec->second;
}
// SI base units