Backport from Bacula Enterprise

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

diff --git a/bacula/src/qt-console/console/console.h b/bacula/src/qt-console/console/console.h
index 1d16764837a13a03e99ba264d913124767122ba3..e5e6c3a27d227492ffcf592b2cc5d760b7b67907 100644 (file)
--- a/bacula/src/qt-console/console/console.h
+++ b/bacula/src/qt-console/console/console.h
@@ -1,23 +1,25 @@
 #ifndef _CONSOLE_H_
 #define _CONSOLE_H_
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   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.
+   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.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   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$
- *
  *   Kern Sibbald, January 2007
  */
 
@@ -54,7 +56,7 @@ struct job_defaults {
 
 class Console : public Pages, public Ui::ConsoleForm
 {
-   Q_OBJECT
+   Q_OBJECT 
    friend class DirComm;
 
 public:
@@ -68,7 +70,7 @@ public:
    int notifyOff(); // enables/disables socket notification - returns the previous state
    bool notify(int conn, bool enable); // enables/disables socket notification - returns the previous state
    bool is_notify_enabled(int conn) const;
-   bool getDirComm(int &conn);
+   bool getDirComm(int &conn);  
    bool findDirComm(int &conn);
    void displayToPrompt(int conn);
    QString returnFromPrompt(int conn);
@@ -128,7 +130,7 @@ public:
    QStringList location_list;
 
 public slots:
-   void connect_dir();
+   void connect_dir();                     
    void status_dir(void);
    void messages(void);
    void set_font(void);