6 files changed, 14 insertions, 13 deletions
diff --git a/src/plugins/General/covermanager/covermanager.cpp b/src/plugins/General/covermanager/covermanager.cpp
index 93d2f9af0..5b00b6078 100644
--- a/src/plugins/General/covermanager/covermanager.cpp
+++ b/src/plugins/General/covermanager/covermanager.cpp
@@ -50,7 +50,7 @@ void CoverManager::showWindow()
             pix = QPixmap(":/cm_no_cover.png");
         w->setPixmap(pix);
         MetaDataFormatter formatter("%p%if(%p&%t, - ,)%if(%t,%t,%f)");
-        w->setWindowTitle(formatter.parse(items.at(0)->metaData()));
+        w->setWindowTitle(formatter.parse(items.at(0)));
         w->show();
     }
 }
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 1cfe6e6d9..1bea2038a 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -175,7 +175,7 @@ void FileOps::execAction(int n)
             destination = QFileInfo(item->url()).absolutePath ();
             if (file.rename(destination + "/" + fname))
             {
-                item->setMetaData(Qmmp::URL, destination + "/" + fname);
+                item->insert(Qmmp::URL, destination + "/" + fname);
                 model->doCurrentVisibleRequest();
             }
             else
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index 98c06b2fc..90106b8b0 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -256,7 +256,7 @@ void HalPlugin::removePath(const QString &path)
     int i = 0;
     while (model->count() > 0 && i < model->count())
     {
-        if (model->item(i)->url ().startsWith(path))
+        if (model->item(i)->url().startsWith(path))
             model->removeAt (i);
         else
             ++i;
diff --git a/src/plugins/General/lyrics/lyrics.cpp b/src/plugins/General/lyrics/lyrics.cpp
index 65ab6182a..779f19cf1 100644
--- a/src/plugins/General/lyrics/lyrics.cpp
+++ b/src/plugins/General/lyrics/lyrics.cpp
@@ -47,9 +47,10 @@ void Lyrics::showLyrics()
     QList <PlayListItem *> items = pl_manager->selectedPlayList()->getSelectedItems();
     if (!items.isEmpty())
     {
-        if (items.at(0)->artist().isEmpty() || items.at(0)->title().isEmpty())
+        if (items.at(0)->value(Qmmp::ARTIST).isEmpty() || items.at(0)->value(Qmmp::TITLE).isEmpty())
                 return;
-            LyricsWindow *w = new LyricsWindow(items.at(0)->artist(), items.at(0)->title(), qApp->activeWindow ());
+            LyricsWindow *w = new LyricsWindow(items.at(0)->value(Qmmp::ARTIST),
+                                               items.at(0)->value(Qmmp::TITLE), qApp->activeWindow ());
             w->show();
     }
 }
diff --git a/src/plugins/General/mpris/tracklistobject.cpp b/src/plugins/General/mpris/tracklistobject.cpp
index a7d069c29..56562e8cc 100644
--- a/src/plugins/General/mpris/tracklistobject.cpp
+++ b/src/plugins/General/mpris/tracklistobject.cpp
@@ -86,15 +86,15 @@ QVariantMap TrackListObject::GetMetadata(int in0)
             map.insert("location", "file://" + item->url());
         else
             map.insert("location", item->url());
-        map.insert("title", item->title());
-        map.insert("artist", item->artist());
-        map.insert("album", item->album());
-        map.insert("tracknumber", item->track());
+        map.insert("title", item->value(Qmmp::TITLE));
+        map.insert("artist", item->value(Qmmp::ARTIST));
+        map.insert("album", item->value(Qmmp::ALBUM));
+        map.insert("tracknumber", item->value(Qmmp::TRACK));
         map.insert("time", (quint32)item->length());
         map.insert("mtime", (quint32)item->length() * 1000);
-        map.insert("genre", item->genre());
-        map.insert("comment", item->comment());
-        map.insert("year", item->year().toUInt());
+        map.insert("genre", item->value(Qmmp::GENRE));
+        map.insert("comment", item->value(Qmmp::COMMENT));
+        map.insert("year", item->value(Qmmp::YEAR).toUInt());
     }
     return map;
 }
diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp
index 19cce37a4..1a1b8d41b 100644
--- a/src/plugins/General/udisks/udisksplugin.cpp
+++ b/src/plugins/General/udisks/udisksplugin.cpp
@@ -248,7 +248,7 @@ void UDisksPlugin::removePath(const QString &path)
     int i = 0;
     while (model->count() > 0 && i < model->count())
     {
-        if (model->item(i)->url ().startsWith(path))
+        if (model->item(i)->url().startsWith(path))
             model->removeAt (i);
         else
             ++i;