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

Base: Quantity: return std::string

Browse Source
This commit is contained in:
Ladislav Michl
2024-07-13 13:07:27 +02:00
committed by Yorik van Havre
parent c11b37e312
commit 2ea8a633ac
58 changed files with 573 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Base/Quantity.h
View File

@@ -25,7 +25,7 @@
#define BASE_Quantity_H
#include "Unit.h"
#include <QString>
#include <string>
// NOLINTBEGIN
#ifndef DOUBLE_MAX
@@ -130,7 +130,7 @@ public:
Quantity(const Quantity&) = default;
Quantity(Quantity&&) = default;
explicit Quantity(double value, const Unit& unit = Unit());
explicit Quantity(double value, const QString& unit);
explicit Quantity(double value, const std::string& unit);
/// Destruction
~Quantity() = default;
@@ -166,17 +166,17 @@ public:
myFormat = fmt;
}
/// transfer to user preferred unit/potence
QString getUserString(double& factor, QString& unitString) const;
QString getUserString() const
std::string getUserString(double& factor, std::string& unitString) const;
std::string getUserString() const
{ // to satisfy GCC
double dummy1 {};
QString dummy2 {};
std::string dummy2 {};
return getUserString(dummy1, dummy2);
}
QString getUserString(UnitsSchema* schema, double& factor, QString& unitString) const;
QString getSafeUserString() const;
std::string getUserString(UnitsSchema* schema, double& factor, std::string& unitString) const;
std::string getSafeUserString() const;
static Quantity parse(const QString& string);
static Quantity parse(const std::string& string);
/// returns the unit of the quantity
const Unit& getUnit() const