Add Phil Stracchino's fix for Qt5

[bacula/bacula] / bacula / src / qt-console / pages.h

diff --git a/bacula/src/qt-console/pages.h b/bacula/src/qt-console/pages.h
index a31443d1038efd9fcdf362fe03cf5c0d1aa7313a..fe4a84facc20e2bd09a908ed4cfa79672b22d4dd 100644 (file)
--- a/bacula/src/qt-console/pages.h
+++ b/bacula/src/qt-console/pages.h
@@ -1,39 +1,33 @@
 #ifndef _PAGES_H_
 #define _PAGES_H_
 /*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2007-2007 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-2017 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.
 */
 /*
- *   Version $Id$
- *
  *   Dirk Bartley, March 2007
  */
 
+#include <QtGlobal>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#else
 #include <QtGui>
+#endif
 #include <QList>
 
 /*
@@ -54,16 +48,18 @@ class Console;
 
 class Pages : public QWidget
 {
+   Q_OBJECT
+
 public:
+   /* methods */
    Pages();
    void dockPage();
    void undockPage();
+   void hidePage();
    void togglePageDocking();
    bool isDocked();
    bool isOnceDocked();
    bool isCloseable();
-   QTabWidget *m_parent;
-   QList<QAction*> m_contextActions;
    virtual void PgSeltreeWidgetClicked();
    virtual void currentStackItem();
    void closeStackPage();
@@ -72,19 +68,24 @@ public:
    void setContextMenuDockText();
    void setTreeWidgetItemDockColor();
    void consoleCommand(QString &);
-   void consoleCommand(QString &, int conn);
    void consoleCommand(QString &, bool setCurrent);
-   void consoleCommand(QString &, int conn, bool setCurrent);
+   void consoleCommand(QString &, int conn, bool setCurrent=true, bool notify=true);
    QString &name() { return m_name; };
    void getVolumeList(QStringList &);
    void getStatusList(QStringList &);
    void firstUseDock();
 
+   /* members */
+   QTabWidget *m_parent;
+   QList<QAction*> m_contextActions;
+
+
 public slots:
    /* closeEvent is a virtual function inherited from QWidget */
    virtual void closeEvent(QCloseEvent* event);
 
 protected:
+   /* methods */
    void pgInitialize();
    void pgInitialize(const QString &);
    void pgInitialize(const QString &, QTreeWidgetItem *);
@@ -92,6 +93,8 @@ protected:
    virtual void changeEvent(QEvent *event);
    void setConsoleCurrent();
    void setTitle();
+
+   /* members */
    bool m_closeable;
    bool m_docked;
    bool m_onceDocked;