From 9614397694f909c61dcc57554f8c564cfed86736 Mon Sep 17 00:00:00 2001 From: m_thread Date: Mon, 29 Dec 2014 14:51:12 +0100 Subject: [PATCH] OP-1628 Uncrustify --- .../src/plugins/setupwizard/connectiondiagram.cpp | 4 ++-- .../src/plugins/setupwizard/pages/rebootpage.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp index 897568c52..20b1d9887 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp @@ -141,7 +141,7 @@ void ConnectionDiagram::setupGraphicsScene() break; default: break; - } + } case VehicleConfigurationSource::VEHICLE_SURFACE: switch (m_configSource->getVehicleSubType()) { case VehicleConfigurationSource::GROUNDVEHICLE_CAR: @@ -156,7 +156,7 @@ void ConnectionDiagram::setupGraphicsScene() default: break; } - case VehicleConfigurationSource::VEHICLE_HELI: + case VehicleConfigurationSource::VEHICLE_HELI: default: break; } diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/rebootpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/rebootpage.cpp index cf3091ab0..91994159e 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/rebootpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/rebootpage.cpp @@ -38,7 +38,7 @@ RebootPage::RebootPage(SetupWizard *wizard, QWidget *parent) : connect(ui->rebootButton, SIGNAL(clicked()), this, SLOT(reboot())); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); Q_ASSERT(pm); - m_uploader = pm->getObject(); + m_uploader = pm->getObject(); Q_ASSERT(m_uploader); } @@ -87,7 +87,7 @@ void RebootPage::reboot() enableButtons(false); ui->rebootProgress->setValue(0); QApplication::processEvents(); - connect(m_uploader, SIGNAL(progressUpdate(uploader::ProgressStep,QVariant)), this, SLOT(progressUpdate(uploader::ProgressStep,QVariant))); + connect(m_uploader, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)), this, SLOT(progressUpdate(uploader::ProgressStep, QVariant))); ui->messageLabel->setText(tr("Reboot in progress...")); m_uploader->reboot(); } @@ -96,7 +96,7 @@ void RebootPage::progressUpdate(uploader::ProgressStep progress, QVariant messag { Q_UNUSED(message); if (progress == uploader::SUCCESS || progress == uploader::FAILURE) { - disconnect(m_uploader, SIGNAL(progressUpdate(uploader::ProgressStep,QVariant)), this, SLOT(progressUpdate(uploader::ProgressStep,QVariant))); + disconnect(m_uploader, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)), this, SLOT(progressUpdate(uploader::ProgressStep, QVariant))); if (progress == uploader::FAILURE) { ui->messageLabel->setText(tr("Software reboot failed!

Please perform a manual reboot by power cycling the board. " "To power cycle the controller remove all batteries and the USB cable for at least 30 seconds. "