Backport from BEE

[bacula/bacula] / bacula / src / qt-console / storage / content.cpp

diff --git a/bacula/src/qt-console/storage/content.cpp b/bacula/src/qt-console/storage/content.cpp
index 9794be0916abc2402cdc34fa25e628a038c17cbd..a41f8737bb9dc6fa786604bd921a754a68815358 100644 (file)
--- a/bacula/src/qt-console/storage/content.cpp
+++ b/bacula/src/qt-console/storage/content.cpp
@@ -3,29 +3,17 @@
 
    Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
 
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version three of the GNU Affero General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
+   The main author of Bacula is Kern Sibbald, with contributions from many
+   others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
 
    Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
 */
- 
+
 #include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QMenu>
@@ -36,11 +24,11 @@
 #include "util/fmtwidgetitem.h"
 #include "status/storstat.h"
 
-// 
+//
 // TODO: List tray
 //       List drives in autochanger
 //       use user selection to add slot= argument
-// 
+//
 
 Content::Content(QString storage, QTreeWidgetItem *parentWidget) : Pages()
 {
@@ -104,7 +92,7 @@ void table_get_selection(QTableWidget *table, QString &sel)
     */
    int s = table->rowCount();
    bool *tab = (bool *)malloc(s * sizeof(bool));
-   memset(tab, 0, s); 
+   memset(tab, 0, s);
 
    foreach (item, table->selectedItems()) {
       current = item->row();
@@ -173,7 +161,7 @@ void Content::statusStorageWindow()
 }
 
 /*
- * The main meat of the class!!  The function that querries the director and 
+ * The main meat of the class!!  The function that querries the director and
  * creates the widgets with appropriate values.
  */
 void Content::populateContent()
@@ -224,33 +212,33 @@ void Content::populateContent()
       }
 
       /* Slot */
-      slotitem.setNumericFld(index++, fld.next()); 
+      slotitem.setNumericFld(index++, fld.next());
 
       /* Real Slot */
       if (fld.next() != "") {
 
          /* Volume */
          slotitem.setTextFld(index++, fld.next());
-         
+
          /* Bytes */
          slotitem.setBytesFld(index++, fld.next());
-         
+
          /* Status */
          slotitem.setVolStatusFld(index++, fld.next());
-         
+
          /* MediaType */
          slotitem.setTextFld(index++, fld.next());
-         
+
          /* Pool */
          slotitem.setTextFld(index++, fld.next());
-         
+
          tim = fld.next().toInt();
          if (tim > 0) {
             /* LastW */
             localtime_r(&tim, &tm);
             strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
             slotitem.setTextFld(index++, QString(buf));
-            
+
             /* Expire */
             tim = fld.next().toInt();
             localtime_r(&tim, &tm);
@@ -293,14 +281,14 @@ void Content::populateContent()
       fld.next();
 
       /* Number */
-      slotitem.setNumericFld(index++, fld.next()); 
+      slotitem.setNumericFld(index++, fld.next());
 
       /* Slot */
       fld.next();
-      
+
       /* Volume */
       slotitem.setTextFld(index++, fld.next());
-         
+
       row++;
    }
 
@@ -328,7 +316,7 @@ void Content::consoleUpdateSlots()
 {
    QString sel = "";
    table_get_selection(tableContent, sel);
-   
+
    QString cmd("update slots");
    if (sel != "") {
       cmd += sel;