From 25edde5951c24fefb87b7fbfdfdcc555d8ae76f6 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 18 Nov 2014 15:53:30 -0800 Subject: [PATCH] Fix compiler warning bugs --- src/AutoPilotPlugins/PX4/FlightModesComponent.cc | 2 +- src/VehicleSetup/SetupView.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc index a2f3b9a6f..bba49c0c9 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc +++ b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc @@ -143,7 +143,7 @@ QList FlightModesComponent::summaryItems(void) const // Switch is not mapped if (i == 0) { // Mode switch is required - Q_ASSERT(switchList[0].param == "RC_MAP_MODE_SW"); + Q_ASSERT(strcmp(switchList[0].param, "RC_MAP_MODE_SW") == 0); row << "Setup required"; } else { row << "None"; diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc index f3fdfda63..8c013a42d 100644 --- a/src/VehicleSetup/SetupView.cc +++ b/src/VehicleSetup/SetupView.cc @@ -118,7 +118,9 @@ void SetupView::_clearComponentButtons(void) QLayoutItem* item; while ((item = _ui->componentButtonLayout->itemAt(0))) { VehicleComponentButton* componentButton = dynamic_cast(item->widget()); + // Make sure this is really a VehicleComponentButton. If it isn't the UI has changed but the code hasn't. Q_ASSERT(componentButton); + Q_UNUSED(componentButton); _ui->componentButtonLayout->removeWidget(item->widget()); } } -- 2.22.0