1 files changed, 18 insertions, 18 deletions

diff --git a/juk/tag.cpp b/juk/tag.cpp
index 972b9284..802567dd 100644
--- a/juk/tag.cpp
+++ b/juk/tag.cpp
@@ -15,8 +15,8 @@
 
 #include <kdebug.h>
 
-#include <qregexp.h>
-#include <qfile.h>
+#include <tqregexp.h>
+#include <tqfile.h>
 
 #include <taglib/tag.h>
 #include <taglib/mpegfile.h>
@@ -46,7 +46,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-Tag::Tag(const QString &fileName) :
+Tag::Tag(const TQString &fileName) :
     m_fileName(fileName),
     m_track(0),
     m_year(0),
@@ -59,33 +59,33 @@ Tag::Tag(const QString &fileName) :
     qDebug("Reading tag for %s", fileName.local8Bit().data());
 
     if(MediaFiles::isMP3(fileName)) {
-        TagLib::MPEG::File file(QFile::encodeName(fileName).data());
+        TagLib::MPEG::File file(TQFile::encodeName(fileName).data());
         if(file.isValid())
             setup(&file);
     }
 
     else if(MediaFiles::isFLAC(fileName)) {
-        TagLib::FLAC::File file(QFile::encodeName(fileName).data());
+        TagLib::FLAC::File file(TQFile::encodeName(fileName).data());
         if(file.isValid())
             setup(&file);
     }
 #ifdef TAGLIB_1_3
     else if(MediaFiles::isMPC(fileName)) {
         kdDebug(65432) << "Trying to resolve Musepack file" << endl;
-        TagLib::MPC::File file(QFile::encodeName(fileName).data());
+        TagLib::MPC::File file(TQFile::encodeName(fileName).data());
         if(file.isValid())
             setup(&file);
     }
 #endif
 #ifdef TAGLIB_1_2
     else if(MediaFiles::isOggFLAC(fileName)) {
-        TagLib::Ogg::FLAC::File file(QFile::encodeName(fileName).data());
+        TagLib::Ogg::FLAC::File file(TQFile::encodeName(fileName).data());
         if(file.isValid())
             setup(&file);
     }
 #endif
     else if(MediaFiles::isVorbis(fileName)) {
-        TagLib::Vorbis::File file(QFile::encodeName(fileName).data());
+        TagLib::Vorbis::File file(TQFile::encodeName(fileName).data());
         if(file.isValid())
             setup(&file);
     }
@@ -104,19 +104,19 @@ bool Tag::save()
     TagLib::File *file = 0;
 
     if(MediaFiles::isMP3(m_fileName))
-        file = new TagLib::MPEG::File(QFile::encodeName(m_fileName).data());
+        file = new TagLib::MPEG::File(TQFile::encodeName(m_fileName).data());
     else if(MediaFiles::isFLAC(m_fileName))
-        file = new TagLib::FLAC::File(QFile::encodeName(m_fileName).data());
+        file = new TagLib::FLAC::File(TQFile::encodeName(m_fileName).data());
 #ifdef TAGLIB_1_3
     else if(MediaFiles::isMPC(m_fileName))
-        file = new TagLib::MPC::File(QFile::encodeName(m_fileName).data());
+        file = new TagLib::MPC::File(TQFile::encodeName(m_fileName).data());
 #endif
 #ifdef TAGLIB_1_2
     else if(MediaFiles::isOggFLAC(m_fileName))
-        file = new TagLib::Ogg::FLAC::File(QFile::encodeName(m_fileName).data());
+        file = new TagLib::Ogg::FLAC::File(TQFile::encodeName(m_fileName).data());
 #endif
     else if(MediaFiles::isVorbis(m_fileName))
-        file = new TagLib::Vorbis::File(QFile::encodeName(m_fileName).data());
+        file = new TagLib::Vorbis::File(TQFile::encodeName(m_fileName).data());
 
     if(file && file->isValid() && file->tag() && !file->readOnly()) {
         file->tag()->setTitle(QStringToTString(m_title));
@@ -169,9 +169,9 @@ CacheDataStream &Tag::read(CacheDataStream &s)
         break;
     }
     default: {
-        static QString dummyString;
+        static TQString dummyString;
         static int dummyInt;
-        QString bitrateString;
+        TQString bitrateString;
 
         s >> dummyInt
           >> m_title
@@ -214,7 +214,7 @@ CacheDataStream &Tag::read(CacheDataStream &s)
 // private methods
 ////////////////////////////////////////////////////////////////////////////////
 
-Tag::Tag(const QString &fileName, bool) :
+Tag::Tag(const TQString &fileName, bool) :
     m_fileName(fileName),
     m_track(0),
     m_year(0),
@@ -242,7 +242,7 @@ void Tag::setup(TagLib::File *file)
     const int seconds = m_seconds % 60;
     const int minutes = (m_seconds - seconds) / 60;
 
-    m_lengthString = QString::number(minutes) + (seconds >= 10 ? ":" : ":0") + QString::number(seconds);
+    m_lengthString = TQString::number(minutes) + (seconds >= 10 ? ":" : ":0") + TQString::number(seconds);
 
     if(m_title.isEmpty()) {
         int i = m_fileName.findRev('/');
@@ -257,7 +257,7 @@ void Tag::setup(TagLib::File *file)
 // related functions
 ////////////////////////////////////////////////////////////////////////////////
 
-QDataStream &operator<<(QDataStream &s, const Tag &t)
+TQDataStream &operator<<(TQDataStream &s, const Tag &t)
 {
     s << t.title()
       << t.artist()