Commit 6601c3cf authored by camilo higuita's avatar camilo higuita

Merge branch 'fmh' into 'master'

Replace fm with fmh

See merge request kde/vvave!2
parents 13a8aa0b 8faa9859
......@@ -109,7 +109,7 @@ void AlbumsModel::setList()
{
if(!item[FMH::MODEL_KEY::ARTWORK].isEmpty() && !FMH::fileExists(QUrl::fromLocalFile(item[FMH::MODEL_KEY::ARTWORK])))
{
this->db->removeArtwork(FMH::MODEL_NAME[static_cast<FMH::MODEL_KEY>(this->query)], FM::toMap(item));
this->db->removeArtwork(FMH::MODEL_NAME[static_cast<FMH::MODEL_KEY>(this->query)], FMH::toMap(item));
item[FMH::MODEL_KEY::ARTWORK] = "";
}
});
......@@ -230,7 +230,7 @@ QVariantMap AlbumsModel::get(const int &index) const
{
if(index >= this->list.size() || index < 0)
return QVariantMap();
return FM::toMap(this->list.at(index));
return FMH::toMap(this->list.at(index));
}
void AlbumsModel::append(const QVariantMap &item)
......
......@@ -159,7 +159,7 @@ QVariantMap PlaylistsModel::get(const int &index) const
{
if(index >= this->list.size() || index < 0)
return QVariantMap();
return FM::toMap(this->list.at(index));
return FMH::toMap(this->list.at(index));
}
void PlaylistsModel::append(const QVariantMap &item)
......
......@@ -119,14 +119,14 @@ QVariantMap TracksModel::get(const int &index) const
{
if(index >= this->list.size() || index < 0)
return QVariantMap();
return FM::toMap(this->list.at(index));
return FMH::toMap(this->list.at(index));
}
QVariantList TracksModel::getAll()
{
QVariantList res;
for(const auto &item : this->list)
res << FM::toMap(item);
res << FMH::toMap(item);
return res;
}
......@@ -137,7 +137,7 @@ void TracksModel::append(const QVariantMap &item)
return;
emit this->preItemAppended();
this->list << FM::toModel(item);
this->list << FMH::toModel(item);
emit this->postItemAppended();
}
......@@ -150,7 +150,7 @@ void TracksModel::append(const QVariantMap &item, const int &at)
return;
emit this->preItemAppendedAt(at);
this->list.insert(at, FM::toModel(item));
this->list.insert(at, FMH::toModel(item));
emit this->postItemAppended();
}
......
......@@ -121,7 +121,7 @@ void vvave::openUrls(const QStringList &urls)
for(const auto &url : urls)
if(db->check_existance(BAE::TABLEMAP[BAE::TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], QUrl(url).toLocalFile()))
{
data << FM::toMap(this->db->getDBData(QStringList() << QUrl(url).toLocalFile()).first());
data << FMH::toMap(this->db->getDBData(QStringList() << QUrl(url).toLocalFile()).first());
}else
{
if(info.feed(QUrl(url).toLocalFile()))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment