diff -Nru juk-4.12.3/actioncollection.cpp juk-4.12.90/actioncollection.cpp --- juk-4.12.3/actioncollection.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/actioncollection.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Feb 27 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "actioncollection.h" #include "juk.h" diff -Nru juk-4.12.3/actioncollection.h juk-4.12.90/actioncollection.h --- juk-4.12.3/actioncollection.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/actioncollection.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Feb 27 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef ACTIONCOLLECTION_H #define ACTIONCOLLECTION_H diff -Nru juk-4.12.3/advancedsearchdialog.cpp juk-4.12.90/advancedsearchdialog.cpp --- juk-4.12.3/advancedsearchdialog.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/advancedsearchdialog.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Jul 31 00:31:51 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "advancedsearchdialog.h" diff -Nru juk-4.12.3/advancedsearchdialog.h juk-4.12.90/advancedsearchdialog.h --- juk-4.12.3/advancedsearchdialog.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/advancedsearchdialog.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Jul 31 00:31:51 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef ADVANCEDSEARCHDIALOG_H #define ADVANCEDSEARCHDIALOG_H diff -Nru juk-4.12.3/cache.cpp juk-4.12.90/cache.cpp --- juk-4.12.3/cache.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/cache.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Sat Sep 7 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2008, 2013 by Michael Pyne - email : mpyne@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2008, 2013 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "cache.h" #include "juk-exception.h" diff -Nru juk-4.12.3/cache.h juk-4.12.90/cache.h --- juk-4.12.3/cache.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/cache.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Sat Sep 7 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2008, 2013 by Michael Pyne - email : mpyne@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2008, 2013 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef JUK_CACHE_H #define JUK_CACHE_H diff -Nru juk-4.12.3/categoryreaderinterface.cpp juk-4.12.90/categoryreaderinterface.cpp --- juk-4.12.3/categoryreaderinterface.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/categoryreaderinterface.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Oct 31 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "categoryreaderinterface.h" #include "filerenameroptions.h" diff -Nru juk-4.12.3/categoryreaderinterface.h juk-4.12.90/categoryreaderinterface.h --- juk-4.12.3/categoryreaderinterface.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/categoryreaderinterface.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Oct 31 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef CATEGORYREADERINTERFACE_H #define CATEGORYREADERINTERFACE_H @@ -28,7 +29,7 @@ * This class is used to map categories into values. You should implement the * functionality in a subclass. * - * @author Michael Pyne + * @author Michael Pyne */ class CategoryReaderInterface { diff -Nru juk-4.12.3/collectionlist.cpp juk-4.12.90/collectionlist.cpp --- juk-4.12.3/collectionlist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/collectionlist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Sep 13 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "collectionlist.h" diff -Nru juk-4.12.3/collectionlist.h juk-4.12.90/collectionlist.h --- juk-4.12.3/collectionlist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/collectionlist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Sep 13 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef COLLECTIONLIST_H #define COLLECTIONLIST_H diff -Nru juk-4.12.3/coverdialogbase.ui juk-4.12.90/coverdialogbase.ui --- juk-4.12.3/coverdialogbase.ui 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/coverdialogbase.ui 2014-03-04 05:58:47.000000000 +0000 @@ -20,7 +20,7 @@ 6 - + 5 @@ -35,12 +35,6 @@ 0 - - Q3ListView::LastColumn - - - false - Artist @@ -65,7 +59,7 @@ 6 - + 5 @@ -96,14 +90,14 @@ - K3ListView - Q3ListView -
k3listview.h
+ KListWidget + QListWidget +
klistwidget.h
 - K3IconViewSearchLine + KLineEdit QWidget -
k3iconviewsearchline.h
+
klineedit.h
 CoverIconView @@ -114,42 +108,10 @@ k3listview.h - k3iconviewsearchline.h + klineedit.h covericonview.h - - m_artists - clicked(Q3ListViewItem*) - CoverDialogBase - slotArtistClicked(Q3ListViewItem*) - - - 20 - 20 - - - 20 - 20 - - - - - m_covers - contextMenuRequested(Q3IconViewItem*,QPoint) - CoverDialogBase - slotContextRequested(Q3IconViewItem*,QPoint) - - - 20 - 20 - - - 20 - 20 - - - diff -Nru juk-4.12.3/coverdialog.cpp juk-4.12.90/coverdialog.cpp --- juk-4.12.3/coverdialog.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/coverdialog.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,23 +1,22 @@ -/*************************************************************************** - begin : Sun May 15 2005 - copyright : (C) 2005 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2005 Michael Pyne + * Copyright (C) 2014 Arnold Dumas + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "coverdialog.h" -#include -#include -#include #include #include #include @@ -31,32 +30,32 @@ using CoverUtility::CoverIconViewItem; -class AllArtistsListViewItem : public K3ListViewItem +class AllArtistsListViewItem : public QListWidgetItem { public: - AllArtistsListViewItem(Q3ListView *parent) : - K3ListViewItem(parent, i18n("<All Artists>")) + AllArtistsListViewItem(KListWidget *parent) : + QListWidgetItem(i18n("<All Artists>"), parent) { } - int compare(Q3ListViewItem *, int, bool) const + bool operator< (const QListWidgetItem& other) const { - return -1; // Always be at the top. + Q_UNUSED(other); + return true; // Always be at the top. } }; -class CaseInsensitiveItem : public K3ListViewItem +class CaseInsensitiveItem : public QListWidgetItem { public: - CaseInsensitiveItem(Q3ListView *parent, const QString &text) : - K3ListViewItem(parent, text) + CaseInsensitiveItem(KListWidget *parent, const QString &text) : + QListWidgetItem(text, parent) { } - int compare(Q3ListViewItem *item, int column, bool ascending) const + bool operator< (const QListWidgetItem& other) const { - Q_UNUSED(ascending); - return text(column).toLower().localeAwareCompare(item->text(column).toLower()); + return text().toLower().localeAwareCompare(other.text().toLower()); } }; @@ -67,11 +66,16 @@ setObjectName( QLatin1String("juk_cover_dialog" )); - m_covers->setResizeMode(Q3IconView::Adjust); - m_covers->setGridX(140); - m_covers->setGridY(150); + m_searchLine->setClearButtonShown(true); - m_searchLine->setIconView(m_covers); + connect(m_artists, SIGNAL(itemClicked(QListWidgetItem*)), + this, SLOT(slotArtistClicked(QListWidgetItem*))); + + connect(m_covers, SIGNAL(customContextMenuRequested(QPoint)), + this, SLOT(slotContextRequested(QPoint))); + + connect(m_searchLine, SIGNAL(textChanged(QString)), + this, SLOT(slotSearchPatternChanged(QString))); } CoverDialog::~CoverDialog() @@ -85,13 +89,10 @@ QStringList artists = CollectionList::instance()->uniqueSet(CollectionList::Artists); - m_artists->setSorting(-1); new AllArtistsListViewItem(m_artists); for(QStringList::ConstIterator it = artists.constBegin(); it != artists.constEnd(); ++it) new CaseInsensitiveItem(m_artists, *it); - m_artists->setSorting(0); - QTimer::singleShot(0, this, SLOT(loadCovers())); QWidget::show(); } @@ -118,16 +119,18 @@ } // TODO: Add a way to show cover art for tracks with no artist. -void CoverDialog::slotArtistClicked(Q3ListViewItem *item) +void CoverDialog::slotArtistClicked(QListWidgetItem *item) { m_covers->clear(); - + if (!item) { + return; + } if(dynamic_cast(item)) { // All artists. loadCovers(); } else { - QString artist = item->text(0).toLower(); + QString artist = item->text().toLower(); CoverDataMapIterator it, end; @@ -141,10 +144,12 @@ } } -void CoverDialog::slotContextRequested(Q3IconViewItem *item, const QPoint &pt) +void CoverDialog::slotContextRequested(const QPoint &pt) { static KMenu *menu = 0; + QListWidgetItem* item = m_covers->currentItem(); + if(!item) return; @@ -153,7 +158,55 @@ menu->addAction(i18n("Remove Cover"), this, SLOT(removeSelectedCover())); } - menu->popup(pt); + QPoint globalPt = m_covers->mapToGlobal(pt); + menu->popup(globalPt); +} + +void CoverDialog::slotSearchPatternChanged(const QString& pattern) +{ + m_covers->clear(); + + QListWidgetItem* item = m_artists->currentItem(); + + // If the expression is cleared, then use slotArtistClicked. + if (pattern.isEmpty()) { + slotArtistClicked(item); + } + + else { + QRegExp filter(pattern, Qt::CaseInsensitive, QRegExp::Wildcard); + QString artist = item->text().toLower(); + + CoverDataMapIterator it, end; + + it = CoverManager::begin(); + end = CoverManager::end(); + + // Here, only show cover that match the search pattern. + if (dynamic_cast(item)) { + + for(; it != end; ++it) { + if (filter.indexIn(it.value()->artist) != -1) { + + (void) new CoverIconViewItem(it.key(), m_covers); + } + } + } + + // Here, only show the covers that match the search pattern and + // that have the same artist as the currently selected one. + else { + + for(; it != end; ++it) { + if (it.value()->artist == artist + && (filter.indexIn(it.value()->artist) != -1) + || (filter.indexIn(it.value()->album) != -1)) { + + (void) new CoverIconViewItem(it.key(), m_covers); + } + } + } + } } void CoverDialog::removeSelectedCover() diff -Nru juk-4.12.3/coverdialog.h juk-4.12.90/coverdialog.h --- juk-4.12.3/coverdialog.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/coverdialog.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,19 @@ -/*************************************************************************** - begin : Sun May 15 2005 - copyright : (C) 2005 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2005 Michael Pyne + * Copyright (C) 2014 Arnold Dumas + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef COVERDIALOG_H #define COVERDIALOG_H @@ -20,6 +22,8 @@ #include +class QListWidgetItem; + class CoverDialog : public QWidget, public Ui::CoverDialogBase { Q_OBJECT @@ -30,8 +34,9 @@ virtual void show(); public slots: - void slotArtistClicked(Q3ListViewItem *item); - void slotContextRequested(Q3IconViewItem *item, const QPoint &pt); + void slotArtistClicked(QListWidgetItem *item); + void slotContextRequested(const QPoint &pt); + void slotSearchPatternChanged(const QString& pattern); private slots: void loadCovers(); diff -Nru juk-4.12.3/covericonview.cpp juk-4.12.90/covericonview.cpp --- juk-4.12.3/covericonview.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/covericonview.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,51 +1,60 @@ -/*************************************************************************** - begin : Sat Jul 9 2005 - copyright : (C) 2005 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2005 Michael Pyne + * Copyright (C) 2014 Arnold Dumas + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "covericonview.h" #include "covermanager.h" using CoverUtility::CoverIconViewItem; -CoverIconViewItem::CoverIconViewItem(coverKey id, Q3IconView *parent) : - K3IconViewItem(parent), m_id(id) +CoverIconViewItem::CoverIconViewItem(coverKey id, KListWidget *parent) : + QListWidgetItem(parent), m_id(id) { CoverDataPtr data = CoverManager::coverInfo(id); setText(QString("%1 - %2").arg(data->artist, data->album)); - setPixmap(data->thumbnail()); + setIcon(data->thumbnail()); + setSizeHint(QSize(140, 150)); } -CoverIconView::CoverIconView(QWidget *parent, const char *name) : K3IconView(parent, name) +CoverIconView::CoverIconView(QWidget *parent, const char *name) : KListWidget(parent) { - setResizeMode(Adjust); + setObjectName(name); + setResizeMode(KListWidget::Adjust); + setViewMode(KListWidget::IconMode); + setIconSize(QSize(130, 140)); + setMovement(KListWidget::Static); + setContextMenuPolicy(Qt::CustomContextMenu); } CoverIconViewItem *CoverIconView::currentItem() const { - return static_cast(K3IconView::currentItem()); + return static_cast(KListWidget::currentItem()); } +// TODO: port to Qt4 +#if 0 Q3DragObject *CoverIconView::dragObject() { -#if 0 // Temporarily disabled pending conversion of the cover manager icon view // to Qt 4 ish stuff. CoverIconViewItem *item = currentItem(); if(item) return new CoverDrag(item->id(), this); -#endif return 0; } +#endif // vim: set et sw=4 tw=0 sta: diff -Nru juk-4.12.3/covericonview.h juk-4.12.90/covericonview.h --- juk-4.12.3/covericonview.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/covericonview.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,22 +1,24 @@ -/*************************************************************************** - begin : Sat Jul 9 2005 - copyright : (C) 2005 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2005 Michael Pyne + * Copyright (C) 2014 Arnold Dumas + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef COVERICONVIEW_H #define COVERICONVIEW_H -#include +#include #include "covermanager.h" @@ -27,10 +29,10 @@ namespace CoverUtility { - class CoverIconViewItem : public K3IconViewItem + class CoverIconViewItem : public QListWidgetItem { public: - CoverIconViewItem(coverKey id, Q3IconView *parent); + CoverIconViewItem(coverKey id, KListWidget *parent); coverKey id() const { return m_id; } @@ -42,12 +44,12 @@ using CoverUtility::CoverIconViewItem; /** - * This class subclasses K3IconView in order to provide cover drag-and-drop + * This class subclasses QListWidget in order to provide cover drag-and-drop * support. * - * @author Michael Pyne + * @author Michael Pyne */ -class CoverIconView : public K3IconView +class CoverIconView : public KListWidget { public: explicit CoverIconView(QWidget *parent, const char *name = 0); @@ -55,7 +57,7 @@ CoverIconViewItem *currentItem() const; protected: - virtual Q3DragObject *dragObject(); + // virtual Q3DragObject *dragObject(); }; #endif /* COVERICONVIEW_H */ diff -Nru juk-4.12.3/coverinfo.cpp juk-4.12.90/coverinfo.cpp --- juk-4.12.3/coverinfo.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/coverinfo.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,19 @@ -/*************************************************************************** - copyright : (C) 2004 Nathan Toone - : (C) 2005, 2008 Michael Pyne - email : nathan@toonetown.com -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Nathan Toone + * Copyright (C) 2005, 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "coverinfo.h" diff -Nru juk-4.12.3/coverinfo.h juk-4.12.90/coverinfo.h --- juk-4.12.3/coverinfo.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/coverinfo.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,19 +1,19 @@ -/*************************************************************************** - copyright : (C) 2004 Nathan Toone - email : nathan@toonetown.com - - copyright : (C) 2008 Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Nathan Toone + * Copyright (C) 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef COVERINFO_H #define COVERINFO_H diff -Nru juk-4.12.3/covermanager.cpp juk-4.12.90/covermanager.cpp --- juk-4.12.3/covermanager.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/covermanager.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun May 15 2005 - copyright : (C) 2005, 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2005, 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "covermanager.h" @@ -97,7 +98,7 @@ * different covers and such. It holds the covers, and the map of path names * to cover ids, and has a few utility methods to load and save the data. * - * @author Michael Pyne + * @author Michael Pyne * @see CoverManager */ class CoverManagerPrivate diff -Nru juk-4.12.3/covermanager.h juk-4.12.90/covermanager.h --- juk-4.12.3/covermanager.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/covermanager.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun May 15 2005 - copyright : (C) 2005, 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2005, 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef JUK_COVERMANAGER_H #define JUK_COVERMANAGER_H @@ -64,7 +65,7 @@ * there to allow the CoverManager to try to automatically assign covers to * new tracks. * - * @author Michael Pyne + * @author Michael Pyne * @see CoverManager */ class CoverData : public KShared @@ -97,7 +98,7 @@ * * As of this writing the mimetype is application/x-juk-coverid * - * @author Michael Pyne + * @author Michael Pyne */ class CoverDrag : public QMimeData { @@ -127,7 +128,7 @@ * CoverManager::instance()->method() * \endcode * - * @author Michael Pyne + * @author Michael Pyne */ class CoverManager { diff -Nru juk-4.12.3/coverproxy.cpp juk-4.12.90/coverproxy.cpp --- juk-4.12.3/coverproxy.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/coverproxy.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Mar 01 2009 - copyright : (C) 2009 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "coverproxy.h" #include "covermanager.h" diff -Nru juk-4.12.3/coverproxy.h juk-4.12.90/coverproxy.h --- juk-4.12.3/coverproxy.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/coverproxy.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Mar 01 2009 - copyright : (C) 2009 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef JUK_COVERPROXY_H #define JUK_COVERPROXY_H diff -Nru juk-4.12.3/dbuscollectionproxy.cpp juk-4.12.90/dbuscollectionproxy.cpp --- juk-4.12.3/dbuscollectionproxy.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/dbuscollectionproxy.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,16 +1,18 @@ -/*************************************************************************** - copyright : (C) 2009 by Michael Pyne - email : michael.pyne@kdemail.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "dbuscollectionproxy.h" diff -Nru juk-4.12.3/dbuscollectionproxy.h juk-4.12.90/dbuscollectionproxy.h --- juk-4.12.3/dbuscollectionproxy.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/dbuscollectionproxy.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,16 +1,18 @@ -/*************************************************************************** - copyright : (C) 2009 by Michael Pyne - email : michael.pyne@kdemail.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef DBUS_COLLECTION_PROXY_H #define DBUS_COLLECTION_PROXY_H diff -Nru juk-4.12.3/debian/changelog juk-4.12.90/debian/changelog --- juk-4.12.3/debian/changelog 2014-03-04 19:27:49.000000000 +0000 +++ juk-4.12.90/debian/changelog 2014-03-19 10:35:13.000000000 +0000 @@ -1,3 +1,9 @@ +juk (4:4.12.90-0ubuntu1) trusty; urgency=medium + + * New upstream beta release + + -- Jonathan Riddell Wed, 19 Mar 2014 10:35:12 +0000 + juk (4:4.12.3-0ubuntu1) trusty; urgency=medium * New upstream bugfix release diff -Nru juk-4.12.3/debian/control juk-4.12.90/debian/control --- juk-4.12.3/debian/control 2014-03-04 19:27:49.000000000 +0000 +++ juk-4.12.90/debian/control 2014-03-19 10:35:13.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Pino Toscano , Sune Vuorela Build-Depends: kde-sc-dev-latest (>= 4:4.10), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), - kdelibs5-dev (>= 4:4.12.3), libphonon-dev, + kdelibs5-dev (>= 4:4.12.90), libphonon-dev, libtag1-dev (>= 1.6), libtag-extras-dev Standards-Version: 3.9.3 Homepage: http://www.kde.org/ diff -Nru juk-4.12.3/deletedialog.cpp juk-4.12.90/deletedialog.cpp --- juk-4.12.3/deletedialog.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/deletedialog.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Aug 31 21:59:58 EST 2004 - copyright : (C) 2004, 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004, 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "deletedialog.h" #include "ui_deletedialogbase.h" diff -Nru juk-4.12.3/deletedialog.h juk-4.12.90/deletedialog.h --- juk-4.12.3/deletedialog.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/deletedialog.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Aug 31 21:54:20 EST 2004 - copyright : (C) 2004, 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004, 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef DELETEDIALOG_H #define DELETEDIALOG_H diff -Nru juk-4.12.3/directorylist.cpp juk-4.12.90/directorylist.cpp --- juk-4.12.3/directorylist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/directorylist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Tue Feb 4 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2009 by Georg Grabler - email : ggrabler@gmail.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * Copyright (C) 2009 Georg Grabler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "directorylist.h" diff -Nru juk-4.12.3/directorylist.h juk-4.12.90/directorylist.h --- juk-4.12.3/directorylist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/directorylist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Feb 4 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef DIRECTORYLIST_H #define DIRECTORYLIST_H diff -Nru juk-4.12.3/dynamicplaylist.cpp juk-4.12.90/dynamicplaylist.cpp --- juk-4.12.3/dynamicplaylist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/dynamicplaylist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon May 5 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "dynamicplaylist.h" #include "collectionlist.h" diff -Nru juk-4.12.3/dynamicplaylist.h juk-4.12.90/dynamicplaylist.h --- juk-4.12.3/dynamicplaylist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/dynamicplaylist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon May 5 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef DYNAMICPLAYLIST_H #define DYNAMICPLAYLIST_H diff -Nru juk-4.12.3/exampleoptions.cpp juk-4.12.90/exampleoptions.cpp --- juk-4.12.3/exampleoptions.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/exampleoptions.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Oct 28 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "exampleoptions.h" diff -Nru juk-4.12.3/exampleoptions.h juk-4.12.90/exampleoptions.h --- juk-4.12.3/exampleoptions.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/exampleoptions.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Oct 28 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef EXAMPLEOPTIONS_H #define EXAMPLEOPTIONS_H diff -Nru juk-4.12.3/filehandle.cpp juk-4.12.90/filehandle.cpp --- juk-4.12.3/filehandle.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filehandle.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Feb 29 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "filehandle.h" diff -Nru juk-4.12.3/filehandle.h juk-4.12.90/filehandle.h --- juk-4.12.3/filehandle.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filehandle.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Feb 29 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef FILEHANDLE_H #define FILEHANDLE_H diff -Nru juk-4.12.3/filehandleproperties.h juk-4.12.90/filehandleproperties.h --- juk-4.12.3/filehandleproperties.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filehandleproperties.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,15 +1,18 @@ -/*************************************************************************** - Copyright (C) 2004 by Scott Wheeler -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef FILEHANDLEPROPERTIES_H #define FILEHANDLEPROPERTIES_H diff -Nru juk-4.12.3/filerenamerconfigdlg.cpp juk-4.12.90/filerenamerconfigdlg.cpp --- juk-4.12.3/filerenamerconfigdlg.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filerenamerconfigdlg.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,18 +1,19 @@ -/*************************************************************************** - begin : Mon Nov 01 2004 - copyright : (C) 2004 by Michael Pyne - : (c) 2003 Frerich Raabe - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * Copyright (C) 2003 Frerich Raabe + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "filerenamerconfigdlg.h" #include "filerenamer.h" diff -Nru juk-4.12.3/filerenamerconfigdlg.h juk-4.12.90/filerenamerconfigdlg.h --- juk-4.12.3/filerenamerconfigdlg.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filerenamerconfigdlg.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,18 +1,19 @@ -/*************************************************************************** - begin : Mon Nov 01 2004 - copyright : (C) 2004 by Michael Pyne - : (c) 2003 Frerich Raabe - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * Copyright (C) 2003 Frerich Raabe + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef FILERENAMERCONFIGDLG_H #define FILERENAMERCONFIGDLG_H diff -Nru juk-4.12.3/filerenamer.cpp juk-4.12.90/filerenamer.cpp --- juk-4.12.3/filerenamer.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filerenamer.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,18 +1,19 @@ -/*************************************************************************** - begin : Thu Oct 28 2004 - copyright : (C) 2004, 2007, 2009 by Michael Pyne - : (c) 2003 Frerich Raabe - email : mpyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004, 2007, 2009 Michael Pyne + * Copyright (C) 2003 Frerich Raabe + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "filerenamer.h" diff -Nru juk-4.12.3/filerenamer.h juk-4.12.90/filerenamer.h --- juk-4.12.3/filerenamer.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filerenamer.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,18 +1,19 @@ -/*************************************************************************** - begin : Thu Oct 28 2004 - copyright : (C) 2004, 2007 by Michael Pyne - : (C) 2003 Frerich Raabe - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004, 2007 Michael Pyne + * Copyright (C) 2003 Frerich Raabe + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef FILERENAMER_H #define FILERENAMER_H @@ -89,7 +90,7 @@ * from whatever the given PlaylistItem is. You can assign different * PlaylistItems in order to change the returned tag category information. * - * @author Michael Pyne + * @author Michael Pyne */ class ConfigCategoryReader : public CategoryReaderInterface { @@ -136,7 +137,7 @@ * It also implements the CategoryReaderInterface in order to implement the * example filename functionality. * - * @author Michael Pyne + * @author Michael Pyne */ class FileRenamerWidget : public QWidget, public CategoryReaderInterface { @@ -493,7 +494,7 @@ * based off of the user's options (see ConfigCategoryReader) and of setting folder icons * if appropriate. * - * @author Michael Pyne + * @author Michael Pyne */ class FileRenamer { diff -Nru juk-4.12.3/filerenameroptionsbase.ui juk-4.12.90/filerenameroptionsbase.ui --- juk-4.12.3/filerenameroptionsbase.ui 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filerenameroptionsbase.ui 2014-03-04 05:58:47.000000000 +0000 @@ -193,7 +193,7 @@ - JuK can force the track used in a file name to have a minimum number of digits. You may want to do this for better sorting in file managers. + JuK can force the track used in a file name to have a minimum number of digits. You may want to do this for better sorting in file managers. Qt::RichText diff -Nru juk-4.12.3/filerenameroptions.cpp juk-4.12.90/filerenameroptions.cpp --- juk-4.12.3/filerenameroptions.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filerenameroptions.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Oct 28 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "filerenameroptions.h" diff -Nru juk-4.12.3/filerenameroptions.h juk-4.12.90/filerenameroptions.h --- juk-4.12.3/filerenameroptions.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/filerenameroptions.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Oct 28 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef FILERENAMEROPTIONS_H #define FILERENAMEROPTIONS_H @@ -23,7 +24,7 @@ /** * Base widget implementing the options for a particular tag type. * - * @author Michael Pyne + * @author Michael Pyne */ class FileRenamerTagOptions : public QWidget, public Ui::FileRenamerTagOptionsBase { @@ -46,7 +47,7 @@ /** * This defines the dialog that actually gets the options from the user. * - * @author Michael Pyne + * @author Michael Pyne */ class TagOptionsDialog : public KDialog { diff -Nru juk-4.12.3/folderplaylist.cpp juk-4.12.90/folderplaylist.cpp --- juk-4.12.3/folderplaylist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/folderplaylist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,16 +1,18 @@ -/*************************************************************************** - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "folderplaylist.h" #include "playlistcollection.h" diff -Nru juk-4.12.3/folderplaylist.h juk-4.12.90/folderplaylist.h --- juk-4.12.3/folderplaylist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/folderplaylist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,16 +1,18 @@ -/*************************************************************************** - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef FOLDERPLAYLIST_H #define FOLDERPLAYLIST_H diff -Nru juk-4.12.3/historyplaylist.cpp juk-4.12.90/historyplaylist.cpp --- juk-4.12.3/historyplaylist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/historyplaylist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ - /*************************************************************************** - begin : Fri Aug 8 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "historyplaylist.h" #include "collectionlist.h" diff -Nru juk-4.12.3/historyplaylist.h juk-4.12.90/historyplaylist.h --- juk-4.12.3/historyplaylist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/historyplaylist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Aug 8 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef HISTORYPLAYLIST_H #define HISTORYPLAYLIST_H diff -Nru juk-4.12.3/juk.cpp juk-4.12.90/juk.cpp --- juk-4.12.3/juk.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/juk.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Mon Feb 4 23:40:41 EST 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2008, 2009 by Michael Pyne - email : mpyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2008, 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "juk.h" diff -Nru juk-4.12.3/juk-exception.h juk-4.12.90/juk-exception.h --- juk-4.12.3/juk-exception.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/juk-exception.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Jan 08 2008 - copyright : (C) 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef JUK_EXCEPTION_H #define JUK_EXCEPTION_H diff -Nru juk-4.12.3/juk.h juk-4.12.90/juk.h --- juk-4.12.3/juk.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/juk.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon Feb 4 23:40:41 EST 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef JUK_H #define JUK_H diff -Nru juk-4.12.3/jukIface.h juk-4.12.90/jukIface.h --- juk-4.12.3/jukIface.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/jukIface.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,15 +1,24 @@ +/** + * Copyright (C) 2003 Antonia Larrosa + * Copyright (C) 2003-2006 Scott Wheeler + * Copyright (C) 2004-2006 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ + /* * Definition of the DCOP interface for JuK. * TODO: Port to DBUS. - * - * Copyright 2003 Antonia Larrosa - * Copyright 2003-2006 Scott Wheeler - * Copyright 2004-2006 Michael Pyne - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #ifndef JUKIFACE_H diff -Nru juk-4.12.3/juk.notifyrc juk-4.12.90/juk.notifyrc --- juk-4.12.3/juk.notifyrc 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/juk.notifyrc 2014-03-04 05:58:47.000000000 +0000 @@ -290,13 +290,14 @@ [Event/dock_mode] Name=JuK running in dock mode -Name[bs]=Juk u usidrenom režimu +Name[bs]=JuK radi u sidrišnom režimu Name[ca]=El JuK s'està executant en el mode acoblat Name[ca@valencia]=El JuK s'està executant en el mode acoblat Name[cs]=JuK běží v dokovaném režimu Name[da]=JuK kører i doktilstand Name[de]=JuK läuft im Systemabschnitt der Kontrollleiste Name[es]=Juk se ejecuta en modo anclado +Name[et]=JuK töötab dokirežiimis Name[fi]=JuK on pienennettynä ilmoitusalueelle Name[fr]=JuK fonctionne en mode intégré Name[gl]=JuK está no modo acoplado @@ -304,6 +305,7 @@ Name[ia]=Juck executante de modo dock Name[it]=JuK in esecuzione nel vassoio di sistema Name[kk]=JuK бүктелген күйде жегілген +Name[ko]=도킹 모드에서 JuK 실행 중 Name[nb]=JuK kjører i dokket modus Name[nds]=JuK löppt binnen Systeemafsnitt Name[nl]=JuK actief in verankerde modus @@ -323,13 +325,14 @@ Name[x-test]=xxJuK running in dock modexx Name[zh_TW]=JuK 以嵌入模式執行中 Comment=Use context menu in system tray to restore. -Comment[bs]=Koristi kontekstni meni u sistemskom uglu za obnovu. +Comment[bs]=Koristite kontekstsni meni u sistemskom uglu za obnovu Comment[ca]=Useu el menú contextual en la safata del sistema per restaurar. Comment[ca@valencia]=Useu el menú contextual en la safata del sistema per restaurar. Comment[cs]=Pro návrat použijte kontextovou nabídky v systémové liště. Comment[da]=Brug kontekstmenuen i statusområdet til at gendanne. Comment[de]=Kontextmenü im Systemabschnitt der Kontrollleiste zum Wiederherstellen verwenden Comment[es]=Use el menú de contexto de la bandeja del sistema para restaurar. +Comment[et]=Taastamiseks kasuta süsteemisalve kontekstimenüüd. Comment[fi]=Palauta käyttämällä ilmoitusalueen kontekstivalikkoa. Comment[fr]=utilisez le menu contextuel de la boîte à miniatures pour le restaurer. Comment[gl]=Use o menú contextual na bandexa do sistema para restauralo. @@ -337,6 +340,7 @@ Comment[ia]=Usa menu de contexto in tabuliero de systema pro restabilir. Comment[it]=Usa il menu contestuale nel vassoio di sistema per ripristinare. Comment[kk]=Қалпына келтіруге жүйелік сөре контекстті мәзірін пайдаланыңыз. +Comment[ko]=시스템 트레이의 컨텍스트 메뉴를 사용하여 복원하십시오. Comment[nb]=Bruk kontekstmenyen i systemkurven for å tilbakestille. Comment[nds]=Du kannst dat över't Kontextmenü binnen den Systeemafsnitt wedderherstellen. Comment[nl]=Contextmenu in systeemvak gebruiken voor herstellen. diff -Nru juk-4.12.3/k3bexporter.cpp juk-4.12.90/k3bexporter.cpp --- juk-4.12.3/k3bexporter.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/k3bexporter.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon May 31 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "k3bexporter.h" diff -Nru juk-4.12.3/k3bexporter.h juk-4.12.90/k3bexporter.h --- juk-4.12.3/k3bexporter.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/k3bexporter.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon May 31 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef K3BEXPORTER_H #define K3BEXPORTER_H diff -Nru juk-4.12.3/keydialog.cpp juk-4.12.90/keydialog.cpp --- juk-4.12.3/keydialog.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/keydialog.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,19 +1,19 @@ -/*************************************************************************** - begin : Tue Mar 11 19:00:00 CET 2003 - copyright : (C) 2003 by Stefan Asserhall - email : stefan.asserhall@telia.com - copyright : (c) 2007, 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003 Stefan Asserhall + * Copyright (C) 2007, 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "keydialog.h" #include "actioncollection.h" diff -Nru juk-4.12.3/keydialog.h juk-4.12.90/keydialog.h --- juk-4.12.3/keydialog.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/keydialog.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,19 +1,19 @@ -/*************************************************************************** - begin : Tue Mar 11 19:00:00 CET 2003 - copyright : (C) 2003 by Stefan Asserhall - email : stefan.asserhall@telia.com - copyright : (c) 2007, 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003 Stefan Asserhall + * Copyright (C) 2007, 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef KEYDIALOG_H #define KEYDIALOG_H diff -Nru juk-4.12.3/ktrm.cpp juk-4.12.90/ktrm.cpp --- juk-4.12.3/ktrm.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/ktrm.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,25 +1,23 @@ -/*************************************************************************** - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - copyright : (c) 2007 by Michael Pyne - email : michael.pyne@kdemail.net - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * Copyright (C) 2007 Michael Pyne + */ -/*************************************************************************** - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library 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 * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * - * 02110-1301, USA * - ***************************************************************************/ +/** + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version + * 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + */ #include "ktrm.h" #include diff -Nru juk-4.12.3/ktrm.h juk-4.12.90/ktrm.h --- juk-4.12.3/ktrm.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/ktrm.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,23 +1,22 @@ -/*************************************************************************** - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + */ -/*************************************************************************** - * This library is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Lesser General Public License version * - * 2.1 as published by the Free Software Foundation. * - * * - * This library 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 * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * - * USA * - ***************************************************************************/ +/** + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version + * 2.1 as published by the Free Software Foundation. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + */ /* * At some point this will likely be a library class, as such it's been written diff -Nru juk-4.12.3/lyricswidget.cpp juk-4.12.90/lyricswidget.cpp --- juk-4.12.3/lyricswidget.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/lyricswidget.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Wed May 9 2012 - copyright : (C) 2012 by Martin Sandsmark - email : martin.sandsmark@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2012 Martin Sandsmark + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include #include @@ -120,7 +121,7 @@ url.addQueryItem("prop", "revisions"); url.addQueryItem("rvprop", "content"); url.addQueryItem("format", "xml"); - url.addQueryItem("titles", artist + ":" + title); + url.addQueryItem("titles", artist + ':' + title); connect(m_networkAccessManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(receiveLyricsReply(QNetworkReply*))); m_networkAccessManager->get(QNetworkRequest(url)); } @@ -144,7 +145,7 @@ } lIndex += 15; // We skip the tag content = content.mid(lIndex, rIndex - lIndex).trimmed(); - content.replace("\n", "
"); + content.replace('\n', "
"); //setText(content); setHtml("

" + m_title + "

" + content + diff -Nru juk-4.12.3/lyricswidget.h juk-4.12.90/lyricswidget.h --- juk-4.12.3/lyricswidget.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/lyricswidget.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Wed May 9 2012 - copyright : (C) 2012 by Martin Sandsmark - email : martin.sandsmark@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2012 Martin Sandsmark + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef LYRICSWIDGET_H #define LYRICSWIDGET_H diff -Nru juk-4.12.3/main.cpp juk-4.12.90/main.cpp --- juk-4.12.3/main.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/main.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon Feb 4 23:40:41 EST 2002 - copyright : (C) 2002 - 2007 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2007 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include #include diff -Nru juk-4.12.3/mediafiles.cpp juk-4.12.90/mediafiles.cpp --- juk-4.12.3/mediafiles.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/mediafiles.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Sep 13 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "mediafiles.h" diff -Nru juk-4.12.3/mediafiles.h juk-4.12.90/mediafiles.h --- juk-4.12.3/mediafiles.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/mediafiles.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Sep 13 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef MEDIAFILES_H #define MEDIAFILES_H diff -Nru juk-4.12.3/mpris2/mediaplayer2player.cpp juk-4.12.90/mpris2/mediaplayer2player.cpp --- juk-4.12.3/mpris2/mediaplayer2player.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/mpris2/mediaplayer2player.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -206,7 +206,7 @@ metaData["mpris:length"] = qint64(playingFile.tag()->seconds() * 1000000); metaData["xesam:url"] = QString::fromLatin1( - QUrl::fromLocalFile(playingFile.absFilePath()).toEncoded()); + KUrl::fromLocalFile(playingFile.absFilePath()).toEncoded()); if(playingFile.coverInfo()->hasCover()) { QString fallbackFileName = KStandardDirs::locateLocal("tmp", diff -Nru juk-4.12.3/musicbrainzquery.cpp juk-4.12.90/musicbrainzquery.cpp --- juk-4.12.3/musicbrainzquery.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/musicbrainzquery.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Aug 3 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "musicbrainzquery.h" diff -Nru juk-4.12.3/musicbrainzquery.h juk-4.12.90/musicbrainzquery.h --- juk-4.12.3/musicbrainzquery.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/musicbrainzquery.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Aug 3 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef MUSICBRAINZQUERY_H #define MUSICBRAINZQUERY_H diff -Nru juk-4.12.3/nowplaying.cpp juk-4.12.90/nowplaying.cpp --- juk-4.12.3/nowplaying.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/nowplaying.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Tue Nov 9 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2009 by Michael Pyne - email : mpyne@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "nowplaying.h" diff -Nru juk-4.12.3/nowplaying.h juk-4.12.90/nowplaying.h --- juk-4.12.3/nowplaying.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/nowplaying.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Nov 9 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef NOWPLAYING_H #define NOWPLAYING_H diff -Nru juk-4.12.3/playermanager.cpp juk-4.12.90/playermanager.cpp --- juk-4.12.3/playermanager.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playermanager.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,23 +1,20 @@ -/*************************************************************************** - begin : Sat Feb 14 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2007 by Matthias Kretz - email : kretz@kde.org - - copyright : (C) 2008, 2009 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * Copyright (C) 2007 Matthias Kretz + * Copyright (C) 2008, 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "playermanager.h" @@ -461,7 +458,7 @@ } else { emit signalItemChanged(m_file); - m_media[m_curOutputPath]->setCurrentSource(m_file.absFilePath()); + m_media[m_curOutputPath]->setCurrentSource(QUrl::fromLocalFile(m_file.absFilePath())); m_media[m_curOutputPath]->play(); } } @@ -670,7 +667,7 @@ m_fader[nextOutputPath]->setVolume(0.0f); emit signalItemChanged(newFile); - m_media[nextOutputPath]->setCurrentSource(newFile.absFilePath()); + m_media[nextOutputPath]->setCurrentSource(QUrl::fromLocalFile(newFile.absFilePath())); m_media[nextOutputPath]->play(); m_fader[m_curOutputPath]->setVolume(1.0f); diff -Nru juk-4.12.3/playermanager.h juk-4.12.90/playermanager.h --- juk-4.12.3/playermanager.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playermanager.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,23 +1,20 @@ -/*************************************************************************** - begin : Sat Feb 14 2004 - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2007 by Matthias Kretz - email : kretz@kde.org - - copyright : (C) 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * Copyright (C) 2007 Matthias Kretz + * Copyright (C) 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYERMANAGER_H #define PLAYERMANAGER_H diff -Nru juk-4.12.3/playlistbox.cpp juk-4.12.90/playlistbox.cpp --- juk-4.12.3/playlistbox.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistbox.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,23 +1,23 @@ -/*************************************************************************** - begin : Thu Sep 12 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler, - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "playlistbox.h" #include #include -#include #include #include #include @@ -503,7 +503,7 @@ // // Otherwise, do not accept the event. - if(!K3URLDrag::canDecode(e)) { + if (!KUrl::List::canDecode(e->mimeData())) { e->setAccepted(false); return; } diff -Nru juk-4.12.3/playlistbox.h juk-4.12.90/playlistbox.h --- juk-4.12.3/playlistbox.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistbox.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Sep 12 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYLISTBOX_H #define PLAYLISTBOX_H diff -Nru juk-4.12.3/playlistcollection.cpp juk-4.12.90/playlistcollection.cpp --- juk-4.12.3/playlistcollection.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistcollection.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,19 +1,19 @@ -/*************************************************************************** - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2009 by Michael Pyne - email : michael.pyne@kdemail.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "playlistcollection.h" diff -Nru juk-4.12.3/playlistcollection.h juk-4.12.90/playlistcollection.h --- juk-4.12.3/playlistcollection.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistcollection.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,16 +1,18 @@ -/*************************************************************************** - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYLIST_COLLECTION_H #define PLAYLIST_COLLECTION_H diff -Nru juk-4.12.3/playlist.cpp juk-4.12.90/playlist.cpp --- juk-4.12.3/playlist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Sat Feb 16 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2008 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "playlist.h" #include "juk-exception.h" @@ -1046,8 +1045,9 @@ setDropHighlighter(false); setDropVisualizer(true); - KUrl::List urls; - if(!K3URLDrag::decode(e, urls) || urls.isEmpty()) { + const KUrl::List urls = KUrl::List::fromMimeData(e->mimeData()); + + if (urls.isEmpty()) { e->ignore(); return; } @@ -1058,7 +1058,7 @@ bool Playlist::acceptDrag(QDropEvent *e) const { - return CoverDrag::isCover(e->mimeData()) || K3URLDrag::canDecode(e); + return CoverDrag::isCover(e->mimeData()) || KUrl::List::canDecode(e->mimeData()); } void Playlist::decode(const QMimeData *s, PlaylistItem *item) @@ -2349,7 +2349,7 @@ void Playlist::notifyUserColumnWidthModeChanged() { KMessageBox::information(this, - i18n("Manual column widths have been enabled. You can " + i18n("Manual column widths have been enabled. You can " "switch back to automatic column sizes in the view " "menu."), i18n("Manual Column Widths Enabled"), diff -Nru juk-4.12.3/playlistexporter.cpp juk-4.12.90/playlistexporter.cpp --- juk-4.12.3/playlistexporter.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistexporter.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Jun 1 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ // Just a quick hack to get Q_OBJECT to work in playlistexporter.h --amth diff -Nru juk-4.12.3/playlistexporter.h juk-4.12.90/playlistexporter.h --- juk-4.12.3/playlistexporter.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistexporter.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Jun 1 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYLISTEXPORTER_H #define PLAYLISTEXPORTER_H @@ -24,7 +25,7 @@ * Abstract base class to define an interface for classes that export * PlaylistItem data. * - * @author Michael Pyne + * @author Michael Pyne * @see K3bExporter */ class PlaylistExporter : public QObject diff -Nru juk-4.12.3/playlist.h juk-4.12.90/playlist.h --- juk-4.12.3/playlist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,19 +1,19 @@ -/*************************************************************************** - begin : Sat Feb 16 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - copyright : (c) 2007 Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2007 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYLIST_H #define PLAYLIST_H diff -Nru juk-4.12.3/playlistinterface.cpp juk-4.12.90/playlistinterface.cpp --- juk-4.12.3/playlistinterface.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistinterface.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,16 +1,18 @@ -/*************************************************************************** - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "playlistinterface.h" diff -Nru juk-4.12.3/playlistinterface.h juk-4.12.90/playlistinterface.h --- juk-4.12.3/playlistinterface.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistinterface.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,16 +1,18 @@ -/*************************************************************************** - copyright : (C) 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYLISTINTERFACE_H #define PLAYLISTINTERFACE_H diff -Nru juk-4.12.3/playlistitem.cpp juk-4.12.90/playlistitem.cpp --- juk-4.12.3/playlistitem.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistitem.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Feb 17 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "playlistitem.h" diff -Nru juk-4.12.3/playlistitem.h juk-4.12.90/playlistitem.h --- juk-4.12.3/playlistitem.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistitem.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Feb 17 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYLISTITEM_H #define PLAYLISTITEM_H diff -Nru juk-4.12.3/playlistsearch.cpp juk-4.12.90/playlistsearch.cpp --- juk-4.12.3/playlistsearch.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistsearch.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Mar 6 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "playlistsearch.h" #include "playlist.h" diff -Nru juk-4.12.3/playlistsearch.h juk-4.12.90/playlistsearch.h --- juk-4.12.3/playlistsearch.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistsearch.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Mar 6 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYLISTSEARCH_H #define PLAYLISTSEARCH_H diff -Nru juk-4.12.3/playlistsplitter.cpp juk-4.12.90/playlistsplitter.cpp --- juk-4.12.3/playlistsplitter.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistsplitter.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Fri Sep 13 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2009 by Michael Pyne - email : michael.pyne@kdemail.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "playlistsplitter.h" diff -Nru juk-4.12.3/playlistsplitter.h juk-4.12.90/playlistsplitter.h --- juk-4.12.3/playlistsplitter.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/playlistsplitter.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Sep 13 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef PLAYLISTSPLITTER_H #define PLAYLISTSPLITTER_H diff -Nru juk-4.12.3/scrobbleconfigdlg.cpp juk-4.12.90/scrobbleconfigdlg.cpp --- juk-4.12.3/scrobbleconfigdlg.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/scrobbleconfigdlg.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Feb 23 2012 - copyright : (C) 2012 by Martin Sandsmark - email : martin.sandsmark@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2012 Martin Sandsmark + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "scrobbleconfigdlg.h" #include "scrobbler.h" diff -Nru juk-4.12.3/scrobbleconfigdlg.h juk-4.12.90/scrobbleconfigdlg.h --- juk-4.12.3/scrobbleconfigdlg.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/scrobbleconfigdlg.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Feb 23 2012 - copyright : (C) 2012 by Martin Sandsmark - email : martin.sandsmark@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2012 Martin Sandsmark + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef SCROBBLESETTINGS_H #define SCROBBLESETTINGS_H @@ -27,14 +28,14 @@ Q_OBJECT public: explicit ScrobbleConfigDlg(QWidget* parent = 0, Qt::WindowFlags f = 0); - + private slots: void testLogin(); void validLogin(); void invalidLogin(); void save(); void valuesChanged(); - + private: KLineEdit *m_usernameEdit; KLineEdit *m_passwordEdit; @@ -42,4 +43,4 @@ QLabel *m_testFeedbackLabel; }; -#endif//SCROBBLESETTINGS_H \ No newline at end of file +#endif//SCROBBLESETTINGS_H diff -Nru juk-4.12.3/scrobbler.cpp juk-4.12.90/scrobbler.cpp --- juk-4.12.3/scrobbler.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/scrobbler.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Feb 21 2012 - copyright : (C) 2012 by Martin Sandsmark - email : martin.sandsmark@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2012 Martin Sandsmark + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "scrobbler.h" @@ -224,7 +225,7 @@ QByteArray data; foreach(QString key, params.keys()) { - data += QUrl::toPercentEncoding(key) + "=" + QUrl::toPercentEncoding(params[key]) + "&"; + data += QUrl::toPercentEncoding(key) + '=' + QUrl::toPercentEncoding(params[key]) + '&'; } QNetworkRequest req(url); diff -Nru juk-4.12.3/scrobbler.h juk-4.12.90/scrobbler.h --- juk-4.12.3/scrobbler.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/scrobbler.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Tue Feb 21 2012 - copyright : (C) 2012 by Martin Sandsmark - email : martin.sandsmark@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2012 Martin Sandsmark + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef JUK_SCROBBLER_H #define JUK_SCROBBLER_H diff -Nru juk-4.12.3/searchplaylist.cpp juk-4.12.90/searchplaylist.cpp --- juk-4.12.3/searchplaylist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/searchplaylist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon May 5 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "searchplaylist.h" #include "juk-exception.h" diff -Nru juk-4.12.3/searchplaylist.h juk-4.12.90/searchplaylist.h --- juk-4.12.3/searchplaylist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/searchplaylist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon May 5 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef SEARCHPLAYLIST_H #define SEARCHPLAYLIST_H diff -Nru juk-4.12.3/searchwidget.cpp juk-4.12.90/searchwidget.cpp --- juk-4.12.3/searchwidget.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/searchwidget.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Sun Mar 6 2003 - copyright : (C) 2003 by Richard Lärkäng - email : nouseforaname@home.se - - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003 Richard Lärkäng + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "searchwidget.h" #include "collectionlist.h" diff -Nru juk-4.12.3/searchwidget.h juk-4.12.90/searchwidget.h --- juk-4.12.3/searchwidget.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/searchwidget.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Sun Mar 6 2003 - copyright : (C) 2003 by Richard Lärkäng - email : nouseforaname@home.se - - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003 Richard Lärkäng + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef SEARCHWIDGET_H #define SEARCHWIDGET_H diff -Nru juk-4.12.3/slideraction.cpp juk-4.12.90/slideraction.cpp --- juk-4.12.3/slideraction.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/slideraction.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Wed Feb 6 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "slideraction.h" diff -Nru juk-4.12.3/slideraction.h juk-4.12.90/slideraction.h --- juk-4.12.3/slideraction.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/slideraction.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Wed Feb 6 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef SLIDERACTION_H #define SLIDERACTION_H diff -Nru juk-4.12.3/slider.cpp juk-4.12.90/slider.cpp --- juk-4.12.3/slider.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/slider.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,20 @@ -/**************************************************************************************** - * Copyright (c) 2003-2009 Mark Kretschmann * - * Copyright (c) 2005 Gabor Lehel * - * Copyright (c) 2008 Dan Meltzer * - * * - * This program is free software; you can redistribute it and/or modify it under * - * the terms of the GNU General Public License as published by the Free Software * - * Foundation; either version 2 of the License, or (at your option) any later * - * version. * - * * - * 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 General Public License along with * - * this program. If not, see . * - ****************************************************************************************/ +/** + * Copyright (c) 2003-2009 Mark Kretschmann + * Copyright (c) 2005 Gabor Lehel + * Copyright (c) 2008 Dan Meltzer + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "slider.h" #include "svghandler.h" diff -Nru juk-4.12.3/slider.h juk-4.12.90/slider.h --- juk-4.12.3/slider.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/slider.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,20 @@ -/**************************************************************************************** - * Copyright (c) 2003-2009 Mark Kretschmann * - * Copyright (c) 2005 Gabor Lehel * - * Copyright (c) 2008 Dan Meltzer * - * * - * This program is free software; you can redistribute it and/or modify it under * - * the terms of the GNU General Public License as published by the Free Software * - * Foundation; either version 2 of the License, or (at your option) any later * - * version. * - * * - * 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 General Public License along with * - * this program. If not, see . * - ****************************************************************************************/ +/** + * Copyright (c) 2003-2009 Mark Kretschmann + * Copyright (c) 2005 Gabor Lehel + * Copyright (c) 2008 Dan Meltzer + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef SLIDERWIDGET_H #define SLIDERWIDGET_H diff -Nru juk-4.12.3/sortedstringlist.cpp juk-4.12.90/sortedstringlist.cpp --- juk-4.12.3/sortedstringlist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/sortedstringlist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Wed Jan 29 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "sortedstringlist.h" diff -Nru juk-4.12.3/sortedstringlist.h juk-4.12.90/sortedstringlist.h --- juk-4.12.3/sortedstringlist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/sortedstringlist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Wed Jan 29 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef SORTEDSTRINGLIST_H #define SORTEDSTRINGLIST_H diff -Nru juk-4.12.3/splashscreen.cpp juk-4.12.90/splashscreen.cpp --- juk-4.12.3/splashscreen.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/splashscreen.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Dec 8 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "splashscreen.h" diff -Nru juk-4.12.3/splashscreen.h juk-4.12.90/splashscreen.h --- juk-4.12.3/splashscreen.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/splashscreen.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Dec 8 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef SPLASHSCREEN_H #define SPLASHSCREEN_H diff -Nru juk-4.12.3/statuslabel.cpp juk-4.12.90/statuslabel.cpp --- juk-4.12.3/statuslabel.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/statuslabel.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Oct 18 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "statuslabel.h" diff -Nru juk-4.12.3/statuslabel.h juk-4.12.90/statuslabel.h --- juk-4.12.3/statuslabel.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/statuslabel.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Fri Oct 18 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef STATUSLABEL_H #define STATUSLABEL_H diff -Nru juk-4.12.3/stringhash.h juk-4.12.90/stringhash.h --- juk-4.12.3/stringhash.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/stringhash.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Feb 2 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef STRINGHASH_H #define STRINGHASH_H diff -Nru juk-4.12.3/stringshare.cpp juk-4.12.90/stringshare.cpp --- juk-4.12.3/stringshare.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/stringshare.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sat Oct 25 2003 - copyright : (C) 2003 by Maksim Orlovich - email : maksim.orlovich@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003 Maksim Orlovich + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "stringshare.h" #include diff -Nru juk-4.12.3/stringshare.h juk-4.12.90/stringshare.h --- juk-4.12.3/stringshare.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/stringshare.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sat Oct 25 2003 - copyright : (C) 2003 by Maksim Orlovich - email : maksim.orlovich@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003 Maksim Orlovich + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef STRING_SHARE_H #define STRING_SHARE_H diff -Nru juk-4.12.3/svghandler.cpp juk-4.12.90/svghandler.cpp --- juk-4.12.3/svghandler.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/svghandler.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,20 @@ -/**************************************************************************************** - * Copyright (c) 2008 Nikolaj Hald Nielsen * - * Copyright (c) 2008 Jeff Mitchell * - * Copyright (c) 2009 Mark Kretschmann * - * * - * This program is free software; you can redistribute it and/or modify it under * - * the terms of the GNU General Public License as published by the Free Software * - * Foundation; either version 2 of the License, or (at your option) any later * - * version. * - * * - * 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 General Public License along with * - * this program. If not, see . * - ****************************************************************************************/ +/** + * Copyright (c) 2008 Nikolaj Hald Nielsen + * Copyright (c) 2008 Jeff Mitchell + * Copyright (c) 2009 Mark Kretschmann + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "svghandler.h" diff -Nru juk-4.12.3/svghandler.h juk-4.12.90/svghandler.h --- juk-4.12.3/svghandler.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/svghandler.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,20 @@ -/**************************************************************************************** - * Copyright (c) 2008 Nikolaj Hald Nielsen * - * Copyright (c) 2008 Jeff Mitchell * - * Copyright (c) 2009 Mark Kretschmann * - * * - * This program is free software; you can redistribute it and/or modify it under * - * the terms of the GNU General Public License as published by the Free Software * - * Foundation; either version 2 of the License, or (at your option) any later * - * version. * - * * - * 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 General Public License along with * - * this program. If not, see . * - ****************************************************************************************/ +/** + * Copyright (c) 2008 Nikolaj Hald Nielsen + * Copyright (c) 2008 Jeff Mitchell + * Copyright (c) 2009 Mark Kretschmann + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef SVGHANDLER_H #define SVGHANDLER_H diff -Nru juk-4.12.3/systemtray.cpp juk-4.12.90/systemtray.cpp --- juk-4.12.3/systemtray.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/systemtray.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,22 +1,20 @@ -/*************************************************************************** - copyright : (C) 2002 by Daniel Molkentin - email : molkentin@kde.org - - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2004 - 2009 by Michael Pyne - email : mpyne@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002 Daniel Molkentin + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2004-2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "systemtray.h" diff -Nru juk-4.12.3/systemtray.h juk-4.12.90/systemtray.h --- juk-4.12.3/systemtray.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/systemtray.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,22 +1,20 @@ -/*************************************************************************** - copyright : (C) 2002 by Daniel Molkentin - email : molkentin@kde.org - - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2007, 2008, 2009 by Michael Pyne - email : mpyne@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002 Daniel Molkentin + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2007, 2008, 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef JUK_SYSTEMTRAY_H #define JUK_SYSTEMTRAY_H diff -Nru juk-4.12.3/tag.cpp juk-4.12.90/tag.cpp --- juk-4.12.3/tag.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tag.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Sun Feb 17 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2009 by Michael Pyne - email : mpyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "tag.h" diff -Nru juk-4.12.3/tageditor.cpp juk-4.12.90/tageditor.cpp --- juk-4.12.3/tageditor.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tageditor.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sat Sep 7 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "tageditor.h" #include "collectionlist.h" diff -Nru juk-4.12.3/tageditor.h juk-4.12.90/tageditor.h --- juk-4.12.3/tageditor.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tageditor.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sat Sep 7 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef TAGEDITOR_H #define TAGEDITOR_H diff -Nru juk-4.12.3/tagguesserconfigdlg.cpp juk-4.12.90/tagguesserconfigdlg.cpp --- juk-4.12.3/tagguesserconfigdlg.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tagguesserconfigdlg.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,11 +1,19 @@ -/* - * tagguesserconfigdlg.cpp - Copyright (c) 2003 Frerich Raabe +/** + * Copyright (C) 2003 Frerich Raabe * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . */ + #include "tagguesserconfigdlg.h" #include "tagguesser.h" diff -Nru juk-4.12.3/tagguesserconfigdlg.h juk-4.12.90/tagguesserconfigdlg.h --- juk-4.12.3/tagguesserconfigdlg.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tagguesserconfigdlg.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,11 +1,19 @@ -/* - * tagguesserconfigdlg.h - Copyright (c) 2003 Frerich Raabe +/** + * Copyright (C) 2003 Frerich Raabe * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . */ + #ifndef TAGGUESSERCONFIGDLG_H #define TAGGUESSERCONFIGDLG_H diff -Nru juk-4.12.3/tagguesser.cpp juk-4.12.90/tagguesser.cpp --- juk-4.12.3/tagguesser.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tagguesser.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,11 +1,19 @@ -/* - * tagguesser.cpp - Copyright (c) 2003 Frerich Raabe +/** + * Copyright (C) 2003 Frerich Raabe * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . */ + #include "tagguesser.h" #include diff -Nru juk-4.12.3/tagguesser.h juk-4.12.90/tagguesser.h --- juk-4.12.3/tagguesser.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tagguesser.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,11 +1,19 @@ -/* - * tagguesser.h - Copyright (c) 2003 Frerich Raabe +/** + * Copyright (C) 2003 Frerich Raabe * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . */ + #ifndef TAGGUESSER_H #define TAGGUESSER_H diff -Nru juk-4.12.3/tag.h juk-4.12.90/tag.h --- juk-4.12.3/tag.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tag.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,19 @@ -/*************************************************************************** - begin : Sun Feb 17 2002 - copyright : (C) 2002 - 2004 by Scott Wheeler - email : wheeler@kde.org - - copyright : (C) 2009 by Michael Pyne - email : mpyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Scott Wheeler + * Copyright (C) 2009 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef TAG_H #define TAG_H diff -Nru juk-4.12.3/tagrenameroptions.cpp juk-4.12.90/tagrenameroptions.cpp --- juk-4.12.3/tagrenameroptions.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tagrenameroptions.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Oct 28 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "tagrenameroptions.h" diff -Nru juk-4.12.3/tagrenameroptions.h juk-4.12.90/tagrenameroptions.h --- juk-4.12.3/tagrenameroptions.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tagrenameroptions.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sun Oct 31 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef TAGRENAMEROPTIONS_H #define TAGRENAMEROPTIONS_H @@ -81,7 +82,7 @@ * Defines options for a tag type. Used by FileRenamerTagOptions as its * data type. * - * @author Michael Pyne + * @author Michael Pyne */ class TagRenamerOptions { diff -Nru juk-4.12.3/tagtransactionmanager.cpp juk-4.12.90/tagtransactionmanager.cpp --- juk-4.12.3/tagtransactionmanager.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tagtransactionmanager.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Wed Sep 22 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "tagtransactionmanager.h" diff -Nru juk-4.12.3/tagtransactionmanager.h juk-4.12.90/tagtransactionmanager.h --- juk-4.12.3/tagtransactionmanager.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tagtransactionmanager.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Wed Sep 22 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef TAGTRANSACTIONMANAGER_H #define TAGTRANSACTIONMANAGER_H @@ -28,7 +29,7 @@ * Class to encapsulate a change to the tag, and optionally the file name, of * a PlaylistItem. * - * @author Michael Pyne + * @author Michael Pyne * @see TagTransactionManager */ class TagTransactionAtom @@ -103,7 +104,7 @@ * things were (except possibly for file renames). You can call forget() to * forget a series of changes as well. * - * @author Michael Pyne + * @author Michael Pyne */ class TagTransactionManager : public QObject { diff -Nru juk-4.12.3/trackpickerdialog.cpp juk-4.12.90/trackpickerdialog.cpp --- juk-4.12.3/trackpickerdialog.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/trackpickerdialog.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sat Sep 6 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include diff -Nru juk-4.12.3/trackpickerdialog.h juk-4.12.90/trackpickerdialog.h --- juk-4.12.3/trackpickerdialog.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/trackpickerdialog.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sat Sep 6 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler - email : wheeler@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef TRACKPICKERDIALOG_H #define TRACKPICKERDIALOG_H diff -Nru juk-4.12.3/tracksequenceiterator.cpp juk-4.12.90/tracksequenceiterator.cpp --- juk-4.12.3/tracksequenceiterator.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tracksequenceiterator.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Aug 19 2004 - copyright : (C) 2002 - 2004 by Michael Pyne - email : michael.pyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "tracksequenceiterator.h" diff -Nru juk-4.12.3/tracksequenceiterator.h juk-4.12.90/tracksequenceiterator.h --- juk-4.12.3/tracksequenceiterator.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tracksequenceiterator.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Aug 19 2004 - copyright : (C) 2002 - 2004 by Michael Pyne - email : michael.pyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef TRACKSEQUENCEITERATOR_H #define TRACKSEQUENCEITERATOR_H @@ -27,7 +28,7 @@ * in order to define your own ordering for playlist sequences. For an example, * see the UpcomingPlaylist class. * - * @author Michael Pyne + * @author Michael Pyne * @see UpcomingPlaylist * @see TrackSequenceManager */ @@ -132,7 +133,7 @@ * This is the default iterator for JuK, supporting normal, random, and album * random playback with or without looping. * - * @author Michael Pyne + * @author Michael Pyne */ class DefaultSequenceIterator : public TrackSequenceIterator { diff -Nru juk-4.12.3/tracksequencemanager.cpp juk-4.12.90/tracksequencemanager.cpp --- juk-4.12.3/tracksequencemanager.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tracksequencemanager.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Aug 19 2004 - copyright : (C) 2002 - 2004 by Michael Pyne - email : michael.pyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include #include diff -Nru juk-4.12.3/tracksequencemanager.h juk-4.12.90/tracksequencemanager.h --- juk-4.12.3/tracksequencemanager.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/tracksequencemanager.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Aug 19 2004 - copyright : (C) 2002 - 2004 by Michael Pyne - email : michael.pyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef TRACKSEQUENCEMANAGER_H #define TRACKSEQUENCEMANAGER_H @@ -32,7 +33,7 @@ * * @see Playlist * @see TrackSequenceIterator - * @author Michael Pyne + * @author Michael Pyne */ class TrackSequenceManager : public QObject { diff -Nru juk-4.12.3/treeviewitemplaylist.cpp juk-4.12.90/treeviewitemplaylist.cpp --- juk-4.12.3/treeviewitemplaylist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/treeviewitemplaylist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon Jun 21 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "treeviewitemplaylist.h" diff -Nru juk-4.12.3/treeviewitemplaylist.h juk-4.12.90/treeviewitemplaylist.h --- juk-4.12.3/treeviewitemplaylist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/treeviewitemplaylist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Mon Jun 21 2004 - copyright : (C) 2004 by Michael Pyne - email : michael.pyne@kdemail.net -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef TREEVIEWITEMPLAYLIST_H #define TREEVIEWITEMPLAYLIST_H diff -Nru juk-4.12.3/upcomingplaylist.cpp juk-4.12.90/upcomingplaylist.cpp --- juk-4.12.3/upcomingplaylist.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/upcomingplaylist.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Aug 19 2004 - copyright : (C) 2002 - 2004, 2008 by Michael Pyne - email : michael.pyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004, 2008 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "upcomingplaylist.h" #include "juk-exception.h" diff -Nru juk-4.12.3/upcomingplaylist.h juk-4.12.90/upcomingplaylist.h --- juk-4.12.3/upcomingplaylist.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/upcomingplaylist.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Thu Aug 19 2004 - copyright : (C) 2002 - 2004 by Michael Pyne - email : michael.pyne@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2002-2004 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef UPCOMINGPLAYLIST_H #define UPCOMINGPLAYLIST_H @@ -37,7 +38,7 @@ * it is added to the top of this playlist automatically, replacing any * currently playing song. * - * @author Michael Pyne + * @author Michael Pyne * @see UpcomingSequenceIterator */ class UpcomingPlaylist : public Playlist @@ -134,7 +135,7 @@ * * @see UpcomingPlaylist * @see TrackSequenceManager - * @author Michael Pyne + * @author Michael Pyne */ class UpcomingPlaylist::UpcomingSequenceIterator : public TrackSequenceIterator { diff -Nru juk-4.12.3/viewmode.cpp juk-4.12.90/viewmode.cpp --- juk-4.12.3/viewmode.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/viewmode.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,18 @@ -/*************************************************************************** - begin : Sat Jun 7 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler, - email : wheeler@kde.org - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "viewmode.h" diff -Nru juk-4.12.3/viewmode.h juk-4.12.90/viewmode.h --- juk-4.12.3/viewmode.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/viewmode.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,19 +1,19 @@ -/*************************************************************************** - begin : Sat Jun 7 2003 - copyright : (C) 2003 - 2004 by Scott Wheeler, - email : wheeler@kde.org - copyright : (c) 2007 Michael Pyne - email : michael.pyne@kdemail.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2003-2004 Scott Wheeler + * Copyright (C) 2007 Michael Pyne + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef VIEWMODE_H #define VIEWMODE_H diff -Nru juk-4.12.3/volumepopupbutton.cpp juk-4.12.90/volumepopupbutton.cpp --- juk-4.12.3/volumepopupbutton.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/volumepopupbutton.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,19 +1,19 @@ -/**************************************************************************************** - * Copyright (c) 2009 Nikolaj Hald Nielsen * - * Copyright (c) 2009 Mark Kretschmann * - * * - * This program is free software; you can redistribute it and/or modify it under * - * the terms of the GNU General Public License as published by the Free Software * - * Foundation; either version 2 of the License, or (at your option) any later * - * version. * - * * - * 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 General Public License along with * - * this program. If not, see . * - ****************************************************************************************/ +/** + * Copyright (c) 2009 Nikolaj Hald Nielsen + * Copyright (c) 2009 Mark Kretschmann + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "volumepopupbutton.h" #include "slider.h" @@ -106,7 +106,7 @@ else setIcon( KIcon( "audio-volume-high" ) ); - m_volumeLabel->setText( QString::number( int( newVolume * 100 ) ) + '%' ); + m_volumeLabel->setText( i18n( "%1%" , int( newVolume * 100 ) ) ); if( newVolume != m_volumeSlider->value() ) m_volumeSlider->setValue( newVolume * 100 ); @@ -126,7 +126,7 @@ { const float volume = JuK::JuKInstance()->playerManager()->volume(); setIcon( KIcon( "audio-volume-muted" ) ); - setToolTip( i18n( "Volume: %1% %2", int( 100 * volume ), i18n( "(muted)" ) ) ); + setToolTip( i18n( "Volume: %1% (muted)", int( 100 * volume ) ) ); } else { @@ -162,10 +162,9 @@ { event->accept(); PlayerManager *player = JuK::JuKInstance()->playerManager(); - float volume = qBound( 0.0, player->volume() + float( event->delta() ) / 4000.0, 1.0 ); + float volume = qBound( 0.0f, player->volume() + float( event->delta() ) / 4000.0f, 1.0f ); player->setVolume( volume ); volumeChanged( volume ); } #include "volumepopupbutton.moc" - diff -Nru juk-4.12.3/volumepopupbutton.h juk-4.12.90/volumepopupbutton.h --- juk-4.12.3/volumepopupbutton.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/volumepopupbutton.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,19 +1,19 @@ -/**************************************************************************************** - * Copyright (c) 2009 Nikolaj Hald Nielsen * - * Copyright (c) 2009 Mark Kretschmann * - * * - * This program is free software; you can redistribute it and/or modify it under * - * the terms of the GNU General Public License as published by the Free Software * - * Foundation; either version 2 of the License, or (at your option) any later * - * version. * - * * - * 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 General Public License along with * - * this program. If not, see . * - ****************************************************************************************/ +/** + * Copyright (c) 2009 Nikolaj Hald Nielsen + * Copyright (c) 2009 Mark Kretschmann + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef VOLUMEPOPUPBUTTON_H #define VOLUMEPOPUPBUTTON_H diff -Nru juk-4.12.3/webimagefetcher.cpp juk-4.12.90/webimagefetcher.cpp --- juk-4.12.3/webimagefetcher.cpp 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/webimagefetcher.cpp 2014-03-04 05:58:47.000000000 +0000 @@ -1,17 +1,20 @@ -/*************************************************************************** - copyright : (C) 2004 Nathan Toone - copyright : (C) 2007 Michael Pyne - copyright : (C) 2012 Martin Sandsmark -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Nathan Toone + * Copyright (C) 2007 Michael Pyne + * Copyright (C) 2012 Martin Sandsmark + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #include "webimagefetcher.h" @@ -157,7 +160,7 @@ if (d->dialog) return; d->dialog = new KDialog(); - d->dialog->setCaption("Cover found"); + d->dialog->setCaption(i18n("Cover found")); d->dialog->setButtons(KDialog::Apply | KDialog::Cancel); d->dialog->button(KDialog::Apply)->setText(i18n("Store")); QWidget *mainWidget = new QWidget(); diff -Nru juk-4.12.3/webimagefetcher.h juk-4.12.90/webimagefetcher.h --- juk-4.12.3/webimagefetcher.h 2014-02-25 08:30:28.000000000 +0000 +++ juk-4.12.90/webimagefetcher.h 2014-03-04 05:58:47.000000000 +0000 @@ -1,20 +1,20 @@ -/*************************************************************************** - copyright : (C) 2004 Nathan Toone - email : nathan@toonetown.com - copyright : (C) 2007 Michael Pyne - email : michael.pyne@kdemail.net - copyright : (C) 2012 Martin Sandsmark - email : martin.sandsmark@kde.org -***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/** + * Copyright (C) 2004 Nathan Toone + * Copyright (C) 2007 Michael Pyne + * Copyright (C) 2012 Martin Sandsmark + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * 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 General Public License along with + * this program. If not, see . + */ #ifndef WEBIMAGEFETCHER_H #define WEBIMAGEFETCHER_H