diff options
Diffstat (limited to 'juk')
| -rw-r--r-- | juk/playlist.cpp | 4 | ||||
| -rw-r--r-- | juk/tag.cpp | 12 | ||||
| -rw-r--r-- | juk/tageditor.cpp | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 02b00259..32caf879 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -65,6 +65,8 @@ #include "tagtransactionmanager.h" #include "cache.h" +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) + using namespace ActionCollection; /** @@ -2168,7 +2170,7 @@ void Playlist::slotRenameTag() TQStringList genreList; TagLib::StringList genres = TagLib::ID3v1::genreList(); for(TagLib::StringList::ConstIterator it = genres.begin(); it != genres.end(); ++it) - genreList.append(TStringToQString((*it))); + genreList.append(TStringToTQString((*it))); edit->completionObject()->setItems(genreList); break; } diff --git a/juk/tag.cpp b/juk/tag.cpp index 08a717ea..c5290610 100644 --- a/juk/tag.cpp +++ b/juk/tag.cpp @@ -41,6 +41,8 @@ #include "mediafiles.h" #include "stringshare.h" +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) + //////////////////////////////////////////////////////////////////////////////// // public members //////////////////////////////////////////////////////////////////////////////// @@ -227,11 +229,11 @@ Tag::Tag(const TQString &fileName, bool) : void Tag::setup(TagLib::File *file) { - m_title = TQString(TStringToQString(file->tag()->title())).stripWhiteSpace(); - m_artist = TQString(TStringToQString(file->tag()->artist())).stripWhiteSpace(); - m_album = TQString(TStringToQString(file->tag()->album())).stripWhiteSpace(); - m_genre = TQString(TStringToQString(file->tag()->genre())).stripWhiteSpace(); - m_comment = TQString(TStringToQString(file->tag()->comment())).stripWhiteSpace(); + m_title = TStringToTQString(file->tag()->title()).stripWhiteSpace(); + m_artist = TStringToTQString(file->tag()->artist()).stripWhiteSpace(); + m_album = TStringToTQString(file->tag()->album()).stripWhiteSpace(); + m_genre = TStringToTQString(file->tag()->genre()).stripWhiteSpace(); + m_comment = TStringToTQString(file->tag()->comment()).stripWhiteSpace(); m_track = file->tag()->track(); m_year = file->tag()->year(); diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index 7862be71..c0b0a183 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -44,6 +44,8 @@ #undef KeyRelease +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) + using namespace ActionCollection; class FileNameValidator : public TQValidator @@ -403,7 +405,7 @@ void TagEditor::updateCollection() TagLib::StringList genres = TagLib::ID3v1::genreList(); for(TagLib::StringList::ConstIterator it = genres.begin(); it != genres.end(); ++it) - genreHash.insert(TStringToQString((*it))); + genreHash.insert(TStringToTQString((*it))); m_genreList = genreHash.values(); m_genreList.sort(); @@ -436,7 +438,7 @@ void TagEditor::readConfig() TagLib::StringList genres = TagLib::ID3v1::genreList(); for(TagLib::StringList::ConstIterator it = genres.begin(); it != genres.end(); ++it) - m_genreList.append(TStringToQString((*it))); + m_genreList.append(TStringToTQString((*it))); m_genreList.sort(); m_genreBox->clear(); |