Backport from BEE

[bacula/bacula] / bacula / src / qt-console / fileset / fileset.cpp

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index 6efe7ae6a75b5cd09fd500ec748e56332f01f2a2..a3f49b10dcad5145048ec88722e0648e554313ce 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.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.
 */
- 
+
 /*
  *   Version $Id$
  *
@@ -33,7 +21,7 @@
  *
  *   Dirk Bartley, March 2007
  *
- */ 
+ */
 
 #include "bat.h"
 #include <QAbstractEventDispatcher>
@@ -65,7 +53,7 @@ FileSet::~FileSet()
 }
 
 /*
- * 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 FileSet::populateTable()
@@ -127,7 +115,7 @@ void FileSet::populateTable()
             if (indexOf != -1) { notFoundList.removeAt(indexOf); }
 
             TableItemFormatter item(*tableWidget, row);
-  
+
             /* Iterate through fields in the record */
             QStringListIterator fld(fieldlist);
             int col = 0;
@@ -150,11 +138,11 @@ void FileSet::populateTable()
       item.setTextFld(0, filesetName);
       row++;
    }
-   
+
    /* set default sorting */
    tableWidget->sortByColumn(headerlist.indexOf(tr("FileSet Name")), Qt::AscendingOrder);
    tableWidget->setSortingEnabled(true);
-   
+
    /* Resize rows and columns */
    tableWidget->resizeColumnsToContents();
    tableWidget->resizeRowsToContents();
@@ -215,8 +203,8 @@ void FileSet::tableItemChanged(QTableWidgetItem *currentwidgetitem, QTableWidget
    }
 }
 
-/* 
- * Setup a context menu 
+/*
+ * Setup a context menu
  * Made separate from populate so that it would not create context menu over and
  * over as the tree is repopulated.
  */
@@ -274,7 +262,7 @@ void FileSet::writeSettings()
  * Read and restore user settings associated with this page
  */
 void FileSet::readSettings()
-{ 
+{
    QSettings settings(m_console->m_dir->name(), "bat");
    settings.beginGroup("FileSet");
    restoreGeometry(settings.value("geometry").toByteArray());