From 3e6192f2d162cdbe31c073dcd8985c0f2d69b175 Mon Sep 17 00:00:00 2001 From: m_thread Date: Sun, 9 Feb 2014 19:12:45 +0100 Subject: [PATCH] OP-1191 Uncrustify. --- .../src/plugins/config/configpipxtremewidget.cpp | 10 +++++----- .../src/plugins/config/configvehicletypewidget.cpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp index ce0616102..6595b6366 100644 --- a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp @@ -121,9 +121,9 @@ void ConfigPipXtremeWidget::updateStatus(UAVObject *object) // Update the link state UAVObjectField *linkField = object->getField("LinkState"); m_oplink->LinkState->setText(linkField->getValue().toString()); - bool linkConnected = (linkField->getValue() == linkField->getOptions().at(OPLinkStatus::LINKSTATE_CONNECTED)); + bool linkConnected = (linkField->getValue() == linkField->getOptions().at(OPLinkStatus::LINKSTATE_CONNECTED)); bool modemEnabled = linkConnected || (linkField->getValue() == linkField->getOptions().at(OPLinkStatus::LINKSTATE_DISCONNECTED)) || - (linkField->getValue() == linkField->getOptions().at(OPLinkStatus::LINKSTATE_ENABLED)); + (linkField->getValue() == linkField->getOptions().at(OPLinkStatus::LINKSTATE_ENABLED)); UAVObjectField *pairRssiField = object->getField("PairSignalStrengths"); @@ -143,7 +143,7 @@ void ConfigPipXtremeWidget::updateStatus(UAVObject *object) m_oplink->PairSignalStrengthLabel1->setText(QString("%1dB").arg(m_oplink->PairSignalStrengthBar1->value())); pairid = pairIdField->getValue(1).toUInt(); - bound = (pairid == boundPairId); + bound = (pairid == boundPairId); m_oplink->PairID2->setText(QString::number(pairid, 16).toUpper()); m_oplink->PairID2->setEnabled(false); m_oplink->Bind2->setText(bound ? tr("Unbind") : tr("Bind")); @@ -152,7 +152,7 @@ void ConfigPipXtremeWidget::updateStatus(UAVObject *object) m_oplink->PairSignalStrengthLabel2->setText(QString("%1dB").arg(m_oplink->PairSignalStrengthBar2->value())); pairid = pairIdField->getValue(2).toUInt(); - bound = (pairid == boundPairId); + bound = (pairid == boundPairId); m_oplink->PairID3->setText(QString::number(pairid, 16).toUpper()); m_oplink->PairID3->setEnabled(false); m_oplink->Bind3->setText(bound ? tr("Unbind") : tr("Bind")); @@ -161,7 +161,7 @@ void ConfigPipXtremeWidget::updateStatus(UAVObject *object) m_oplink->PairSignalStrengthLabel3->setText(QString("%1dB").arg(m_oplink->PairSignalStrengthBar3->value())); pairid = pairIdField->getValue(3).toUInt(); - bound = (pairid == boundPairId); + bound = (pairid == boundPairId); m_oplink->PairID4->setText(QString::number(pairid, 16).toUpper()); m_oplink->PairID4->setEnabled(false); m_oplink->Bind4->setText(bound ? tr("Unbind") : tr("Bind")); diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp index 4bfda4563..8a49d6421 100644 --- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp @@ -197,7 +197,7 @@ void ConfigVehicleTypeWidget::refreshWidgetsValues(UAVObject *o) // is not ideal, but there you go. QString frameType = field->getValue().toString(); - int category = frameCategory(frameType); + int category = frameCategory(frameType); m_aircraft->aircraftType->setCurrentIndex(category); VehicleConfig *vehicleConfig = getVehicleConfigWidget(category); @@ -303,13 +303,13 @@ VehicleConfig *ConfigVehicleTypeWidget::createVehicleConfigWidget(int frameCateg { if (frameCategory == ConfigVehicleTypeWidget::FIXED_WING) { return new ConfigFixedWingWidget(); - } else if (frameCategory == ConfigVehicleTypeWidget::MULTIROTOR){ + } else if (frameCategory == ConfigVehicleTypeWidget::MULTIROTOR) { return new ConfigMultiRotorWidget(); } else if (frameCategory == ConfigVehicleTypeWidget::HELICOPTER) { return new ConfigCcpmWidget(); } else if (frameCategory == ConfigVehicleTypeWidget::GROUND) { return new ConfigGroundVehicleWidget(); - } else if (frameCategory ==ConfigVehicleTypeWidget::CUSTOM) { + } else if (frameCategory == ConfigVehicleTypeWidget::CUSTOM) { return new ConfigCustomWidget(); } return NULL;