TQt4 port soundkonverter

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/soundkonverter@1239038 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 49 insertions, 49 deletions

diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
index 34abd23..6043e99 100755
--- a/src/metadata/tagengine.cpp
+++ b/src/metadata/tagengine.cpp
@@ -1,7 +1,7 @@
 
 #include "tagengine.h"
 
-#include <qfile.h>
+#include <tqfile.h>
 
 // #include <taglib/attachedpictureframe.h>
 #include <taglib/fileref.h>
@@ -38,9 +38,9 @@
 // TODO COMPILATION tag
 // FIXME BPM tag
 
-TagData::TagData( const QString& _artist, const QString& _composer,
-             const QString& _album, const QString& _title,
-             const QString& _genre, const QString& _comment,
+TagData::TagData( const TQString& _artist, const TQString& _composer,
+             const TQString& _album, const TQString& _title,
+             const TQString& _genre, const TQString& _comment,
              int _track, int _disc, int _year,
              int _length, int _fileSize, int _bitrate, int _samplingRate )
 {
@@ -75,9 +75,9 @@ TagEngine::TagEngine()
 TagEngine::~TagEngine()
 {}
 
-TagData* TagEngine::readTags( const QString& file )
+TagData* TagEngine::readTags( const TQString& file )
 {
-    TagLib::FileRef fileref( QFile::encodeName(file) );
+    TagLib::FileRef fileref( TQFile::encodeName(file) );
     TagData* tagData = new TagData();
 
     if( !fileref.isNull() )
@@ -92,11 +92,11 @@ TagData* TagEngine::readTags( const QString& file )
 
         if( tag )
         {
-            tagData->title = TStringToQString( tag->title() ).stripWhiteSpace();
-            tagData->artist = TStringToQString( tag->artist() ).stripWhiteSpace();
-            tagData->album = TStringToQString( tag->album() ).stripWhiteSpace();
-            tagData->genre = TStringToQString( tag->genre() ).stripWhiteSpace();
-            tagData->comment = TStringToQString( tag->comment() ).stripWhiteSpace();
+            tagData->title = TQString(TStringToQString( tag->title() )).stripWhiteSpace();
+            tagData->artist = TQString(TStringToQString( tag->artist() )).stripWhiteSpace();
+            tagData->album = TQString(TStringToQString( tag->album() )).stripWhiteSpace();
+            tagData->genre = TQString(TStringToQString( tag->genre() )).stripWhiteSpace();
+            tagData->comment = TQString(TStringToQString( tag->comment() )).stripWhiteSpace();
             tagData->track = tag->track();
             tagData->year = tag->year();
         }
@@ -113,26 +113,26 @@ TagData* TagEngine::readTags( const QString& file )
             tagData->samplingRate = audioProperties->sampleRate();
         }
 
-        QString disc;
-        QString track_gain;
-        QString album_gain;
+        TQString disc;
+        TQString track_gain;
+        TQString album_gain;
         if ( TagLib::MPEG::File *file = dynamic_cast<TagLib::MPEG::File *>( fileref.file() ) )
         {
             if ( file->ID3v2Tag() )
             {
                 if ( !file->ID3v2Tag()->frameListMap()[ "TPOS" ].isEmpty() )
-                    disc = TStringToQString( file->ID3v2Tag()->frameListMap()["TPOS"].front()->toString() ).stripWhiteSpace();
+                    disc = TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TPOS"].front()->toString() )).stripWhiteSpace();
 
                 if ( !file->ID3v2Tag()->frameListMap()[ "TCOM" ].isEmpty() )
-                    tagData->composer = TStringToQString( file->ID3v2Tag()->frameListMap()["TCOM"].front()->toString() ).stripWhiteSpace();
+                    tagData->composer = TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TCOM"].front()->toString() )).stripWhiteSpace();
             }
             if ( file->APETag() )
             {
                 if ( !file->APETag()->itemListMap()[ "REPLAYGAIN_TRACK_GAIN" ].isEmpty() )
-                    track_gain = TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_TRACK_GAIN"].toString() ).stripWhiteSpace();
+                    track_gain = TQString(TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_TRACK_GAIN"].toString() )).stripWhiteSpace();
 
                 if ( !file->APETag()->itemListMap()[ "REPLAYGAIN_ALBUM_GAIN" ].isEmpty() )
-                    album_gain = TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_ALBUM_GAIN"].toString() ).stripWhiteSpace();
+                    album_gain = TQString(TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_ALBUM_GAIN"].toString() )).stripWhiteSpace();
             }
         }
         else if ( TagLib::Ogg::Vorbis::File *file = dynamic_cast<TagLib::Ogg::Vorbis::File *>( fileref.file() ) )
@@ -140,16 +140,16 @@ TagData* TagEngine::readTags( const QString& file )
             if ( file->tag() )
             {
                 if ( !file->tag()->fieldListMap()[ "COMPOSER" ].isEmpty() )
-                    tagData->composer = TStringToQString( file->tag()->fieldListMap()["COMPOSER"].front() ).stripWhiteSpace();
+                    tagData->composer = TQString(TStringToQString( file->tag()->fieldListMap()["COMPOSER"].front() )).stripWhiteSpace();
 
                 if ( !file->tag()->fieldListMap()[ "DISCNUMBER" ].isEmpty() )
-                    disc = TStringToQString( file->tag()->fieldListMap()["DISCNUMBER"].front() ).stripWhiteSpace();
+                    disc = TQString(TStringToQString( file->tag()->fieldListMap()["DISCNUMBER"].front() )).stripWhiteSpace();
 
                 if ( !file->tag()->fieldListMap()[ "REPLAYGAIN_TRACK_GAIN" ].isEmpty() )
-                    track_gain = TStringToQString( file->tag()->fieldListMap()["REPLAYGAIN_TRACK_GAIN"].front() ).stripWhiteSpace();
+                    track_gain = TQString(TStringToQString( file->tag()->fieldListMap()["REPLAYGAIN_TRACK_GAIN"].front() )).stripWhiteSpace();
 
                 if ( !file->tag()->fieldListMap()[ "REPLAYGAIN_ALBUM_GAIN" ].isEmpty() )
-                    album_gain = TStringToQString( file->tag()->fieldListMap()["REPLAYGAIN_ALBUM_GAIN"].front() ).stripWhiteSpace();
+                    album_gain = TQString(TStringToQString( file->tag()->fieldListMap()["REPLAYGAIN_ALBUM_GAIN"].front() )).stripWhiteSpace();
             }
         }
         else if ( TagLib::FLAC::File *file = dynamic_cast<TagLib::FLAC::File *>( fileref.file() ) )
@@ -157,25 +157,25 @@ TagData* TagEngine::readTags( const QString& file )
             if ( file->xiphComment() )
             {
                 if ( !file->xiphComment()->fieldListMap()[ "COMPOSER" ].isEmpty() )
-                    tagData->composer = TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).stripWhiteSpace();
+                    tagData->composer = TQString(TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() )).stripWhiteSpace();
 
                 if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() )
-                    disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).stripWhiteSpace();
+                    disc = TQString(TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() )).stripWhiteSpace();
 
                 if ( !file->xiphComment()->fieldListMap()[ "REPLAYGAIN_TRACK_GAIN" ].isEmpty() )
-                    track_gain = TStringToQString( file->xiphComment()->fieldListMap()["REPLAYGAIN_TRACK_GAIN"].front() ).stripWhiteSpace();
+                    track_gain = TQString(TStringToQString( file->xiphComment()->fieldListMap()["REPLAYGAIN_TRACK_GAIN"].front() )).stripWhiteSpace();
 
                 if ( !file->xiphComment()->fieldListMap()[ "REPLAYGAIN_ALBUM_GAIN" ].isEmpty() )
-                    album_gain = TStringToQString( file->xiphComment()->fieldListMap()["REPLAYGAIN_ALBUM_GAIN"].front() ).stripWhiteSpace();
+                    album_gain = TQString(TStringToQString( file->xiphComment()->fieldListMap()["REPLAYGAIN_ALBUM_GAIN"].front() )).stripWhiteSpace();
             }
 
             /*if ( file->tag() )
             {
                 if ( !file->tag()->fieldListMap()[ "REPLAYGAIN_TRACK_GAIN" ].isEmpty() )
-                    track_gain = TStringToQString( file->tag()->fieldListMap()["REPLAYGAIN_TRACK_GAIN"].front() ).stripWhiteSpace();
+                    track_gain = TQString(TStringToQString( file->tag()->fieldListMap()["REPLAYGAIN_TRACK_GAIN"].front() )).stripWhiteSpace();
 
                 if ( !file->tag()->fieldListMap()[ "REPLAYGAIN_ALBUM_GAIN" ].isEmpty() )
-                    album_gain = TStringToQString( file->tag()->fieldListMap()["REPLAYGAIN_ALBUM_GAIN"].front() ).stripWhiteSpace();
+                    album_gain = TQString(TStringToQString( file->tag()->fieldListMap()["REPLAYGAIN_ALBUM_GAIN"].front() )).stripWhiteSpace();
             }*/
         }
         else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
@@ -185,7 +185,7 @@ TagData* TagEngine::readTags( const QString& file )
             {
                 tagData->composer = TStringToQString( mp4tag->composer() );
 
-                disc = QString::number( mp4tag->disk() );
+                disc = TQString::number( mp4tag->disk() );
             }
         }
 /*        else if ( TagLib::MPC::File *file = dynamic_cast<TagLib::MPC::File *>( fileref.file() ) )
@@ -193,10 +193,10 @@ TagData* TagEngine::readTags( const QString& file )
             if ( file->APETag() )
             {
                 if ( !file->APETag()->itemListMap()[ "REPLAYGAIN_TRACK_GAIN" ].isEmpty() )
-                    track_gain = TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_TRACK_GAIN"].toString() ).stripWhiteSpace();
+                    track_gain = TQString(TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_TRACK_GAIN"].toString() )).stripWhiteSpace();
 
                 if ( !file->APETag()->itemListMap()[ "REPLAYGAIN_ALBUM_GAIN" ].isEmpty() )
-                    album_gain = TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_ALBUM_GAIN"].toString() ).stripWhiteSpace();
+                    album_gain = TQString(TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_ALBUM_GAIN"].toString() )).stripWhiteSpace();
             }
         }*/
         else if ( TagLib::WavPack::File *file = dynamic_cast<TagLib::WavPack::File *>( fileref.file() ) )
@@ -204,10 +204,10 @@ TagData* TagEngine::readTags( const QString& file )
             if ( file->APETag() )
             {
                 if ( !file->APETag()->itemListMap()[ "REPLAYGAIN_TRACK_GAIN" ].isEmpty() )
-                    track_gain = TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_TRACK_GAIN"].toString() ).stripWhiteSpace();
+                    track_gain = TQString(TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_TRACK_GAIN"].toString() )).stripWhiteSpace();
 
                 if ( !file->APETag()->itemListMap()[ "REPLAYGAIN_ALBUM_GAIN" ].isEmpty() )
-                    album_gain = TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_ALBUM_GAIN"].toString() ).stripWhiteSpace();
+                    album_gain = TQString(TStringToQString( file->APETag()->itemListMap()["REPLAYGAIN_ALBUM_GAIN"].toString() )).stripWhiteSpace();
             }
         }
         else if ( TagLib::TTA::File *file = dynamic_cast<TagLib::TTA::File *>( fileref.file() ) )
@@ -215,16 +215,16 @@ TagData* TagEngine::readTags( const QString& file )
             if ( file->ID3v2Tag() )
             {
                 if ( !file->ID3v2Tag()->frameListMap()[ "TPOS" ].isEmpty() )
-                    disc = TStringToQString( file->ID3v2Tag()->frameListMap()["TPOS"].front()->toString() ).stripWhiteSpace();
+                    disc = TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TPOS"].front()->toString() )).stripWhiteSpace();
 
                 if ( !file->ID3v2Tag()->frameListMap()[ "TCOM" ].isEmpty() )
-                    tagData->composer = TStringToQString( file->ID3v2Tag()->frameListMap()["TCOM"].front()->toString() ).stripWhiteSpace();
+                    tagData->composer = TQString(TStringToQString( file->ID3v2Tag()->frameListMap()["TCOM"].front()->toString() )).stripWhiteSpace();
             }
         }
 
         if( !disc.isEmpty() )
         {
-            int i = disc.find('/');
+            int i = disc.tqfind('/');
             if( i != -1 )
                 // disc.right( i ).toInt() is total number of discs, we don't use this at the moment
                 tagData->disc = disc.left( i ).toInt();
@@ -234,7 +234,7 @@ TagData* TagEngine::readTags( const QString& file )
 
         if( !track_gain.isEmpty() )
         {
-            int i = track_gain.find(' ');
+            int i = track_gain.tqfind(' ');
             if( i != -1 )
                 tagData->track_gain = track_gain.left( i ).toFloat();
             else
@@ -243,7 +243,7 @@ TagData* TagEngine::readTags( const QString& file )
 
         if( !album_gain.isEmpty() )
         {
-            int i = album_gain.find(' ');
+            int i = album_gain.tqfind(' ');
             if( i != -1 )
                 tagData->album_gain = album_gain.left( i ).toFloat();
             else
@@ -256,14 +256,14 @@ TagData* TagEngine::readTags( const QString& file )
     return 0;
 }
 
-bool TagEngine::writeTags( const QString& file, TagData* tagData )
+bool TagEngine::writeTags( const TQString& file, TagData* tagData )
 {
     if( !tagData ) tagData = new TagData();
 
     //Set default codec to UTF-8 (see bugs 111246 and 111232)
     TagLib::ID3v2::FrameFactory::instance()->setDefaultTextEncoding( TagLib::String::UTF8 );
 
-    TagLib::FileRef fileref( QFile::encodeName(file), false );
+    TagLib::FileRef fileref( TQFile::encodeName(file), false );
 
     if ( !fileref.isNull() )
     {
@@ -289,12 +289,12 @@ bool TagEngine::writeTags( const QString& file, TagData* tagData )
             {
                 if ( !file->ID3v2Tag()->frameListMap()[ "TPOS" ].isEmpty() )
                 {
-                    file->ID3v2Tag()->frameListMap()[ "TPOS" ].front()->setText( QStringToTString( QString::number(tagData->disc) ) );
+                    file->ID3v2Tag()->frameListMap()[ "TPOS" ].front()->setText( QStringToTString( TQString::number(tagData->disc) ) );
                 }
                 else
                 {
                     TagLib::ID3v2::TextIdentificationFrame *frame = new TagLib::ID3v2::TextIdentificationFrame( "TPOS", TagLib::ID3v2::FrameFactory::instance()->defaultTextEncoding() );
-                    frame->setText( QStringToTString( QString::number(tagData->disc) ) );
+                    frame->setText( QStringToTString( TQString::number(tagData->disc) ) );
                     file->ID3v2Tag()->addFrame( frame );
                 }
 
@@ -324,12 +324,12 @@ bool TagEngine::writeTags( const QString& file, TagData* tagData )
                 // HACK sets the id3v2 year tag
                 if ( !file->ID3v2Tag()->frameListMap()[ "TYER" ].isEmpty() )
                 {
-                    file->ID3v2Tag()->frameListMap()[ "TYER" ].front()->setText( QStringToTString( QString::number(tagData->year) ) );
+                    file->ID3v2Tag()->frameListMap()[ "TYER" ].front()->setText( QStringToTString( TQString::number(tagData->year) ) );
                 }
                 else
                 {
                     TagLib::ID3v2::TextIdentificationFrame *frame = new TagLib::ID3v2::TextIdentificationFrame( "TYER", TagLib::ID3v2::FrameFactory::instance()->defaultTextEncoding() );
-                    frame->setText( QStringToTString( QString::number(tagData->year) ) );
+                    frame->setText( QStringToTString( TQString::number(tagData->year) ) );
                     file->ID3v2Tag()->addFrame( frame );
                 }
             }
@@ -340,7 +340,7 @@ bool TagEngine::writeTags( const QString& file, TagData* tagData )
             {
                 file->tag()->addField( "COMPOSER", QStringToTString( tagData->composer ), true );
 
-                file->tag()->addField( "DISCNUMBER", QStringToTString( QString::number(tagData->disc) ), true );
+                file->tag()->addField( "DISCNUMBER", QStringToTString( TQString::number(tagData->disc) ), true );
             }
         }
         else if ( TagLib::FLAC::File *file = dynamic_cast<TagLib::FLAC::File *>( fileref.file() ) )
@@ -349,7 +349,7 @@ bool TagEngine::writeTags( const QString& file, TagData* tagData )
             {
                 file->xiphComment()->addField( "COMPOSER", QStringToTString( tagData->composer ), true );
 
-                file->xiphComment()->addField( "DISCNUMBER", QStringToTString( QString::number(tagData->disc) ), true );
+                file->xiphComment()->addField( "DISCNUMBER", QStringToTString( TQString::number(tagData->disc) ), true );
             }
         }
         else if ( TagLib::MP4::File *file = dynamic_cast<TagLib::MP4::File *>( fileref.file() ) )
@@ -368,12 +368,12 @@ bool TagEngine::writeTags( const QString& file, TagData* tagData )
             {
                 if ( !file->ID3v2Tag()->frameListMap()[ "TPOS" ].isEmpty() )
                 {
-                    file->ID3v2Tag()->frameListMap()[ "TPOS" ].front()->setText( QStringToTString( QString::number(tagData->disc) ) );
+                    file->ID3v2Tag()->frameListMap()[ "TPOS" ].front()->setText( QStringToTString( TQString::number(tagData->disc) ) );
                 }
                 else
                 {
                     TagLib::ID3v2::TextIdentificationFrame *frame = new TagLib::ID3v2::TextIdentificationFrame( "TPOS", TagLib::ID3v2::FrameFactory::instance()->defaultTextEncoding() );
-                    frame->setText( QStringToTString( QString::number(tagData->disc) ) );
+                    frame->setText( QStringToTString( TQString::number(tagData->disc) ) );
                     file->ID3v2Tag()->addFrame( frame );
                 }
 
@@ -395,7 +395,7 @@ bool TagEngine::writeTags( const QString& file, TagData* tagData )
     return false;
 }
 
-// bool TagEngine::canWrite( QString format )
+// bool TagEngine::canWrite( TQString format )
 // {
 //     format = format.lower();
 //