Backport from BEE

[bacula/bacula] / bacula / src / qt-console / restore / prerestore.cpp

diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index 8a89188508975a03ed4cc502ceab53b39716c587..50cf3e73a57f692ad3b924d1ad289b9289721372 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -3,35 +3,23 @@
 
    Copyright (C) 2007-2010 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.
 */
- 
+
 /*
  *  preRestore -> dialog put up to determine the restore type
  *
  *   Kern Sibbald, February MMVII
  *
- */ 
+ */
 
 #include "bat.h"
 #include "restore.h"
@@ -167,10 +155,10 @@ void prerestorePage::okButtonPushed()
    if (mainWin->m_commandDebug) {
       Pmsg1(000, "preRestore command \'%s\'\n", cmd.toUtf8().data());
    }
-   /* 
+   /*
     * Send off command that looks something like:
     *
-    * restore fileset="Full Set" client="timmy-fd" 
+    * restore fileset="Full Set" client="timmy-fd"
     *        storage="File" current select
     */
    m_console->write_dir(m_conn, cmd.toUtf8().data());
@@ -359,7 +347,7 @@ void prerestorePage::jobRadioClicked(bool checked)
       selectJobIdsRadio->setChecked(true);
    }
    if (mainWin->m_miscDebug) {
-      Pmsg2(000, "jobRadio=%d jobidsRadio=%d\n", selectJobRadio->isChecked(), 
+      Pmsg2(000, "jobRadio=%d jobidsRadio=%d\n", selectJobRadio->isChecked(),
          selectJobIdsRadio->isChecked());
    }
 }
@@ -392,7 +380,7 @@ void prerestorePage::jobidsRadioClicked(bool checked)
       selectJobIdsRadio->setChecked(false);
    }
    if (mainWin->m_miscDebug) {
-      Pmsg2(000, "jobRadio=%d jobidsRadio=%d\n", selectJobRadio->isChecked(), 
+      Pmsg2(000, "jobRadio=%d jobidsRadio=%d\n", selectJobRadio->isChecked(),
          selectJobIdsRadio->isChecked());
    }
 }