Backport from Bacula Enterprise

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

diff --git a/bacula/src/qt-console/restore/restoretree.h b/bacula/src/qt-console/restore/restoretree.h
index f6121a9280d064d6d068374b81132e067f05b64b..ae39d3c340c6ec9f0d1fb391f332b805195ef348 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.h
+++ b/bacula/src/qt-console/restore/restoretree.h
@@ -2,35 +2,25 @@
 #define _RESTORETREE_H_
 
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2007-2014 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 two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
-   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 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.
 
-   You should have received a copy of the GNU 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.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
 
-   Bacula® is a registered trademark of John Walker.
-   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) is a registered trademark of Kern Sibbald.
 */
 /*
- *   Version $Id$
- *
  *  Kern Sibbald, February 2007
  */
 
@@ -49,6 +39,7 @@ class restoreTree : public Pages, public Ui::restoreTreeForm
 public:
    restoreTree();
    ~restoreTree();
+   virtual void PgSeltreeWidgetClicked();
    virtual void currentStackItem();
    enum folderCheckState
    {
@@ -75,8 +66,7 @@ private slots:
 private:
    void populateDirectoryTree();
    void populateJobTable();
-   void parseDirectory(QString &dir_in);
-   bool addDirectory(QString &, QString &);
+   void parseDirectory(const QString &dir_in);
    void setupPage();
    void writeSettings();
    void readSettings();
@@ -95,12 +85,12 @@ private:
    void setJobsCheckedList();
    int queryFileIndex(QString &fullPath, int jobID);
 
-   QSplitter *splitter_2;
+   QSplitter *m_splitter;
+   QString m_groupText;
+   QString m_splitText1;
+   QString m_splitText2;
    bool m_populated;
    bool m_dropdownChanged;
-   QRegExp m_winRegExpDrive;
-   QRegExp m_winRegExpPath;
-   QRegExp m_slashregex;
    bool m_slashTrap;
    QHash<QString, QTreeWidgetItem *> m_dirPaths;
    QString m_checkedJobs, m_prevJobCombo, m_prevClientCombo, m_prevFileSetCombo;
@@ -115,7 +105,8 @@ private:
    QMultiHash<QString, QString> m_fileExceptionMulti;
    QHash<QString, int> m_versionExceptionHash;
    QHash<QString, int> m_directoryIconStateHash;
-   int m_toggleUpIndex, m_toggleDownIndex;
+   QHash<QString, int> m_directoryPathIdHash;
+   int m_toggleUpIndex, m_toggleDownIndex, m_nullFileNameId;
 };
 
 #endif /* _RESTORETREE_H_ */