From a1a82ad137307c4d64fe85e6f18231dedafe7504 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Thu, 27 Mar 2014 10:05:21 +0100
Subject: [PATCH] Cosmetics

---
 companion/src/avroutputdialog.cpp | 27 ++++++++++++++-------------
 companion/src/burndialog.cpp      | 19 +++++++++++--------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/companion/src/avroutputdialog.cpp b/companion/src/avroutputdialog.cpp
index 1c8140709..e7f6243aa 100644
--- a/companion/src/avroutputdialog.cpp
+++ b/companion/src/avroutputdialog.cpp
@@ -51,18 +51,20 @@ avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg,
         ui->progressBar->setMaximum(127);
         QTimer::singleShot(500, this, SLOT(doCopy()));
       }
-    } else {
-      if(wTitle.isEmpty())
-          setWindowTitle(getProgrammer() + " " + tr("result"));
+    }
+    else {
+      if (wTitle.isEmpty())
+        setWindowTitle(getProgrammer() + " " + tr("result"));
       else
-          setWindowTitle(getProgrammer() + " - " + wTitle);
+        setWindowTitle(getProgrammer() + " - " + wTitle);
       QFile exec;
       winTitle=wTitle;
       if (!(exec.exists(prog))) {
         QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("executable not found"));
         closeOpt = AVR_DIALOG_FORCE_CLOSE;
         QTimer::singleShot(0, this, SLOT(forceClose()));
-      } else {
+      }
+      else {
         foreach(QString str, arg) cmdLine.append(" " + str);
         lfuse = 0;
         hfuse = 0;
@@ -70,10 +72,11 @@ avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg,
         phase=0;
         currLine.clear();
         if (!displayDetails) {
-            ui->plainTextEdit->hide();
-            QTimer::singleShot(0, this, SLOT(shrink()));
-        } else {
-            ui->checkBox->setChecked(true);
+          ui->plainTextEdit->hide();
+          QTimer::singleShot(0, this, SLOT(shrink()));
+        }
+        else {
+          ui->checkBox->setChecked(true);
         }
         process = new QProcess(this);
         connect(process,SIGNAL(readyReadStandardError()), this, SLOT(doAddTextStdErr()));
@@ -241,10 +244,8 @@ void avrOutputDialog::doAddTextStdOut()
 
     if (text.contains("Complete ")) {
 #if !__GNUC__
-      if (kill_timer) {
-        delete kill_timer;
-        kill_timer = NULL;
-      }
+      delete kill_timer;
+      kill_timer = NULL;
 #endif
       int start = text.indexOf("Complete ");
       int end = text.indexOf("%");
diff --git a/companion/src/burndialog.cpp b/companion/src/burndialog.cpp
index 21b151051..e02cf9b02 100644
--- a/companion/src/burndialog.cpp
+++ b/companion/src/burndialog.cpp
@@ -20,11 +20,11 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
   ui->setupUi(this);
   setWindowIcon(CompanionIcon("write_flash.png"));
 
-  if(!g.profile[g.id()].splashFile().isEmpty()){
+  if (!g.profile[g.id()].splashFile().isEmpty()){
     imageSource=PROFILE;
     imageFile=g.profile[g.id()].splashFile();
   }
-  else{
+  else {
     ui->useProfileImageCB->setDisabled(true);
     imageSource=FIRMWARE;
     imageFile="";
@@ -306,7 +306,7 @@ void burnDialog::displaySplash()
     FlashInterface flash(ui->FWFileName->text());
     image = flash.getSplash();
   }
-  else{
+  else {
     image.load(imageFile);
   }
   if (image.isNull()) {
@@ -426,15 +426,18 @@ void burnDialog::on_BurnFlashButton_clicked()
             hexfileName->clear();
             QMessageBox::critical(this, tr("Warning"), tr("Cannot save customized firmware"));
           }
-        } else {
+        }
+        else {
           hexfileName->clear();
           QMessageBox::critical(this, tr("Warning"), tr("Custom image not found"));
         }
-      } else {
-            hexfileName->clear();
-            hexfileName->append(fileName);
       }
-    } else {
+      else {
+        hexfileName->clear();
+        hexfileName->append(fileName);
+      }
+    }
+    else {
       QMessageBox::critical(this, tr("Warning"), tr("No firmware selected"));
       hexfileName->clear();     
     }