Changeset View
Changeset View
Standalone View
Standalone View
src/unit.cpp
Show All 18 Lines | |||||
19 | */ | 19 | */ | ||
20 | 20 | | |||
21 | #include "unit.h" | 21 | #include "unit.h" | ||
22 | #include "unit_p.h" | 22 | #include "unit_p.h" | ||
23 | #include "unitcategory.h" | 23 | #include "unitcategory.h" | ||
24 | 24 | | |||
25 | #include <KI18n/klocalizedstring.h> | 25 | #include <KI18n/klocalizedstring.h> | ||
26 | 26 | | |||
27 | // Qt | ||||
28 | #include <QLocale> | ||||
29 | | ||||
27 | namespace KUnitConversion | 30 | namespace KUnitConversion | ||
28 | { | 31 | { | ||
29 | 32 | | |||
30 | UnitPrivate::UnitPrivate() | 33 | UnitPrivate::UnitPrivate() | ||
31 | : m_categoryId(InvalidCategory), | 34 | : m_categoryId(InvalidCategory), | ||
32 | m_id(InvalidUnit), | 35 | m_id(InvalidUnit), | ||
33 | m_multiplier(1.0) | 36 | m_multiplier(1.0) | ||
34 | { | 37 | { | ||
▲ Show 20 Lines • Show All 166 Lines • ▼ Show 20 Line(s) | 203 | { | |||
201 | if (isNull()) | 204 | if (isNull()) | ||
202 | return QString(); | 205 | return QString(); | ||
203 | if ((int)value == value && precision < 1) { | 206 | if ((int)value == value && precision < 1) { | ||
204 | return d->m_integerString.subs((int)value).toString(); | 207 | return d->m_integerString.subs((int)value).toString(); | ||
205 | } | 208 | } | ||
206 | return d->m_realString.subs(value, fieldWidth, format, precision, fillChar).toString(); | 209 | return d->m_realString.subs(value, fieldWidth, format, precision, fillChar).toString(); | ||
207 | } | 210 | } | ||
208 | 211 | | |||
212 | QString Unit::toString(qreal value, const QLocale &locale, char format, int precision) const | ||||
213 | { | ||||
214 | if (isNull()) | ||||
215 | return QString(); | ||||
216 | if ((int)value == value && precision < 1) { | ||||
217 | return d->m_integerString.subs(locale.toString(static_cast<int>(value))).toString(); | ||||
218 | } | ||||
219 | return d->m_realString.subs(locale.toString(value, format, precision)).toString(); | ||||
220 | } | ||||
221 | | ||||
209 | QString Unit::toSymbolString(qreal value, int fieldWidth, char format, int precision, | 222 | QString Unit::toSymbolString(qreal value, int fieldWidth, char format, int precision, | ||
210 | const QChar &fillChar) const | 223 | const QChar &fillChar) const | ||
211 | { | 224 | { | ||
212 | if (d) | 225 | if (d) | ||
213 | return d->m_symbolString.subs(value, fieldWidth, format, precision, fillChar).subs(d->m_symbol).toString(); | 226 | return d->m_symbolString.subs(value, fieldWidth, format, precision, fillChar).subs(d->m_symbol).toString(); | ||
214 | return QString(); | 227 | return QString(); | ||
215 | } | 228 | } | ||
216 | 229 | | |||
230 | QString Unit::toSymbolString(qreal value, const QLocale &locale, char format, int precision) const | ||||
231 | { | ||||
232 | if (d) | ||||
233 | return d->m_symbolString.subs(locale.toString(value, format, precision)).subs(d->m_symbol).toString(); | ||||
234 | return QString(); | ||||
235 | } | ||||
236 | | ||||
217 | } | 237 | } | ||
218 | 238 | |