Browse Source

Merge pull request #5705 from HorusAeronaves/solve_typo

Solve some typos
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
ad1dbf03b7
  1. 2
      src/AnalyzeView/ULogParser.cc
  2. 2
      src/Joystick/JoystickSDL.cc
  3. 2
      src/MissionManager/MissionItemTest.cc

2
src/AnalyzeView/ULogParser.cc

@ -36,7 +36,7 @@ int ULogParser::sizeOfType(QString& typeName) @@ -36,7 +36,7 @@ int ULogParser::sizeOfType(QString& typeName)
return 1;
}
qWarning() << "Unkown type in ULog : " << typeName;
qWarning() << "Unknown type in ULog : " << typeName;
return 0;
}

2
src/Joystick/JoystickSDL.cc

@ -65,7 +65,7 @@ QMap<QString, Joystick*> JoystickSDL::discover(MultiVehicleManager* _multiVehicl @@ -65,7 +65,7 @@ QMap<QString, Joystick*> JoystickSDL::discover(MultiVehicleManager* _multiVehicl
qCDebug(JoystickLog) << "\t" << name << "axes:" << axisCount << "buttons:" << buttonCount << "hats:" << hatCount << "isGC:" << isGameController;
// Check for joysticks with duplicate names and differentiate the keys when neccessary.
// Check for joysticks with duplicate names and differentiate the keys when necessary.
// This is required when using an Xbox 360 wireless receiver that always identifies as
// 4 individual joysticks, regardless of how many joysticks are actually connected to the
// receiver. Using GUID does not help, all of these devices present the same GUID.

2
src/MissionManager/MissionItemTest.cc

@ -297,7 +297,7 @@ void MissionItemTest::_testLoadFromJsonV1(void) @@ -297,7 +297,7 @@ void MissionItemTest::_testLoadFromJsonV1(void)
QString errorString;
QJsonObject jsonObject = _createV1Json();
// V1 format has param 1-4 in seperate items instead of in params array
// V1 format has param 1-4 in separate items instead of in params array
QStringList removeKeys;
removeKeys << MissionItem::_jsonParam1Key << MissionItem::_jsonParam2Key << MissionItem::_jsonParam3Key << MissionItem::_jsonParam4Key;

Loading…
Cancel
Save