diff options
Diffstat (limited to 'src/metadata')
-rw-r--r-- | src/metadata/asf/asfattribute.cpp | 8 | ||||
-rw-r--r-- | src/metadata/asf/asfattribute.h | 6 | ||||
-rw-r--r-- | src/metadata/asf/asffile.cpp | 8 | ||||
-rw-r--r-- | src/metadata/asf/asffile.h | 2 | ||||
-rw-r--r-- | src/metadata/m4a/mp4file.h | 2 | ||||
-rw-r--r-- | src/metadata/m4a/mp4mvhdbox.cpp | 2 | ||||
-rw-r--r-- | src/metadata/m4a/mp4mvhdbox.h | 2 | ||||
-rw-r--r-- | src/metadata/m4a/mp4propsproxy.h | 2 | ||||
-rwxr-xr-x | src/metadata/tagengine.cpp | 98 | ||||
-rwxr-xr-x | src/metadata/tagengine.h | 30 | ||||
-rwxr-xr-x | src/metadata/tplugins.cpp | 4 | ||||
-rw-r--r-- | src/metadata/trueaudio/ttafile.h | 2 | ||||
-rw-r--r-- | src/metadata/wavpack/wvfile.h | 2 |
13 files changed, 84 insertions, 84 deletions
diff --git a/src/metadata/asf/asfattribute.cpp b/src/metadata/asf/asfattribute.cpp index bfe81c5..5c83243 100644 --- a/src/metadata/asf/asfattribute.cpp +++ b/src/metadata/asf/asfattribute.cpp @@ -100,7 +100,7 @@ ASF::Attribute::Attribute(unsigned int value) ASF::Attribute::Attribute(unsigned long long value) { d = new AttributePrivate; - d->type = QWordType; + d->type = TQWordType; d->longLongValue = value; } @@ -205,8 +205,8 @@ ASF::Attribute::parse(ASF::File &f, int kind) d->intValue = f.readDWORD(); break; - case QWordType: - d->longLongValue = f.readQWORD(); + case TQWordType: + d->longLongValue = f.readTQWORD(); break; case UnicodeType: @@ -245,7 +245,7 @@ ASF::Attribute::render(const String &name, int kind) const data.append(ByteVector::fromUInt(d->intValue, false)); break; - case QWordType: + case TQWordType: data.append(ByteVector::fromLongLong(d->longLongValue, false)); break; diff --git a/src/metadata/asf/asfattribute.h b/src/metadata/asf/asfattribute.h index 9a8e3c9..9624f33 100644 --- a/src/metadata/asf/asfattribute.h +++ b/src/metadata/asf/asfattribute.h @@ -45,7 +45,7 @@ namespace TagLib BytesType = 1, BoolType = 2, DWordType = 3, - QWordType = 4, + TQWordType = 4, WordType = 5, GuidType = 6 }; @@ -71,7 +71,7 @@ namespace TagLib Attribute(unsigned int value); /*! - * Constructs an attribute with \a key and a QWordType \a value. + * Constructs an attribute with \a key and a TQWordType \a value. */ Attribute(unsigned long long value); @@ -121,7 +121,7 @@ namespace TagLib unsigned int toUInt() const; /*! - * Returns the QWordType \a value. + * Returns the TQWordType \a value. */ unsigned long long toULongLong() const; diff --git a/src/metadata/asf/asffile.cpp b/src/metadata/asf/asffile.cpp index 55a12cc..bbe5ee5 100644 --- a/src/metadata/asf/asffile.cpp +++ b/src/metadata/asf/asffile.cpp @@ -325,7 +325,7 @@ ASF::File::HeaderExtensionObject::parse(ASF::File *file, uint /*size*/) long long dataPos = 0; while(dataPos < dataSize) { ByteVector guid = file->readBlock(16); - long long size = file->readQWORD(); + long long size = file->readTQWORD(); BaseObject *obj; if(guid == metadataGuid) { obj = new MetadataObject(); @@ -401,13 +401,13 @@ void ASF::File::read(bool /*readProperties*/, Properties::ReadStyle /*properties d->tag = new ASF::Tag(); d->properties = new ASF::Properties(); - d->size = readQWORD(); + d->size = readTQWORD(); int numObjects = readDWORD(); seek(2, Current); for(int i = 0; i < numObjects; i++) { ByteVector guid = readBlock(16); - long size = (long)readQWORD(); + long size = (long)readTQWORD(); BaseObject *obj; if(guid == filePropertiesGuid) { obj = new FilePropertiesObject(); @@ -513,7 +513,7 @@ unsigned int ASF::File::readDWORD() return v.toUInt(false); } -long long ASF::File::readQWORD() +long long ASF::File::readTQWORD() { ByteVector v = readBlock(8); return v.toLongLong(false); diff --git a/src/metadata/asf/asffile.h b/src/metadata/asf/asffile.h index db97331..618a3a9 100644 --- a/src/metadata/asf/asffile.h +++ b/src/metadata/asf/asffile.h @@ -86,7 +86,7 @@ namespace TagLib { int readBYTE(); int readWORD(); unsigned int readDWORD(); - long long readQWORD(); + long long readTQWORD(); static ByteVector renderString(const String &str, bool includeLength = false); String readString(int len); void read(bool readProperties, Properties::ReadStyle propertiesStyle); diff --git a/src/metadata/m4a/mp4file.h b/src/metadata/m4a/mp4file.h index 9e40dbc..c1da43d 100644 --- a/src/metadata/m4a/mp4file.h +++ b/src/metadata/m4a/mp4file.h @@ -104,7 +104,7 @@ namespace TagLib { /*! * This will remove all tags. * - * \note This will also invalidate pointers to the tags + * \note This will also tqinvalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/src/metadata/m4a/mp4mvhdbox.cpp b/src/metadata/m4a/mp4mvhdbox.cpp index 36053e4..894f7f8 100644 --- a/src/metadata/m4a/mp4mvhdbox.cpp +++ b/src/metadata/m4a/mp4mvhdbox.cpp @@ -39,7 +39,7 @@ public: TagLib::uint timescale; //! duration of presentation TagLib::ulonglong duration; - //! playout speed + //! ptqlayout speed TagLib::uint rate; //! volume for entire presentation TagLib::uint volume; diff --git a/src/metadata/m4a/mp4mvhdbox.h b/src/metadata/m4a/mp4mvhdbox.h index b133485..31e3d74 100644 --- a/src/metadata/m4a/mp4mvhdbox.h +++ b/src/metadata/m4a/mp4mvhdbox.h @@ -44,7 +44,7 @@ namespace TagLib uint timescale() const; //! function to get the presentation duration in the mp4 file ulonglong duration() const; - //! function to get the rate (playout speed) - typically 1.0; + //! function to get the rate (ptqlayout speed) - typically 1.0; uint rate() const; //! function to get volume level for presentation - typically 1.0; uint volume() const; diff --git a/src/metadata/m4a/mp4propsproxy.h b/src/metadata/m4a/mp4propsproxy.h index 0ea29e2..c6b6f9d 100644 --- a/src/metadata/m4a/mp4propsproxy.h +++ b/src/metadata/m4a/mp4propsproxy.h @@ -29,7 +29,7 @@ namespace TagLib namespace MP4 { //! Mp4PropsProxy is used to access the stsd box and mvhd box directly - /*! this class works as a shortcut to avoid stepping through all parent boxes + /*! this class works as a shortcut to avoid stepping through all tqparent boxes * to access the boxes in question */ class Mp4PropsProxy 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(); // diff --git a/src/metadata/tagengine.h b/src/metadata/tagengine.h index e21a48c..8b0e6f0 100755 --- a/src/metadata/tagengine.h +++ b/src/metadata/tagengine.h @@ -3,8 +3,8 @@ #ifndef TAGENGINE_H #define TAGENGINE_H -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> /** * @short All metainformation can be stored in this class @@ -17,9 +17,9 @@ public: /** * Constructor */ - TagData( const QString& _artist = QString::null, const QString& _composer = QString::null, - const QString& _album = QString::null, const QString& _title = QString::null, - const QString& _genre = QString::null, const QString& _comment = QString::null, + TagData( const TQString& _artist = TQString(), const TQString& _composer = TQString(), + const TQString& _album = TQString(), const TQString& _title = TQString(), + const TQString& _genre = TQString(), const TQString& _comment = TQString(), int _track = 0, int _disc = 0, int _year = 0, int _length = 0, int _fileSize = 0, int _bitrate = 0, int _samplingRate = 0 ); @@ -29,12 +29,12 @@ public: virtual ~TagData(); /** The tags */ - QString artist; - QString composer; - QString album; - QString title; - QString genre; - QString comment; + TQString artist; + TQString composer; + TQString album; + TQString title; + TQString genre; + TQString comment; int track; int disc; int year; @@ -68,12 +68,12 @@ public: virtual ~TagEngine(); /** A list of all genre */ - QStringList genreList; + TQStringList genreList; - TagData* readTags( const QString& file ); - bool writeTags( const QString& file, TagData* tagData ); + TagData* readTags( const TQString& file ); + bool writeTags( const TQString& file, TagData* tagData ); -// bool canWrite( QString format ); // NOTE no const because this string is being modyfied +// bool canWrite( TQString format ); // NOTE no const because this string is being modyfied }; #endif // TAGENGINE_H diff --git a/src/metadata/tplugins.cpp b/src/metadata/tplugins.cpp index b84d601..10d7107 100755 --- a/src/metadata/tplugins.cpp +++ b/src/metadata/tplugins.cpp @@ -22,7 +22,7 @@ #include <config.h> // #include <debug.h> -#include <qfile.h> +#include <tqfile.h> #include <kmimetype.h> #include <taglib/fileref.h> @@ -73,7 +73,7 @@ TagLib::File *MimeTypeFileTypeResolver::createFile(const char *fileName, bool readProperties, TagLib::AudioProperties::ReadStyle propertiesStyle) const { - QString fn = QFile::decodeName( fileName ); + TQString fn = TQFile::decodeName( fileName ); int accuracy = 0; KMimeType::Ptr mimetype = KMimeType::findByFileContent( fn, &accuracy ); diff --git a/src/metadata/trueaudio/ttafile.h b/src/metadata/trueaudio/ttafile.h index 2cb0785..3a97a9e 100644 --- a/src/metadata/trueaudio/ttafile.h +++ b/src/metadata/trueaudio/ttafile.h @@ -154,7 +154,7 @@ namespace TagLib { * This will remove the tags that match the OR-ed together TagTypes from the * file. By default it removes all tags. * - * \note This will also invalidate pointers to the tags + * \note This will also tqinvalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/src/metadata/wavpack/wvfile.h b/src/metadata/wavpack/wvfile.h index 6c57f6d..18f2316 100644 --- a/src/metadata/wavpack/wvfile.h +++ b/src/metadata/wavpack/wvfile.h @@ -136,7 +136,7 @@ namespace TagLib { * This will remove the tags that match the OR-ed together TagTypes from the * file. By default it removes all tags. * - * \note This will also invalidate pointers to the tags + * \note This will also tqinvalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ |