From 1c4a8612113b198f234fec8ab2c6272dab773793 Mon Sep 17 00:00:00 2001 From: m_thread Date: Sun, 1 Mar 2015 22:49:53 +0100 Subject: [PATCH] OP-1756 Uncrustify --- .../src/plugins/setupwizard/connectiondiagram.cpp | 2 +- .../setupwizard/pages/outputcalibrationpage.cpp | 10 +++++----- .../plugins/setupwizard/pages/outputcalibrationpage.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp index d20c95397..04c240f59 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp @@ -168,7 +168,7 @@ void ConnectionDiagram::setupGraphicsScene() case VehicleConfigurationSource::CONTROLLER_CC3D: prefix = "cc-"; if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT || - m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) { + m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) { suffix = "-oneshot"; } break; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp index fc7e08655..970231dfc 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp @@ -46,7 +46,7 @@ OutputCalibrationPage::OutputCalibrationPage(SetupWizard *wizard, QWidget *paren connect(ui->calibrateAllMotors, SIGNAL(toggled(bool)), this, SLOT(calibrateAllMotorsChanged())); // move the code that was here to setupVehicle() so we can determine which image to use. - m_vehicleScene = new QGraphicsScene(this); + m_vehicleScene = new QGraphicsScene(this); ui->vehicleView->setScene(m_vehicleScene); } @@ -407,8 +407,8 @@ bool OutputCalibrationPage::validatePage() if (!isFinished()) { m_currentWizardIndex++; if (ui->calibrateAllMotors->isChecked() && - m_currentWizardIndex > 0 && - m_wizardIndexes[m_currentWizardIndex - 1] == 1) { + m_currentWizardIndex > 0 && + m_wizardIndexes[m_currentWizardIndex - 1] == 1) { while (!isFinished() && m_wizardIndexes[m_currentWizardIndex] == 1) { m_currentWizardIndex++; } @@ -465,7 +465,7 @@ void OutputCalibrationPage::customBackClicked() void OutputCalibrationPage::getCurrentChannels(QList &channels) { if (ui->calibrateAllMotors->isChecked()) { - for(int i = 1; i < m_channelIndex.size(); i++) { + for (int i = 1; i < m_channelIndex.size(); i++) { if (m_vehicleElementTypes[i + 1] == MOTOR) { channels << m_channelIndex[i]; } @@ -630,7 +630,7 @@ void OutputCalibrationPage::on_servoButton_toggled(bool checked) void OutputCalibrationPage::on_servoCenterAngleSlider_valueChanged(int position) { Q_UNUSED(position); - quint16 value = ui->servoCenterAngleSlider->value(); + quint16 value = ui->servoCenterAngleSlider->value(); m_calibrationUtil->setChannelOutputValue(value); QList currentChannels; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h index c574b70e8..dd02fd885 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h @@ -73,7 +73,7 @@ private slots: void on_calibrateAllMotors_toggled(bool checked); private: - enum ElementType{ FULL, FRAME, MOTOR, SERVO }; + enum ElementType { FULL, FRAME, MOTOR, SERVO }; void setupVehicle(); void startWizard(); void setupVehicleItems();