Make qt-console compatible to Qt5 (Qt4 still work)

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

diff --git a/bacula/src/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp
index e9eb0caf40b7b8cc4d8cfc61b296a0dab76b35d6..143f3c53bf26f5a158c0b5c79ae75c55157edbc4 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.cpp
+++ b/bacula/src/qt-console/restore/restoretree.cpp
@@ -1,29 +1,20 @@
 /*
-   Bacula® - The Network Backup Solution
-
-   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.
-
-   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.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2016 Kern Sibbald
+
+   The original 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.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
  
 /*
@@ -564,7 +555,7 @@ void restoreTree::fileCurrentItemChanged(QTableWidgetItem *currentFileTableItem,
                foreach (field, fieldlist) {
                   field = field.trimmed();  /* strip leading & trailing spaces */
                   if (column == 5 ) {
-                     QByteArray jtype(field.trimmed().toAscii());
+                     QByteArray jtype(field.trimmed().toLatin1());
                      if (jtype.size()) {
                         field = job_type_to_str(jtype[0]);
                      }
@@ -714,7 +705,7 @@ void restoreTree::populateJobTable()
                field = field.trimmed();  /* strip leading & trailing spaces */
                if (field != "") {
                   if (column == typeIndex) {
-                     QByteArray jtype(field.trimmed().toAscii());
+                     QByteArray jtype(field.trimmed().toLatin1());
                      if (jtype.size()) {
                         field = job_type_to_str(jtype[0]);
                      }