Browse Source

Vehicle: Remove QString constructor with tr

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
QGC4.4
Patrick José Pereira 6 years ago
parent
commit
daba18b518
  1. 8
      src/Vehicle/Vehicle.cc

8
src/Vehicle/Vehicle.cc

@ -1539,7 +1539,7 @@ void Vehicle::_handleSysStatus(mavlink_message_t& message)
if (sysStatus.battery_remaining > 0) { if (sysStatus.battery_remaining > 0) {
if (sysStatus.battery_remaining < _settingsManager->appSettings()->batteryPercentRemainingAnnounce()->rawValue().toInt() && if (sysStatus.battery_remaining < _settingsManager->appSettings()->batteryPercentRemainingAnnounce()->rawValue().toInt() &&
sysStatus.battery_remaining < _lastAnnouncedLowBatteryPercent) { sysStatus.battery_remaining < _lastAnnouncedLowBatteryPercent) {
_say(QString(tr("%1 low battery: %2 percent remaining")).arg(_vehicleIdSpeech()).arg(sysStatus.battery_remaining)); _say(tr("%1 low battery: %2 percent remaining").arg(_vehicleIdSpeech()).arg(sysStatus.battery_remaining));
} }
_lastAnnouncedLowBatteryPercent = sysStatus.battery_remaining; _lastAnnouncedLowBatteryPercent = sysStatus.battery_remaining;
} }
@ -2934,7 +2934,7 @@ QString Vehicle::vehicleTypeName() const {
QString Vehicle::_vehicleIdSpeech(void) QString Vehicle::_vehicleIdSpeech(void)
{ {
if (_toolbox->multiVehicleManager()->vehicles()->count() > 1) { if (_toolbox->multiVehicleManager()->vehicles()->count() > 1) {
return QString(tr("vehicle %1")).arg(id()); return tr("vehicle %1").arg(id());
} else { } else {
return QString(); return QString();
} }
@ -2942,13 +2942,13 @@ QString Vehicle::_vehicleIdSpeech(void)
void Vehicle::_handleFlightModeChanged(const QString& flightMode) void Vehicle::_handleFlightModeChanged(const QString& flightMode)
{ {
_say(QString(tr("%1 %2 flight mode")).arg(_vehicleIdSpeech()).arg(flightMode)); _say(tr("%1 %2 flight mode").arg(_vehicleIdSpeech()).arg(flightMode));
emit guidedModeChanged(_firmwarePlugin->isGuidedMode(this)); emit guidedModeChanged(_firmwarePlugin->isGuidedMode(this));
} }
void Vehicle::_announceArmedChanged(bool armed) void Vehicle::_announceArmedChanged(bool armed)
{ {
_say(QString("%1 %2").arg(_vehicleIdSpeech()).arg(armed ? QString(tr("armed")) : QString(tr("disarmed")))); _say(QString("%1 %2").arg(_vehicleIdSpeech()).arg(armed ? tr("armed") : tr("disarmed")));
} }
void Vehicle::_setFlying(bool flying) void Vehicle::_setFlying(bool flying)

Loading…
Cancel
Save