From 843070ba1825b280fccb6f7e45cd3f3fa6531258 Mon Sep 17 00:00:00 2001 From: Scott Wheeler Date: Sun, 26 Jun 2011 21:37:01 +0200 Subject: Tabs be gone --- taglib/flac/flacproperties.h | 2 +- taglib/mpeg/id3v2/frames/attachedpictureframe.cpp | 2 +- taglib/mpeg/id3v2/id3v2framefactory.cpp | 4 +- taglib/mpeg/mpegfile.cpp | 11 ++--- taglib/ogg/xiphcomment.cpp | 2 +- taglib/riff/aiff/aiffproperties.cpp | 4 +- taglib/riff/aiff/aiffproperties.h | 42 +++++++++--------- taglib/riff/wav/wavproperties.cpp | 2 +- taglib/riff/wav/wavproperties.h | 52 +++++++++++------------ taglib/toolkit/tbytevector.h | 4 +- taglib/toolkit/tfilestream.cpp | 2 +- 11 files changed, 64 insertions(+), 63 deletions(-) diff --git a/taglib/flac/flacproperties.h b/taglib/flac/flacproperties.h index 5bba6417..a8a02e7c 100644 --- a/taglib/flac/flacproperties.h +++ b/taglib/flac/flacproperties.h @@ -79,7 +79,7 @@ namespace TagLib { /*! * Returns the MD5 signature of the uncompressed audio stream as read - * from the stream info header header. + * from the stream info header header. */ ByteVector signature() const; diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp index c31e1076..86f8e355 100644 --- a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp +++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp @@ -136,7 +136,7 @@ void AttachedPictureFrame::parseFields(const ByteVector &data) int pos = 1; d->mimeType = readStringField(data, String::Latin1, &pos); - /* Now we need at least two more bytes available */ + /* Now we need at least two more bytes available */ if (uint(pos) + 1 >= data.size()) { debug("Truncated picture frame."); return; diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index e1850833..6bd8b204 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -185,13 +185,13 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader) // ID3v2.2 Attached Picture - if(frameID == "PIC") { + if(frameID == "PIC") { AttachedPictureFrame *f = new AttachedPictureFrameV22(data, header); d->setTextEncoding(f); return f; } - // Relative Volume Adjustment (frames 4.11) + // Relative Volume Adjustment (frames 4.11) if(frameID == "RVA2") return new RelativeVolumeFrame(data, header); diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp index 9786c99a..a3bad823 100644 --- a/taglib/mpeg/mpegfile.cpp +++ b/taglib/mpeg/mpegfile.cpp @@ -201,7 +201,7 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version) // APE tag location has changed, update if it exists if(APETag()) - findAPE(); + findAPE(); } else if(stripOthers) success = strip(ID3v2, false) && success; @@ -239,9 +239,10 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version) else { seek(0, End); d->APELocation = tell(); - d->APEFooterLocation = d->APELocation - + d->tag.access(APEIndex, false)->footer()->completeTagSize() - - APE::Footer::size(); + APE::Tag *apeTag = d->tag.access(APEIndex, false); + d->APEFooterLocation = d->APELocation + + apeTag->footer()->completeTagSize() + - APE::Footer::size(); writeBlock(APETag()->render()); d->APEOriginalSize = APETag()->footer()->completeTagSize(); d->hasAPE = true; @@ -587,7 +588,7 @@ void MPEG::File::findAPE() seek(d->APEFooterLocation); APE::Footer footer(readBlock(APE::Footer::size())); d->APELocation = d->APEFooterLocation - footer.completeTagSize() - + APE::Footer::size(); + + APE::Footer::size(); return; } } diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp index e7e8fa91..c26391a9 100644 --- a/taglib/ogg/xiphcomment.cpp +++ b/taglib/ogg/xiphcomment.cpp @@ -285,7 +285,7 @@ void Ogg::XiphComment::parse(const ByteVector &data) // The first thing in the comment data is the vendor ID length, followed by a // UTF8 string with the vendor ID. - int pos = 0; + uint pos = 0; int vendorLength = data.mid(0, 4).toUInt(false); pos += 4; diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp index c7cbaa34..4a1a3001 100644 --- a/taglib/riff/aiff/aiffproperties.cpp +++ b/taglib/riff/aiff/aiffproperties.cpp @@ -44,7 +44,7 @@ static double ConvertFromIeeeExtended(unsigned char *bytes) double f; int expon; unsigned long hiMant, loMant; - + expon = ((bytes[0] & 0x7F) << 8) | (bytes[1] & 0xFF); hiMant = ((unsigned long)(bytes[2] & 0xFF) << 24) | @@ -141,7 +141,7 @@ int RIFF::AIFF::Properties::sampleWidth() const uint RIFF::AIFF::Properties::sampleFrames() const { - return d->sampleFrames; + return d->sampleFrames; } //////////////////////////////////////////////////////////////////////////////// diff --git a/taglib/riff/aiff/aiffproperties.h b/taglib/riff/aiff/aiffproperties.h index ceefe32e..68e90b79 100644 --- a/taglib/riff/aiff/aiffproperties.h +++ b/taglib/riff/aiff/aiffproperties.h @@ -46,35 +46,35 @@ namespace TagLib { class TAGLIB_EXPORT Properties : public AudioProperties { public: - /*! - * Create an instance of AIFF::Properties with the data read from the - * ByteVector \a data. - */ - Properties(const ByteVector &data, ReadStyle style); + /*! + * Create an instance of AIFF::Properties with the data read from the + * ByteVector \a data. + */ + Properties(const ByteVector &data, ReadStyle style); - /*! - * Destroys this AIFF::Properties instance. - */ - virtual ~Properties(); + /*! + * Destroys this AIFF::Properties instance. + */ + virtual ~Properties(); - // Reimplementations. + // Reimplementations. - virtual int length() const; - virtual int bitrate() const; - virtual int sampleRate() const; - virtual int channels() const; + virtual int length() const; + virtual int bitrate() const; + virtual int sampleRate() const; + virtual int channels() const; - int sampleWidth() const; - uint sampleFrames() const; + int sampleWidth() const; + uint sampleFrames() const; private: - Properties(const Properties &); - Properties &operator=(const Properties &); + Properties(const Properties &); + Properties &operator=(const Properties &); - void read(const ByteVector &data); + void read(const ByteVector &data); - class PropertiesPrivate; - PropertiesPrivate *d; + class PropertiesPrivate; + PropertiesPrivate *d; }; } } diff --git a/taglib/riff/wav/wavproperties.cpp b/taglib/riff/wav/wavproperties.cpp index 6c3e2f41..10d10eca 100644 --- a/taglib/riff/wav/wavproperties.cpp +++ b/taglib/riff/wav/wavproperties.cpp @@ -106,7 +106,7 @@ int RIFF::WAV::Properties::sampleWidth() const uint RIFF::WAV::Properties::sampleFrames() const { - return d->sampleFrames; + return d->sampleFrames; } //////////////////////////////////////////////////////////////////////////////// diff --git a/taglib/riff/wav/wavproperties.h b/taglib/riff/wav/wavproperties.h index e75ec0fb..2023f539 100644 --- a/taglib/riff/wav/wavproperties.h +++ b/taglib/riff/wav/wavproperties.h @@ -49,41 +49,41 @@ namespace TagLib { class TAGLIB_EXPORT Properties : public AudioProperties { public: - /*! - * Create an instance of WAV::Properties with the data read from the - * ByteVector \a data. - */ - Properties(const ByteVector &data, ReadStyle style); + /*! + * Create an instance of WAV::Properties with the data read from the + * ByteVector \a data. + */ + Properties(const ByteVector &data, ReadStyle style); - /*! - * Create an instance of WAV::Properties with the data read from the - * ByteVector \a data and the length calculated using \a streamLength. - */ - Properties(const ByteVector &data, uint streamLength, ReadStyle style); + /*! + * Create an instance of WAV::Properties with the data read from the + * ByteVector \a data and the length calculated using \a streamLength. + */ + Properties(const ByteVector &data, uint streamLength, ReadStyle style); - /*! - * Destroys this WAV::Properties instance. - */ - virtual ~Properties(); + /*! + * Destroys this WAV::Properties instance. + */ + virtual ~Properties(); - // Reimplementations. + // Reimplementations. - virtual int length() const; - virtual int bitrate() const; - virtual int sampleRate() const; - virtual int channels() const; + virtual int length() const; + virtual int bitrate() const; + virtual int sampleRate() const; + virtual int channels() const; - int sampleWidth() const; - uint sampleFrames() const; + int sampleWidth() const; + uint sampleFrames() const; private: - Properties(const Properties &); - Properties &operator=(const Properties &); + Properties(const Properties &); + Properties &operator=(const Properties &); - void read(const ByteVector &data); + void read(const ByteVector &data); - class PropertiesPrivate; - PropertiesPrivate *d; + class PropertiesPrivate; + PropertiesPrivate *d; }; } } diff --git a/taglib/toolkit/tbytevector.h b/taglib/toolkit/tbytevector.h index b7fffdde..af3420f5 100644 --- a/taglib/toolkit/tbytevector.h +++ b/taglib/toolkit/tbytevector.h @@ -397,8 +397,8 @@ namespace TagLib { static ByteVector null; /*! - * Returns a hex-encoded copy of the byte vector. - */ + * Returns a hex-encoded copy of the byte vector. + */ ByteVector toHex() const; protected: diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp index 45e4cdde..e2aebae3 100644 --- a/taglib/toolkit/tfilestream.cpp +++ b/taglib/toolkit/tfilestream.cpp @@ -100,7 +100,7 @@ FileStream::FileStreamPrivate::FileStreamPrivate(FileName fileName, bool openRea readOnly = false; else file = _wfopen(name, L"rb"); - } + } if(file) return; -- cgit v1.2.3