diff options
Diffstat (limited to 'src/plugins/Input/flac/flacmetadatamodel.cpp')
| -rw-r--r-- | src/plugins/Input/flac/flacmetadatamodel.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index 6abb8b9c4..33a37bdfa 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -26,9 +26,6 @@ #include <qmmp/metadatamanager.h> #include "flacmetadatamodel.h" -#define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8) -#define TStringToQString_qt4(s) QString::fromUtf8(s.toCString(true)).trimmed() - FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) { m_file = 0; @@ -147,25 +144,25 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) switch((int) key) { case Qmmp::TITLE: - return TStringToQString_qt4(m_tag->title()); + return TStringToQString(m_tag->title()); case Qmmp::ARTIST: - return TStringToQString_qt4(m_tag->artist()); + return TStringToQString(m_tag->artist()); case Qmmp::ALBUMARTIST: if(m_tag->fieldListMap()["ALBUMARTIST"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["ALBUMARTIST"].front()); + return TStringToQString(m_tag->fieldListMap()["ALBUMARTIST"].front()); case Qmmp::ALBUM: - return TStringToQString_qt4(m_tag->album()); + return TStringToQString(m_tag->album()); case Qmmp::COMMENT: - return TStringToQString_qt4(m_tag->comment()); + return TStringToQString(m_tag->comment()); case Qmmp::GENRE: - return TStringToQString_qt4(m_tag->genre()); + return TStringToQString(m_tag->genre()); case Qmmp::COMPOSER: if(m_tag->fieldListMap()["COMPOSER"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["COMPOSER"].front()); + return TStringToQString(m_tag->fieldListMap()["COMPOSER"].front()); case Qmmp::YEAR: return QString::number(m_tag->year()); case Qmmp::TRACK: @@ -174,7 +171,7 @@ const QString VorbisCommentModel::value(Qmmp::MetaData key) if(m_tag->fieldListMap()["DISCNUMBER"].isEmpty()) return QString(); else - return TStringToQString_qt4(m_tag->fieldListMap()["DISCNUMBER"].front()); + return TStringToQString(m_tag->fieldListMap()["DISCNUMBER"].front()); } return QString(); } @@ -184,7 +181,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) if(!m_tag) return; - TagLib::String str = QStringToTString_qt4(value); + TagLib::String str = QStringToTString(value); switch((int) key) { |