Minor fixes: Formatting, string generation

This commit is contained in:
Klaus Basan
2017-01-05 02:12:19 +01:00
committed by Mathew Sutcliffe
parent 7e95d4a550
commit 5f18707c9c
10 changed files with 28 additions and 38 deletions

View File

@@ -17,7 +17,6 @@ namespace BlackMisc
{
namespace Aviation
{
CAircraftEngine::CAircraftEngine(int number, bool on) : m_number(number), m_on(on)
{
Q_ASSERT_X(number > 0, "CAircraftEngine", "Engine number have to be > 1");
@@ -32,11 +31,8 @@ namespace BlackMisc
QString CAircraftEngine::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
QString s = QString::number(m_number);
s += " ";
s += BlackMisc::boolToOnOff(m_on);
return s;
static const QString s("%1 on: %2");
return s.arg(m_number).arg(BlackMisc::boolToOnOff(m_on));
}
} // namespace
} // namespace

View File

@@ -18,21 +18,21 @@ namespace BlackMisc
{
namespace Aviation
{
QString CHeading::convertToQString(bool i18n) const
{
QString s = CAngle::convertToQString(i18n).append(" ");
static const QString s("%1 %2");
if (i18n)
{
return s.append(this->isMagneticHeading() ?
QCoreApplication::translate("Aviation", "magnetic") :
QCoreApplication::translate("Aviation", "true"));
return s.arg(CAngle::convertToQString(i18n),
this->isMagneticHeading() ?
QCoreApplication::translate("Aviation", "magnetic") :
QCoreApplication::translate("Aviation", "true"));
}
else
{
return s.append(this->isMagneticHeading() ? "magnetic" : "true");
return s.arg(CAngle::convertToQString(i18n),
this->isMagneticHeading() ? "magnetic" : "true");
}
}
} // namespace
} // namespace