From bb322394fe0ef716b729cff2c11bdb067b00bafa Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 9 Jul 2019 17:16:05 +0200 Subject: [PATCH] Map to bracket initializer --- src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc | 29 +++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc index be6b637..75059ee 100644 --- a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc @@ -16,21 +16,20 @@ FirmwarePlugin::remapParamNameMajorVersionMap_t ArduRoverFirmwarePlugin::_remapP APMRoverMode::APMRoverMode(uint32_t mode, bool settable) : APMCustomMode(mode, settable) { - QMap enumToString; - enumToString.insert(MANUAL, "Manual"); - enumToString.insert(ACRO, "Acro"); - enumToString.insert(STEERING, "Steering"); - enumToString.insert(HOLD, "Hold"); - enumToString.insert(LOITER, "Loiter"); - enumToString.insert(FOLLOW, "Follow"); - enumToString.insert(SIMPLE, "Simple"); - enumToString.insert(AUTO, "Auto"); - enumToString.insert(RTL, "RTL"); - enumToString.insert(SMART_RTL, "Smart RTL"); - enumToString.insert(GUIDED, "Guided"); - enumToString.insert(INITIALIZING, "Initializing"); - - setEnumToStringMapping(enumToString); + setEnumToStringMapping({ + {MANUAL, "Manual"}, + {ACRO, "Acro"}, + {STEERING, "Steering"}, + {HOLD, "Hold"}, + {LOITER, "Loiter"}, + {FOLLOW, "Follow"}, + {SIMPLE, "Simple"}, + {AUTO, "Auto"}, + {RTL, "RTL"}, + {SMART_RTL, "Smart RTL"}, + {GUIDED, "Guided"}, + {INITIALIZING, "Initializing"}, + }); } ArduRoverFirmwarePlugin::ArduRoverFirmwarePlugin(void)