From e45f0e7a01dda1b0f8bd73387db9bddf4481bc15 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Mon, 30 Jun 2014 22:42:59 -0700 Subject: [PATCH] QBool no longer exists, just use C++'s standard bool type. --- src/qgcunittest/FlightModeConfigTest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qgcunittest/FlightModeConfigTest.cc b/src/qgcunittest/FlightModeConfigTest.cc index 67d581279..d0b01ff49 100644 --- a/src/qgcunittest/FlightModeConfigTest.cc +++ b/src/qgcunittest/FlightModeConfigTest.cc @@ -152,7 +152,7 @@ void FlightModeConfigUnitTest::_modeSwitchParam_test(void) // Make sure the text for the current selection doesn't contain the text Unknown // which means that it received an unsupported mode - QCOMPARE(combo->currentText().contains("unknown", Qt::CaseInsensitive), QBool(false)); + QCOMPARE(combo->currentText().contains("unknown", Qt::CaseInsensitive), false); // Check that the right simple mode check boxes are checked QCOMPARE(_rgSimpleModeCheckBox[i]->isChecked(), !!((1 << i) & simpleModeBitMask)); @@ -283,7 +283,7 @@ void FlightModeConfigUnitTest::_unknownMode_test(void) QCOMPARE(_rgCombo[0]->itemData(_rgCombo[0]->currentIndex()), mapParams["FLTMODE1"]); // Make sure the text for the current selection contains the text Unknown - QCOMPARE(_rgCombo[0]->currentText().contains("unknown", Qt::CaseInsensitive), QBool(true)); + QCOMPARE(_rgCombo[0]->currentText().contains("unknown", Qt::CaseInsensitive), true); } void FlightModeConfigUnitTest::_findControls(QObject* fmc) -- 2.22.0