diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-26 18:32:26 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-27 11:21:35 +0900 |
commit | c282724a2111c15cb624429895f0eab81509d935 (patch) | |
tree | bb4d3b2e0546327d68bc72f8031fc8e0ac015abc /tdefile-plugins/mp3 | |
parent | 938578ffc3e80f59646041c2483985f1d70692f6 (diff) | |
download | tdemultimedia-c282724a2111c15cb624429895f0eab81509d935.tar.gz tdemultimedia-c282724a2111c15cb624429895f0eab81509d935.zip |
Fix FTBFS caused by taglib as a result of the QString -> TQString remaning
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdefile-plugins/mp3')
-rw-r--r-- | tdefile-plugins/mp3/tdefile_mp3.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tdefile-plugins/mp3/tdefile_mp3.cpp b/tdefile-plugins/mp3/tdefile_mp3.cpp index 4e7d4bf6..742f0759 100644 --- a/tdefile-plugins/mp3/tdefile_mp3.cpp +++ b/tdefile-plugins/mp3/tdefile_mp3.cpp @@ -40,6 +40,8 @@ #include <id3v1genres.h> #include <id3v2framefactory.h> +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) + typedef KGenericFactory<KMp3Plugin> Mp3Factory; K_EXPORT_COMPONENT_FACTORY(tdefile_mp3, Mp3Factory( "tdefile_mp3" )) @@ -154,21 +156,21 @@ bool KMp3Plugin::readInfo(KFileMetaInfo &info, uint what) TQString date = file.tag()->year() > 0 ? TQString::number(file.tag()->year()) : TQString(); TQString track = file.tag()->track() > 0 ? TQString::number(file.tag()->track()) : TQString(); - TQString title = TQString(TStringToQString(file.tag()->title())).stripWhiteSpace(); + TQString title = TStringToTQString(file.tag()->title()).stripWhiteSpace(); if (!title.isEmpty()) appendItem(id3group, "Title", title); - TQString artist = TQString(TStringToQString(file.tag()->artist())).stripWhiteSpace(); + TQString artist = TStringToTQString(file.tag()->artist()).stripWhiteSpace(); if (!artist.isEmpty()) appendItem(id3group, "Artist", artist); - TQString album = TQString(TStringToQString(file.tag()->album())).stripWhiteSpace(); + TQString album = TStringToTQString(file.tag()->album()).stripWhiteSpace(); if (!album.isEmpty()) appendItem(id3group, "Album", album); appendItem(id3group, "Date", date); - TQString comment = TQString(TStringToQString(file.tag()->comment())).stripWhiteSpace(); + TQString comment = TStringToTQString(file.tag()->comment()).stripWhiteSpace(); if (!comment.isEmpty()) appendItem(id3group, "Comment", comment); appendItem(id3group, "Tracknumber", track); - TQString genre = TQString(TStringToQString(file.tag()->genre())).stripWhiteSpace(); + TQString genre = TStringToTQString(file.tag()->genre()).stripWhiteSpace(); if (!genre.isEmpty()) appendItem(id3group, "Genre", genre); } @@ -294,7 +296,7 @@ TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, TagLib::StringList genres = TagLib::ID3v1::genreList(); for(TagLib::StringList::ConstIterator it = genres.begin(); it != genres.end(); ++it) { - l.append(TStringToQString((*it))); + l.append(TStringToTQString((*it))); } return new ComboValidator(l, false, true, parent, name); } |