Backport from BEE

[bacula/bacula] / bacula / src / qt-console / jobgraphs / jobplot.cpp

diff --git a/bacula/src/qt-console/jobgraphs/jobplot.cpp b/bacula/src/qt-console/jobgraphs/jobplot.cpp
index 95dc4a7b81e19b32b369c6615c0976debab1d8a6..510d9f0e84f3fce161e20f21a00baad377bd0648 100644 (file)
--- a/bacula/src/qt-console/jobgraphs/jobplot.cpp
+++ b/bacula/src/qt-console/jobgraphs/jobplot.cpp
@@ -3,29 +3,17 @@
 
    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.
+   The main 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.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
 */
- 
+
 /*
  *   Version $Id$
  *
@@ -33,7 +21,7 @@
  *
  *   Dirk Bartley, March 2007
  *
- */ 
+ */
 
 #include "bat.h"
 #include <QtGui>
@@ -193,7 +181,7 @@ void JobPlot::setupControls()
       controls->limitSpinBox->setValue(mainWin->m_recordLimitVal);
       controls->daysCheckBox->setCheckState(mainWin->m_daysLimitCheck ? Qt::Checked : Qt::Unchecked);
       controls->daysSpinBox->setValue(mainWin->m_daysLimitVal);
-   } 
+   }
 }
 
 /*
@@ -260,7 +248,7 @@ void JobPlot::runQuery()
 
       QString field;
       QStringList fieldlist;
-   
+
       int row = 0;
       /* Iterate through the record returned from the query */
       foreach (resultline, results) {
@@ -283,7 +271,7 @@ void JobPlot::runQuery()
          }
          row++;
       }
-   } 
+   }
    if ((controls->volumeComboBox->itemText(volumeIndex) != tr("Any")) && (results.count() == 0)){
       /* for context sensitive searches, let the user know if there were no
        *        * results */
@@ -320,7 +308,7 @@ void JobPlot::setupUserInterface()
    area->setObjectName(QString::fromUtf8("area"));
    controls = new JobPlotControls();
    area->setWidget(controls);
-   
+
    m_splitter->addWidget(m_jobPlot);
    m_splitter->addWidget(area);
 
@@ -398,7 +386,7 @@ void JobPlot::addCurve()
          }
          QDateTime mdt = QDateTime::fromString(monthBegin, mainWin->m_dtformat);
          double monbeg = mdt.toTime_t();
-   
+
          //  ...a vertical line at the first of each month
          QwtPlotMarker *mX = new QwtPlotMarker();
          mX->setLabel(mdt.toString("MMM-d"));
@@ -448,7 +436,7 @@ void JobPlot::setPlotType(QString currentText)
 void JobPlot::fillSymbolCombo(QComboBox *q)
 {
   q->addItem( tr("Ellipse"), (int)QwtSymbol::Ellipse);
-  q->addItem( tr("Rect"), (int)QwtSymbol::Rect); 
+  q->addItem( tr("Rect"), (int)QwtSymbol::Rect);
   q->addItem( tr("Diamond"), (int)QwtSymbol::Diamond);
   q->addItem( tr("Triangle"), (int)QwtSymbol::Triangle);
   q->addItem( tr("DTrianle"), (int)QwtSymbol::DTriangle);
@@ -461,7 +449,7 @@ void JobPlot::fillSymbolCombo(QComboBox *q)
   q->addItem( tr("Vline"), (int)QwtSymbol::VLine);
   q->addItem( tr("Star1"), (int)QwtSymbol::Star1);
   q->addItem( tr("Star2"), (int)QwtSymbol::Star2);
-  q->addItem( tr("Hexagon"), (int)QwtSymbol::Hexagon); 
+  q->addItem( tr("Hexagon"), (int)QwtSymbol::Hexagon);
   q->addItem( tr("None"), (int)QwtSymbol::NoSymbol);
 }
 
@@ -490,7 +478,7 @@ void JobPlot::setSymbolType(int index, int type)
       sym.setStyle( (QwtSymbol::Style)style.toInt() );
       sym.setBrush(QColor(Qt::yellow));
       m_fileCurve->setSymbol(sym);
-   
+
    } else {
       style = controls->byteSymbolTypeCombo->itemData(index);
       sym.setStyle( (QwtSymbol::Style)style.toInt() );
@@ -545,7 +533,7 @@ void JobPlot::writeSettings()
    settings.endGroup();
 }
 
-/* 
+/*
  * Read settings values for Controls
  */
 void JobPlot::readControlSettings()
@@ -571,7 +559,7 @@ void JobPlot::readSplitterSettings()
 {
    QSettings settings(m_console->m_dir->name(), "bat");
    settings.beginGroup("JobPlot");
-   if (settings.contains("m_splitterSizes")) { 
+   if (settings.contains("m_splitterSizes")) {
       m_splitter->restoreState(settings.value("m_splitterSizes").toByteArray());
    }
    settings.endGroup();