From 89c453b5b06197026984710f48efacd69b85eb7a Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <mvw@planets.elm.net>
Date: Thu, 16 Feb 2012 23:52:39 +0100
Subject: [PATCH] Tweak some comments and formatting.

---
 bacula/src/qt-console/medialist/medialist.cpp | 3 +--
 bacula/src/qt-console/medialist/mediaview.cpp | 6 +++---
 bacula/src/qt-console/restore/brestore.cpp    | 2 +-
 bacula/src/qt-console/storage/storage.cpp     | 2 +-
 bacula/src/qt-console/util/fmtwidgetitem.cpp  | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index 05cbda8367..670241f381 100644
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -207,8 +207,7 @@ void MediaList::populateTree()
             int inchanger = fld.next().toInt();
             if (inchanger) {
                mediaitem.setNumericFld(index++, fld.next()); 
-            }
-            else {
+            } else {
                /* volume not in changer, show blank slot */
                mediaitem.setNumericFld(index++, ""); 
                fld.next();
diff --git a/bacula/src/qt-console/medialist/mediaview.cpp b/bacula/src/qt-console/medialist/mediaview.cpp
index 6c31687964..7a44e15652 100644
--- a/bacula/src/qt-console/medialist/mediaview.cpp
+++ b/bacula/src/qt-console/medialist/mediaview.cpp
@@ -336,7 +336,7 @@ void MediaView::populateTable()
 
       foreach (resultline, results) { // should have only one result
          int index = 0;
-         QString Slot, VolBytes, MediaType, LastWritten, VolStatus;
+         QString VolBytes, MediaType, LastWritten, VolStatus;
          fieldlist = resultline.split("\t");
          if (fieldlist.size() != 10) {
             continue;
@@ -350,8 +350,8 @@ void MediaView::populateTable()
          /* Online */
          mediaitem.setInChanger(index++, fld.next());
 
-         Slot = fld.next();            // Slot
-         mediaitem.setNumericFld(index++, Slot);
+         /* Slot */
+         mediaitem.setNumericFld(index++, fld.next());
 
          MediaType = fld.next();
          VolStatus = fld.next();
diff --git a/bacula/src/qt-console/restore/brestore.cpp b/bacula/src/qt-console/restore/brestore.cpp
index f1b6b2905d..f397b4ee2d 100644
--- a/bacula/src/qt-console/restore/brestore.cpp
+++ b/bacula/src/qt-console/restore/brestore.cpp
@@ -286,7 +286,7 @@ void bRestore::displayFileVersion(QString pathid, QString fnid,
          //PathId, FilenameId, fileid, jobid, lstat, Md5, VolName, Inchanger
          fieldlist = resultline.split("\t");
          TableItemFormatter item(*FileRevisions, row++);
-         item.setInChanger(col++, fieldlist.at(7));    // inchanger
+         item.setInChanger(col++, fieldlist.at(7)); // inchanger
          item.setTextFld(col++, fieldlist.at(6)); // Volume
          item.setNumericFld(col++, fieldlist.at(3)); // JobId
          decode_stat(fieldlist.at(4).toLocal8Bit().data(), 
diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 996d0eb107..7a3021cc9c 100644
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -146,7 +146,7 @@ void Storage::populateTree()
             QStringListIterator fld(fieldlist);
  
             /* storage id */
-            storageItem.setNumericFld(index++, fld.next() );
+            storageItem.setNumericFld(index++, fld.next());
 
             /* changer */
             QString changer = fld.next();
diff --git a/bacula/src/qt-console/util/fmtwidgetitem.cpp b/bacula/src/qt-console/util/fmtwidgetitem.cpp
index b98bdcb4fb..d284ac2f14 100644
--- a/bacula/src/qt-console/util/fmtwidgetitem.cpp
+++ b/bacula/src/qt-console/util/fmtwidgetitem.cpp
@@ -283,13 +283,13 @@ void ItemFormatterBase::setBoolFld(int index, int fld, bool center)
 void ItemFormatterBase::setNumericFld(int index, const QString &fld)
 {
    setRightFld(index, fld.trimmed());
-   setSortValue(index, fld.toDouble() );
+   setSortValue(index, fld.toDouble());
 }
 
 void ItemFormatterBase::setNumericFld(int index, const QString &fld, const QVariant &sortval)
 {
    setRightFld(index, fld.trimmed());
-   setSortValue(index, sortval );
+   setSortValue(index, sortval);
 }
 
 void ItemFormatterBase::setBytesFld(int index, const QString &fld)
-- 
2.39.5