From e9084e4d594c649931aed070dd6d3fb31b145d8f Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Wed, 4 Jun 2014 16:31:27 +0200
Subject: [PATCH] Cosmetics

---
 companion/src/apppreferencesdialog.cpp |  6 +++---
 companion/src/mainwindow.cpp           |  9 +++++----
 companion/src/wizarddialog.cpp         | 16 ++++++++--------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index 485029775..b33f80b55 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -174,14 +174,14 @@ void AppPreferencesDialog::initSettings()
 
   QString hwSettings;
   if (g.profile[g.id()].stickPotCalib() == "" ) {
-    hwSettings = QString(tr("EMPTY: No radio settings stored in profile"));
+    hwSettings = tr("EMPTY: No radio settings stored in profile");
   }
   else  {
     QString str = g.profile[g.id()].timeStamp();
     if (str.isEmpty())
-      hwSettings = QString(tr("AVAILABLE: Radio settings of unknown age"));
+      hwSettings = tr("AVAILABLE: Radio settings of unknown age");
     else
-      hwSettings = QString(tr("AVAILABLE: Radio settings stored %1").arg(str));
+      hwSettings = tr("AVAILABLE: Radio settings stored %1").arg(str);
   }
   ui->lblGeneralSettings->setText(hwSettings);
 
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index e6f568429..3822f9ef3 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -1939,15 +1939,16 @@ void MainWindow::updateProfilesActions()
 }
 
 void MainWindow::createProfile()
-{ int i;
-for (i=0; i<MAX_PROFILES && g.profile[i].existsOnDisk(); i++)
+{
+  int i;
+  for (i=0; i<MAX_PROFILES && g.profile[i].existsOnDisk(); i++)
     ;
   if (i==MAX_PROFILES)  //Failed to find free slot
     return;
  
   // Copy current profile to new and give it a new name
   g.profile[i] = g.profile[g.id()];
-  g.profile[i].name( QString(tr("New Radio")));
+  g.profile[i].name(tr("New Radio"));
 
   g.id(i);
   updateMenus();
@@ -1955,7 +1956,7 @@ for (i=0; i<MAX_PROFILES && g.profile[i].existsOnDisk(); i++)
 
 QString MainWindow::strippedName(const QString &fullFileName)
 {
-    return QFileInfo(fullFileName).fileName();
+  return QFileInfo(fullFileName).fileName();
 }
 
 int MainWindow::getEpromVersion(QString fileName)
diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizarddialog.cpp
index 43396c1d3..d66fc8077 100644
--- a/companion/src/wizarddialog.cpp
+++ b/companion/src/wizarddialog.cpp
@@ -18,10 +18,10 @@
 #include "helpers.h"
 #include "googleanalytics.h"
 
-WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelId, QWidget *parent)
-  : QWizard(parent),
-    mix(settings, modelId),
-    settings(settings)
+WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelId, QWidget *parent):
+  QWizard(parent),
+  mix(settings, modelId),
+  settings(settings)
 {
   setWindowIcon(CompanionIcon("wizard.png"));
   setWindowTitle(tr("Model Wizard"));
@@ -1012,10 +1012,10 @@ WizardPrinter::WizardPrinter(WizMix *wizMix)
 
 QString WizardPrinter::print()
 {
-  QString str = QString(tr("Model Name: ")) + mix->name + "\n";
-  str += QString(tr("Model Type: ")) + vehicleName(mix->vehicle) + "\n";
+  QString str = tr("Model Name: ") + mix->name + "\n";
+  str += tr("Model Type: ") + vehicleName(mix->vehicle) + "\n";
 
-  str += QString(tr("Options: ")) + "[";
+  str += tr("Options: ") + "[";
   for (int i=0; i<WIZ_MAX_OPTIONS; i++) {
     if (mix->options[i])
       str += "X";
@@ -1027,7 +1027,7 @@ QString WizardPrinter::print()
   for (int i=0; i<WIZ_MAX_CHANNELS; i++) {
     if (mix->channel[i].page != Page_None) {
       Channel ch = mix->channel[i];
-      str += QString(tr("Channel %1: ").arg(i+1));
+      str += tr("Channel %1: ").arg(i+1);
       str += printChannel(ch.input1, ch.weight1, ch.input2, ch.weight2 );
       str += QString("\n");
     }