Change copyright as per agreement with FSFE

[bacula/bacula] / bacula / src / qt-console / tray-monitor / tray-ui.h

diff --git a/bacula/src/qt-console/tray-monitor/tray-ui.h b/bacula/src/qt-console/tray-monitor/tray-ui.h
index 0c2b959049466fa2b5f41a73c633be9630939c17..515bf0f460cd3ac142de92a6c2c6fb67dffd196f 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray-ui.h
+++ b/bacula/src/qt-console/tray-monitor/tray-ui.h
@@ -1,17 +1,20 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2011-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2016 Kern Sibbald
 
-   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.
 */
 
 #ifndef TRAYUI_H
@@ -23,6 +26,7 @@
 # endif
 #endif
 
+//#include "winhdrs.h"
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
@@ -45,7 +49,7 @@
 #include <QFont>
 
 #include "version.h"
-#include "ui/ui_run.h"
+#include "ui_run.h"
 #include "tray-monitor.h"
 
 class RunDlg: public QDialog, public Ui::runForm
@@ -70,7 +74,7 @@ public:
 
       qDebug() << "start getting elements";
       get_list(item, ".jobs type=B", res.job_list);
-
+      
       if (res.job_list.length() == 0) {
          QMessageBox msgBox;
          msgBox.setText("This restricted console doesn't have access to Backup jobs");
@@ -142,7 +146,7 @@ private slots:
       qDebug() << cmd;
       item->D_sock->fsend("%s", cmd.toUtf8().data());
       QString output;
-      while(bnet_recv(item->D_sock) >= 0) {output += item->D_sock->msg;}
+      while(item->D_sock->recv() >= 0) {output += item->D_sock->msg;}
       QMessageBox msgBox;
       msgBox.setText(output);
       msgBox.exec();
@@ -192,7 +196,7 @@ public:
        return hash.value(QString(title));
     }
 
-    void clearText(char *title)
+    void clearText(char *title) 
     {
        QPlainTextEdit *w = getTextEdit(title);
        if (!w) {
@@ -201,7 +205,7 @@ public:
        w->clear();
     }
 
-    void appendText(char *title, char *line)
+    void appendText(char *title, char *line) 
     {
        QPlainTextEdit *w = getTextEdit(title);
        if (!w) {
@@ -244,7 +248,7 @@ public:
         director = NULL;
         if (TrayMonitor->objectName().isEmpty())
             TrayMonitor->setObjectName(QString::fromUtf8("TrayMonitor"));
-        TrayMonitor->setWindowIcon(QIcon(":/images/cartridge1.png"));
+        TrayMonitor->setWindowIcon(QIcon(":/images/cartridge1.png")); 
         TrayMonitor->resize(789, 595);
         centralwidget = new QWidget(TrayMonitor);
         centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
@@ -306,7 +310,7 @@ public:
         stmenu->addAction(actAbout);
         stmenu->addSeparator();
         stmenu->addAction(actQuit);
-
+        
         connect(actRun, SIGNAL(triggered()), this, SLOT(cb_run()));
         connect(actShow, SIGNAL(triggered()), this, SLOT(cb_show()));
         connect(actQuit, SIGNAL(triggered()), this, SLOT(cb_quit()));
@@ -344,8 +348,8 @@ private slots:
     void cb_about() {
        QMessageBox::about(this, "Bacula Tray Monitor", "Bacula Tray Monitor\n"
                           "For more information, see: www.baculasystems.com\n"
-                          "Copyright (C) 1999-2010, Bacula Systems(R) SA\n"
-                          "Licensed under GNU AGPLv3.");
+                          "Copyright (C) 1999-2015, Kern Sibbald.\n"
+                          "License AGPLv3 see LICENSE.");
     }
 
     void cb_run() {