From 063db5732272361908785881db58cd5bc2f234da Mon Sep 17 00:00:00 2001
From: Corvus Corax <corvuscorax@cybertrench.com>
Date: Wed, 29 Oct 2014 21:12:14 +0100
Subject: [PATCH] uncrustification

---
 .../pages/airframeinitialtuningpage.cpp       |  2 +-
 .../setupwizard/pages/esccalibrationpage.cpp  |  4 ++--
 .../vehicletemplateexportdialog.cpp           | 22 +++++++++----------
 .../src/plugins/welcome/welcomeplugin.cpp     |  6 ++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
index 37d69f041..d18c7aa3e 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
@@ -173,7 +173,7 @@ void AirframeInitialTuningPage::loadValidFiles()
             QJsonParseError error;
             QJsonDocument templateDoc = QJsonDocument::fromJson(jsonData, &error);
             if (error.error == QJsonParseError::NoError) {
-                QJsonObject json    = templateDoc.object();
+                QJsonObject json = templateDoc.object();
                 if (json["type"].toInt() == getWizard()->getVehicleType() &&
                     json["subtype"].toInt() == getWizard()->getVehicleSubType()) {
                     QString uuid = json["uuid"].toString();
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/esccalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/esccalibrationpage.cpp
index c3bfcfac8..cedad20b1 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/esccalibrationpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/esccalibrationpage.cpp
@@ -160,8 +160,8 @@ void EscCalibrationPage::stopButtonClicked()
 void EscCalibrationPage::securityCheckBoxesToggled()
 {
     ui->startButton->setEnabled(ui->securityCheckBox1->isChecked() &&
-                                    ui->securityCheckBox2->isChecked() &&
-                                    ui->securityCheckBox3->isChecked());
+                                ui->securityCheckBox2->isChecked() &&
+                                ui->securityCheckBox3->isChecked());
 }
 
 
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
index 3ba7821a9..72b59a1b2 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
@@ -214,18 +214,18 @@ void VehicleTemplateExportDialog::accept()
 
     const char *fileType = ".optmpl";
 
-    QString fileName = QString("%1-%2-%3%4")
-            .arg(fixFilenameString(ui->Name->text(), 20))
-            .arg(fixFilenameString(ui->Type->text(), 30))
-            .arg(fixFilenameString(uuid.toString().right(12)))
-            .arg(fileType);
+    QString fileName     = QString("%1-%2-%3%4")
+                           .arg(fixFilenameString(ui->Name->text(), 20))
+                           .arg(fixFilenameString(ui->Type->text(), 30))
+                           .arg(fixFilenameString(uuid.toString().right(12)))
+                           .arg(fileType);
 
     QString fullPath = QString("%1%2%3%4%5")
-            .arg(EXPORT_BASE_NAME)
-            .arg(QDir::separator())
-            .arg(getTypeDirectory())
-            .arg(QDir::separator())
-            .arg(fileName);
+                       .arg(EXPORT_BASE_NAME)
+                       .arg(QDir::separator())
+                       .arg(getTypeDirectory())
+                       .arg(QDir::separator())
+                       .arg(fileName);
 
     QDir dir = QFileInfo(fullPath).absoluteDir();
     if (!dir.exists()) {
@@ -243,7 +243,7 @@ void VehicleTemplateExportDialog::accept()
             saveFile.write(saveDoc.toJson());
             saveFile.close();
         } else {
-           QMessageBox::information(this, "Export", tr("Settings could not be exported to \n%1(%2).\nPlease try again.")
+            QMessageBox::information(this, "Export", tr("Settings could not be exported to \n%1(%2).\nPlease try again.")
                                      .arg(QFileInfo(saveFile).absoluteFilePath(), saveFile.error()), QMessageBox::Ok);
         }
         QDialog::accept();
diff --git a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.cpp b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.cpp
index 7edfe85bd..0dfbf91bd 100644
--- a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.cpp
@@ -55,11 +55,11 @@ WelcomePlugin::~WelcomePlugin()
     // The below code is commented out to avoid having the application
     // crash when it is terminated. TODO: Fix a real solution.
     /*
-    if (m_welcomeMode) {
+       if (m_welcomeMode) {
         removeObject(m_welcomeMode);
         delete m_welcomeMode;
-    }
-    */
+       }
+     */
 }
 
 /*! Initializes the plugin. Returns true on success.