From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- juk/tag.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'juk/tag.cpp') diff --git a/juk/tag.cpp b/juk/tag.cpp index 802567dd..a9d37297 100644 --- a/juk/tag.cpp +++ b/juk/tag.cpp @@ -146,10 +146,10 @@ CacheDataStream &Tag::read(CacheDataStream &s) { switch(s.cacheVersion()) { case 1: { - Q_INT32 track; - Q_INT32 year; - Q_INT32 bitrate; - Q_INT32 seconds; + TQ_INT32 track; + TQ_INT32 year; + TQ_INT32 bitrate; + TQ_INT32 seconds; s >> m_title >> m_artist @@ -227,11 +227,11 @@ Tag::Tag(const TQString &fileName, bool) : void Tag::setup(TagLib::File *file) { - m_title = TStringToQString(file->tag()->title()).stripWhiteSpace(); - m_artist = TStringToQString(file->tag()->artist()).stripWhiteSpace(); - m_album = TStringToQString(file->tag()->album()).stripWhiteSpace(); - m_genre = TStringToQString(file->tag()->genre()).stripWhiteSpace(); - m_comment = TStringToQString(file->tag()->comment()).stripWhiteSpace(); + 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_track = file->tag()->track(); m_year = file->tag()->year(); @@ -245,8 +245,8 @@ void Tag::setup(TagLib::File *file) m_lengthString = TQString::number(minutes) + (seconds >= 10 ? ":" : ":0") + TQString::number(seconds); if(m_title.isEmpty()) { - int i = m_fileName.findRev('/'); - int j = m_fileName.findRev('.'); + int i = m_fileName.tqfindRev('/'); + int j = m_fileName.tqfindRev('.'); m_title = i > 0 ? m_fileName.mid(i + 1, j - i - 1) : m_fileName; } @@ -263,12 +263,12 @@ TQDataStream &operator<<(TQDataStream &s, const Tag &t) << t.artist() << t.album() << t.genre() - << Q_INT32(t.track()) - << Q_INT32(t.year()) + << TQ_INT32(t.track()) + << TQ_INT32(t.year()) << t.comment() - << Q_INT32(t.bitrate()) + << TQ_INT32(t.bitrate()) << t.lengthString() - << Q_INT32(t.seconds()); + << TQ_INT32(t.seconds()); return s; } -- cgit v1.2.3