diff --git a/collectionlist.cpp b/collectionlist.cpp
index 17b4bd89..c2cd26e6 100644
--- a/collectionlist.cpp
+++ b/collectionlist.cpp
@@ -1,611 +1,611 @@
 /**
  * Copyright (C) 2002-2004 Scott Wheeler <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.
  *
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 #include "collectionlist.h"
 
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmenu.h>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 #include <kglobal.h>
 #include <kactioncollection.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <ktoolbarpopupaction.h>
 #include <kdirwatch.h>
 
 #include <QStringBuilder>
 #include <QList>
 #include <QDragMoveEvent>
 #include <QDropEvent>
 #include <QApplication>
 #include <QTimer>
 #include <QTime>
 #include <QClipboard>
 #include <QFileInfo>
 #include <QHeaderView>
 
 #include "playlistcollection.h"
 #include "splashscreen.h"
 #include "stringshare.h"
 #include "cache.h"
 #include "actioncollection.h"
 #include "tag.h"
 #include "viewmode.h"
 #include "juk_debug.h"
 
 using ActionCollection::action;
 
 ////////////////////////////////////////////////////////////////////////////////
 // static methods
 ////////////////////////////////////////////////////////////////////////////////
 
 CollectionList *CollectionList::m_list = 0;
 
 CollectionList *CollectionList::instance()
 {
     return m_list;
 }
 
 static QTime stopwatch;
 
 void CollectionList::startLoadingCachedItems()
 {
     if(!m_list)
         return;
 
     qCDebug(JUK_LOG) << "Starting to load cached items";
     stopwatch.start();
 
     if(!Cache::instance()->prepareToLoadCachedItems()) {
         qCCritical(JUK_LOG) << "Unable to setup to load cache... perhaps it doesn't exist?";
 
         completedLoadingCachedItems();
         return;
     }
 
     qCDebug(JUK_LOG) << "Kicked off first batch";
     QTimer::singleShot(0, this, SLOT(loadNextBatchCachedItems()));
 }
 
 void CollectionList::loadNextBatchCachedItems()
 {
     Cache *cache = Cache::instance();
     bool done = false;
 
     for(int i = 0; i < 20; ++i) {
         FileHandle cachedItem(cache->loadNextCachedItem());
 
         if(cachedItem.isNull()) {
             done = true;
             break;
         }
 
         // This may have already been created via a loaded playlist.
         if(!m_itemsDict.contains(cachedItem.absFilePath())) {
             CollectionListItem *newItem = new CollectionListItem(this, cachedItem);
             setupItem(newItem);
         }
     }
 
     SplashScreen::update();
 
     if(!done) {
         QTimer::singleShot(0, this, SLOT(loadNextBatchCachedItems()));
     }
     else {
         completedLoadingCachedItems();
     }
 }
 
 void CollectionList::completedLoadingCachedItems()
 {
     // The CollectionList is created with sorting disabled for speed.  Re-enable
     // it here, and perform the sort.
     KConfigGroup config(KSharedConfig::openConfig(), "Playlists");
 
     Qt::SortOrder order = Qt::DescendingOrder;
     if(config.readEntry("CollectionListSortAscending", true))
         order = Qt::AscendingOrder;
 
     m_list->sortByColumn(config.readEntry("CollectionListSortColumn", 1), order);
 
     SplashScreen::finishedLoading();
 
     qCDebug(JUK_LOG) << "Finished loading cached items, took" << stopwatch.elapsed() << "ms";
     qCDebug(JUK_LOG) << m_itemsDict.size() << "items are in the CollectionList";
 
     emit cachedItemsLoaded();
 }
 
 void CollectionList::initialize(PlaylistCollection *collection)
 {
     if(m_list)
         return;
 
     // We have to delay initialization here because dynamic_cast or comparing to
     // the collection instance won't work in the PlaylistBox::Item initialization
     // won't work until the CollectionList is fully constructed.
 
     m_list = new CollectionList(collection);
     m_list->setName(i18n("Collection List"));
 
     collection->setupPlaylist(m_list, "folder-sound");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
 CollectionListItem *CollectionList::createItem(const FileHandle &file, QTreeWidgetItem *, bool)
 {
     // It's probably possible to optimize the line below away, but, well, right
     // now it's more important to not load duplicate items.
 
     if(m_itemsDict.contains(file.absFilePath()))
         return 0;
 
     CollectionListItem *item = new CollectionListItem(this, file);
 
     if(!item->isValid()) {
         qCCritical(JUK_LOG) << "CollectionList::createItem() -- A valid tag was not created for \""
-                 << file.absFilePath() << "\"" << endl;
+                 << file.absFilePath() << "\"";
         delete item;
         return 0;
     }
 
     setupItem(item);
 
     return item;
 }
 
 void CollectionList::clearItems(const PlaylistItemList &items)
 {
     foreach(PlaylistItem *item, items) {
         delete item;
     }
 
     dataChanged();
 }
 
 void CollectionList::setupTreeViewEntries(ViewMode *viewMode) const
 {
     TreeViewMode *treeViewMode = dynamic_cast<TreeViewMode *>(viewMode);
     if(!treeViewMode) {
         qCWarning(JUK_LOG) << "Can't setup entries on a non-tree-view mode!\n";
         return;
     }
 
     QList<int> columnList;
     columnList << PlaylistItem::ArtistColumn;
     columnList << PlaylistItem::GenreColumn;
     columnList << PlaylistItem::AlbumColumn;
 
     foreach(int column, columnList)
         treeViewMode->addItems(m_columnTags[column]->keys(), column);
 }
 
 void CollectionList::slotNewItems(const KFileItemList &items)
 {
     QStringList files;
 
     for(KFileItemList::ConstIterator it = items.constBegin(); it != items.constEnd(); ++it)
         files.append((*it).url().path());
 
     addFiles(files);
     update();
 }
 
 void CollectionList::slotRefreshItems(const QList<QPair<KFileItem, KFileItem> > &items)
 {
     for(int i = 0; i < items.count(); ++i) {
         const KFileItem fileItem = items[i].second;
         CollectionListItem *item = lookup(fileItem.url().path());
 
         if(item) {
             item->refreshFromDisk();
 
             // If the item is no longer on disk, remove it from the collection.
 
             if(item->file().fileInfo().exists())
                 item->repaint();
             else
                 delete item;
         }
     }
 
     update();
 }
 
 void CollectionList::slotDeleteItem(const KFileItem &item)
 {
     delete lookup(item.url().path());
 }
 
 void CollectionList::saveItemsToCache() const
 {
     qCDebug(JUK_LOG) << "Saving collection list to cache";
 
     QString cacheFileName =
         KGlobal::dirs()->saveLocation("appdata") % QLatin1String("cache");
 
     KSaveFile f(cacheFileName);
 
     if(!f.open(QIODevice::WriteOnly)) {
         qCCritical(JUK_LOG) << "Error saving cache:" << f.errorString();
         return;
     }
 
     QByteArray data;
     QDataStream s(&data, QIODevice::WriteOnly);
     s.setVersion(QDataStream::Qt_4_3);
 
     QHash<QString, CollectionListItem *>::const_iterator it;
     for(it = m_itemsDict.begin(); it != m_itemsDict.end(); ++it) {
         s << it.key();
         s << (*it)->file();
     }
 
     QDataStream fs(&f);
 
     qint32 checksum = qChecksum(data.data(), data.size());
 
     fs << qint32(Cache::playlistItemsCacheVersion)
        << checksum
        << data;
 
     f.close();
 
     if(!f.finalize())
         qCCritical(JUK_LOG) << "Error saving cache:" << f.errorString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public slots
 ////////////////////////////////////////////////////////////////////////////////
 
 void CollectionList::paste()
 {
     decode(QApplication::clipboard()->mimeData());
 }
 
 void CollectionList::clear()
 {
     int result = KMessageBox::warningContinueCancel(this,
         i18n("Removing an item from the collection will also remove it from "
              "all of your playlists. Are you sure you want to continue?\n\n"
              "Note, however, that if the directory that these files are in is in "
              "your \"scan on startup\" list, they will be readded on startup."));
 
     if(result == KMessageBox::Continue) {
         Playlist::clear();
         emit signalCollectionChanged();
     }
 }
 
 void CollectionList::slotCheckCache()
 {
     PlaylistItemList invalidItems;
     qCDebug(JUK_LOG) << "Starting to check cached items for consistency";
     stopwatch.start();
 
     int i = 0;
     foreach(CollectionListItem *item, m_itemsDict) {
         if(!item->checkCurrent())
             invalidItems.append(item);
         if(++i == (m_itemsDict.size() / 2))
             qCDebug(JUK_LOG) << "Checkpoint";
     }
 
     clearItems(invalidItems);
 
     qCDebug(JUK_LOG) << "Finished consistency check, took" << stopwatch.elapsed() << "ms";
 }
 
 void CollectionList::slotRemoveItem(const QString &file)
 {
     delete m_itemsDict[file];
 }
 
 void CollectionList::slotRefreshItem(const QString &file)
 {
     if(m_itemsDict[file])
         m_itemsDict[file]->refresh();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // protected methods
 ////////////////////////////////////////////////////////////////////////////////
 
 CollectionList::CollectionList(PlaylistCollection *collection) :
     Playlist(collection, true),
     m_columnTags(15, 0)
 {
     QAction *spaction = ActionCollection::actions()->addAction("showPlaying");
     spaction->setText(i18n("Show Playing"));
     connect(spaction, SIGNAL(triggered(bool)), SLOT(slotShowPlaying()));
 
     connect(action<KToolBarPopupAction>("back")->menu(), SIGNAL(aboutToShow()),
             this, SLOT(slotPopulateBackMenu()));
     connect(action<KToolBarPopupAction>("back")->menu(), SIGNAL(triggered(QAction*)),
             this, SLOT(slotPlayFromBackMenu(QAction*)));
     setSortingEnabled(false); // Temporarily disable sorting to add items faster.
 
     m_columnTags[PlaylistItem::ArtistColumn] = new TagCountDict;
     m_columnTags[PlaylistItem::AlbumColumn] = new TagCountDict;
     m_columnTags[PlaylistItem::GenreColumn] = new TagCountDict;
 
     // Even set to true it wouldn't work with this class due to other checks
     setAllowDuplicates(false);
 }
 
 CollectionList::~CollectionList()
 {
     KConfigGroup config(KSharedConfig::openConfig(), "Playlists");
     config.writeEntry("CollectionListSortColumn", header()->sortIndicatorSection());
     config.writeEntry("CollectionListSortAscending", header()->sortIndicatorOrder() == Qt::AscendingOrder);
 
     // In some situations the dataChanged signal from clearItems will cause observers to
     // subsequently try to access a deleted item.  Since we're going away just remove all
     // observers.
 
     clearObservers();
 
     // The CollectionListItems will try to remove themselves from the
     // m_columnTags member, so we must make sure they're gone before we
     // are.
 
     clearItems(items());
 
     qDeleteAll(m_columnTags);
     m_columnTags.clear();
 }
 
 void CollectionList::dropEvent(QDropEvent *e)
 {
     if(e->source() == this)
         return; // Don't rearrange in the CollectionList.
     else
         Playlist::dropEvent(e);
 }
 
 void CollectionList::dragMoveEvent(QDragMoveEvent *e)
 {
     if(e->source() != this)
         Playlist::dragMoveEvent(e);
     else
         e->setAccepted(false);
 }
 
 QString CollectionList::addStringToDict(const QString &value, int column)
 {
     if(column > m_columnTags.count() || value.trimmed().isEmpty())
         return QString();
 
     if(m_columnTags[column]->contains(value))
         ++((*m_columnTags[column])[value]);
     else {
         m_columnTags[column]->insert(value, 1);
         emit signalNewTag(value, column);
     }
 
     return value;
 }
 
 QStringList CollectionList::uniqueSet(UniqueSetType t) const
 {
     int column;
 
     switch(t)
     {
     case Artists:
         column = PlaylistItem::ArtistColumn;
     break;
 
     case Albums:
         column = PlaylistItem::AlbumColumn;
     break;
 
     case Genres:
         column = PlaylistItem::GenreColumn;
     break;
 
     default:
         return QStringList();
     }
 
     return m_columnTags[column]->keys();
 }
 
 CollectionListItem *CollectionList::lookup(const QString &file) const
 {
     return m_itemsDict.value(file, 0);
 }
 
 void CollectionList::removeStringFromDict(const QString &value, int column)
 {
     if(column > m_columnTags.count() || value.trimmed().isEmpty())
         return;
 
     if(m_columnTags[column]->contains(value) &&
        --((*m_columnTags[column])[value])) // If the decrement goes to 0...
     {
         emit signalRemovedTag(value, column);
         m_columnTags[column]->remove(value);
     }
 }
 
 void CollectionList::addWatched(const QString &file)
 {
     m_dirWatch->addFile(file);
 }
 
 void CollectionList::removeWatched(const QString &file)
 {
     m_dirWatch->removeFile(file);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CollectionListItem public methods
 ////////////////////////////////////////////////////////////////////////////////
 
 void CollectionListItem::refresh()
 {
     int offset = CollectionList::instance()->columnOffset();
     int columns = lastColumn() + offset + 1;
 
     sharedData()->metadata.resize(columns);
     sharedData()->cachedWidths.resize(columns);
 
     for(int i = offset; i < columns; i++) {
         setText(i, text(i));
         int id = i - offset;
         if(id != TrackNumberColumn && id != LengthColumn) {
             // All columns other than track num and length need local-encoded data for sorting
 
             QString toLower = text(i).toLower();
 
             // For some columns, we may be able to share some strings
 
             if((id == ArtistColumn) || (id == AlbumColumn) ||
                (id == GenreColumn)  || (id == YearColumn)  ||
                (id == CommentColumn))
             {
                 toLower = StringShare::tryShare(toLower);
 
                 if(id != YearColumn && id != CommentColumn && sharedData()->metadata[id] != toLower) {
                     CollectionList::instance()->removeStringFromDict(sharedData()->metadata[id], id);
                     CollectionList::instance()->addStringToDict(text(i), id);
                 }
             }
 
             sharedData()->metadata[id] = toLower;
         }
 
         int newWidth = treeWidget()->fontMetrics().width(text(i));
         if(newWidth != sharedData()->cachedWidths[i])
             playlist()->slotWeightDirty(i);
 
         sharedData()->cachedWidths[i] = newWidth;
     }
 
     for(PlaylistItemList::Iterator it = m_children.begin(); it != m_children.end(); ++it) {
         (*it)->playlist()->update();
         (*it)->playlist()->dataChanged();
     }
     if(treeWidget()->isVisible())
         treeWidget()->viewport()->update();
 
     CollectionList::instance()->dataChanged();
     emit CollectionList::instance()->signalCollectionChanged();
 }
 
 PlaylistItem *CollectionListItem::itemForPlaylist(const Playlist *playlist)
 {
     if(playlist == CollectionList::instance())
         return this;
 
     PlaylistItemList::ConstIterator it;
     for(it = m_children.constBegin(); it != m_children.constEnd(); ++it)
         if((*it)->playlist() == playlist)
             return *it;
     return 0;
 }
 
 void CollectionListItem::updateCollectionDict(const QString &oldPath, const QString &newPath)
 {
     CollectionList *collection = CollectionList::instance();
 
     if(!collection)
         return;
 
     collection->removeFromDict(oldPath);
     collection->addToDict(newPath, this);
 }
 
 void CollectionListItem::repaint() const
 {
     // FIXME repaint
     /*QItemDelegate::repaint();
     for(PlaylistItemList::ConstIterator it = m_children.constBegin(); it != m_children.constEnd(); ++it)
         (*it)->repaint();*/
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CollectionListItem protected methods
 ////////////////////////////////////////////////////////////////////////////////
 
 CollectionListItem::CollectionListItem(CollectionList *parent, const FileHandle &file) :
     PlaylistItem(parent),
     m_shuttingDown(false)
 {
     parent->addToDict(file.absFilePath(), this);
 
     sharedData()->fileHandle = file;
 
     if(file.tag()) {
         refresh();
         parent->dataChanged();
     }
     else {
         qCCritical(JUK_LOG) << "CollectionListItem::CollectionListItem() -- Tag() could not be created.";
     }
 
     SplashScreen::increment();
 }
 
 CollectionListItem::~CollectionListItem()
 {
     m_shuttingDown = true;
 
     foreach(PlaylistItem *item, m_children)
         delete item;
 
     CollectionList *l = CollectionList::instance();
     if(l) {
         l->removeFromDict(file().absFilePath());
         l->removeStringFromDict(file().tag()->album(), AlbumColumn);
         l->removeStringFromDict(file().tag()->artist(), ArtistColumn);
         l->removeStringFromDict(file().tag()->genre(), GenreColumn);
     }
 }
 
 void CollectionListItem::addChildItem(PlaylistItem *child)
 {
     m_children.append(child);
 }
 
 void CollectionListItem::removeChildItem(PlaylistItem *child)
 {
     if(!m_shuttingDown)
         m_children.removeAll(child);
 }
 
 bool CollectionListItem::checkCurrent()
 {
     if(!file().fileInfo().exists() || !file().fileInfo().isFile())
         return false;
 
     if(!file().current()) {
         file().refresh();
         refresh();
     }
 
     return true;
 }
 
 // vim: set et sw=4 tw=0 sta:
diff --git a/filerenamer.cpp b/filerenamer.cpp
index 18503cf6..1d4e1b6e 100644
--- a/filerenamer.cpp
+++ b/filerenamer.cpp
@@ -1,1081 +1,1081 @@
 /**
  * Copyright (C) 2004, 2007, 2009 Michael Pyne <mpyne@kde.org>
  * Copyright (C) 2003 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2014 Arnold Dumas <contact@arnolddumas.fr>
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the 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 <http://www.gnu.org/licenses/>.
  */
 
 #include "filerenamer.h"
 
 #include <algorithm>
 
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 #include <kio/job.h>
 #include <kio/netaccess.h>
 #include <kdesktopfile.h>
 #include <kconfiggroup.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kvbox.h>
 
 #include <QFile>
 #include <QTimer>
 #include <QCheckBox>
 #include <QDir>
 #include <QLabel>
 #include <QSignalMapper>
 #include <QPixmap>
 #include <QFrame>
 #include <QTreeWidget>
 #include <QScrollBar>
 #include <QPushButton>
 
 #include "tag.h"
 #include "filerenameroptions.h"
 #include "filehandle.h"
 #include "exampleoptions.h"
 #include "playlistitem.h"
 #include "playlist.h" // processEvents()
 #include "coverinfo.h"
 #include "juk_debug.h"
 
 class ConfirmationDialog : public KDialog
 {
 public:
     ConfirmationDialog(const QMap<QString, QString> &files,
                        QWidget *parent = 0, const char *name = 0)
         : KDialog(parent)
     {
         setObjectName( QLatin1String( name ) );
         setModal(true);
         setCaption(i18nc("warning about mass file rename", "Warning"));
         setButtons(Ok | Cancel);
 
         KVBox *vbox = new KVBox(this);
         setMainWidget(vbox);
         KVBox *hbox = new KVBox(vbox);
 
         QLabel *l = new QLabel(hbox);
         l->setPixmap(SmallIcon("dialog-warning", 32));
 
         l = new QLabel(i18n("You are about to rename the following files. "
                             "Are you sure you want to continue?"), hbox);
         hbox->setStretchFactor(l, 1);
 
         QTreeWidget *lv = new QTreeWidget(vbox);
 
         QStringList headers;
         headers << i18n("Original Name");
         headers << i18n("New Name");
 
         lv->setHeaderLabels(headers);
         lv->setRootIsDecorated(false);
 
         int lvHeight = 0;
 
         QMap<QString, QString>::ConstIterator it = files.constBegin();
         for(; it != files.constEnd(); ++it) {
             QTreeWidgetItem *item = new QTreeWidgetItem(lv);
             item->setText(0, it.key());
 
             if (it.key() != it.value()) {
                 item->setText(1, it.value());
             }
 
             else {
                 item->setText(1, i18n("No Change"));
             }
 
             lvHeight += lv->visualItemRect(item).height();
         }
 
         lvHeight += lv->horizontalScrollBar()->height() + lv->header()->height();
         lv->setMinimumHeight(qMin(lvHeight, 400));
         resize(qMin(width(), 500), qMin(minimumHeight(), 400));
 
         show();
     }
 };
 
 //
 // Implementation of ConfigCategoryReader
 //
 
 ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(),
     m_currentItem(0)
 {
     KConfigGroup config(KSharedConfig::openConfig(), "FileRenamer");
 
     QList<int> categoryOrder = config.readEntry("CategoryOrder", QList<int>());
     int categoryCount[NumTypes] = { 0 }; // Keep track of each category encountered.
 
     // Set a default:
 
     if(categoryOrder.isEmpty())
         categoryOrder << Artist << Album << Title << Track;
 
     QList<int>::ConstIterator catIt = categoryOrder.constBegin();
     for(; catIt != categoryOrder.constEnd(); ++catIt)
     {
         int catCount = categoryCount[*catIt]++;
         TagType category = static_cast<TagType>(*catIt);
         CategoryID catId(category, catCount);
 
         m_options[catId] = TagRenamerOptions(catId);
         m_categoryOrder << catId;
     }
 
     m_folderSeparators.fill(false, m_categoryOrder.count() - 1);
 
     QList<int> checkedSeparators = config.readEntry("CheckedDirSeparators", QList<int>());
 
     QList<int>::ConstIterator it = checkedSeparators.constBegin();
     for(; it != checkedSeparators.constEnd(); ++it) {
         if(*it < m_folderSeparators.count())
             m_folderSeparators[*it] = true;
     }
 
     m_musicFolder = config.readPathEntry("MusicFolder", "${HOME}/music");
     m_separator = config.readEntry("Separator", " - ");
 }
 
 QString ConfigCategoryReader::categoryValue(TagType type) const
 {
     if(!m_currentItem)
         return QString();
 
     Tag *tag = m_currentItem->file().tag();
 
     switch(type) {
     case Track:
         return QString::number(tag->track());
 
     case Year:
         return QString::number(tag->year());
 
     case Title:
         return tag->title();
 
     case Artist:
         return tag->artist();
 
     case Album:
         return tag->album();
 
     case Genre:
         return tag->genre();
 
     default:
         return QString();
     }
 }
 
 QString ConfigCategoryReader::prefix(const CategoryID &category) const
 {
     return m_options[category].prefix();
 }
 
 QString ConfigCategoryReader::suffix(const CategoryID &category) const
 {
     return m_options[category].suffix();
 }
 
 TagRenamerOptions::EmptyActions ConfigCategoryReader::emptyAction(const CategoryID &category) const
 {
     return m_options[category].emptyAction();
 }
 
 QString ConfigCategoryReader::emptyText(const CategoryID &category) const
 {
     return m_options[category].emptyText();
 }
 
 QList<CategoryID> ConfigCategoryReader::categoryOrder() const
 {
     return m_categoryOrder;
 }
 
 QString ConfigCategoryReader::separator() const
 {
     return m_separator;
 }
 
 QString ConfigCategoryReader::musicFolder() const
 {
     return m_musicFolder;
 }
 
 int ConfigCategoryReader::trackWidth(int categoryNum) const
 {
     return m_options[CategoryID(Track, categoryNum)].trackWidth();
 }
 
 bool ConfigCategoryReader::hasFolderSeparator(int index) const
 {
     if(index >= m_folderSeparators.count())
         return false;
     return m_folderSeparators[index];
 }
 
 bool ConfigCategoryReader::isDisabled(const CategoryID &category) const
 {
     return m_options[category].disabled();
 }
 
 //
 // Implementation of FileRenamerWidget
 //
 
 FileRenamerWidget::FileRenamerWidget(QWidget *parent) :
     QWidget(parent),
     CategoryReaderInterface(),
     m_ui(new Ui::FileRenamerBase),
     m_exampleFromFile(false)
 {
     m_ui->setupUi(this);
 
     // This must be created before createTagRows() is called.
 
     m_exampleDialog = new ExampleOptionsDialog(this);
 
     createTagRows();
     loadConfig();
 
     // Add correct text to combo box.
     m_ui->m_category->clear();
     for(int i = StartTag; i < NumTypes; ++i) {
         QString category = TagRenamerOptions::tagTypeText(static_cast<TagType>(i));
         m_ui->m_category->addItem(category);
     }
 
     connect(m_exampleDialog, SIGNAL(signalShown()), SLOT(exampleDialogShown()));
     connect(m_exampleDialog, SIGNAL(signalHidden()), SLOT(exampleDialogHidden()));
     connect(m_exampleDialog, SIGNAL(dataChanged()), SLOT(dataSelected()));
     connect(m_exampleDialog, SIGNAL(fileChanged(QString)),
             this,            SLOT(fileSelected(QString)));
 
     exampleTextChanged();
 }
 
 void FileRenamerWidget::loadConfig()
 {
     QList<int> checkedSeparators;
     KConfigGroup config(KSharedConfig::openConfig(), "FileRenamer");
 
     for(int i = 0; i < m_rows.count(); ++i)
         m_rows[i].options = TagRenamerOptions(m_rows[i].category);
 
     checkedSeparators = config.readEntry("CheckedDirSeparators", QList<int>());
 
     foreach(int separator, checkedSeparators) {
         if(separator < m_folderSwitches.count())
             m_folderSwitches[separator]->setChecked(true);
     }
 
     QString path = config.readEntry("MusicFolder", "${HOME}/music");
     m_ui->m_musicFolder->setUrl(KUrl(path));
     m_ui->m_musicFolder->setMode(KFile::Directory |
                                  KFile::ExistingOnly |
                                  KFile::LocalOnly);
 
     m_ui->m_separator->setEditText(config.readEntry("Separator", " - "));
 }
 
 void FileRenamerWidget::saveConfig()
 {
     KConfigGroup config(KSharedConfig::openConfig(), "FileRenamer");
     QList<int> checkedSeparators;
     QList<int> categoryOrder;
 
     for(int i = 0; i < m_rows.count(); ++i) {
         int rowId = idOfPosition(i); // Write out in GUI order, not m_rows order
         m_rows[rowId].options.saveConfig(m_rows[rowId].category.categoryNumber);
         categoryOrder += m_rows[rowId].category.category;
     }
 
     for(int i = 0; i < m_folderSwitches.count(); ++i)
         if(m_folderSwitches[i]->isChecked() == true)
             checkedSeparators += i;
 
     config.writeEntry("CheckedDirSeparators", checkedSeparators);
     config.writeEntry("CategoryOrder", categoryOrder);
     config.writePathEntry("MusicFolder", m_ui->m_musicFolder->url().path());
     config.writeEntry("Separator", m_ui->m_separator->currentText());
 
     config.sync();
 }
 
 FileRenamerWidget::~FileRenamerWidget()
 {
 }
 
 int FileRenamerWidget::addRowCategory(TagType category)
 {
     static QIcon up   = SmallIcon("go-up");
     static QIcon down = SmallIcon("go-down");
 
     // Find number of categories already of this type.
     int categoryCount = 0;
     for(int i = 0; i < m_rows.count(); ++i)
         if(m_rows[i].category.category == category)
             ++categoryCount;
 
     Row row;
 
     row.category = CategoryID(category, categoryCount);
     row.position = m_rows.count();
     int id = row.position;
 
     QFrame *frame = new QFrame(m_mainFrame);
     QHBoxLayout *frameLayout = new QHBoxLayout(frame);
     frameLayout->setMargin(3);
 
     row.widget = frame;
     frame->setFrameShape(QFrame::Box);
     frame->setLineWidth(1);
 
     QBoxLayout *mainFrameLayout = static_cast<QBoxLayout *>(m_mainFrame->layout());
     mainFrameLayout->addWidget(frame, 1);
 
     QFrame *buttons = new QFrame(frame);
     QVBoxLayout *buttonLayout = new QVBoxLayout(buttons);
     frameLayout->addWidget(buttons);
     buttons->setFrameStyle(QFrame::Plain | QFrame::Box);
     buttons->setLineWidth(1);
 
     row.upButton = new QPushButton(buttons);
     row.downButton = new QPushButton(buttons);
 
     row.upButton->setIcon(up);
     row.downButton->setIcon(down);
     row.upButton->setFlat(true);
     row.downButton->setFlat(true);
 
     upMapper->connect(row.upButton, SIGNAL(clicked()), SLOT(map()));
     upMapper->setMapping(row.upButton, id);
     downMapper->connect(row.downButton, SIGNAL(clicked()), SLOT(map()));
     downMapper->setMapping(row.downButton, id);
 
     buttonLayout->addWidget(row.upButton);
     buttonLayout->addWidget(row.downButton);
 
     QString labelText = QString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category));
     QLabel *label = new QLabel(labelText, frame);
     frameLayout->addWidget(label, 1);
     label->setAlignment(Qt::AlignCenter);
 
     QVBoxLayout *optionLayout = new QVBoxLayout;
     frameLayout->addLayout(optionLayout);
 
     row.enableButton = new QPushButton(i18nc("remove music genre from file renamer", "Remove"), frame);
     optionLayout->addWidget(row.enableButton);
     toggleMapper->connect(row.enableButton, SIGNAL(clicked()), SLOT(map()));
     toggleMapper->setMapping(row.enableButton, id);
 
     row.optionsButton = new QPushButton(i18nc("file renamer genre options", "Options"), frame);
     optionLayout->addWidget(row.optionsButton);
     mapper->connect(row.optionsButton, SIGNAL(clicked()), SLOT(map()));
     mapper->setMapping(row.optionsButton, id);
 
     row.widget->show();
     m_rows.append(row);
 
     // Disable add button if there's too many rows.
     if(m_rows.count() == MAX_CATEGORIES)
         m_ui->m_insertCategory->setEnabled(false);
 
     return id;
 }
 
 void FileRenamerWidget::moveSignalMappings(int oldId, int newId)
 {
     mapper->setMapping(m_rows[oldId].optionsButton, newId);
     downMapper->setMapping(m_rows[oldId].downButton, newId);
     upMapper->setMapping(m_rows[oldId].upButton, newId);
     toggleMapper->setMapping(m_rows[oldId].enableButton, newId);
 }
 
 bool FileRenamerWidget::removeRow(int id)
 {
     if(id >= m_rows.count()) {
         qCWarning(JUK_LOG) << "Trying to remove row, but " << id << " is out-of-range.\n";
         return false;
     }
 
     if(m_rows.count() == 1) {
         qCCritical(JUK_LOG) << "Can't remove last row of File Renamer.\n";
         return false;
     }
 
     // Remove widget.  Don't delete it since it appears QSignalMapper may still need it.
     m_rows[id].widget->deleteLater();
     m_rows[id].widget = 0;
     m_rows[id].enableButton = 0;
     m_rows[id].upButton = 0;
     m_rows[id].optionsButton = 0;
     m_rows[id].downButton = 0;
 
     int checkboxPosition = 0; // Remove first checkbox.
 
     // If not the first row, remove the checkbox before it.
     if(m_rows[id].position > 0)
         checkboxPosition = m_rows[id].position - 1;
 
     // The checkbox is contained within a layout widget, so the layout
     // widget is the one the needs to die.
     delete m_folderSwitches[checkboxPosition]->parent();
     m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]);
 
     // Go through all the rows and if they have the same category and a
     // higher categoryNumber, decrement the number.  Also update the
     // position identifier.
     for(int i = 0; i < m_rows.count(); ++i) {
         if(i == id)
             continue; // Don't mess with ourself.
 
         if((m_rows[id].category.category == m_rows[i].category.category) &&
            (m_rows[id].category.categoryNumber < m_rows[i].category.categoryNumber))
         {
             --m_rows[i].category.categoryNumber;
         }
 
         // Items are moving up.
         if(m_rows[id].position < m_rows[i].position)
             --m_rows[i].position;
     }
 
     // Every row after the one we delete will have a different identifier, since
     // the identifier is simply its index into m_rows.  So we need to re-do the
     // signal mappings for the affected rows.
     for(int i = id + 1; i < m_rows.count(); ++i)
         moveSignalMappings(i, i - 1);
 
     m_rows.erase(&m_rows[id]);
 
     // Make sure we update the buttons of affected rows.
     m_rows[idOfPosition(0)].upButton->setEnabled(false);
     m_rows[idOfPosition(m_rows.count() - 1)].downButton->setEnabled(false);
 
     // We can insert another row now, make sure GUI is updated to match.
     m_ui->m_insertCategory->setEnabled(true);
 
     QTimer::singleShot(0, this, SLOT(exampleTextChanged()));
     return true;
 }
 
 void FileRenamerWidget::addFolderSeparatorCheckbox()
 {
     QWidget *temp = new QWidget(m_mainFrame);
     m_mainFrame->layout()->addWidget(temp);
 
     QHBoxLayout *l = new QHBoxLayout(temp);
 
     QCheckBox *cb = new QCheckBox(i18n("Insert folder separator"), temp);
     m_folderSwitches.append(cb);
     l->addWidget(cb, 0, Qt::AlignCenter);
     cb->setChecked(false);
 
     connect(cb, SIGNAL(toggled(bool)),
             SLOT(exampleTextChanged()));
 
     temp->show();
 }
 
 void FileRenamerWidget::createTagRows()
 {
     KConfigGroup config(KSharedConfig::openConfig(), "FileRenamer");
     QList<int> categoryOrder = config.readEntry("CategoryOrder", QList<int>());
 
     if(categoryOrder.isEmpty())
         categoryOrder << Artist << Album << Title << Track;
 
     // Setup arrays.
     m_rows.reserve(categoryOrder.count());
     m_folderSwitches.reserve(categoryOrder.count() - 1);
 
     mapper       = new QSignalMapper(this);
     mapper->setObjectName( QLatin1String("signal mapper" ));
     toggleMapper = new QSignalMapper(this);
     toggleMapper->setObjectName( QLatin1String("toggle mapper" ));
     upMapper     = new QSignalMapper(this);
     upMapper->setObjectName( QLatin1String("up button mapper" ));
     downMapper   = new QSignalMapper(this);
     downMapper->setObjectName( QLatin1String("down button mapper" ));
 
     connect(mapper,       SIGNAL(mapped(int)), SLOT(showCategoryOption(int)));
     connect(toggleMapper, SIGNAL(mapped(int)), SLOT(slotRemoveRow(int)));
     connect(upMapper,     SIGNAL(mapped(int)), SLOT(moveItemUp(int)));
     connect(downMapper,   SIGNAL(mapped(int)), SLOT(moveItemDown(int)));
 
     m_mainFrame = new QFrame(m_ui->m_mainView);
     m_ui->m_mainView->setWidget(m_mainFrame);
     m_ui->m_mainView->setWidgetResizable(true);
 
     QVBoxLayout *frameLayout = new QVBoxLayout(m_mainFrame);
     frameLayout->setMargin(10);
     frameLayout->setSpacing(5);
 
     // OK, the deal with the categoryOrder variable is that we need to create
     // the rows in the order that they were saved in (the order given by categoryOrder).
     // The signal mappers operate according to the row identifier.  To find the position of
     // a row given the identifier, use m_rows[id].position.  To find the id of a given
     // position, use idOfPosition(position).
 
     QList<int>::ConstIterator it = categoryOrder.constBegin();
 
     for(; it != categoryOrder.constEnd(); ++it) {
         if(*it < StartTag || *it >= NumTypes) {
             qCCritical(JUK_LOG) << "Invalid category encountered in file renamer configuration.\n";
             continue;
         }
 
         if(m_rows.count() == MAX_CATEGORIES) {
             qCCritical(JUK_LOG) << "Maximum number of File Renamer tags reached, bailing.\n";
             break;
         }
 
         TagType i = static_cast<TagType>(*it);
 
         addRowCategory(i);
 
         // Insert the directory separator checkbox if this isn't the last
         // item.
 
         QList<int>::ConstIterator dup(it);
 
         // Check for last item
         if(++dup != categoryOrder.constEnd())
             addFolderSeparatorCheckbox();
     }
 
     m_rows.first().upButton->setEnabled(false);
     m_rows.last().downButton->setEnabled(false);
 
     // If we have maximum number of categories already, don't let the user
     // add more.
     if(m_rows.count() >= MAX_CATEGORIES)
         m_ui->m_insertCategory->setEnabled(false);
 }
 
 void FileRenamerWidget::exampleTextChanged()
 {
     // Just use .mp3 as an example
     if(m_exampleFromFile && (m_exampleFile.isEmpty() ||
                              !FileHandle(m_exampleFile).tag()->isValid()))
     {
         m_ui->m_exampleText->setText(i18n("No file selected, or selected file has no tags."));
         return;
     }
 
     m_ui->m_exampleText->setText(FileRenamer::fileName(*this) + ".mp3");
 }
 
 QString FileRenamerWidget::fileCategoryValue(TagType category) const
 {
     FileHandle file(m_exampleFile);
     Tag *tag = file.tag();
 
     switch(category) {
     case Track:
         return QString::number(tag->track());
 
     case Year:
         return QString::number(tag->year());
 
     case Title:
         return tag->title();
 
     case Artist:
         return tag->artist();
 
     case Album:
         return tag->album();
 
     case Genre:
         return tag->genre();
 
     default:
         return QString();
     }
 }
 
 QString FileRenamerWidget::categoryValue(TagType category) const
 {
     if(m_exampleFromFile)
         return fileCategoryValue(category);
 
     const ExampleOptions *example = m_exampleDialog->widget();
 
     switch (category) {
     case Track:
         return example->m_exampleTrack->text();
 
     case Year:
         return example->m_exampleYear->text();
 
     case Title:
         return example->m_exampleTitle->text();
 
     case Artist:
         return example->m_exampleArtist->text();
 
     case Album:
         return example->m_exampleAlbum->text();
 
     case Genre:
         return example->m_exampleGenre->text();
 
     default:
         return QString();
     }
 }
 
 QList<CategoryID> FileRenamerWidget::categoryOrder() const
 {
     QList<CategoryID> list;
 
     // Iterate in GUI row order.
     for(int i = 0; i < m_rows.count(); ++i) {
         int rowId = idOfPosition(i);
         list += m_rows[rowId].category;
     }
 
     return list;
 }
 
 bool FileRenamerWidget::hasFolderSeparator(int index) const
 {
     if(index >= m_folderSwitches.count())
         return false;
     return m_folderSwitches[index]->isChecked();
 }
 
 void FileRenamerWidget::moveItem(int id, MovementDirection direction)
 {
     QWidget *l = m_rows[id].widget;
     int bottom = m_rows.count() - 1;
     int pos = m_rows[id].position;
     int newPos = (direction == MoveUp) ? pos - 1 : pos + 1;
 
     // Item we're moving can't go further down after this.
 
     if((pos == (bottom - 1) && direction == MoveDown) ||
        (pos == bottom && direction == MoveUp))
     {
         int idBottomRow = idOfPosition(bottom);
         int idAboveBottomRow = idOfPosition(bottom - 1);
 
         m_rows[idBottomRow].downButton->setEnabled(true);
         m_rows[idAboveBottomRow].downButton->setEnabled(false);
     }
 
     // We're moving the top item, do some button switching.
 
     if((pos == 0 && direction == MoveDown) || (pos == 1 && direction == MoveUp)) {
         int idTopItem = idOfPosition(0);
         int idBelowTopItem = idOfPosition(1);
 
         m_rows[idTopItem].upButton->setEnabled(true);
         m_rows[idBelowTopItem].upButton->setEnabled(false);
     }
 
     // This is the item we're swapping with.
 
     int idSwitchWith = idOfPosition(newPos);
     QWidget *w = m_rows[idSwitchWith].widget;
 
     // Update the table of widget rows.
 
     std::swap(m_rows[id].position, m_rows[idSwitchWith].position);
 
     // Move the item two spaces above/below its previous position.  It has to
     // be 2 spaces because of the checkbox.
 
     QBoxLayout *layout = dynamic_cast<QBoxLayout *>(m_mainFrame->layout());
     if ( !layout )
         return;
 
     layout->removeWidget(l);
     layout->insertWidget(2 * newPos, l);
 
     // Move the top item two spaces in the opposite direction, for a similar
     // reason.
 
     layout->removeWidget(w);
     layout->insertWidget(2 * pos, w);
     layout->invalidate();
 
     QTimer::singleShot(0, this, SLOT(exampleTextChanged()));
 }
 
 int FileRenamerWidget::idOfPosition(int position) const
 {
     if(position >= m_rows.count()) {
         qCCritical(JUK_LOG) << "Search for position " << position << " out-of-range.\n";
         return -1;
     }
 
     for(int i = 0; i < m_rows.count(); ++i)
         if(m_rows[i].position == position)
             return i;
 
     qCCritical(JUK_LOG) << "Unable to find identifier for position " << position;
     return -1;
 }
 
 int FileRenamerWidget::findIdentifier(const CategoryID &category) const
 {
     for(int index = 0; index < m_rows.count(); ++index)
         if(m_rows[index].category == category)
             return index;
 
     qCCritical(JUK_LOG) << "Unable to find match for category " <<
         TagRenamerOptions::tagTypeText(category.category) <<
-        ", number " << category.categoryNumber << endl;
+        ", number " << category.categoryNumber;
 
     return MAX_CATEGORIES;
 }
 
 void FileRenamerWidget::enableAllUpButtons()
 {
     for(int i = 0; i < m_rows.count(); ++i)
         m_rows[i].upButton->setEnabled(true);
 }
 
 void FileRenamerWidget::enableAllDownButtons()
 {
     for(int i = 0; i < m_rows.count(); ++i)
         m_rows[i].downButton->setEnabled(true);
 }
 
 void FileRenamerWidget::showCategoryOption(int id)
 {
     TagOptionsDialog *dialog = new TagOptionsDialog(this, m_rows[id].options, m_rows[id].category.categoryNumber);
 
     if(dialog->exec() == QDialog::Accepted) {
         m_rows[id].options = dialog->options();
         exampleTextChanged();
     }
 
     delete dialog;
 }
 
 void FileRenamerWidget::moveItemUp(int id)
 {
     moveItem(id, MoveUp);
 }
 
 void FileRenamerWidget::moveItemDown(int id)
 {
     moveItem(id, MoveDown);
 }
 
 void FileRenamerWidget::toggleExampleDialog()
 {
     m_exampleDialog->setHidden(!m_exampleDialog->isHidden());
 }
 
 void FileRenamerWidget::insertCategory()
 {
     TagType category = static_cast<TagType>(m_ui->m_category->currentIndex());
     if(m_ui->m_category->currentIndex() < 0 || category >= NumTypes) {
         qCCritical(JUK_LOG) << "Trying to add unknown category somehow.\n";
         return;
     }
 
     // We need to enable the down button of the current bottom row since it
     // can now move down.
     int idBottom = idOfPosition(m_rows.count() - 1);
     m_rows[idBottom].downButton->setEnabled(true);
 
     addFolderSeparatorCheckbox();
 
     // Identifier of new row.
     int id = addRowCategory(category);
 
     // Set its down button to be disabled.
     m_rows[id].downButton->setEnabled(false);
 
     m_mainFrame->layout()->invalidate();
     m_ui->m_mainView->update();
 
     // Now update according to the code in loadConfig().
     m_rows[id].options = TagRenamerOptions(m_rows[id].category);
     exampleTextChanged();
 }
 
 void FileRenamerWidget::exampleDialogShown()
 {
     m_ui->m_showExample->setText(i18n("Hide Renamer Test Dialog"));
 }
 
 void FileRenamerWidget::exampleDialogHidden()
 {
     m_ui->m_showExample->setText(i18n("Show Renamer Test Dialog"));
 }
 
 void FileRenamerWidget::fileSelected(const QString &file)
 {
     m_exampleFromFile = true;
     m_exampleFile = file;
     exampleTextChanged();
 }
 
 void FileRenamerWidget::dataSelected()
 {
     m_exampleFromFile = false;
     exampleTextChanged();
 }
 
 QString FileRenamerWidget::separator() const
 {
     return m_ui->m_separator->currentText();
 }
 
 QString FileRenamerWidget::musicFolder() const
 {
     return m_ui->m_musicFolder->url().path();
 }
 
 void FileRenamerWidget::slotRemoveRow(int id)
 {
     // Remove the given identified row.
     if(!removeRow(id))
         qCCritical(JUK_LOG) << "Unable to remove row " << id;
 }
 
 //
 // Implementation of FileRenamer
 //
 
 FileRenamer::FileRenamer()
 {
 }
 
 void FileRenamer::rename(PlaylistItem *item)
 {
     PlaylistItemList list;
     list.append(item);
 
     rename(list);
 }
 
 void FileRenamer::rename(const PlaylistItemList &items)
 {
     ConfigCategoryReader reader;
     QStringList errorFiles;
     QMap<QString, QString> map;
     QMap<QString, PlaylistItem *> itemMap;
 
     for(PlaylistItemList::ConstIterator it = items.constBegin(); it != items.constEnd(); ++it) {
         reader.setPlaylistItem(*it);
         QString oldFile = (*it)->file().absFilePath();
         QString extension = (*it)->file().fileInfo().suffix();
         QString newFile = fileName(reader) + '.' + extension;
 
         if(oldFile != newFile) {
             map[oldFile] = newFile;
             itemMap[oldFile] = *it;
         }
     }
 
     if(itemMap.isEmpty() || ConfirmationDialog(map).exec() != QDialog::Accepted)
         return;
 
     QApplication::setOverrideCursor(Qt::WaitCursor);
     for(QMap<QString, QString>::ConstIterator it = map.constBegin();
         it != map.constEnd(); ++it)
     {
         if(moveFile(it.key(), it.value())) {
             itemMap[it.key()]->setFile(it.value());
             itemMap[it.key()]->refresh();
 
             setFolderIcon(it.value(), itemMap[it.key()]);
         }
         else
             errorFiles << i18n("%1 to %2", it.key(), it.value());
 
         processEvents();
     }
     QApplication::restoreOverrideCursor();
 
     if(!errorFiles.isEmpty())
         KMessageBox::errorList(0, i18n("The following rename operations failed:\n"), errorFiles);
 }
 
 bool FileRenamer::moveFile(const QString &src, const QString &dest)
 {
     qCDebug(JUK_LOG) << "Moving file " << src << " to " << dest;
 
     if(src == dest)
         return false;
 
     // Escape URL.
     KUrl srcURL = KUrl(src);
     KUrl dstURL = KUrl(dest);
 
     // Clean it.
     srcURL.cleanPath();
     dstURL.cleanPath();
 
     // Make sure it is valid.
     if(!srcURL.isValid() || !dstURL.isValid())
         return false;
 
     // Get just the directory.
     KUrl dir = dstURL;
     dir.setFileName(QString());
 
     // Create the directory.
     if(!KStandardDirs::exists(dir.path()))
         if(!KStandardDirs::makeDir(dir.path())) {
             qCCritical(JUK_LOG) << "Unable to create directory " << dir.path();
             return false;
         }
 
     // Move the file.
     KIO::Job *job = KIO::file_move(srcURL, dstURL);
     return KIO::NetAccess::synchronousRun(job, 0);
 }
 
 void FileRenamer::setFolderIcon(const KUrl &dst, const PlaylistItem *item)
 {
     if(item->file().tag()->album().isEmpty() ||
        !item->file().coverInfo()->hasCover())
     {
         return;
     }
 
     KUrl dstURL = dst;
     dstURL.cleanPath();
 
     // Split path, and go through each path element.  If a path element has
     // the album information, set its folder icon.
     QStringList elements = dstURL.directory().split('/', QString::SkipEmptyParts);
     QString path;
 
     for(QStringList::ConstIterator it = elements.constBegin(); it != elements.constEnd(); ++it) {
         path.append('/' + (*it));
 
         qCDebug(JUK_LOG) << "Checking path: " << path;
         if((*it).contains(item->file().tag()->album() ) &&
            !QFile::exists(path + "/.directory"))
         {
             // Seems to be a match, let's set the folder icon for the current
             // path.  First we should write out the file.
 
             QPixmap thumb = item->file().coverInfo()->pixmap(CoverInfo::Thumbnail);
             thumb.save(path + "/.juk-thumbnail.png", "PNG");
 
             KDesktopFile dirFile(path + "/.directory");
             KConfigGroup desktopGroup(dirFile.desktopGroup());
 
             if(!desktopGroup.hasKey("Icon")) {
                 desktopGroup.writePathEntry("Icon", QString("%1/.juk-thumbnail.png").arg(path));
                 dirFile.sync();
             }
 
             return;
         }
     }
 }
 
 /**
  * Returns iterator pointing to the last item enabled in the given list with
  * a non-empty value (or is required to be included).
  */
 QList<CategoryID>::ConstIterator lastEnabledItem(const QList<CategoryID> &list,
                                                  const CategoryReaderInterface &interface)
 {
     QList<CategoryID>::ConstIterator it = list.constBegin();
     QList<CategoryID>::ConstIterator last = list.constEnd();
 
     for(; it != list.constEnd(); ++it) {
         if(interface.isRequired(*it) || (!interface.isDisabled(*it) &&
               !interface.categoryValue((*it).category).isEmpty()))
         {
             last = it;
         }
     }
 
     return last;
 }
 
 QString FileRenamer::fileName(const CategoryReaderInterface &interface)
 {
     const QList<CategoryID> categoryOrder = interface.categoryOrder();
     const QString separator = interface.separator();
     const QString folder = interface.musicFolder();
     QList<CategoryID>::ConstIterator lastEnabled;
     int i = 0;
     QStringList list;
     QChar dirSeparator (QDir::separator());
 
     // Use lastEnabled to properly handle folder separators.
     lastEnabled = lastEnabledItem(categoryOrder, interface);
     bool pastLast = false; // Toggles to true once we've passed lastEnabled.
 
     for(QList<CategoryID>::ConstIterator it = categoryOrder.constBegin();
             it != categoryOrder.constEnd();
             ++it, ++i)
     {
         if(it == lastEnabled)
             pastLast = true;
 
         if(interface.isDisabled(*it))
             continue;
 
         QString value = interface.value(*it);
 
         // The user can use the folder separator checkbox to add folders, so don't allow
         // slashes that slip in to accidentally create new folders.  Should we filter this
         // back out when showing it in the GUI?
         value.replace('/', "%2f");
 
         if(!pastLast && interface.hasFolderSeparator(i))
             value.append(dirSeparator);
 
         if(interface.isRequired(*it) || !value.isEmpty())
             list.append(value);
     }
 
     // Construct a single string representation, handling strings ending in
     // '/' specially
 
     QString result;
 
     for(QStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); /* Empty */) {
         result += *it;
 
         ++it; // Manually advance iterator to check for end-of-list.
 
         // Add separator unless at a directory boundary
         if(it != list.constEnd() &&
            !(*it).startsWith(dirSeparator) && // Check beginning of next item.
            !result.endsWith(dirSeparator))
         {
             result += separator;
         }
     }
 
     return QString(folder + dirSeparator + result);
 }
 
 // vim: set et sw=4 tw=0 sta:
diff --git a/playlist.cpp b/playlist.cpp
index 311999cd..d13cd8d8 100644
--- a/playlist.cpp
+++ b/playlist.cpp
@@ -1,2373 +1,2372 @@
 /**
  * Copyright (C) 2002-2004 Scott Wheeler <wheeler@kde.org>
  * Copyright (C) 2008 Michael Pyne <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.
  *
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 #include "playlist.h"
 #include "juk-exception.h"
 
 #include <kconfig.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kglobalsettings.h>
 #include <kurl.h>
 #include <kio/netaccess.h>
 #include <kio/copyjob.h>
 #include <kmenu.h>
 #include <kactioncollection.h>
 #include <kconfiggroup.h>
 #include <ktoolbarpopupaction.h>
 #include <kactionmenu.h>
 #include <ktoggleaction.h>
 #include <kselectaction.h>
 #include <kglobal.h>
 #include <kmimetype.h>
 
 #include <QCursor>
 #include <QDir>
 #include <QDirIterator>
 #include <QToolTip>
 #include <QFile>
 #include <QResizeEvent>
 #include <QMouseEvent>
 #include <QKeyEvent>
 #include <QMimeData>
 #include <QTimer>
 #include <QClipboard>
 #include <QTextStream>
 #include <QDropEvent>
 #include <QDragEnterEvent>
 #include <QPixmap>
 #include <QStackedWidget>
 #include <QScrollBar>
 #include <id3v1genres.h>
 
 #include <time.h>
 #include <cmath>
 
 #include "playlistitem.h"
 #include "playlistcollection.h"
 #include "playlistsearch.h"
 #include "mediafiles.h"
 #include "collectionlist.h"
 #include "filerenamer.h"
 #include "actioncollection.h"
 #include "tracksequencemanager.h"
 #include "tag.h"
 #include "upcomingplaylist.h"
 #include "deletedialog.h"
 #include "webimagefetcher.h"
 #include "coverinfo.h"
 #include "coverdialog.h"
 #include "tagtransactionmanager.h"
 #include "cache.h"
 #include "juk_debug.h"
 
 using namespace ActionCollection;
 
 /**
  * Used to give every track added in the program a unique identifier. See
  * PlaylistItem
  */
 quint32 g_trackID = 0;
 
 /**
  * Just a shortcut of sorts.
  */
 
 static bool manualResize()
 {
     return action<KToggleAction>("resizeColumnsManually")->isChecked();
 }
 
 /**
  * A tooltip specialized to show full filenames over the file name column.
  */
 
 #ifdef __GNUC__
 #warning disabling the tooltip for now
 #endif
 #if 0
 class PlaylistToolTip : public QToolTip
 {
 public:
     PlaylistToolTip(QWidget *parent, Playlist *playlist) :
         QToolTip(parent), m_playlist(playlist) {}
 
     virtual void maybeTip(const QPoint &p)
     {
         PlaylistItem *item = static_cast<PlaylistItem *>(m_playlist->itemAt(p));
 
         if(!item)
             return;
 
         QPoint contentsPosition = m_playlist->viewportToContents(p);
 
         int column = m_playlist->header()->sectionAt(contentsPosition.x());
 
         if(column == m_playlist->columnOffset() + PlaylistItem::FileNameColumn ||
            item->cachedWidths()[column] > m_playlist->columnWidth(column) ||
            (column == m_playlist->columnOffset() + PlaylistItem::CoverColumn &&
             item->file().coverInfo()->hasCover()))
         {
             QRect r = m_playlist->itemRect(item);
             int headerPosition = m_playlist->header()->sectionPos(column);
             r.setLeft(headerPosition);
             r.setRight(headerPosition + m_playlist->header()->sectionSize(column));
 
             if(column == m_playlist->columnOffset() + PlaylistItem::FileNameColumn)
                 tip(r, item->file().absFilePath());
             else if(column == m_playlist->columnOffset() + PlaylistItem::CoverColumn) {
                 Q3MimeSourceFactory *f = Q3MimeSourceFactory::defaultFactory();
                 f->setImage("coverThumb",
                             QImage(item->file().coverInfo()->pixmap(CoverInfo::Thumbnail).convertToImage()));
                 tip(r, "<center><img source=\"coverThumb\"/></center>");
             }
             else
                 tip(r, item->text(column));
         }
     }
 
 private:
     Playlist *m_playlist;
 };
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Playlist::SharedSettings definition
 ////////////////////////////////////////////////////////////////////////////////
 
 bool Playlist::m_visibleChanged = false;
 bool Playlist::m_shuttingDown = false;
 
 /**
  * Shared settings between the playlists.
  */
 
 class Playlist::SharedSettings
 {
 public:
     static SharedSettings *instance();
     /**
      * Sets the default column order to that of Playlist @param p.
      */
     void setColumnOrder(const Playlist *l);
     void toggleColumnVisible(int column);
     void setInlineCompletionMode(KGlobalSettings::Completion mode);
 
     /**
      * Apply the settings.
      */
     void apply(Playlist *l) const;
     void sync() { writeConfig(); }
 
 protected:
     SharedSettings();
     ~SharedSettings() {}
 
 private:
     void writeConfig();
 
     static SharedSettings *m_instance;
     QList<int> m_columnOrder;
     QVector<bool> m_columnsVisible;
     KGlobalSettings::Completion m_inlineCompletion;
 };
 
 Playlist::SharedSettings *Playlist::SharedSettings::m_instance = 0;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Playlist::SharedSettings public members
 ////////////////////////////////////////////////////////////////////////////////
 
 Playlist::SharedSettings *Playlist::SharedSettings::instance()
 {
     static SharedSettings settings;
     return &settings;
 }
 
 void Playlist::SharedSettings::setColumnOrder(const Playlist *l)
 {
     if(!l)
         return;
 
     m_columnOrder.clear();
 
     for(int i = l->columnOffset(); i < l->columnCount(); ++i)
         m_columnOrder.append(l->header()->visualIndex(i)); // FIXME  MISMATCH with apply
 
     writeConfig();
 }
 
 void Playlist::SharedSettings::toggleColumnVisible(int column)
 {
     if(column >= m_columnsVisible.size())
         m_columnsVisible.fill(true, column + 1);
 
     m_columnsVisible[column] = !m_columnsVisible[column];
 
     writeConfig();
 }
 
 void Playlist::SharedSettings::setInlineCompletionMode(KGlobalSettings::Completion mode)
 {
     m_inlineCompletion = mode;
     writeConfig();
 }
 
 
 void Playlist::SharedSettings::apply(Playlist *l) const
 {
     if(!l)
         return;
 
     int offset = l->columnOffset();
     int i = 0;
     //bool oldState = l->header()->blockSignals(true);
     foreach(int column, m_columnOrder)
         // FIXME this is broken
         l->header()->moveSection(i++ + offset, column + offset); // FIXME mismatch with setColumnOrder
     //l->header()->blockSignals(oldState);
 
     for(int i = 0; i < m_columnsVisible.size(); i++) {
         if(m_columnsVisible[i] && l->isColumnHidden(i + offset))
             l->showColumn(i + offset, false);
         else if(!m_columnsVisible[i] && !l->isColumnHidden(i + offset))
             l->hideColumn(i + offset, false);
     }
 
     l->updateLeftColumn();
     // FIXME rename
     //l->renameLineEdit()->setCompletionMode(m_inlineCompletion);
     l->slotColumnResizeModeChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Playlist::ShareSettings protected members
 ////////////////////////////////////////////////////////////////////////////////
 
 Playlist::SharedSettings::SharedSettings()
 {
     KConfigGroup config(KSharedConfig::openConfig(), "PlaylistShared");
 
     bool resizeColumnsManually = config.readEntry("ResizeColumnsManually", false);
     action("resizeColumnsManually")->setChecked(resizeColumnsManually);
 
     // Preallocate spaces so we don't need to check later.
     m_columnsVisible.fill(true, PlaylistItem::lastColumn() + 1);
 
     // save column order
     m_columnOrder = config.readEntry("ColumnOrder", QList<int>());
 
     QList<int> l = config.readEntry("VisibleColumns", QList<int>());
 
     if(l.isEmpty()) {
 
         // Provide some default values for column visibility if none were
         // read from the configuration file.
 
         m_columnsVisible[PlaylistItem::BitrateColumn] = false;
         m_columnsVisible[PlaylistItem::CommentColumn] = false;
         m_columnsVisible[PlaylistItem::FileNameColumn] = false;
         m_columnsVisible[PlaylistItem::FullPathColumn] = false;
     }
     else {
         // Convert the int list into a bool list.
 
         m_columnsVisible.fill(false);
         for(int i = 0; i < l.size() && i < m_columnsVisible.size(); ++i)
             m_columnsVisible[i] = bool(l[i]);
     }
 
     m_inlineCompletion = KGlobalSettings::Completion(
         config.readEntry("InlineCompletionMode", int(KGlobalSettings::CompletionAuto)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Playlist::SharedSettings private members
 ////////////////////////////////////////////////////////////////////////////////
 
 void Playlist::SharedSettings::writeConfig()
 {
     KConfigGroup config(KSharedConfig::openConfig(), "PlaylistShared");
     config.writeEntry("ColumnOrder", m_columnOrder);
 
     QList<int> l;
     for(int i = 0; i < m_columnsVisible.size(); i++)
         l.append(int(m_columnsVisible[i]));
 
     config.writeEntry("VisibleColumns", l);
     config.writeEntry("InlineCompletionMode", int(m_inlineCompletion));
 
     config.writeEntry("ResizeColumnsManually", manualResize());
 
     KSharedConfig::openConfig()->sync();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
 PlaylistItemList Playlist::m_history;
 QVector<PlaylistItem *> Playlist::m_backMenuItems;
 int Playlist::m_leftColumn = 0;
 
 Playlist::Playlist(PlaylistCollection *collection, const QString &name,
                    const QString &iconName) :
     QTreeWidget(collection->playlistStack()),
     m_collection(collection),
     m_fetcher(new WebImageFetcher(this)),
     m_allowDuplicates(true),
     m_applySharedSettings(true),
     m_columnWidthModeChanged(false),
     m_disableColumnWidthUpdates(true),
     m_time(0),
     m_widthsDirty(true),
     m_searchEnabled(true),
     m_playlistName(name),
     m_rmbMenu(0),
     m_toolTip(0),
     m_blockDataChanged(false)
 {
     setup();
     collection->setupPlaylist(this, iconName);
 }
 
 Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items,
                    const QString &name, const QString &iconName) :
     QTreeWidget(collection->playlistStack()),
     m_collection(collection),
     m_fetcher(new WebImageFetcher(this)),
     m_allowDuplicates(true),
     m_applySharedSettings(true),
     m_columnWidthModeChanged(false),
     m_disableColumnWidthUpdates(true),
     m_time(0),
     m_widthsDirty(true),
     m_searchEnabled(true),
     m_playlistName(name),
     m_rmbMenu(0),
     m_toolTip(0),
     m_blockDataChanged(false)
 {
     setup();
     collection->setupPlaylist(this, iconName);
     createItems(items);
 }
 
 Playlist::Playlist(PlaylistCollection *collection, const QFileInfo &playlistFile,
                    const QString &iconName) :
     QTreeWidget(collection->playlistStack()),
     m_collection(collection),
     m_fetcher(new WebImageFetcher(this)),
     m_allowDuplicates(true),
     m_applySharedSettings(true),
     m_columnWidthModeChanged(false),
     m_disableColumnWidthUpdates(true),
     m_time(0),
     m_widthsDirty(true),
     m_searchEnabled(true),
     m_fileName(playlistFile.canonicalFilePath()),
     m_rmbMenu(0),
     m_toolTip(0),
     m_blockDataChanged(false)
 {
     setup();
     loadFile(m_fileName, playlistFile);
     collection->setupPlaylist(this, iconName);
 }
 
 Playlist::Playlist(PlaylistCollection *collection, bool delaySetup, int extraColumns) :
     QTreeWidget(collection->playlistStack()),
     m_collection(collection),
     m_fetcher(new WebImageFetcher(this)),
     m_allowDuplicates(true),
     m_applySharedSettings(true),
     m_columnWidthModeChanged(false),
     m_disableColumnWidthUpdates(true),
     m_time(0),
     m_widthsDirty(true),
     m_searchEnabled(true),
     m_rmbMenu(0),
     m_toolTip(0),
     m_blockDataChanged(false)
 {
     for(int i = 0; i < extraColumns; ++i) {
         addColumn(i18n("JuK")); // Placeholder text!
     }
 
     setup();
 
     if(!delaySetup)
         collection->setupPlaylist(this, "audio-midi");
 }
 
 Playlist::~Playlist()
 {
     // In some situations the dataChanged signal from clearItems will cause observers to
     // subsequently try to access a deleted item.  Since we're going away just remove all
     // observers.
 
     clearObservers();
 
     // clearItem() will take care of removing the items from the history,
     // so call clearItems() to make sure it happens.
 
     clearItems(items());
 
     /* delete m_toolTip; */
 
     if(!m_shuttingDown)
         m_collection->removePlaylist(this);
 }
 
 QString Playlist::name() const
 {
     if(m_playlistName.isEmpty())
         return m_fileName.section(QDir::separator(), -1).section('.', 0, -2);
     else
         return m_playlistName;
 }
 
 FileHandle Playlist::currentFile() const
 {
     return playingItem() ? playingItem()->file() : FileHandle::null();
 }
 
 int Playlist::time() const
 {
     // Since this method gets a lot of traffic, let's optimize for such.
 
     if(!m_addTime.isEmpty()) {
         foreach(const PlaylistItem *item, m_addTime) {
             if(item)
                 m_time += item->file().tag()->seconds();
         }
 
         m_addTime.clear();
     }
 
     if(!m_subtractTime.isEmpty()) {
         foreach(const PlaylistItem *item, m_subtractTime) {
             if(item)
                 m_time -= item->file().tag()->seconds();
         }
 
         m_subtractTime.clear();
     }
 
     return m_time;
 }
 
 void Playlist::playFirst()
 {
     TrackSequenceManager::instance()->setNextItem(static_cast<PlaylistItem *>(
         *QTreeWidgetItemIterator(const_cast<Playlist *>(this), QTreeWidgetItemIterator::NotHidden)));
     action("forward")->trigger();
 }
 
 void Playlist::playNextAlbum()
 {
     PlaylistItem *current = TrackSequenceManager::instance()->currentItem();
     if(!current)
         return; // No next album if we're not already playing.
 
     QString currentAlbum = current->file().tag()->album();
     current = TrackSequenceManager::instance()->nextItem();
 
     while(current && current->file().tag()->album() == currentAlbum)
         current = TrackSequenceManager::instance()->nextItem();
 
     TrackSequenceManager::instance()->setNextItem(current);
     action("forward")->trigger();
 }
 
 void Playlist::playNext()
 {
     TrackSequenceManager::instance()->setCurrentPlaylist(this);
     setPlaying(TrackSequenceManager::instance()->nextItem());
 }
 
 void Playlist::stop()
 {
     m_history.clear();
     setPlaying(0);
 }
 
 void Playlist::playPrevious()
 {
     if(!playingItem())
         return;
 
     bool random = action("randomPlay") && action<KToggleAction>("randomPlay")->isChecked();
 
     PlaylistItem *previous = 0;
 
     if(random && !m_history.isEmpty()) {
         PlaylistItemList::Iterator last = --m_history.end();
         previous = *last;
         m_history.erase(last);
     }
     else {
         m_history.clear();
         previous = TrackSequenceManager::instance()->previousItem();
     }
 
     if(!previous)
         previous = static_cast<PlaylistItem *>(playingItem()->itemAbove());
 
     setPlaying(previous, false);
 }
 
 void Playlist::setName(const QString &n)
 {
     m_collection->addNameToDict(n);
     m_collection->removeNameFromDict(m_playlistName);
 
     m_playlistName = n;
     emit signalNameChanged(m_playlistName);
 }
 
 void Playlist::save()
 {
     if(m_fileName.isEmpty())
         return saveAs();
 
     QFile file(m_fileName);
 
     if(!file.open(QIODevice::WriteOnly))
         return KMessageBox::error(this, i18n("Could not save to file %1.", m_fileName));
 
     QTextStream stream(&file);
 
     QStringList fileList = files();
 
     foreach(const QString &file, fileList)
         stream << file << endl;
 
     file.close();
 }
 
 void Playlist::saveAs()
 {
     m_collection->removeFileFromDict(m_fileName);
 
     m_fileName = MediaFiles::savePlaylistDialog(name(), this);
 
     if(!m_fileName.isEmpty()) {
         m_collection->addFileToDict(m_fileName);
 
         // If there's no playlist name set, use the file name.
         if(m_playlistName.isEmpty())
             emit signalNameChanged(name());
         save();
     }
 }
 
 void Playlist::updateDeletedItem(PlaylistItem *item)
 {
     m_members.remove(item->file().absFilePath());
     m_search.clearItem(item);
 
     m_history.removeAll(item);
     m_addTime.removeAll(item);
     m_subtractTime.removeAll(item);
 }
 
 void Playlist::clearItem(PlaylistItem *item)
 {
     // Automatically updates internal structs via updateDeletedItem
     delete item;
 
     dataChanged();
 }
 
 void Playlist::clearItems(const PlaylistItemList &items)
 {
     foreach(PlaylistItem *item, items)
         delete item;
 
     dataChanged();
 }
 
 PlaylistItem *Playlist::playingItem() // static
 {
     return PlaylistItem::playingItems().isEmpty() ? 0 : PlaylistItem::playingItems().front();
 }
 
 QStringList Playlist::files() const
 {
     QStringList list;
 
     for(QTreeWidgetItemIterator it(const_cast<Playlist *>(this)); *it; ++it)
         list.append(static_cast<PlaylistItem *>(*it)->file().absFilePath());
 
     return list;
 }
 
 PlaylistItemList Playlist::items()
 {
     return items(QTreeWidgetItemIterator::IteratorFlag(0));
 }
 
 PlaylistItemList Playlist::visibleItems()
 {
     return items(QTreeWidgetItemIterator::NotHidden);
 }
 
 PlaylistItemList Playlist::selectedItems()
 {
     return items(QTreeWidgetItemIterator::Selected | QTreeWidgetItemIterator::NotHidden);
 }
 
 PlaylistItem *Playlist::firstChild() const
 {
     return static_cast<PlaylistItem *>(topLevelItem(0));
 }
 
 void Playlist::updateLeftColumn()
 {
     int newLeftColumn = leftMostVisibleColumn();
 
     if(m_leftColumn != newLeftColumn) {
         updatePlaying();
         m_leftColumn = newLeftColumn;
     }
 }
 
 void Playlist::setItemsVisible(const PlaylistItemList &items, bool visible) // static
 {
     m_visibleChanged = true;
 
     foreach(PlaylistItem *playlistItem, items)
         playlistItem->setHidden(!visible);
 }
 
 void Playlist::setSearch(const PlaylistSearch &s)
 {
     m_search = s;
 
     if(!m_searchEnabled)
         return;
 
     setItemsVisible(s.matchedItems(), true);
     setItemsVisible(s.unmatchedItems(), false);
 
     TrackSequenceManager::instance()->iterator()->playlistChanged();
 }
 
 void Playlist::setSearchEnabled(bool enabled)
 {
     if(m_searchEnabled == enabled)
         return;
 
     m_searchEnabled = enabled;
 
     if(enabled) {
         setItemsVisible(m_search.matchedItems(), true);
         setItemsVisible(m_search.unmatchedItems(), false);
     }
     else
         setItemsVisible(items(), true);
 }
 
 void Playlist::synchronizePlayingItems(const PlaylistList &sources, bool setMaster)
 {
     foreach(const Playlist *p, sources) {
         if(p->playing()) {
             CollectionListItem *base = playingItem()->collectionItem();
             for(QTreeWidgetItemIterator itemIt(this); *itemIt; ++itemIt) {
                 PlaylistItem *item = static_cast<PlaylistItem *>(*itemIt);
                 if(base == item->collectionItem()) {
                     item->setPlaying(true, setMaster);
                     PlaylistItemList playing = PlaylistItem::playingItems();
                     TrackSequenceManager::instance()->setCurrent(item);
                     return;
                 }
             }
             return;
         }
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public slots
 ////////////////////////////////////////////////////////////////////////////////
 
 void Playlist::copy()
 {
     PlaylistItemList items = selectedItems();
     KUrl::List urls;
 
     foreach(PlaylistItem *item, items) {
         urls << KUrl::fromPath(item->file().absFilePath());
     }
 
     QMimeData *mimeData = new QMimeData;
     urls.populateMimeData(mimeData);
 
     QApplication::clipboard()->setMimeData(mimeData, QClipboard::Clipboard);
 }
 
 void Playlist::paste()
 {
     decode(QApplication::clipboard()->mimeData(), static_cast<PlaylistItem *>(currentItem()));
 }
 
 void Playlist::clear()
 {
     PlaylistItemList l = selectedItems();
     if(l.isEmpty())
         l = items();
 
     clearItems(l);
 }
 
 void Playlist::slotRefresh()
 {
     PlaylistItemList l = selectedItems();
     if(l.isEmpty())
         l = visibleItems();
 
     QApplication::setOverrideCursor(Qt::WaitCursor);
     foreach(PlaylistItem *item, l) {
         item->refreshFromDisk();
 
         if(!item->file().tag() || !item->file().fileInfo().exists()) {
             qCDebug(JUK_LOG) << "Error while trying to refresh the tag.  "
-                           << "This file has probably been removed."
-                           << endl;
+                           << "This file has probably been removed.";
             delete item->collectionItem();
         }
 
         processEvents();
     }
     QApplication::restoreOverrideCursor();
 }
 
 void Playlist::slotRenameFile()
 {
     FileRenamer renamer;
     PlaylistItemList items = selectedItems();
 
     if(items.isEmpty())
         return;
 
     emit signalEnableDirWatch(false);
 
     m_blockDataChanged = true;
     renamer.rename(items);
     m_blockDataChanged = false;
     dataChanged();
 
     emit signalEnableDirWatch(true);
 }
 
 void Playlist::slotViewCover()
 {
     const PlaylistItemList items = selectedItems();
     if (items.isEmpty())
         return;
     foreach(const PlaylistItem *item, items)
         item->file().coverInfo()->popup();
 }
 
 void Playlist::slotRemoveCover()
 {
     PlaylistItemList items = selectedItems();
     if(items.isEmpty())
         return;
     int button = KMessageBox::warningContinueCancel(this,
                                                     i18n("Are you sure you want to delete these covers?"),
                                                     QString(),
                                                     KGuiItem(i18n("&Delete Covers")));
     if(button == KMessageBox::Continue)
         refreshAlbums(items);
 }
 
 void Playlist::slotShowCoverManager()
 {
     static CoverDialog *managerDialog = 0;
 
     if(!managerDialog)
         managerDialog = new CoverDialog(this);
 
     managerDialog->show();
 }
 
 void Playlist::slotAddCover(bool retrieveLocal)
 {
     PlaylistItemList items = selectedItems();
 
     if(items.isEmpty())
         return;
 
     if(!retrieveLocal) {
         m_fetcher->setFile((*items.begin())->file());
         m_fetcher->searchCover();
         return;
     }
 
     KUrl file = KFileDialog::getImageOpenUrl(
         KUrl( "kfiledialog://homedir" ), this, i18n("Select Cover Image File"));
 
     if(file.isEmpty())
         return;
 
     QString artist = items.front()->file().tag()->artist();
     QString album = items.front()->file().tag()->album();
 
     coverKey newId = CoverManager::addCover(file, artist, album);
 
     if(newId != CoverManager::NoMatch)
         refreshAlbums(items, newId);
 }
 
 // Called when image fetcher has added a new cover.
 void Playlist::slotCoverChanged(int coverId)
 {
     qCDebug(JUK_LOG) << "Refreshing information for newly changed covers.\n";
     refreshAlbums(selectedItems(), coverId);
 }
 
 void Playlist::slotGuessTagInfo(TagGuesser::Type type)
 {
     QApplication::setOverrideCursor(Qt::WaitCursor);
     const PlaylistItemList items = selectedItems();
     setDynamicListsFrozen(true);
 
     m_blockDataChanged = true;
 
     foreach(PlaylistItem *item, items) {
         item->guessTagInfo(type);
         processEvents();
     }
 
     // MusicBrainz queries automatically commit at this point.  What would
     // be nice is having a signal emitted when the last query is completed.
 
     if(type == TagGuesser::FileName)
         TagTransactionManager::instance()->commit();
 
     m_blockDataChanged = false;
 
     dataChanged();
     setDynamicListsFrozen(false);
     QApplication::restoreOverrideCursor();
 }
 
 void Playlist::slotReload()
 {
     QFileInfo fileInfo(m_fileName);
     if(!fileInfo.exists() || !fileInfo.isFile() || !fileInfo.isReadable())
         return;
 
     clearItems(items());
     loadFile(m_fileName, fileInfo);
 }
 
 void Playlist::slotWeightDirty(int column)
 {
     if(column < 0) {
         m_weightDirty.clear();
         for(int i = 0; i < columnCount(); i++) {
             if(!isColumnHidden(i))
                 m_weightDirty.append(i);
         }
         return;
     }
 
     if(!m_weightDirty.contains(column))
         m_weightDirty.append(column);
 }
 
 void Playlist::slotShowPlaying()
 {
     if(!playingItem())
         return;
 
     Playlist *l = playingItem()->playlist();
 
     l->clearSelection();
 
     // Raise the playlist before selecting the items otherwise the tag editor
     // will not update when it gets the selectionChanged() notification
     // because it will think the user is choosing a different playlist but not
     // selecting a different item.
 
     m_collection->raise(l);
 
     l->setCurrentItem(playingItem());
     l->scrollToItem(playingItem());
 }
 
 void Playlist::slotColumnResizeModeChanged()
 {
     if(manualResize()) {
         header()->setSectionResizeMode(QHeaderView::Interactive);
         setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     } else {
         header()->setSectionResizeMode(QHeaderView::Fixed);
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     }
 
     if(!manualResize())
         slotUpdateColumnWidths();
 
     SharedSettings::instance()->sync();
 }
 
 void Playlist::dataChanged()
 {
     if(m_blockDataChanged)
         return;
     PlaylistInterface::dataChanged();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
 
 void Playlist::removeFromDisk(const PlaylistItemList &items)
 {
     if(isVisible() && !items.isEmpty()) {
 
         QStringList files;
         foreach(const PlaylistItem *item, items)
             files.append(item->file().absFilePath());
 
         DeleteDialog dialog(this);
 
         m_blockDataChanged = true;
 
         if(dialog.confirmDeleteList(files)) {
             bool shouldDelete = dialog.shouldDelete();
             QStringList errorFiles;
 
             foreach(PlaylistItem *item, items) {
                 if(playingItem() == item)
                     action("forward")->trigger();
 
                 QString removePath = item->file().absFilePath();
                 if((!shouldDelete && KIO::NetAccess::synchronousRun(KIO::trash(removePath), this)) ||
                    (shouldDelete && QFile::remove(removePath)))
                 {
                     delete item->collectionItem();
                 }
                 else
                     errorFiles.append(item->file().absFilePath());
             }
 
             if(!errorFiles.isEmpty()) {
                 QString errorMsg = shouldDelete ?
                         i18n("Could not delete these files") :
                         i18n("Could not move these files to the Trash");
                 KMessageBox::errorList(this, errorMsg, errorFiles);
             }
         }
 
         m_blockDataChanged = false;
 
         dataChanged();
     }
 }
 
 void Playlist::dragEnterEvent(QDragEnterEvent *e)
 {
     if(CoverDrag::isCover(e->mimeData())) {
         //setDropHighlighter(true);
         setDropIndicatorShown(false);
 
         e->accept();
         return;
     }
 
     //setDropHighlighter(false);
     setDropIndicatorShown(true);
 
     const KUrl::List urls = KUrl::List::fromMimeData(e->mimeData());
 
     if (urls.isEmpty()) {
         e->ignore();
         return;
     }
 
     if(e->mimeData()->hasUrls())
         e->acceptProposedAction();
     return;
 }
 
 bool Playlist::acceptDrag(QDropEvent *e) const
 {
     return CoverDrag::isCover(e->mimeData()) || KUrl::List::canDecode(e->mimeData());
 }
 
 void Playlist::decode(const QMimeData *s, PlaylistItem *item)
 {
     if(!KUrl::List::canDecode(s))
         return;
 
     const KUrl::List urls = KUrl::List::fromMimeData(s);
 
     if(urls.isEmpty())
         return;
 
     // handle dropped images
 
     if(!MediaFiles::isMediaFile(urls.front().path())) {
 
         QString file;
 
         if(urls.front().isLocalFile())
             file = urls.front().path();
         else
             KIO::NetAccess::download(urls.front(), file, 0);
 
         KMimeType::Ptr mimeType = KMimeType::findByPath(file);
 
         if(item && mimeType->name().startsWith(QLatin1String("image/"))) {
             item->file().coverInfo()->setCover(QImage(file));
             refreshAlbum(item->file().tag()->artist(),
                          item->file().tag()->album());
         }
 
         KIO::NetAccess::removeTempFile(file);
     }
 
     QStringList fileList = MediaFiles::convertURLsToLocal(urls, this);
 
     addFiles(fileList, item);
 }
 
 bool Playlist::eventFilter(QObject *watched, QEvent *e)
 {
     if(watched == header()) {
         switch(e->type()) {
         case QEvent::MouseMove:
         {
             if((static_cast<QMouseEvent *>(e)->modifiers() & Qt::LeftButton) == Qt::LeftButton &&
                 !action<KToggleAction>("resizeColumnsManually")->isChecked())
             {
                 m_columnWidthModeChanged = true;
 
                 action<KToggleAction>("resizeColumnsManually")->setChecked(true);
                 slotColumnResizeModeChanged();
             }
 
             break;
         }
         case QEvent::MouseButtonPress:
         {
             if(static_cast<QMouseEvent *>(e)->button() == Qt::RightButton)
                 m_headerMenu->popup(QCursor::pos());
 
             break;
         }
         case QEvent::MouseButtonRelease:
         {
             if(m_columnWidthModeChanged) {
                 m_columnWidthModeChanged = false;
                 notifyUserColumnWidthModeChanged();
             }
 
             if(!manualResize() && m_widthsDirty)
                 QTimer::singleShot(0, this, SLOT(slotUpdateColumnWidths()));
             break;
         }
         default:
             break;
         }
     }
 
     return QTreeWidget::eventFilter(watched, e);
 }
 
 void Playlist::keyPressEvent(QKeyEvent *event)
 {
     if(event->key() == Qt::Key_Up) {
         using ::operator|;
         QTreeWidgetItemIterator selected(this, QTreeWidgetItemIterator::Selected |
                                            QTreeWidgetItemIterator::NotHidden);
         if(*selected) {
             QTreeWidgetItemIterator visible(this, QTreeWidgetItemIterator::NotHidden);
             if(*selected == *visible)
                 QApplication::postEvent(parent(), new FocusUpEvent);
         }
 
     }
 
     QTreeWidget::keyPressEvent(event);
 }
 
 QStringList Playlist::mimeTypes() const
 {
     return QStringList("text/uri-list");
 }
 
 QMimeData* Playlist::mimeData(const QList<QTreeWidgetItem *> items) const
 {
     KUrl::List urls;
     foreach(QTreeWidgetItem *item, items) {
         urls << KUrl::fromPath(static_cast<PlaylistItem*>(item)->file().absFilePath());
     }
 
     QMimeData *urlDrag = new QMimeData();
 
     urlDrag->setUrls(urls);
 
     return urlDrag;
 }
 
 bool Playlist::dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action)
 {
     qCDebug(JUK_LOG) << index;
     return true;
 }
 
 void Playlist::dropEvent(QDropEvent *e)
 {
     QPoint vp = e->pos();
     PlaylistItem *item = static_cast<PlaylistItem *>(itemAt(vp));
 
     // First see if we're dropping a cover, if so we can get it out of the
     // way early.
     if(item && CoverDrag::isCover(e->mimeData())) {
         coverKey id = CoverDrag::idFromData(e->mimeData());
 
         // If the item we dropped on is selected, apply cover to all selected
         // items, otherwise just apply to the dropped item.
 
         if(item->isSelected()) {
             const PlaylistItemList selItems = selectedItems();
             foreach(PlaylistItem *playlistItem, selItems) {
                 playlistItem->file().coverInfo()->setCoverId(id);
                 playlistItem->refresh();
             }
         }
         else {
             item->file().coverInfo()->setCoverId(id);
             item->refresh();
         }
 
         return;
     }
 
     // When dropping on the toUpper half of an item, insert before this item.
     // This is what the user expects, and also allows the insertion at
     // top of the list
 
     QRect rect = visualItemRect(item);
     if(!item)
         item = static_cast<PlaylistItem *>(topLevelItem(topLevelItemCount() - 1));
     else if(vp.y() < rect.y() + rect.height() / 2)
         item = static_cast<PlaylistItem *>(item->itemAbove());
 
     m_blockDataChanged = true;
 
     if(e->source() == this) {
 
         // Since we're trying to arrange things manually, turn off sorting.
 
         sortItems(columnCount() + 1, Qt::AscendingOrder);
 
         const QList<QTreeWidgetItem *> items = QTreeWidget::selectedItems();
 
         foreach(QTreeWidgetItem *listViewItem, items) {
             if(!item) {
 
                 // Insert the item at the top of the list.  This is a bit ugly,
                 // but I don't see another way.
 
                 takeItem(listViewItem);
                 insertItem(listViewItem);
             }
             //else
             //    listViewItem->moveItem(item);
 
             item = static_cast<PlaylistItem *>(listViewItem);
         }
     }
     else
         decode(e->mimeData(), item);
 
     m_blockDataChanged = false;
 
     dataChanged();
     emit signalPlaylistItemsDropped(this);
     QTreeWidget::dropEvent(e);
 }
 
 void Playlist::showEvent(QShowEvent *e)
 {
     if(m_applySharedSettings) {
         SharedSettings::instance()->apply(this);
         m_applySharedSettings = false;
     }
 
     QTreeWidget::showEvent(e);
 }
 
 void Playlist::applySharedSettings()
 {
     m_applySharedSettings = true;
 }
 
 void Playlist::read(QDataStream &s)
 {
     s >> m_playlistName
       >> m_fileName;
 
     // m_fileName is probably empty.
     if(m_playlistName.isEmpty())
         throw BICStreamException();
 
     // Do not sort. Add the files in the order they were saved.
     setSortingEnabled(false);
 
     QStringList files;
     s >> files;
 
     QTreeWidgetItem *after = 0;
 
     m_blockDataChanged = true;
 
     foreach(const QString &file, files) {
         if(file.isEmpty())
             throw BICStreamException();
 
         after = createItem(FileHandle(file), after, false);
     }
 
     m_blockDataChanged = false;
 
     dataChanged();
     m_collection->setupPlaylist(this, "audio-midi");
 }
 
 void Playlist::paintEvent(QPaintEvent *pe)
 {
     // If there are columns that need to be updated, well, update them.
 
     if(!m_weightDirty.isEmpty() && !manualResize())
     {
         calculateColumnWeights();
         slotUpdateColumnWidths();
     }
 
     QTreeWidget::paintEvent(pe);
 }
 
 void Playlist::resizeEvent(QResizeEvent *re)
 {
     // If the width of the view has changed, manually update the column
     // widths.
 
     if(re->size().width() != re->oldSize().width() && !manualResize())
         slotUpdateColumnWidths();
 
     QTreeWidget::resizeEvent(re);
 }
 
 void Playlist::insertItem(QTreeWidgetItem *item)
 {
     // Because we're called from the PlaylistItem ctor, item may not be a
     // PlaylistItem yet (it would be QListViewItem when being inserted.  But,
     // it will be a PlaylistItem by the time it matters, but be careful if
     // you need to use the PlaylistItem from here.
 
     m_addTime.append(static_cast<PlaylistItem *>(item));
     QTreeWidget::insertTopLevelItem(0, item);
 }
 
 void Playlist::takeItem(QTreeWidgetItem *item)
 {
     // See the warning in Playlist::insertItem.
 
     m_subtractTime.append(static_cast<PlaylistItem *>(item));
     int index = indexOfTopLevelItem(item);
     QTreeWidget::takeTopLevelItem(index);
 }
 
 void Playlist::addColumn(const QString &label, int)
 {
     m_columns.append(label);
     setHeaderLabels(m_columns);
 }
 
 PlaylistItem *Playlist::createItem(const FileHandle &file,
                                    QTreeWidgetItem *after, bool emitChanged)
 {
     return createItem<PlaylistItem>(file, after, emitChanged);
 }
 
 void Playlist::createItems(const PlaylistItemList &siblings, PlaylistItem *after)
 {
     createItems<PlaylistItem, PlaylistItem>(siblings, after);
 }
 
 void Playlist::addFiles(const QStringList &files, PlaylistItem *after)
 {
     if(!after)
         after = static_cast<PlaylistItem *>(topLevelItem(topLevelItemCount() - 1));
 
     QApplication::setOverrideCursor(Qt::WaitCursor);
 
     m_blockDataChanged = true;
 
     FileHandleList queue;
 
     foreach(const QString &file, files)
         addFile(file, queue, true, &after);
 
     addFileHelper(queue, &after, true);
 
     m_blockDataChanged = false;
 
     slotWeightDirty();
     dataChanged();
 
     QApplication::restoreOverrideCursor();
 }
 
 void Playlist::refreshAlbums(const PlaylistItemList &items, coverKey id)
 {
     QList< QPair<QString, QString> > albums;
     bool setAlbumCovers = items.count() == 1;
 
     foreach(const PlaylistItem *item, items) {
         QString artist = item->file().tag()->artist();
         QString album = item->file().tag()->album();
 
         if(!albums.contains(qMakePair(artist, album)))
             albums.append(qMakePair(artist, album));
 
         item->file().coverInfo()->setCoverId(id);
         if(setAlbumCovers)
             item->file().coverInfo()->applyCoverToWholeAlbum(true);
     }
 
     for(QList< QPair<QString, QString> >::ConstIterator it = albums.constBegin();
         it != albums.constEnd(); ++it)
     {
         refreshAlbum((*it).first, (*it).second);
     }
 }
 
 void Playlist::updatePlaying() const
 {
     foreach(const PlaylistItem *item, PlaylistItem::playingItems())
         item->treeWidget()->viewport()->update();
 }
 
 void Playlist::refreshAlbum(const QString &artist, const QString &album)
 {
     ColumnList columns;
     columns.append(PlaylistItem::ArtistColumn);
     PlaylistSearch::Component artistComponent(artist, false, columns,
                                               PlaylistSearch::Component::Exact);
 
     columns.clear();
     columns.append(PlaylistItem::AlbumColumn);
     PlaylistSearch::Component albumComponent(album, false, columns,
                                              PlaylistSearch::Component::Exact);
 
     PlaylistSearch::ComponentList components;
     components.append(artist);
     components.append(album);
 
     PlaylistList playlists;
     playlists.append(CollectionList::instance());
 
     PlaylistSearch search(playlists, components);
     const PlaylistItemList matches = search.matchedItems();
 
     foreach(PlaylistItem *item, matches)
         item->refresh();
 }
 
 void Playlist::hideColumn(int c, bool updateSearch)
 {
     foreach (QAction *action, m_headerMenu->actions()) {
         if(!action)
             continue;
 
         if (action->data().toInt() == c) {
             action->setChecked(false);
             break;
         }
     }
 
     if(isColumnHidden(c))
         return;
     
     QTreeWidget::hideColumn(c);
     
     if(c == m_leftColumn) {
         updatePlaying();
         m_leftColumn = leftMostVisibleColumn();
     }
 
     if(!manualResize()) {
         slotUpdateColumnWidths();
         viewport()->update();
     }
 
     if(this != CollectionList::instance())
         CollectionList::instance()->hideColumn(c, false);
 
     if(updateSearch)
         redisplaySearch();
 }
 
 void Playlist::showColumn(int c, bool updateSearch)
 {
     foreach (QAction *action, m_headerMenu->actions()) {
         if(!action)
             continue;
 
         if (action->data().toInt() == c) {
             action->setChecked(true);
             break;
         }
     }
 
     if(!isColumnHidden(c))
         return;
 
     QTreeWidget::showColumn(c);
 
     if(c == leftMostVisibleColumn()) {
         updatePlaying();
         m_leftColumn = leftMostVisibleColumn();
     }
 
     if(!manualResize()) {
         slotUpdateColumnWidths();
         viewport()->update();
     }
 
     if(this != CollectionList::instance())
         CollectionList::instance()->showColumn(c, false);
 
     if(updateSearch)
         redisplaySearch();
 }
 
 void Playlist::sortByColumn(int column, Qt::SortOrder order)
 {
     setSortingEnabled(true);
     QTreeWidget::sortByColumn(column, order);
 }
 
 void Playlist::slotInitialize()
 {
     addColumn(i18n("Track Name"));
     addColumn(i18n("Artist"));
     addColumn(i18n("Album"));
     addColumn(i18n("Cover"));
     addColumn(i18nc("cd track number", "Track"));
     addColumn(i18n("Genre"));
     addColumn(i18n("Year"));
     addColumn(i18n("Length"));
     addColumn(i18n("Bitrate"));
     addColumn(i18n("Comment"));
     addColumn(i18n("File Name"));
     addColumn(i18n("File Name (full path)"));
 
     // FIXME rename
     /*setRenameable(PlaylistItem::TrackColumn, true);
     setRenameable(PlaylistItem::ArtistColumn, true);
     setRenameable(PlaylistItem::AlbumColumn, true);
     setRenameable(PlaylistItem::TrackNumberColumn, true);
     setRenameable(PlaylistItem::GenreColumn, true);
     setRenameable(PlaylistItem::YearColumn, true);*/
 
     setAllColumnsShowFocus(true);
     setSelectionMode(QTreeWidget::ExtendedSelection);
     header()->setSortIndicatorShown(true);
 
     m_columnFixedWidths.resize(columnCount());
 
     //////////////////////////////////////////////////
     // setup header RMB menu
     //////////////////////////////////////////////////
 
 #ifdef __GNUC__
     #warning should be fixed...
 #endif
     /* m_headerMenu->insertTitle(i18n("Show")); */
 
     QAction *showAction;
 
     for(int i = 0; i < header()->count(); ++i) {
         if(i - columnOffset() == PlaylistItem::FileNameColumn)
             m_headerMenu->addSeparator();
 
         showAction = new QAction(headerItem()->text(i), m_headerMenu);
         showAction->setData(i);
         showAction->setCheckable(true);
         showAction->setChecked(true);
         m_headerMenu->addAction(showAction);
 
         resizeColumnToContents(i);
     }
 
     connect(m_headerMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotToggleColumnVisible(QAction*)));
 
     connect(this, SIGNAL(customContextMenuRequested(QPoint)),
             this, SLOT(slotShowRMBMenu(QPoint)));
     // FIXME rename
     /*connect(this, SIGNAL(itemRenamed(QTreeWidgetItem*,QString,int)),
             this, SLOT(slotInlineEditDone(QTreeWidgetItem*,QString,int)));*/
     connect(this, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
             this, SLOT(slotPlayCurrent()));
     // FIXME returnPressed
     /*connect(this, SIGNAL(returnPressed(QTreeWidgetItem*)),
             this, SLOT(slotPlayCurrent()));*/
 
     // FIXME rename
     /*connect(renameLineEdit(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)),
             this, SLOT(slotInlineCompletionModeChanged(KGlobalSettings::Completion)));*/
 
     connect(action("resizeColumnsManually"), SIGNAL(triggered()),
             this, SLOT(slotColumnResizeModeChanged()));
 
     if(action<KToggleAction>("resizeColumnsManually")->isChecked()) {
         header()->setSectionResizeMode(QHeaderView::Interactive);
         setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     } else {
         header()->setSectionResizeMode(QHeaderView::Fixed);
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     }
 
     viewport()->setAcceptDrops(true);
     setDropIndicatorShown(true);
     setDragEnabled(true);
 
     m_disableColumnWidthUpdates = false;
 
     // FIXME tooltips
     //setShowToolTips(false);
     /* m_toolTip = new PlaylistToolTip(viewport(), this); */
 }
 
 void Playlist::setupItem(PlaylistItem *item)
 {
     item->setTrackId(g_trackID);
     g_trackID++;
 
     if(!m_search.isEmpty())
         item->setHidden(!m_search.checkItem(item));
 
     if(topLevelItemCount() <= 2 && !manualResize()) {
         slotWeightDirty();
         slotUpdateColumnWidths();
         viewport()->update();
     }
 }
 
 void Playlist::setDynamicListsFrozen(bool frozen)
 {
     m_collection->setDynamicListsFrozen(frozen);
 }
 
 CollectionListItem *Playlist::collectionListItem(const FileHandle &file)
 {
     if(!QFile::exists(file.absFilePath())) {
         qCCritical(JUK_LOG) << "File" << file.absFilePath() << "does not exist.";
         return 0;
     }
 
     CollectionListItem *item = CollectionList::instance()->lookup(file.absFilePath());
 
     if(!item) {
         item = CollectionList::instance()->createItem(file);
     }
 
     return item;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // protected slots
 ////////////////////////////////////////////////////////////////////////////////
 
 void Playlist::slotPopulateBackMenu() const
 {
     if(!playingItem())
         return;
 
     QMenu *menu = action<KToolBarPopupAction>("back")->menu();
     menu->clear();
     m_backMenuItems.clear();
     m_backMenuItems.reserve(10);
 
     int count = 0;
     PlaylistItemList::ConstIterator it = m_history.constEnd();
 
     QAction *action;
 
     while(it != m_history.constBegin() && count < 10) {
         ++count;
         --it;
         action = new QAction((*it)->file().tag()->title(), menu);
         action->setData(count - 1);
         menu->addAction(action);
         m_backMenuItems << *it;
     }
 }
 
 void Playlist::slotPlayFromBackMenu(QAction *backAction) const
 {
     int number = backAction->data().toInt();
 
     if(number >= m_backMenuItems.size())
         return;
 
     TrackSequenceManager::instance()->setNextItem(m_backMenuItems[number]);
     action("forward")->trigger();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
 void Playlist::setup()
 {
     setRootIsDecorated(false);
     setContextMenuPolicy(Qt::CustomContextMenu);
 
     connect(header(), SIGNAL(sectionMoved(int,int,int)), this, SLOT(slotColumnOrderChanged(int,int,int)));
 
     connect(m_fetcher, SIGNAL(signalCoverChanged(int)), this, SLOT(slotCoverChanged(int)));
 
     // Prevent list of selected items from changing while internet search is in
     // progress.
     connect(this, SIGNAL(itemSelectionChanged()), m_fetcher, SLOT(abortSearch()));
 
     sortByColumn(1, Qt::AscendingOrder);
 
     // This apparently must be created very early in initialization for other
     // Playlist code requiring m_headerMenu.
     m_columnVisibleAction = new KActionMenu(i18n("&Show Columns"), this);
     ActionCollection::actions()->addAction("showColumns", m_columnVisibleAction);
 
     m_headerMenu = m_columnVisibleAction->menu();
 
     header()->installEventFilter(this);
 
     // TODO: Determine if other stuff in setup must happen before slotInitialize().
 
     // Explicitly call slotInitialize() so that the columns are added before
     // SharedSettings::apply() sets the visible and hidden ones.
     slotInitialize();
 }
 
 void Playlist::loadFile(const QString &fileName, const QFileInfo &fileInfo)
 {
     QFile file(fileName);
     if(!file.open(QIODevice::ReadOnly))
         return;
 
     QTextStream stream(&file);
 
     // Turn off non-explicit sorting.
 
     setSortingEnabled(false);
 
     PlaylistItem *after = 0;
 
     m_disableColumnWidthUpdates = true;
 
     m_blockDataChanged = true;
 
     while(!stream.atEnd()) {
         QString itemName = stream.readLine().trimmed();
 
         QFileInfo item(itemName);
 
         if(item.isRelative())
             item.setFile(QDir::cleanPath(fileInfo.absolutePath() + '/' + itemName));
 
         if(item.exists() && item.isFile() && item.isReadable() &&
            MediaFiles::isMediaFile(item.fileName()))
         {
             if(after)
                 after = createItem(FileHandle(item, item.absoluteFilePath()), after, false);
             else
                 after = createItem(FileHandle(item, item.absoluteFilePath()), 0, false);
         }
     }
 
     m_blockDataChanged = false;
 
     file.close();
 
     dataChanged();
 
     m_disableColumnWidthUpdates = false;
 }
 
 void Playlist::setPlaying(PlaylistItem *item, bool addToHistory)
 {
     if(playingItem() == item)
         return;
 
     if(playingItem()) {
         if(addToHistory) {
             if(playingItem()->playlist() ==
                playingItem()->playlist()->m_collection->upcomingPlaylist())
                 m_history.append(playingItem()->collectionItem());
             else
                 m_history.append(playingItem());
         }
         playingItem()->setPlaying(false);
     }
 
     TrackSequenceManager::instance()->setCurrent(item);
 #ifdef __GNUC__
 #warning "kde4: port it"
 #endif
     //kapp->dcopClient()->emitDCOPSignal("Player", "trackChanged()", data);
 
     if(!item)
         return;
 
     item->setPlaying(true);
 
     bool enableBack = !m_history.isEmpty();
     action<KToolBarPopupAction>("back")->menu()->setEnabled(enableBack);
 }
 
 bool Playlist::playing() const
 {
     return playingItem() && this == playingItem()->playlist();
 }
 
 int Playlist::leftMostVisibleColumn() const
 {
     int i = 0;
     while(isColumnHidden(header()->visualIndex(i)) && i < PlaylistItem::lastColumn())
         i++;
 
     return header()->visualIndex(i);
 }
 
 PlaylistItemList Playlist::items(QTreeWidgetItemIterator::IteratorFlags flags)
 {
     PlaylistItemList list;
 
     for(QTreeWidgetItemIterator it(this, flags); *it; ++it)
         list.append(static_cast<PlaylistItem *>(*it));
 
     return list;
 }
 
 void Playlist::calculateColumnWeights()
 {
     if(m_disableColumnWidthUpdates)
         return;
 
     PlaylistItemList l = items();
     QList<int>::Iterator columnIt;
 
     QVector<double> averageWidth(columnCount());
     double itemCount = l.size();
 
     QVector<int> cachedWidth;
 
     // Here we're not using a real average, but averaging the squares of the
     // column widths and then using the square root of that value.  This gives
     // a nice weighting to the longer columns without doing something arbitrary
     // like adding a fixed amount of padding.
 
     foreach(PlaylistItem *item, l) {
         cachedWidth = item->cachedWidths();
 
         // Extra columns start at 0, but those weights aren't shared with all
         // items.
         for(int i = 0; i < columnOffset(); ++i) {
             averageWidth[i] +=
                 std::pow(double(columnWidth(i)), 2.0) / itemCount;
         }
 
         for(int column = columnOffset(); column < columnCount(); ++column) {
             averageWidth[column] +=
                 std::pow(double(cachedWidth[column - columnOffset()]), 2.0) / itemCount;
         }
     }
 
     if(m_columnWeights.isEmpty())
         m_columnWeights.fill(-1, columnCount());
 
     foreach(int column, m_weightDirty) {
         m_columnWeights[column] = int(std::sqrt(averageWidth[column]) + 0.5);
     }
 
     m_weightDirty.clear();
 }
 
 void Playlist::addFile(const QString &file, FileHandleList &files, bool importPlaylists,
                        PlaylistItem **after)
 {
     if(hasItem(file) && !m_allowDuplicates)
         return;
 
     addFileHelper(files, after);
 
     // Our biggest thing that we're fighting during startup is too many stats
     // of files.  Make sure that we don't do one here if it's not needed.
 
     const CollectionListItem *item = CollectionList::instance()->lookup(file);
 
     if(item && !item->file().isNull()) {
         FileHandle cached(item->file());
         cached.tag();
         files.append(cached);
         return;
     }
 
     const QFileInfo fileInfo(QDir::cleanPath(file));
     if(!fileInfo.exists())
         return;
 
     const QString canonicalPath = fileInfo.canonicalFilePath();
 
     if(fileInfo.isFile() && fileInfo.isReadable()) {
         if(MediaFiles::isMediaFile(file)) {
             FileHandle f(fileInfo, canonicalPath);
             f.tag();
             files.append(f);
         }
     }
 
     if(importPlaylists && MediaFiles::isPlaylistFile(file) &&
        !m_collection->containsPlaylistFile(canonicalPath))
     {
         new Playlist(m_collection, fileInfo);
         return;
     }
 
     if(fileInfo.isDir()) {
         foreach(const QString &directory, m_collection->excludedFolders()) {
             if(canonicalPath.startsWith(directory))
                 return; // Exclude it
         }
 
         QDirIterator dirIterator(canonicalPath, QDir::AllEntries | QDir::NoDotAndDotDot);
 
         while(dirIterator.hasNext()) {
             // We set importPlaylists to the value from the add directories
             // dialog as we want to load all of the ones that the user has
             // explicitly asked for, but not those that we find in toLower
             // directories.
 
             addFile(dirIterator.next(), files,
                     m_collection->importPlaylists(), after);
         }
     }
 }
 
 void Playlist::addFileHelper(FileHandleList &files, PlaylistItem **after, bool ignoreTimer)
 {
     static QTime time = QTime::currentTime();
 
     // Process new items every 10 seconds, when we've loaded 1000 items, or when
     // it's been requested in the API.
 
     if(ignoreTimer || time.elapsed() > 10000 ||
        (files.count() >= 1000 && time.elapsed() > 1000))
     {
         time.restart();
 
         const bool focus = hasFocus();
         const bool visible = isVisible() && files.count() > 20;
 
         if(visible)
             m_collection->raiseDistraction();
 
         foreach(const FileHandle &fileHandle, files)
             *after = createItem(fileHandle, *after, false);
 
         files.clear();
 
         if(visible)
             m_collection->lowerDistraction();
 
         if(focus)
             setFocus();
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private slots
 ////////////////////////////////////////////////////////////////////////////////
 
 void Playlist::slotUpdateColumnWidths()
 {
     if(m_disableColumnWidthUpdates || manualResize())
         return;
 
     // Make sure that the column weights have been initialized before trying to
     // update the columns.
 
     QList<int> visibleColumns;
     for(int i = 0; i < columnCount(); i++) {
         if(!isColumnHidden(i))
             visibleColumns.append(i);
     }
 
     if(count() == 0) {
         foreach(int column, visibleColumns)
             setColumnWidth(column, header()->fontMetrics().width(headerItem()->text(column)) + 10);
 
         return;
     }
 
     if(m_columnWeights.isEmpty())
         return;
 
     // First build a list of minimum widths based on the strings in the listview
     // header.  We won't let the width of the column go below this width.
 
     QVector<int> minimumWidth(columnCount(), 0);
     int minimumWidthTotal = 0;
 
     // Also build a list of either the minimum *or* the fixed width -- whichever is
     // greater.
 
     QVector<int> minimumFixedWidth(columnCount(), 0);
     int minimumFixedWidthTotal = 0;
 
     foreach(int column, visibleColumns) {
         minimumWidth[column] = header()->fontMetrics().width(headerItem()->text(column)) + 10;
         minimumWidthTotal += minimumWidth[column];
 
         minimumFixedWidth[column] = qMax(minimumWidth[column], m_columnFixedWidths[column]);
         minimumFixedWidthTotal += minimumFixedWidth[column];
     }
 
     // Make sure that the width won't get any smaller than this.  We have to
     // account for the scrollbar as well.  Since this method is called from the
     // resize event this will set a pretty hard toLower bound on the size.
 
     setMinimumWidth(minimumWidthTotal + verticalScrollBar()->width());
 
     // If we've got enough room for the fixed widths (larger than the minimum
     // widths) then instead use those for our "minimum widths".
 
     if(minimumFixedWidthTotal < viewport()->width()) {
         minimumWidth = minimumFixedWidth;
         minimumWidthTotal = minimumFixedWidthTotal;
     }
 
     // We've got a list of columns "weights" based on some statistics gathered
     // about the widths of the items in that column.  We need to find the total
     // useful weight to use as a divisor for each column's weight.
 
     double totalWeight = 0;
     foreach(int column, visibleColumns)
         totalWeight += m_columnWeights[column];
 
     // Computed a "weighted width" for each visible column.  This would be the
     // width if we didn't have to handle the cases of minimum and maximum widths.
 
     QVector<int> weightedWidth(columnCount(), 0);
     foreach(int column, visibleColumns)
         weightedWidth[column] = int(double(m_columnWeights[column]) / totalWeight * viewport()->width() + 0.5);
 
     // The "extra" width for each column.  This is the weighted width less the
     // minimum width or zero if the minimum width is greater than the weighted
     // width.
 
     QVector<int> extraWidth(columnCount(), 0);
 
     // This is used as an indicator if we have any columns where the weighted
     // width is less than the minimum width.  If this is false then we can
     // just use the weighted width with no problems, otherwise we have to
     // "readjust" the widths.
 
     bool readjust = false;
 
     // If we have columns where the weighted width is less than the minimum width
     // we need to steal that space from somewhere.  The amount that we need to
     // steal is the "neededWidth".
 
     int neededWidth = 0;
 
     // While we're on the topic of stealing -- we have to have somewhere to steal
     // from.  availableWidth is the sum of the amount of space beyond the minimum
     // width that each column has been allocated -- the sum of the values of
     // extraWidth[].
 
     int availableWidth = 0;
 
     // Fill in the values discussed above.
 
     foreach(int column, visibleColumns) {
         if(weightedWidth[column] < minimumWidth[column]) {
             readjust = true;
             extraWidth[column] = 0;
             neededWidth += minimumWidth[column] - weightedWidth[column];
         }
         else {
             extraWidth[column] = weightedWidth[column] - minimumWidth[column];
             availableWidth += extraWidth[column];
         }
     }
 
     // The adjustmentRatio is the amount of the "extraWidth[]" that columns will
     // actually be given.
 
     double adjustmentRatio = (double(availableWidth) - double(neededWidth)) / double(availableWidth);
 
     // This will be the sum of the total space that we actually use.  Because of
     // rounding error this won't be the exact available width.
 
     int usedWidth = 0;
 
     // Now set the actual column widths.  If the weighted widths are all greater
     // than the minimum widths, just use those, otherwise use the "reajusted
     // weighted width".
 
     foreach(int column, visibleColumns) {
         int width;
         if(readjust) {
             int adjustedExtraWidth = int(double(extraWidth[column]) * adjustmentRatio + 0.5);
             width = minimumWidth[column] + adjustedExtraWidth;
         }
         else
             width = weightedWidth[column];
 
         setColumnWidth(column, width);
         usedWidth += width;
     }
 
     // Fill the remaining gap for a clean fit into the available space.
 
     int remainingWidth = viewport()->width() - usedWidth;
     setColumnWidth(visibleColumns.back(), columnWidth(visibleColumns.back()) + remainingWidth);
 
     m_widthsDirty = false;
 }
 
 void Playlist::slotAddToUpcoming()
 {
     m_collection->setUpcomingPlaylistEnabled(true);
     m_collection->upcomingPlaylist()->appendItems(selectedItems());
 }
 
 void Playlist::slotShowRMBMenu(const QPoint &point)
 {
     QTreeWidgetItem *item = itemAt(point);
     int column = columnAt(point.x());
     if(!item)
         return;
 
     // Create the RMB menu on demand.
 
     if(!m_rmbMenu) {
 
         // Probably more of these actions should be ported over to using KActions.
 
         m_rmbMenu = new QMenu(this);
 
         m_rmbMenu->addAction(SmallIcon("go-jump-today"),
             i18n("Add to Play Queue"), this, SLOT(slotAddToUpcoming()));
         m_rmbMenu->addSeparator();
 
         if(!readOnly()) {
             m_rmbMenu->addAction( action("edit_cut") );
             m_rmbMenu->addAction( action("edit_copy") );
             m_rmbMenu->addAction( action("edit_paste") );
             m_rmbMenu->addSeparator();
             m_rmbMenu->addAction( action("removeFromPlaylist") );
         }
         else
             m_rmbMenu->addAction( action("edit_copy") );
 
         m_rmbEdit = m_rmbMenu->addAction(i18n("Edit"), this, SLOT(slotRenameTag()));
 
         m_rmbMenu->addAction( action("refresh") );
         m_rmbMenu->addAction( action("removeItem") );
 
         m_rmbMenu->addSeparator();
 
         m_rmbMenu->addAction( action("guessTag") );
         m_rmbMenu->addAction( action("renameFile") );
 
         m_rmbMenu->addAction( action("coverManager") );
 
         m_rmbMenu->addSeparator();
 
         m_rmbMenu->addAction(
             SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, SLOT(slotCreateGroup()));
     }
 
     // Ignore any columns added by subclasses.
 
     column -= columnOffset();
 
     bool showEdit =
         (column == PlaylistItem::TrackColumn) ||
         (column == PlaylistItem::ArtistColumn) ||
         (column == PlaylistItem::AlbumColumn) ||
         (column == PlaylistItem::TrackNumberColumn) ||
         (column == PlaylistItem::GenreColumn) ||
         (column == PlaylistItem::YearColumn);
 
     if(showEdit)
         m_rmbEdit->setText(i18n("Edit '%1'", item->text(column + columnOffset())));
 
     m_rmbEdit->setVisible(showEdit);
 
     // Disable edit menu if only one file is selected, and it's read-only
 
     FileHandle file = static_cast<PlaylistItem*>(item)->file();
 
     m_rmbEdit->setEnabled(file.fileInfo().isWritable() || selectedItems().count() > 1);
 
     // View cover is based on if there is a cover to see.  We should only have
     // the remove cover option if the cover is in our database (and not directly
     // embedded in the file, for instance).
 
     action("viewCover")->setEnabled(file.coverInfo()->hasCover());
     action("removeCover")->setEnabled(file.coverInfo()->coverId() != CoverManager::NoMatch);
 
     m_rmbMenu->popup(mapToGlobal(point));
     m_currentColumn = column + columnOffset();
 }
 
 void Playlist::slotRenameTag()
 {
     // setup completions and validators
 
     // FIXME rename
     /*CollectionList *list = CollectionList::instance();
 
     KLineEdit *edit = renameLineEdit();
 
     switch(m_currentColumn - columnOffset())
     {
     case PlaylistItem::ArtistColumn:
         edit->completionObject()->setItems(list->uniqueSet(CollectionList::Artists));
         break;
     case PlaylistItem::AlbumColumn:
         edit->completionObject()->setItems(list->uniqueSet(CollectionList::Albums));
         break;
     case PlaylistItem::GenreColumn:
     {
         QStringList genreList;
         TagLib::StringList genres = TagLib::ID3v1::genreList();
         for(TagLib::StringList::Iterator it = genres.begin(); it != genres.end(); ++it)
             genreList.append(TStringToQString((*it)));
         edit->completionObject()->setItems(genreList);
         break;
     }
     default:
         edit->completionObject()->clear();
         break;
     }
 
     m_editText = currentItem()->text(m_currentColumn);
 
     rename(currentItem(), m_currentColumn);*/
 }
 
 bool Playlist::editTag(PlaylistItem *item, const QString &text, int column)
 {
     Tag *newTag = TagTransactionManager::duplicateTag(item->file().tag());
 
     switch(column - columnOffset())
     {
     case PlaylistItem::TrackColumn:
         newTag->setTitle(text);
         break;
     case PlaylistItem::ArtistColumn:
         newTag->setArtist(text);
         break;
     case PlaylistItem::AlbumColumn:
         newTag->setAlbum(text);
         break;
     case PlaylistItem::TrackNumberColumn:
     {
         bool ok;
         int value = text.toInt(&ok);
         if(ok)
             newTag->setTrack(value);
         break;
     }
     case PlaylistItem::GenreColumn:
         newTag->setGenre(text);
         break;
     case PlaylistItem::YearColumn:
     {
         bool ok;
         int value = text.toInt(&ok);
         if(ok)
             newTag->setYear(value);
         break;
     }
     }
 
     TagTransactionManager::instance()->changeTagOnItem(item, newTag);
     return true;
 }
 
 void Playlist::slotInlineEditDone(QTreeWidgetItem *, const QString &, int column)
 {
     // FIXME rename
     /*QString text = renameLineEdit()->text();
     bool changed = false;
 
     PlaylistItemList l = selectedItems();
 
     // See if any of the files have a tag different from the input.
 
     for(PlaylistItemList::ConstIterator it = l.constBegin(); it != l.constEnd() && !changed; ++it)
         if((*it)->text(column - columnOffset()) != text)
             changed = true;
 
     if(!changed ||
        (l.count() > 1 && KMessageBox::warningContinueCancel(
            0,
            i18n("This will edit multiple files. Are you sure?"),
            QString(),
            KGuiItem(i18n("Edit")),
            KStandardGuiItem::cancel(),
            "DontWarnMultipleTags") == KMessageBox::Cancel))
     {
         return;
     }
 
     foreach(PlaylistItem *item, l)
         editTag(item, text, column);
 
     TagTransactionManager::instance()->commit();
 
     CollectionList::instance()->dataChanged();
     dataChanged();
     update();*/
 }
 
 void Playlist::slotColumnOrderChanged(int, int from, int to)
 {
     if(from == 0 || to == 0) {
         updatePlaying();
         m_leftColumn = header()->sectionPosition(0);
     }
 
     SharedSettings::instance()->setColumnOrder(this);
 }
 
 void Playlist::slotToggleColumnVisible(QAction *action)
 {
     int column = action->data().toInt();
 
     if(isColumnHidden(column)) {
         int fileNameColumn = PlaylistItem::FileNameColumn + columnOffset();
         int fullPathColumn = PlaylistItem::FullPathColumn + columnOffset();
 
         if(column == fileNameColumn && !isColumnHidden(fullPathColumn)) {
             hideColumn(fullPathColumn, false);
             SharedSettings::instance()->toggleColumnVisible(fullPathColumn);
         }
         if(column == fullPathColumn && !isColumnHidden(fileNameColumn)) {
             hideColumn(fileNameColumn, false);
             SharedSettings::instance()->toggleColumnVisible(fileNameColumn);
         }
     }
 
     if(!isColumnHidden(column))
         hideColumn(column);
     else
         showColumn(column);
 
     if(column >= columnOffset()) {
         SharedSettings::instance()->toggleColumnVisible(column - columnOffset());
     }
 }
 
 void Playlist::slotCreateGroup()
 {
     QString name = m_collection->playlistNameDialog(i18n("Create New Playlist"));
 
     if(!name.isEmpty())
         new Playlist(m_collection, selectedItems(), name);
 }
 
 void Playlist::notifyUserColumnWidthModeChanged()
 {
     KMessageBox::information(this,
                              i18n("Manual column widths have been enabled. You can "
                                   "switch back to automatic column sizes in the view "
                                   "menu."),
                              i18n("Manual Column Widths Enabled"),
                              "ShowManualColumnWidthInformation");
 }
 
 void Playlist::columnResized(int column, int, int newSize)
 {
     m_widthsDirty = true;
     m_columnFixedWidths[column] = newSize;
 }
 
 void Playlist::slotInlineCompletionModeChanged(KGlobalSettings::Completion mode)
 {
     SharedSettings::instance()->setInlineCompletionMode(mode);
 }
 
 void Playlist::slotPlayCurrent()
 {
     QTreeWidgetItemIterator it(this, QTreeWidgetItemIterator::Selected);
     PlaylistItem *next = static_cast<PlaylistItem *>(*it);
     TrackSequenceManager::instance()->setNextItem(next);
     action("forward")->trigger();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // helper functions
 ////////////////////////////////////////////////////////////////////////////////
 
 QDataStream &operator<<(QDataStream &s, const Playlist &p)
 {
     s << p.name();
     s << p.fileName();
     s << p.files();
 
     return s;
 }
 
 QDataStream &operator>>(QDataStream &s, Playlist &p)
 {
     p.read(s);
     return s;
 }
 
 bool processEvents()
 {
     static QTime time = QTime::currentTime();
 
     if(time.elapsed() > 100) {
         time.restart();
         qApp->processEvents();
         return true;
     }
     return false;
 }
 
 // vim: set et sw=4 tw=0 sta:
diff --git a/tag.cpp b/tag.cpp
index 38b2914e..064c14db 100644
--- a/tag.cpp
+++ b/tag.cpp
@@ -1,247 +1,247 @@
 /**
  * Copyright (C) 2002-2004 Scott Wheeler <wheeler@kde.org>
  * Copyright (C) 2009 Michael Pyne <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.
  *
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 #include "tag.h"
 
 #include <klocale.h>
 
 #include <QtCore/QFile>
 
 #include <taglib/tag.h>
 #include <tfile.h>
 #include <audioproperties.h>
 #include <id3v2framefactory.h>
 
 #include "cache.h"
 #include "mediafiles.h"
 #include "stringshare.h"
 #include "juk_debug.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
 
 Tag::Tag(const QString &fileName) :
     m_fileName(fileName),
     m_track(0),
     m_year(0),
     m_seconds(0),
     m_bitrate(0),
     m_isValid(false)
 {
     if(fileName.isEmpty()) {
         qCCritical(JUK_LOG) << "Trying to add empty file";
         return;
     }
 
     TagLib::File *file = MediaFiles::fileFactoryByType(fileName);
     if(file && file->isValid()) {
         setup(file);
         delete file;
     }
     else {
         qCCritical(JUK_LOG) << "Couldn't resolve the mime type of \"" <<
-            fileName << "\" -- this shouldn't happen." << endl;
+            fileName << "\" -- this shouldn't happen.";
     }
 }
 
 bool Tag::save()
 {
     bool result;
     TagLib::ID3v2::FrameFactory::instance()->setDefaultTextEncoding(TagLib::String::UTF8);
     TagLib::File *file = MediaFiles::fileFactoryByType(m_fileName);
 
     if(file && !file->readOnly() && file->isValid() && file->tag()) {
         file->tag()->setTitle(TagLib::String(m_title.toUtf8().constData(), TagLib::String::UTF8));
         file->tag()->setArtist(TagLib::String(m_artist.toUtf8().constData(), TagLib::String::UTF8));
         file->tag()->setAlbum(TagLib::String(m_album.toUtf8().constData(), TagLib::String::UTF8));
         file->tag()->setGenre(TagLib::String(m_genre.toUtf8().constData(), TagLib::String::UTF8));
         file->tag()->setComment(TagLib::String(m_comment.toUtf8().constData(), TagLib::String::UTF8));
         file->tag()->setTrack(m_track);
         file->tag()->setYear(m_year);
         result = file->save();
     }
     else {
         qCCritical(JUK_LOG) << "Couldn't save file.";
         result = false;
     }
 
     delete file;
     return result;
 }
 
 QString Tag::playingString() const
 {
     QString str;
     if(artist().isEmpty())
         str = title();
     else {
         str = i18nc("a playing track, %1 is artist, %2 is song title",
                     "%1 - <i>%2</i>", artist(), title());
     }
 
     return str;
 }
 
 CacheDataStream &Tag::read(CacheDataStream &s)
 {
     switch(s.cacheVersion()) {
     case 1: {
         qint32 track;
         qint32 year;
         qint32 bitrate;
         qint32 seconds;
 
         s >> m_title
           >> m_artist
           >> m_album
           >> m_genre
           >> track
           >> year
           >> m_comment
           >> bitrate
           >> m_lengthString
           >> seconds;
 
         m_track = track;
         m_year = year;
         m_bitrate = bitrate;
         m_seconds = seconds;
         break;
     }
     default: {
         static QString dummyString;
         static int dummyInt;
         QString bitrateString;
 
         s >> dummyInt
           >> m_title
           >> m_artist
           >> m_album
           >> m_genre
           >> dummyInt
           >> m_track
           >> dummyString
           >> m_year
           >> dummyString
           >> m_comment
           >> bitrateString
           >> m_lengthString
           >> m_seconds
           >> dummyString;
 
         bool ok;
         m_bitrate = bitrateString.toInt(&ok);
         if(!ok)
             m_bitrate = 0;
         break;
     }
     }
 
     minimizeMemoryUsage();
     return s;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private methods
 ////////////////////////////////////////////////////////////////////////////////
 
 Tag::Tag(const QString &fileName, bool) :
     m_fileName(fileName),
     m_track(0),
     m_year(0),
     m_seconds(0),
     m_bitrate(0),
     m_isValid(true)
 {
 
 }
 
 void Tag::setup(TagLib::File *file)
 {
     if(!file || !file->tag()) {
         qCWarning(JUK_LOG) << "Can't setup invalid file" << m_fileName;
         return;
     }
 
     m_title   = TStringToQString(file->tag()->title()).trimmed();
     m_artist  = TStringToQString(file->tag()->artist()).trimmed();
     m_album   = TStringToQString(file->tag()->album()).trimmed();
     m_genre   = TStringToQString(file->tag()->genre()).trimmed();
     m_comment = TStringToQString(file->tag()->comment()).trimmed();
 
     m_track = file->tag()->track();
     m_year  = file->tag()->year();
 
     m_seconds = file->audioProperties()->length();
     m_bitrate = file->audioProperties()->bitrate();
 
     const int seconds = m_seconds % 60;
     const int minutes = (m_seconds - seconds) / 60;
 
     m_lengthString = QString::number(minutes) + (seconds >= 10 ? ":" : ":0") + QString::number(seconds);
 
     if(m_title.isEmpty()) {
         int i = m_fileName.lastIndexOf('/');
         int j = m_fileName.lastIndexOf('.');
         m_title = i > 0 ? m_fileName.mid(i + 1, j - i - 1) : m_fileName;
     }
 
     minimizeMemoryUsage();
     m_isValid = true;
 }
 
 void Tag::minimizeMemoryUsage()
 {
     // Try to reduce memory usage: share tags that frequently repeat, squeeze others
 
     m_title.squeeze();
     m_lengthString.squeeze();
 
     m_comment = StringShare::tryShare(m_comment);
     m_artist  = StringShare::tryShare(m_artist);
     m_album   = StringShare::tryShare(m_album);
     m_genre   = StringShare::tryShare(m_genre);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // related functions
 ////////////////////////////////////////////////////////////////////////////////
 
 QDataStream &operator<<(QDataStream &s, const Tag &t)
 {
     s << t.title()
       << t.artist()
       << t.album()
       << t.genre()
       << qint32(t.track())
       << qint32(t.year())
       << t.comment()
       << qint32(t.bitrate())
       << t.lengthString()
       << qint32(t.seconds());
 
     return s;
 }
 
 CacheDataStream &operator>>(CacheDataStream &s, Tag &t)
 {
     return t.read(s);
 }
 
 // vim: set et sw=4 tw=0 sta: