diff --git a/CodingStyle.cc b/CodingStyle.cc index 9c5d7527a32f6474ce9c45f167c0a0f583ded2b9..5eb53a422d9c5368a25b20d0d20b08a5835ed9a2 100644 --- a/CodingStyle.cc +++ b/CodingStyle.cc @@ -20,7 +20,7 @@ #include -// Note how the Qt headers and the QGroundControl headers above are kept seperate +// Note how the Qt headers and the QGroundControl headers above are kept separate Q_LOGGING_CATEGORY(CodingStyleLog, "CodingStyleLog") diff --git a/CodingStyle.h b/CodingStyle.h index 49ce95812427587d768acffa55ca355ab27da2b5..362698106fb5d586fdf6368b7f8cc50d2305b94b 100644 --- a/CodingStyle.h +++ b/CodingStyle.h @@ -25,7 +25,7 @@ #include "Fact.h" #include "UASInterface.h" -// Note how the Qt headers, System, headers and the QGroundControl headers above are kept in seperate groups +// Note how the Qt headers, System, headers and the QGroundControl headers above are kept in separate groups // If you are going to use a logging category for a class it should have the same name as the class // with a suffix of Log. diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 6524583b72c3ce825b1cc8a0b865bb4d86d2df60..9e746de954d2ebc46bcf806ed2fb9ec4a608711e 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -9,7 +9,7 @@ WindowsBuild { # [REQUIRED] Add support for the MAVLink communications protocol. # Mavlink dialect is hardwired to arudpilotmega for now. The reason being # the current codebase supports both PX4 and APM flight stack. PX4 flight stack -# only usese common mavlink specifications, wherease APM flight stack uses custom +# only usese common mavlink specifications, whereas APM flight stack uses custom # mavlink specifications which add to common. So by using the adupilotmega dialect # QGC can support both in the same codebase. # diff --git a/android/src/com/hoho/android/usbserial/driver/ProlificSerialDriver.java b/android/src/com/hoho/android/usbserial/driver/ProlificSerialDriver.java index d6e2d1338d1a1f08051b5f13d2303a526c7a3639..7c4c0a7f30136065fd71c16224de6ff8682ead0a 100644 --- a/android/src/com/hoho/android/usbserial/driver/ProlificSerialDriver.java +++ b/android/src/com/hoho/android/usbserial/driver/ProlificSerialDriver.java @@ -217,7 +217,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver { } } - /* throw and clear an exception which occured in the status read thread */ + /* throw and clear an exception which occurred in the status read thread */ IOException readStatusException = mReadStatusException; if (mReadStatusException != null) { mReadStatusException = null; @@ -288,7 +288,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver { + "available! Assuming that it is a HX device"); mDeviceType = DEVICE_TYPE_HX; } catch (Exception e) { - Log.e(TAG, "An unexpected exception occured while trying " + Log.e(TAG, "An unexpected exception occurred while trying " + "to detect PL2303 subtype", e); } } @@ -318,7 +318,7 @@ public class ProlificSerialDriver extends CommonUsbSerialDriver { try { mReadStatusThread.join(); } catch (Exception e) { - Log.w(TAG, "An error occured while waiting for status read thread", e); + Log.w(TAG, "An error occurred while waiting for status read thread", e); } } } diff --git a/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java b/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java index b3157061d33fbe9ceab16b2a26b455639e4d1f04..6520ebb6b9258722fa168a19aa9743b9e7820ff8 100644 --- a/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java +++ b/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java @@ -347,7 +347,7 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe Log.e(TAG, "UsbIoManager instance is null"); m_ioManager.put(idL, managerL); m_Executor.submit(managerL); - Log.i(TAG, "Port open successfull"); + Log.i(TAG, "Port open successful"); return idL; } } diff --git a/doc/Doxyfile b/doc/Doxyfile index 344f84a98a16443aafb45e2d33e8d136858df743..c37739f04c3cfc8e35ebd63d52971fdc4984b59c 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -281,7 +281,7 @@ TYPEDEF_HIDES_STRUCT = NO # causing a significant performance penality. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/resources/flightgear/Aircraft/EasyStar/easystar.xml b/resources/flightgear/Aircraft/EasyStar/easystar.xml index 742c6cb6318b5269fb93c35561020a5362a506b3..2d0090e7303d36f05797423f74de9081351a6f89 100644 --- a/resources/flightgear/Aircraft/EasyStar/easystar.xml +++ b/resources/flightgear/Aircraft/EasyStar/easystar.xml @@ -7,7 +7,7 @@ Ron Jensen Aeromatic v 0.91 2010-03-28 - $Revison: $ + $Revision: $ Models a EasyStar. diff --git a/resources/flightgear/Aircraft/EasyStar/readme.txt b/resources/flightgear/Aircraft/EasyStar/readme.txt index ce0b8d625ed5d810ecf5ce772798decf4ff5729e..886a41c0472fb476a95a6c8d8e9615c0403cc438 100644 --- a/resources/flightgear/Aircraft/EasyStar/readme.txt +++ b/resources/flightgear/Aircraft/EasyStar/readme.txt @@ -1,4 +1,4 @@ -Origional readme: +Original readme: ************************************************************************ * MULTIPLEX Modellsport GmbH & Co. KG * * Neuer Weg 2, D-75223 Niefern, Germany * diff --git a/resources/flightgear/Aircraft/Rascal/README.Rascal b/resources/flightgear/Aircraft/Rascal/README.Rascal index 53559bf73c3fabde9ebf0dd8079b8674bf9d37ac..856ef405c559881e9e5f2fb3da5c55f25dd4209b 100644 --- a/resources/flightgear/Aircraft/Rascal/README.Rascal +++ b/resources/flightgear/Aircraft/Rascal/README.Rascal @@ -127,7 +127,7 @@ tires. rudder which is connected to a steerable tail wheel. Use brakes only for positive, precision ground control when necessary. -(3) Taxi upwind with stick back; downwind with stick foreward. When +(3) Taxi upwind with stick back; downwind with stick forward. When ground winds are in excess of 15 M.P.H., turn into wind using ailerons in direction of turn; apply ailerons away from the turn when turning downwind. This procedure helps to prevent the wind "picking up" a diff --git a/resources/flightgear/Aircraft/Rascal110/README.Rascal b/resources/flightgear/Aircraft/Rascal110/README.Rascal index 53559bf73c3fabde9ebf0dd8079b8674bf9d37ac..856ef405c559881e9e5f2fb3da5c55f25dd4209b 100644 --- a/resources/flightgear/Aircraft/Rascal110/README.Rascal +++ b/resources/flightgear/Aircraft/Rascal110/README.Rascal @@ -127,7 +127,7 @@ tires. rudder which is connected to a steerable tail wheel. Use brakes only for positive, precision ground control when necessary. -(3) Taxi upwind with stick back; downwind with stick foreward. When +(3) Taxi upwind with stick back; downwind with stick forward. When ground winds are in excess of 15 M.P.H., turn into wind using ailerons in direction of turn; apply ailerons away from the turn when turning downwind. This procedure helps to prevent the wind "picking up" a diff --git a/src/AutoPilotPlugins/APM/APMCameraComponent.qml b/src/AutoPilotPlugins/APM/APMCameraComponent.qml index 313786ced119a423b8ae64c7dcc46e8d0eadd15d..1e7699f477c8229ae25b64e888081dd23a7ef9eb 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponent.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponent.qml @@ -144,7 +144,7 @@ QGCView { Connections { target: _rc13Function; onValueChanged: calcGimbalOutValues() } Connections { target: _rc14Function; onValueChanged: calcGimbalOutValues() } - // Whenever an MNT_RC_IN_* setting is changed make sure to turn on RC targetting + // Whenever an MNT_RC_IN_* setting is changed make sure to turn on RC targeting Connections { target: _mountRCInPan onValueChanged: _mountDefaultMode.value = _mountDefaultModeRCTargetting diff --git a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml index fc75d7fcd09fa1207eecf848a94467dd995756af..e5d4884e0d313cee58d0ba8f6cb2a5b32f13456b 100644 --- a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml @@ -51,11 +51,11 @@ Item { qsTr("The Main mode switch must always be assigned to a channel in order to fly") readonly property string assistModeName: qsTr("Assist") - readonly property string assistModeDescription: qsTr("If Position Control is placed on a seperate channel from the Main mode channel, an additional 'Assist' mode is added to the Main switch. ") + + readonly property string assistModeDescription: qsTr("If Position Control is placed on a separate channel from the Main mode channel, an additional 'Assist' mode is added to the Main switch. ") + qsTr("In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.") readonly property string autoModeName: qsTr("Auto") - readonly property string autoModeDescription: qsTr("If Loiter is placed on a seperate channel from the Main mode channel, an additional 'Auto' mode is added to the Main switch. ") + + readonly property string autoModeDescription: qsTr("If Loiter is placed on a separate channel from the Main mode channel, an additional 'Auto' mode is added to the Main switch. ") + qsTr("In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.") readonly property string fwAcroModeName: qsTr("Stabilized") diff --git a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc index 2d7fc378a72c7996ff73eaa19c0a5b288f20631e..e8044064e7af5d0be06349d415150a2e75506566 100644 --- a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc +++ b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc @@ -88,7 +88,7 @@ void PX4AdvancedFlightModesController::_init(void) // PosCtl disabled so AltCtl must move back to main Mode switch _assistModeVisible = false; } else { - // Assist mode is visible if AltCtl/PosCtl are on seperate channel from main Mode switch + // Assist mode is visible if AltCtl/PosCtl are on separate channel from main Mode switch _assistModeVisible = posCtlChannel != modeChannel; } @@ -96,7 +96,7 @@ void PX4AdvancedFlightModesController::_init(void) // Loiter disabled so Mission must move back to main Mode switch _autoModeVisible = false; } else { - // Auto mode is visible if Mission/Loiter are on seperate channel from main Mode switch + // Auto mode is visible if Mission/Loiter are on separate channel from main Mode switch _autoModeVisible = loiterChannel != modeChannel; } @@ -662,7 +662,7 @@ void PX4AdvancedFlightModesController::setPosCtlModeChannelIndex(int index) // PosCtl disabled so AltCtl must move back to main Mode switch _assistModeVisible = false; } else { - // Assist mode is visible if AltCtl/PosCtl are on seperate channel from main Mode switch + // Assist mode is visible if AltCtl/PosCtl are on separate channel from main Mode switch _assistModeVisible = channel != getParameterFact(-1, "RC_MAP_MODE_SW")->rawValue().toInt(); } @@ -684,7 +684,7 @@ void PX4AdvancedFlightModesController::setLoiterModeChannelIndex(int index) // Loiter disabled so Mission must move back to main Mode switch _autoModeVisible = false; } else { - // Auto mode is visible if Mission/Loiter are on seperate channel from main Mode switch + // Auto mode is visible if Mission/Loiter are on separate channel from main Mode switch _autoModeVisible = channel != getParameterFact(-1, "RC_MAP_MODE_SW")->rawValue().toInt(); } diff --git a/src/FactSystem/FactMetaData.h b/src/FactSystem/FactMetaData.h index e6eb2c509cd24f71a7dd4754423f7dfd53d11bc3..37b54825edf5f18dcfd3372044d0af5684db5e3a 100644 --- a/src/FactSystem/FactMetaData.h +++ b/src/FactSystem/FactMetaData.h @@ -21,7 +21,7 @@ /// Holds the meta data associated with a Fact. /// -/// Holds the meta data associated with a Fact. This is kept in a seperate object from the Fact itself +/// Holds the meta data associated with a Fact. This is kept in a separate object from the Fact itself /// since you may have multiple instances of the same Fact. But there is only ever one FactMetaData /// instance or each Fact. class FactMetaData : public QObject diff --git a/src/FactSystem/ParameterLoader.h b/src/FactSystem/ParameterLoader.h index 944f5920a5bd16e8876ff8cd76c883baf27e64d2..515181e623ea6a17034f708def3dd2dd42ea50d9 100644 --- a/src/FactSystem/ParameterLoader.h +++ b/src/FactSystem/ParameterLoader.h @@ -142,7 +142,7 @@ private: QMap > _mapGroup2ParameterName; bool _parametersReady; ///< true: full set of parameters correctly loaded - bool _initialLoadComplete; ///< true: Initial load of all parameters complete, whether succesful or not + bool _initialLoadComplete; ///< true: Initial load of all parameters complete, whether successful or not bool _waitingForDefaultComponent; ///< true: last chance wait for default component params bool _saveRequired; ///< true: _saveToEEPROM should be called int _defaultComponentId; diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc index 96f32dd2fe0ab7956c7852a9627463918b82b174..30032c2f26d8d9204b97cab5d55616a61b9ece0e 100644 --- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc +++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc @@ -312,7 +312,7 @@ bool APMParameterMetaData::parseParameterAttributes(QXmlStreamReader& xml, APMFa // as long as param doens't end while (!(elementName == "param" && xml.isEndElement())) { if (elementName.isEmpty()) { - // skip empty elements. Somehow I am getting lot of these. Dont know what to do with them. + // skip empty elements. Somehow I am getting lot of these. Don't know what to do with them. } else if (elementName == "field") { QString attributeName = xml.attributes().value("name").toString(); diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h index 4e1159e142c73e7463ce5f0b91b60666980a6c11..0c7625032b9e62cd70b3479134fbe02ef26a9595 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.h +++ b/src/FirmwarePlugin/FirmwarePlugin.h @@ -181,7 +181,7 @@ public: virtual QString internalParameterMetaDataFile(void) { return QString(); } /// Loads the specified parameter meta data file. - /// @return Opaque parameter meta data information which must be stored with Vehicle. Vehicle is reponsible to + /// @return Opaque parameter meta data information which must be stored with Vehicle. Vehicle is responsible to /// call deleteParameterMetaData when no longer needed. virtual QObject* loadParameterMetaData(const QString& metaDataFile) { Q_UNUSED(metaDataFile); return NULL; } diff --git a/src/FollowMe/FollowMe.cc b/src/FollowMe/FollowMe.cc index 2c4a3d151b8a9743134e1d01ab268a5bdf46493c..f5bcb45334cecc2d446361f31418ba108a3f1300 100644 --- a/src/FollowMe/FollowMe.cc +++ b/src/FollowMe/FollowMe.cc @@ -92,13 +92,13 @@ void FollowMe::_setGPSLocation(QGeoPositionInfo geoPositionInfo) _motionReport.pos_std_dev[2] = geoPositionInfo.attribute(QGeoPositionInfo::VerticalAccuracy); } - // calculate z velocity if it's availible + // calculate z velocity if it's available if(geoPositionInfo.hasAttribute(QGeoPositionInfo::VerticalSpeed)) { _motionReport.vz = geoPositionInfo.attribute(QGeoPositionInfo::VerticalSpeed); } - // calculate x,y velocity if it's availible + // calculate x,y velocity if it's available if((geoPositionInfo.hasAttribute(QGeoPositionInfo::Direction) == true) && (geoPositionInfo.hasAttribute(QGeoPositionInfo::GroundSpeed) == true)) { diff --git a/src/LogCompressor.cc b/src/LogCompressor.cc index 7e4099084c606c0fd2fdccce737aeea86a07f021..ed923f21e3dbc42eab3862308ddfe6e8771f0f5f 100644 --- a/src/LogCompressor.cc +++ b/src/LogCompressor.cc @@ -70,7 +70,7 @@ void LogCompressor::run() // First we search the input file through keySearchLimit number of lines - // looking for variables. This is neccessary before CSV files require + // looking for variables. This is necessary before CSV files require // the same number of fields for every line. const unsigned int keySearchLimit = 15000; unsigned int keyCounter = 0; diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml index 55d57223ace8230e73c2f2f8fcf39cf82391b39c..f8beda4c283a32f89b25b1d61e91a03552752c45 100644 --- a/src/MissionEditor/SurveyItemEditor.qml +++ b/src/MissionEditor/SurveyItemEditor.qml @@ -16,7 +16,7 @@ Rectangle { color: qgcPal.windowShadeDark radius: _radius - // The following properties must be available up the hierachy chain + // The following properties must be available up the hierarchy chain //property real availableWidth ///< Width for control //property var missionItem ///< Mission Item for editor diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json index cfcb346de1767490e2190279654bf6ce2ba01a5a..81cf9f6a1ad2e7f98bc793a07340d301fcc30ba6 100644 --- a/src/MissionManager/MavCmdInfoCommon.json +++ b/src/MissionManager/MavCmdInfoCommon.json @@ -768,7 +768,7 @@ "label": "Mode:", "default": 0, "decimalPlaces": 0, - "enumStrings": "Retract,Neutral,Mavlink Targetting,RC Targetting,GPS Point", + "enumStrings": "Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point", "enumValues": "0,1,2,3,4" }, "param2": { diff --git a/src/MissionManager/MissionManager.cc b/src/MissionManager/MissionManager.cc index e7b09d4deb2ea8785628d0515e7e5a40ca8662af..05ebd3e31d3f007739ac0672acbb32dd6b6647f3 100644 --- a/src/MissionManager/MissionManager.cc +++ b/src/MissionManager/MissionManager.cc @@ -165,7 +165,7 @@ void MissionManager::_ackTimeout(void) if (timedOutAck == AckNone) { qCWarning(MissionManagerLog) << "_ackTimeout timeout with AckNone"; - _sendError(InternalError, "Internal error occured during Mission Item communication: _ackTimeOut:_retryAck == AckNone"); + _sendError(InternalError, "Internal error occurred during Mission Item communication: _ackTimeOut:_retryAck == AckNone"); return; } diff --git a/src/MissionManager/MissionManager.h b/src/MissionManager/MissionManager.h index 8e6146ed0f4fc6be647ba03cd797a3acba241da2..f3661e1af85234160b6c009a0af501cfe541023b 100644 --- a/src/MissionManager/MissionManager.h +++ b/src/MissionManager/MissionManager.h @@ -82,7 +82,7 @@ private: AckMissionCount, ///< MISSION_COUNT message expected AckMissionItem, ///< MISSION_ITEM expected AckMissionRequest, ///< MISSION_REQUEST is expected, or MISSION_ACK to end sequence - AckGuidedItem, ///< MISSION_ACK expected in reponse to ArduPilot guided mode single item send + AckGuidedItem, ///< MISSION_ACK expected in response to ArduPilot guided mode single item send } AckType_t; void _startAckTimeout(AckType_t ack); diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc index 66d602b506eab3722fc280f3c542a5b68c248417..6f7cf029fb0226d4dff682918c0fbcb528b1e69c 100644 --- a/src/MissionManager/SimpleMissionItem.cc +++ b/src/MissionManager/SimpleMissionItem.cc @@ -152,7 +152,7 @@ void SimpleMissionItem::_connectSignals(void) connect(&_missionItem._commandFact, &Fact::valueChanged, this, &SimpleMissionItem::_setDirtyFromSignal); connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::_setDirtyFromSignal); - // Values from these facts must propogate back and forth between the real object storage + // Values from these facts must propagate back and forth between the real object storage connect(&_altitudeRelativeToHomeFact, &Fact::valueChanged, this, &SimpleMissionItem::_syncAltitudeRelativeToHomeToFrame); connect(&_missionItem._frameFact, &Fact::valueChanged, this, &SimpleMissionItem::_syncFrameToAltitudeRelativeToHome); @@ -182,7 +182,7 @@ void SimpleMissionItem::_connectSignals(void) connect(&_missionItem._commandFact, &Fact::valueChanged, this, &SimpleMissionItem::_sendCommandChanged); connect(&_missionItem._frameFact, &Fact::valueChanged, this, &SimpleMissionItem::_sendFrameChanged); - // Sequence number is kept in mission iteem, so we need to propogate signal up as well + // Sequence number is kept in mission iteem, so we need to propagate signal up as well connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::sequenceNumberChanged); } diff --git a/src/MissionManager/VisualMissionItem.h b/src/MissionManager/VisualMissionItem.h index e5f58a5ee98b96f0344e9b0e60d4de64c12edb27..6e1fa8daff949ecd87fca03ba0ce11f57a7a16ee 100644 --- a/src/MissionManager/VisualMissionItem.h +++ b/src/MissionManager/VisualMissionItem.h @@ -40,7 +40,7 @@ public: const VisualMissionItem& operator=(const VisualMissionItem& other); - // The following properties are calulated/set by the MissionControll recalc methods + // The following properties are calculated/set by the MissionControll recalc methods Q_PROPERTY(double altDifference READ altDifference WRITE setAltDifference NOTIFY altDifferenceChanged) ///< Change in altitude from previous waypoint Q_PROPERTY(double altPercent READ altPercent WRITE setAltPercent NOTIFY altPercentChanged) ///< Percent of total altitude change in mission altitude diff --git a/src/PositionManager/SimulatedPosition.h b/src/PositionManager/SimulatedPosition.h index 5e82229f85471bc4db4068f0916080947fd9d6c0..ebd36657e6168c9f6401b66d7ea6198176229069 100644 --- a/src/PositionManager/SimulatedPosition.h +++ b/src/PositionManager/SimulatedPosition.h @@ -41,7 +41,7 @@ private: QGeoPositionInfo lastPosition; - // items for simulating QGC movment in jMAVSIM + // items for simulating QGC movement in jMAVSIM int32_t lat_int; int32_t lon_int; diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 90a376aeb71e9e60858c2ff4047eb73d1d02ae97..98ef422614a4b1be03630285194bbff47102d3d3 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -206,7 +206,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) if (!_runningUnitTests) { if (getuid() == 0) { QMessageBox msgBox; - msgBox.setInformativeText("You are runnning QGroundControl as root. " + msgBox.setInformativeText("You are running QGroundControl as root. " "You should not do this since it will cause other issues with QGroundControl. " "QGroundControl will now exit. " "If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:\n" diff --git a/src/QGCMobileFileDialogController.h b/src/QGCMobileFileDialogController.h index 9507a175c717a9d045edca11c8e008fecfaf2f41..602d84e6517ea2cfdf9ab4b9ed06e2ea7f2dc0bc 100644 --- a/src/QGCMobileFileDialogController.h +++ b/src/QGCMobileFileDialogController.h @@ -30,7 +30,7 @@ public: /// @param fileExtension Expected file extension, added if needed Q_INVOKABLE QString fullPath(const QString& filename, const QString& fileExtension); - /// Check for file existance + /// Check for file existence /// @param filename File name, not fully qualified, may not have extension /// @param fileExtension Expected file extension, added if needed /// @return true: File exists at Documents location diff --git a/src/QGCQmlWidgetHolder.h b/src/QGCQmlWidgetHolder.h index b3e57329af5f9d5d3ad4a0da1b1195d2e805b1d9..fc2b1838d98c57fcee2179a22b4d898b08ea3e85 100644 --- a/src/QGCQmlWidgetHolder.h +++ b/src/QGCQmlWidgetHolder.h @@ -50,7 +50,7 @@ public: QQmlEngine* getEngine(); /// Sets the QML into the control. Will display errors message box if error occurs loading source. - /// @return true: source loaded, false: source not loaded, errors occured + /// @return true: source loaded, false: source not loaded, errors occurred bool setSource(const QUrl& qmlUrl); void setContextPropertyObject(const QString& name, QObject* object); diff --git a/src/QGCQuickWidget.cc b/src/QGCQuickWidget.cc index 8f5b9f5f932ed338d23ef6864c084340ba47ecfb..a3628bc6d525e0e6a12005df507861908839be72 100644 --- a/src/QGCQuickWidget.cc +++ b/src/QGCQuickWidget.cc @@ -18,7 +18,7 @@ #include /// @file -/// @brief Subclass of QQuickWidget which injects Facts and the Pallete object into +/// @brief Subclass of QQuickWidget which injects Facts and the Palette object into /// the QML context. /// /// @author Don Gagne diff --git a/src/QGCQuickWidget.h b/src/QGCQuickWidget.h index 5cc8dcc8d9c60e1e8328634a42333b214268469b..6b47309274f2b6ffbb6bbf2a66bea441a6d2a850 100644 --- a/src/QGCQuickWidget.h +++ b/src/QGCQuickWidget.h @@ -16,7 +16,7 @@ #include "AutoPilotPlugin.h" /// @file -/// @brief Subclass of QQuickWidget which injects Facts and the Pallete object into +/// @brief Subclass of QQuickWidget which injects Facts and the Palette object into /// the QML context. /// /// @author Don Gagne @@ -31,7 +31,7 @@ public: void setAutoPilot(AutoPilotPlugin* autoPilot); /// Sets the QML into the control. Will display errors message box if error occurs loading source. - /// @return true: source loaded, false: source not loaded, errors occured + /// @return true: source loaded, false: source not loaded, errors occurred bool setSource(const QUrl& qmlUrl); }; diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index 345cc40ae8e17d2fac3f34e4dca87007f02b927b..a39be4d577585b886ac22bccd364826ae026a0bc 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -32,12 +32,12 @@ Item { property real defaultFontPointSize: 10 - /// You can use this property to position ui elements in a screen resolution independant manner. Using fixed positioning values should not + /// You can use this property to position ui elements in a screen resolution independent manner. Using fixed positioning values should not /// be done. All positioning should be done using anchors or a ratio of the defaultFontPixelHeight and defaultFontPixelWidth values. This way /// your ui elements will reposition themselves appropriately on varying screen sizes and resolutions. property real defaultFontPixelHeight: 10 - /// You can use this property to position ui elements in a screen resolution independant manner. Using fixed positioning values should not + /// You can use this property to position ui elements in a screen resolution independent manner. Using fixed positioning values should not /// be done. All positioning should be done using anchors or a ratio of the defaultFontPixelHeight and defaultFontPixelWidth values. This way /// your ui elements will reposition themselves appropriately on varying screen sizes and resolutions. property real defaultFontPixelWidth: 10 diff --git a/src/VehicleSetup/FirmwareImage.cc b/src/VehicleSetup/FirmwareImage.cc index 4b5562719f2f8a35b4835ed81f09d3272609e730..cce005b7366d146f5171388a50428716fbdef40f 100644 --- a/src/VehicleSetup/FirmwareImage.cc +++ b/src/VehicleSetup/FirmwareImage.cc @@ -198,7 +198,7 @@ bool FirmwareImage::_px4Load(const QString& imageFilename) { _imageSize = 0; - // We need to collect information from the .px4 file as well as pull the binary image out to a seperate file. + // We need to collect information from the .px4 file as well as pull the binary image out to a separate file. QFile px4File(imageFilename); if (!px4File.open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -400,7 +400,7 @@ bool FirmwareImage::_decompressJsonValue(const QJsonObject& jsonObject, ///< J return false; } - emit statusMessage(QString("Succesfully decompressed %1").arg(bytesKey)); + emit statusMessage(QString("Successfully decompressed %1").arg(bytesKey)); return true; } diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml index a89c9e5ed60c51470e773f4cdda69b6d06232567..55df893480a96c51c2e7842ed6363d2e7b91dc0f 100644 --- a/src/VehicleSetup/FirmwareUpgrade.qml +++ b/src/VehicleSetup/FirmwareUpgrade.qml @@ -312,7 +312,7 @@ QGCView { qsTr("This firmware has NOT BEEN FLIGHT TESTED. ") + qsTr("It is only intended for DEVELOPERS. ") + qsTr("Run bench tests without props first. ") + - qsTr("Do NOT fly this without additonal safety precautions. ") + + qsTr("Do NOT fly this without additional safety precautions. ") + qsTr("Follow the mailing list actively when using it.") } else { firmwareVersionWarningLabel.visible = false diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h index ea344a3517089f02053cb68c183514999baf09bd..cd093fd2f1aefda0f8c1383c3c4e21dca099f38e 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.h +++ b/src/VehicleSetup/FirmwareUpgradeController.h @@ -218,7 +218,7 @@ private: QNetworkAccessManager* _downloadManager; ///< Used for firmware file downloading across the internet QNetworkReply* _downloadNetworkReply; ///< Used for firmware file downloading across the internet - /// @brief Thread controller which is used to run bootloader commands on seperate thread + /// @brief Thread controller which is used to run bootloader commands on separate thread PX4FirmwareUpgradeThreadController* _threadController; static const int _eraseTickMsec = 500; ///< Progress bar update tick time for erase diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc index 56c4d2eafaa16c95e426d35dea356a65e40bb739..532ca38df28f7b698aab59742808a8d35020240a 100644 --- a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc +++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc @@ -9,7 +9,7 @@ /// @file -/// @brief PX4 Firmware Upgrade operations which occur on a seperate thread. +/// @brief PX4 Firmware Upgrade operations which occur on a separate thread. /// @author Don Gagne #include "PX4FirmwareUpgradeThread.h" diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.h b/src/VehicleSetup/PX4FirmwareUpgradeThread.h index cf75f1ab135c160c75b16a5b50c0c9994bde4e73..cff613019a3a9275f2db41a05895493b39d7ff18 100644 --- a/src/VehicleSetup/PX4FirmwareUpgradeThread.h +++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.h @@ -9,7 +9,7 @@ /// @file -/// @brief PX4 Firmware Upgrade operations which occur on a seperate thread. +/// @brief PX4 Firmware Upgrade operations which occur on a separate thread. /// @author Don Gagne #ifndef PX4FirmwareUpgradeThread_H @@ -30,7 +30,7 @@ class PX4FirmwareUpgradeThreadController; -/// @brief Used to run bootloader commands on a seperate thread. These routines are mainly meant to to be called +/// @brief Used to run bootloader commands on a separate thread. These routines are mainly meant to to be called /// internally by the PX4FirmwareUpgradeThreadController. Clients should call the various public methods /// exposed by PX4FirmwareUpgradeThreadController. class PX4FirmwareUpgradeThreadWorker : public QObject @@ -83,7 +83,7 @@ private: }; /// @brief Provides methods to interact with the bootloader. The commands themselves are signalled -/// across to PX4FirmwareUpgradeThreadWorker so that they run on the seperate thread. +/// across to PX4FirmwareUpgradeThreadWorker so that they run on the separate thread. class PX4FirmwareUpgradeThreadController : public QObject { Q_OBJECT diff --git a/src/VideoStreaming/gstqtvideosink/gstqtglvideosink.cpp b/src/VideoStreaming/gstqtvideosink/gstqtglvideosink.cpp index 2af4d8a8a45af0d89293f15b0bccea0813c215bc..c92cca8de4761d5284be2e3ea30f2122220be6cf 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtglvideosink.cpp +++ b/src/VideoStreaming/gstqtvideosink/gstqtglvideosink.cpp @@ -86,7 +86,7 @@ void GstQtGLVideoSink::class_init(gpointer g_class, gpointer class_data) * This is an action signal that you can call from your Qt surface class inside * its paint function to render the video. It takes a QPainter* and the target * area rectangle as arguments. You should schedule to call this function to - * repaint the surface whenever the ::update signal is emited. + * repaint the surface whenever the ::update signal is emitted. * * Note that the x,y,width and height arguments are actually qreal. This means * that on architectures like arm they will be float instead of double. You should @@ -107,7 +107,7 @@ void GstQtGLVideoSink::class_init(gpointer g_class, gpointer class_data) /** * GstQtGLVideoSink::update * - * This signal is emited when the surface should be repainted. It should + * This signal is emitted when the surface should be repainted. It should * be connected to QWidget::update() or QGraphicsItem::update() or any * other similar function in your surface. */ diff --git a/src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.cpp b/src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.cpp index eedfd06999b161a2ac318257196b7033615a36da..fb07d1c95e5bbe1631fad9e5de23c07696474b50 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.cpp +++ b/src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.cpp @@ -410,7 +410,7 @@ gst_qt_quick2_video_sink_class_init (GstQtQuick2VideoSinkClass *klass) * inside its updateNode function to render the video. It takes a QSGNode* * and the item's area rectangle as arguments. You should schedule to call * this function to repaint the surface whenever the ::update signal is - * emited. + * emitted. * * Note that the x,y,width and height arguments are actually qreal. * This means that on architectures like arm they will be float instead @@ -432,7 +432,7 @@ gst_qt_quick2_video_sink_class_init (GstQtQuick2VideoSinkClass *klass) /** * GstQtQuick2VideoSink::update * - * This signal is emited when the surface should be repainted. It should + * This signal is emitted when the surface should be repainted. It should * be connected to QQuickItem::update(). */ s_signals[SIGNAL_UPDATE] = diff --git a/src/VideoStreaming/gstqtvideosink/gstqtvideosink.cpp b/src/VideoStreaming/gstqtvideosink/gstqtvideosink.cpp index b491745cd119f001af5b9374953408725b8dc183..edb5a6db9941297f1d6569c06550392a7ac293ee 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtvideosink.cpp +++ b/src/VideoStreaming/gstqtvideosink/gstqtvideosink.cpp @@ -66,7 +66,7 @@ void GstQtVideoSink::class_init(gpointer g_class, gpointer class_data) * This is an action signal that you can call from your Qt surface class inside * its paint function to render the video. It takes a QPainter* and the target * area rectangle as arguments. You should schedule to call this function to - * repaint the surface whenever the ::update signal is emited. + * repaint the surface whenever the ::update signal is emitted. * * Note that the x,y,width and height arguments are actually qreal. This means * that on architectures like arm they will be float instead of double. You should @@ -87,7 +87,7 @@ void GstQtVideoSink::class_init(gpointer g_class, gpointer class_data) /** * GstQtVideoSink::update * - * This signal is emited when the surface should be repainted. It should + * This signal is emitted when the surface should be repainted. It should * be connected to QWidget::update() or QGraphicsItem::update() or any * other similar function in your surface. */ diff --git a/src/comm/LinkInterface.h b/src/comm/LinkInterface.h index 5a83bee0fdb07d97333404143be3fbbd585db8e2..ed47e7ab62e833e1bcfa95cdad8c4b07c803aa56 100644 --- a/src/comm/LinkInterface.h +++ b/src/comm/LinkInterface.h @@ -187,7 +187,7 @@ signals: */ void nameChanged(QString name); - /** @brief Communication error occured */ + /** @brief Communication error occurred */ void communicationError(const QString& title, const QString& error); void communicationUpdate(const QString& linkname, const QString& text); @@ -217,7 +217,7 @@ protected: /// This function logs the send times and amounts of datas for input. Data is used for calculating /// the transmission rate. /// @param byteCount Number of bytes received - /// @param time Time in ms send occured + /// @param time Time in ms send occurred void _logInputDataRate(quint64 byteCount, qint64 time) { if(_enableRateCollection) _logDataRateToBuffer(_inDataWriteAmounts, _inDataWriteTimes, &_inDataIndex, byteCount, time); @@ -226,7 +226,7 @@ protected: /// This function logs the send times and amounts of datas for output. Data is used for calculating /// the transmission rate. /// @param byteCount Number of bytes sent - /// @param time Time in ms receive occured + /// @param time Time in ms receive occurred void _logOutputDataRate(quint64 byteCount, qint64 time) { if(_enableRateCollection) _logDataRateToBuffer(_outDataWriteAmounts, _outDataWriteTimes, &_outDataIndex, byteCount, time); diff --git a/src/comm/LogReplayLink.cc b/src/comm/LogReplayLink.cc index 00f286265ed896331d12630310f83f82baeef80b..273d358867da3840b480fb1928e117a220c592aa 100644 --- a/src/comm/LogReplayLink.cc +++ b/src/comm/LogReplayLink.cc @@ -159,7 +159,7 @@ quint64 LogReplayLink::_parseTimestamp(const QByteArray& bytes) return timestamp; } -/// Seeks to the beginning of the next successully parsed mavlink message in the log file. +/// Seeks to the beginning of the next successfully parsed mavlink message in the log file. /// @param nextMsg[output] Parsed next message that was found /// @return A Unix timestamp in microseconds UTC for found message or 0 if parsing failed quint64 LogReplayLink::_seekToNextMavlinkMessage(mavlink_message_t* nextMsg) diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc index 2779fb7e1b326ec96682657882069f3450173b50..fcbb4029fb7c458908cea6d07b9545379c6eaa5c 100644 --- a/src/comm/QGCFlightGearLink.cc +++ b/src/comm/QGCFlightGearLink.cc @@ -68,13 +68,13 @@ QGCFlightGearLink::QGCFlightGearLink(Vehicle* vehicle, QString startupArguments, QGCFlightGearLink::~QGCFlightGearLink() { //do not disconnect unless it is connected. - //disconnectSimulation will delete the memory that was allocated for proces, terraSync and _udpCommSocket + //disconnectSimulation will delete the memory that was allocated for process, terraSync and _udpCommSocket if(connectState){ disconnectSimulation(); } } -/// @brief Runs the simulation thread. We do setup work here which needs to happen in the seperate thread. +/// @brief Runs the simulation thread. We do setup work here which needs to happen in the separate thread. void QGCFlightGearLink::run() { Q_ASSERT(_vehicle); @@ -497,7 +497,7 @@ bool QGCFlightGearLink::disconnectSimulation() return !connectState; } -/// @brief Splits a space seperated set of command line arguments into a QStringList. +/// @brief Splits a space separated set of command line arguments into a QStringList. /// Quoted strings are allowed and handled correctly. /// @param uiArgs Arguments to parse /// @param argList Returned argument list @@ -602,7 +602,7 @@ bool QGCFlightGearLink::connectSimulation() // We setup all the information we need to start FlightGear here such that if something goes // wrong we can return false out of here. All of this happens on the main UI thread. Once we // have that information setup we start the thread which will call run, which will in turn - // start the various FG processes on the seperate thread. + // start the various FG processes on the separate thread. if (!_vehicle->uas()) { return false; @@ -617,7 +617,7 @@ bool QGCFlightGearLink::connectSimulation() QDir fgAppDir; // Location of main FlightGear application // Reset the list of arguments which will be provided to FG to the arguments set by the user via the UI - // First split the space seperated command line arguments coming in from the ui into a QStringList since + // First split the space separated command line arguments coming in from the ui into a QStringList since // that is what QProcess::start needs. QStringList uiArgList; bool mismatchedQuotes = parseUIArguments(startupArguments, uiArgList); @@ -709,7 +709,7 @@ bool QGCFlightGearLink::connectSimulation() regExp.setPattern("^fg_scenery:(.*)"); if (regExp.indexIn(line) == 0 && regExp.captureCount() == 1) { - // Scenery can contain multiple paths seperated by ';' so don't do QDir::absolutePath on it + // Scenery can contain multiple paths separated by ';' so don't do QDir::absolutePath on it fgSceneryPath = regExp.cap(1); qDebug() << "fg_scenery" << fgSceneryPath; continue; diff --git a/src/comm/QGCJSBSimLink.cc b/src/comm/QGCJSBSimLink.cc index 2e7867d95122b835fa858efc00e9028afbde69b1..be22be67aba8564463cba61b1a6314c897991c75 100644 --- a/src/comm/QGCJSBSimLink.cc +++ b/src/comm/QGCJSBSimLink.cc @@ -48,7 +48,7 @@ QGCJSBSimLink::QGCJSBSimLink(Vehicle* vehicle, QString startupArguments, QString QGCJSBSimLink::~QGCJSBSimLink() { //do not disconnect unless it is connected. - //disconnectSimulation will delete the memory that was allocated for proces, terraSync and socket + //disconnectSimulation will delete the memory that was allocated for process, terraSync and socket if(connectState){ disconnectSimulation(); } diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc index 65f2cfc17944118af85c1e9c3b4f2b641b8dc3b4..085648b4d065251a88b00fde2c8e8992fff9b1b6 100644 --- a/src/comm/SerialLink.cc +++ b/src/comm/SerialLink.cc @@ -88,7 +88,7 @@ void SerialLink::_writeBytes(const QByteArray data) _logOutputDataRate(data.size(), QDateTime::currentMSecsSinceEpoch()); _port->write(data); } else { - // Error occured + // Error occurred _emitLinkError(tr("Could not send data - link %1 is disconnected!").arg(getName())); } } diff --git a/src/input/Mouse6dofInput.cpp b/src/input/Mouse6dofInput.cpp index d1c5956ea0daf0874df79edeb3ba7214ae32ea9e..26d41620f75ffa19f5ea4930020fbb102f149e6b 100644 --- a/src/input/Mouse6dofInput.cpp +++ b/src/input/Mouse6dofInput.cpp @@ -240,7 +240,7 @@ void Mouse6dofInput::button3DMouseDown(int button) #ifdef QGC_MOUSE_ENABLED_LINUX void Mouse6dofInput::handleX11Event(XEvent *event) { - //qDebug("XEvent occured..."); + //qDebug("XEvent occurred..."); if (!mouseActive) { qDebug() << "3dMouse not initialized. Cancelled handling X11event for 3dMouse"; diff --git a/src/qgcunittest/FileManagerTest.cc b/src/qgcunittest/FileManagerTest.cc index 6c08cacb0be13632b0c043824a0207138b8c4491..0a8cc1f9158d4ab1db5be735268e59e97a1a0b5b 100644 --- a/src/qgcunittest/FileManagerTest.cc +++ b/src/qgcunittest/FileManagerTest.cc @@ -235,7 +235,7 @@ void FileManagerTest::_readDownloadTest(void) _fileManager->downloadPath(testCase->filename, QDir::temp()); QTest::qWait(_ackTimerTimeoutMsecs); // Let the file manager timeout - // This should be a succesful download + // This should be a successful download QCOMPARE(_multiSpy->checkOnlySignalByMask(commandCompleteSignalMask), true); _multiSpy->clearAllSignals(); @@ -321,7 +321,7 @@ void FileManagerTest::_streamDownloadTest(void) _fileManager->streamPath(testCase->filename, QDir::temp()); QTest::qWait(_ackTimerTimeoutMsecs); // Let the file manager timeout - // This should be a succesful download + // This should be a successful download QCOMPARE(_multiSpy->checkOnlySignalByMask(commandCompleteSignalMask), true); _multiSpy->clearAllSignals(); diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index d4d107c0f142fcb3879973a3500cec78db482c5b..32b74d9d0b1aab91e5f78e41499f31addfa245ee 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -1745,7 +1745,7 @@ float UAS::addZeroMeanNoise(float truth_meas, float noise_var) //as well float noise = z0 * sqrt(noise_var); //calculate normally distributed variable with mu = 0, std = var^2 - //Finally gaurd against any case where the noise is not real + //Finally guard against any case where the noise is not real if(std::isfinite(noise)) { return truth_meas + noise; } else { diff --git a/src/uas/UAS.h b/src/uas/UAS.h index 59aa19bc49716f5f92a96e30dddfece4a8f77eac..1e93a06702404203b6b6e57469d983edf5c0dcf6 100644 --- a/src/uas/UAS.h +++ b/src/uas/UAS.h @@ -590,7 +590,7 @@ protected: bool componentMulti[256]; bool connectionLost; ///< Flag indicates a timed out connection quint64 connectionLossTime; ///< Time the connection was interrupted - quint64 lastVoltageWarning; ///< Time at which the last voltage warning occured + quint64 lastVoltageWarning; ///< Time at which the last voltage warning occurred quint64 lastNonNullTime; ///< The last timestamp from the MAV that was not null unsigned int onboardTimeOffsetInvalidCount; ///< Count when the offboard time offset estimation seemed wrong bool hilEnabled; diff --git a/src/uas/UASInterface.h b/src/uas/UASInterface.h index 035920e7542f5a2ce727cf4cbd75d550d7ee209e..cf022f5932c4c6955baf1b47d30bf84130678a2b 100644 --- a/src/uas/UASInterface.h +++ b/src/uas/UASInterface.h @@ -192,7 +192,7 @@ signals: /** * @brief Update the error count of a device * - * The error count indicates how many errors occured during the use of a device. + * The error count indicates how many errors occurred during the use of a device. * Usually a random error from time to time is acceptable, e.g. through electromagnetic * interferences on device lines like I2C and SPI. A constantly and rapidly increasing * error count however can help to identify broken cables or misbehaving drivers. @@ -200,7 +200,7 @@ signals: * @param uasid System ID * @param component Name of the component, e.g. "IMU" * @param device Name of the device, e.g. "SPI0" or "I2C1" - * @param count Errors occured since system startup + * @param count Errors occurred since system startup */ void errCountChanged(int uasid, QString component, QString device, int count); diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index fbc1b53eed140f5373c64cad60331f40236a5c1a..98bd3b6bd5df6e9574e948625091cf118fb2ed0e 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -405,7 +405,7 @@ void MainWindow::reallyClose(void) void MainWindow::closeEvent(QCloseEvent *event) { if (!_forceClose) { - // Attemp close from within the root Qml item + // Attempt close from within the root Qml item qgcApp()->qmlAttemptWindowClose(); event->ignore(); return; diff --git a/src/ui/QGCDataPlot2D.cc b/src/ui/QGCDataPlot2D.cc index 788bf8271ebba20d4dde1418d7483e691557fd22..472b91e1f4ffc03d86a9b1c8780dd3bfb46d0332 100644 --- a/src/ui/QGCDataPlot2D.cc +++ b/src/ui/QGCDataPlot2D.cc @@ -680,7 +680,7 @@ bool QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, dou syy = sumy2 - sumy * sumy / n; sxy = sumxy - sumx * sumy / n; - /* Infinite slope (b), non existant intercept (a) */ + /* Infinite slope (b), non existent intercept (a) */ if (fabs(sxx) == 0) return false; diff --git a/src/ui/linechart/IncrementalPlot.cc b/src/ui/linechart/IncrementalPlot.cc index eb3ee8e69c6fec1ad1e4f7568d7ec4164afe192e..ff594e27cd688f64b783a2c1e2a1c92d9d232b53 100644 --- a/src/ui/linechart/IncrementalPlot.cc +++ b/src/ui/linechart/IncrementalPlot.cc @@ -128,7 +128,7 @@ void IncrementalPlot::showLegend(bool show) } /** - * Set datapoint and line style. This interface is intented + * Set datapoint and line style. This interface is intended * to be directly connected to the UI and allows to parse * human-readable, textual descriptions into plot specs. * diff --git a/src/ui/linechart/LinechartPlot.h b/src/ui/linechart/LinechartPlot.h index cd311d3ce196b1872afdb24bccc9072d99beb3fd..2d6e38e9f02b58b129386692aa892c0fffc7dcc9 100644 --- a/src/ui/linechart/LinechartPlot.h +++ b/src/ui/linechart/LinechartPlot.h @@ -240,9 +240,9 @@ protected: // TODO CHECK THIS!!! int scaling; QwtScaleEngine* yScaleEngine; - quint64 minTime; ///< The smallest timestamp occured so far + quint64 minTime; ///< The smallest timestamp occurred so far quint64 lastTime; ///< Last added timestamp - quint64 maxTime; ///< The biggest timestamp occured so far + quint64 maxTime; ///< The biggest timestamp occurred so far quint64 maxInterval; quint64 storageInterval; diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml index 1b38d7361bb828fb7058ef929368c8d33e74bfa6..902b83e128067685b517892575a48358ec8a00c3 100644 --- a/src/ui/toolbar/MainToolBar.qml +++ b/src/ui/toolbar/MainToolBar.qml @@ -219,7 +219,7 @@ Rectangle { QGCLabel { id: rssiLabel - text: activeVehicle ? (activeVehicle.rcRSSI != 255 ? qsTr("RC RSSI Status") : qsTr("RC RSSI Data Unavailable")) : qsTr("N/A", "No data avaliable") + text: activeVehicle ? (activeVehicle.rcRSSI != 255 ? qsTr("RC RSSI Status") : qsTr("RC RSSI Data Unavailable")) : qsTr("N/A", "No data available") font.family: ScreenTools.demiboldFontFamily anchors.horizontalCenter: parent.horizontalCenter } diff --git a/tools/osxrelocator.py b/tools/osxrelocator.py index 6090ef91b1ff7710eb0b3590912525c01fabe6a9..9a6999b5dfb6f61148f0ef88ffe35be5a098fe47 100755 --- a/tools/osxrelocator.py +++ b/tools/osxrelocator.py @@ -137,7 +137,7 @@ class Main(object): # module import optparse usage = "usage: %prog [options] directory old_prefix new_prefix" - description = 'Rellocates object files changing the dependant '\ + description = 'Rellocates object files changing the dependent '\ ' dynamic libraries location path with a new one' parser = optparse.OptionParser(usage=usage, description=description) parser.add_option('-r', '--recursive', action='store_true', diff --git a/tools/prepare_gstreamer_framework.sh b/tools/prepare_gstreamer_framework.sh index c1e4993e792b809bf0ded3e2e2f0e26397d89650..f59f4c93bbd7ff8bc5296e17dbe4b457d4f034f6 100755 --- a/tools/prepare_gstreamer_framework.sh +++ b/tools/prepare_gstreamer_framework.sh @@ -62,7 +62,7 @@ process_framework() { rm -rf $GST_TARGET/lib/libffi-3.0.13 rm -rf $GST_TARGET/lib/pkgconfig rm $GST_TARGET/Commands - #-- Now relocate the embeded paths + #-- Now relocate the embedded paths echo "GST Installer: Relocating" python $RELOC -r "$GST_TARGET" "$OLDDLPATH" "$NEWDLPATH" > /dev/null || die "Error relocating binaries in $GST_TARGET/lib" }