From 9f27e177e8fd3c0f83a75be29b8d98e8a8ed4b8e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 17 Feb 2010 16:39:36 +0100 Subject: [PATCH] Tweak copyrights --- bacula/src/qt-console/medialist/medialist.cpp | 4 +--- bacula/src/qt-console/medialist/medialist.h | 4 +--- bacula/src/qt-console/medialist/mediaview.cpp | 7 +++--- bacula/src/qt-console/medialist/mediaview.ui | 2 +- bacula/src/qt-console/util/fmtwidgetitem.cpp | 24 +++++++++---------- bacula/src/qt-console/util/fmtwidgetitem.h | 4 +--- 6 files changed, 18 insertions(+), 27 deletions(-) diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp index 2def8025e9..8ae6573833 100644 --- a/bacula/src/qt-console/medialist/medialist.cpp +++ b/bacula/src/qt-console/medialist/medialist.cpp @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2009 Free Software Foundation Europe e.V. + Copyright (C) 2007-2010 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. @@ -27,8 +27,6 @@ */ /* - * Version $Id$ - * * MediaList Class * * Dirk Bartley, March 2007 diff --git a/bacula/src/qt-console/medialist/medialist.h b/bacula/src/qt-console/medialist/medialist.h index 63c2a19f3f..fd2134256c 100644 --- a/bacula/src/qt-console/medialist/medialist.h +++ b/bacula/src/qt-console/medialist/medialist.h @@ -3,7 +3,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2007 Free Software Foundation Europe e.V. + Copyright (C) 2007-2010 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. @@ -28,8 +28,6 @@ Switzerland, email:ftf@fsfeurope.org. */ /* - * Version $Id$ - * * Dirk Bartley, March 2007 */ diff --git a/bacula/src/qt-console/medialist/mediaview.cpp b/bacula/src/qt-console/medialist/mediaview.cpp index 2c8653831d..edcc55a1cf 100644 --- a/bacula/src/qt-console/medialist/mediaview.cpp +++ b/bacula/src/qt-console/medialist/mediaview.cpp @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2009 Free Software Foundation Europe e.V. + Copyright (C) 2007-2010 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. @@ -317,13 +317,13 @@ void MediaView::populateTable() m_tableMedia->setRowCount(results.size()); foreach (resultline, results) { // should have only one result + int index = 0; QString VolBytes, MediaType, LastWritten, VolStatus; fieldlist = resultline.split("\t"); if (fieldlist.size() != 10) { continue; } QStringListIterator fld(fieldlist); - int index=0; TableItemFormatter mediaitem(*m_tableMedia, row); /* VolumeName */ @@ -343,8 +343,7 @@ void MediaView::populateTable() /* Usage */ usage = 0; if (hash_size.contains(MediaType) && - hash_size[MediaType] != 0) - { + hash_size[MediaType] != 0) { usage = VolBytes.toLongLong() * 100 / hash_size[MediaType]; } mediaitem.setPercent(index++, usage); diff --git a/bacula/src/qt-console/medialist/mediaview.ui b/bacula/src/qt-console/medialist/mediaview.ui index a86a8ce534..cd73c531ef 100644 --- a/bacula/src/qt-console/medialist/mediaview.ui +++ b/bacula/src/qt-console/medialist/mediaview.ui @@ -224,7 +224,7 @@ - Volume Name + Volume Name diff --git a/bacula/src/qt-console/util/fmtwidgetitem.cpp b/bacula/src/qt-console/util/fmtwidgetitem.cpp index 2c36e36929..9f7bf412af 100644 --- a/bacula/src/qt-console/util/fmtwidgetitem.cpp +++ b/bacula/src/qt-console/util/fmtwidgetitem.cpp @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2007 Free Software Foundation Europe e.V. + Copyright (C) 2007-2010 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. @@ -27,7 +27,6 @@ */ /* - * Version $Id$ * * Helper functions for tree widget formatting * @@ -309,11 +308,11 @@ void ItemFormatterBase::setDurationFld(int index, const QString &fld) char suffix = 's'; if (dfld) { for (int pos = 0 ; sufs[pos] ; ++pos) { - if (dfld % divs[pos] == 0) { - dfld /= divs[pos]; - suffix = sufs[pos]; - break; - } + if (dfld % divs[pos] == 0) { + dfld /= divs[pos]; + suffix = sufs[pos]; + break; + } } } QString msg; @@ -325,13 +324,13 @@ void ItemFormatterBase::setDurationFld(int index, const QString &fld) dfld = fld.trimmed().toLongLong(); msg = ""; for (int pos = 0 ; sufs[pos] ; ++pos) { - if (dfld / divs[pos] != 0) { - msg += QString(" %1%2").arg(dfld / divs[pos]).arg(sufs[pos]); - dfld %= divs[pos]; - } + if (dfld / divs[pos] != 0) { + msg += QString(" %1%2").arg(dfld / divs[pos]).arg(sufs[pos]); + dfld %= divs[pos]; + } } if (dfld) - msg += QString(" %1s").arg(dfld); + msg += QString(" %1s").arg(dfld); } setNumericFld(index, msg, fld.trimmed().toLongLong()); @@ -536,4 +535,3 @@ const QTableWidgetItem *TableItemFormatter::widget(int col) const { return parent->item(row, col); } - diff --git a/bacula/src/qt-console/util/fmtwidgetitem.h b/bacula/src/qt-console/util/fmtwidgetitem.h index 976d1bb58b..fe645d055c 100644 --- a/bacula/src/qt-console/util/fmtwidgetitem.h +++ b/bacula/src/qt-console/util/fmtwidgetitem.h @@ -3,7 +3,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2007 Free Software Foundation Europe e.V. + Copyright (C) 2007-2010 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. @@ -28,8 +28,6 @@ Switzerland, email:ftf@fsfeurope.org. */ /* - * Version $Id$ - * * TreeView formatting helpers - Riccardo Ghetta, May 2008 */ -- 2.39.5