From deb279bf467478982635b2da847a0ded9c0d7f58 Mon Sep 17 00:00:00 2001 From: Nate Weibley Date: Fri, 17 Jun 2016 13:38:09 -0400 Subject: [PATCH] Correct camelCase --- src/MissionManager/MissionController.cc | 12 ++++++------ src/MissionManager/MissionController.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 6c57a942d..7e0dee440 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -616,8 +616,8 @@ void MissionController::_recalcWaypointLines(void) qCDebug(MissionControllerLog) << "_recalcWaypointLines"; - CoordVectHashTable old_table = _lines_table; - _lines_table.clear(); + CoordVectHashTable old_table = _linesTable; + _linesTable.clear(); _waypointLines.clear(); bool linkBackToHome = false; @@ -639,7 +639,7 @@ void MissionController::_recalcWaypointLines(void) if (lastCoordinateItem != homeItem || (showHomePosition && linkBackToHome)) { if (old_table.contains(pair)) { // Do nothing, this segment already exists and is wired up - _lines_table[pair] = old_table.take(pair); + _linesTable[pair] = old_table.take(pair); } else { // Create a new segment and wire update notifiers auto linevect = new CoordinateVector(lastCoordinateItem->isSimpleItem() ? lastCoordinateItem->coordinate() : lastCoordinateItem->exitCoordinate(), item->coordinate(), this); @@ -652,7 +652,7 @@ void MissionController::_recalcWaypointLines(void) // FIXME: We should ideally have signals for 2D position change, alt change, and 3D position change // Not optimal, but still pretty fast, do a full update of range/bearing/altitudes connect(item, &VisualMissionItem::coordinateChanged, this, &MissionController::_recalcAltitudeRangeBearing); - _lines_table[pair] = linevect; + _linesTable[pair] = linevect; } } lastCoordinateItem = item; @@ -664,8 +664,8 @@ void MissionController::_recalcWaypointLines(void) { // Create a temporary QObjectList and replace the model data QObjectList objs; - objs.reserve(_lines_table.count()); - foreach(CoordinateVector *vect, _lines_table.values()) { + objs.reserve(_linesTable.count()); + foreach(CoordinateVector *vect, _linesTable.values()) { objs.append(vect); } diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h index dcc7afafb..bdc10d2ca 100644 --- a/src/MissionManager/MissionController.h +++ b/src/MissionManager/MissionController.h @@ -117,7 +117,7 @@ private: QmlObjectListModel* _visualItems; QmlObjectListModel* _complexItems; QmlObjectListModel _waypointLines; - CoordVectHashTable _lines_table; + CoordVectHashTable _linesTable; Vehicle* _activeVehicle; bool _autoSync; bool _firstItemsFromVehicle; -- 2.22.0