Break up the mega-lines

diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp
index 6bf705047a74c4e4974b3f81a92e4cba82875996..136a855aea6b9946fcde0c3a7f65daf01c0f63e6 100644 (file)
--- a/taglib/mpeg/id3v2/frames/chapterframe.cpp
+++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp
@@ -56,7 +56,8 @@ ChapterFrame::ChapterFrame(const ByteVector &data) :
   setData(data);
 }
 
-ChapterFrame::ChapterFrame(const ByteVector &eID, const uint &sT, const uint &eT, const uint &sO, const uint &eO, const FrameList &eF) :
+ChapterFrame::ChapterFrame(const ByteVector &eID, const uint &sT, const uint &eT,
+                           const uint &sO, const uint &eO, const FrameList &eF) :
     ID3v2::Frame("CHAP")
 {
   d = new ChapterFramePrivate;
@@ -204,7 +205,8 @@ void ChapterFrame::parseFields(const ByteVector &data)
 {
   uint size = data.size();
   if(size < 18) {
-    debug("A CHAP frame must contain at least 18 bytes (1 byte element ID terminated by null and 4x4 bytes for start and end time and offset).");
+    debug("A CHAP frame must contain at least 18 bytes (1 byte element ID "
+          "terminated by null and 4x4 bytes for start and end time and offset).");
     return;
   }
 

diff --git a/taglib/mpeg/id3v2/frames/chapterframe.h b/taglib/mpeg/id3v2/frames/chapterframe.h
index 84b42137b4594c7cc3147e9bd3144c3c53ac47a6..96827e1f16b1426538855aa32578448113e74d98 100644 (file)
--- a/taglib/mpeg/id3v2/frames/chapterframe.h
+++ b/taglib/mpeg/id3v2/frames/chapterframe.h
@@ -35,7 +35,7 @@ namespace TagLib {
   namespace ID3v2 {
 
     /*!
-     * This is an implementation of ID3v2 chapter frames.  The purpose of this 
+     * This is an implementation of ID3v2 chapter frames.  The purpose of this
      * frame is to describe a single chapter within an audio file.
      */
 
@@ -56,48 +56,49 @@ namespace TagLib {
        * start time \a sT, end time \a eT, start offset \a sO,
        * end offset \a eO and embedded frames, that are in \a eF.
        */
-      ChapterFrame(const ByteVector &eID, const uint &sT, const uint &eT, const uint &sO, const uint &eO, const FrameList &eF);
+      ChapterFrame(const ByteVector &eID, const uint &sT, const uint &eT, const uint &sO,
+                   const uint &eO, const FrameList &eF);
 
       /*!
        * Destroys the frame.
        */
       ~ChapterFrame();
-      
+
       /*!
        * Returns the element ID of the frame. Element ID
        * is a null terminated string, however it's not human-readable.
-       * 
+       *
        * \see setElementID()
        */
       ByteVector elementID() const;
-      
+
       /*!
        * Returns time of chapter's start (in miliseconds).
-       * 
+       *
        * \see setStartTime()
        */
       uint startTime() const;
-      
+
       /*!
        * Returns time of chapter's end (in miliseconds).
-       * 
+       *
        * \see setEndTime()
        */
       uint endTime() const;
-      
+
       /*!
        * Returns zero based byte offset (count of bytes from the beginning
        * of the audio file) of chapter's start.
-       * 
+       *
        * \note If returned value is 0xFFFFFFFF, start time should be used instead.
        * \see setStartOffset()
        */
       uint startOffset() const;
-      
+
       /*!
        * Returns zero based byte offset (count of bytes from the beginning
        * of the audio file) of chapter's end.
-       * 
+       *
        * \note If returned value is 0xFFFFFFFF, end time should be used instead.
        * \see setEndOffset()
        */
@@ -106,48 +107,48 @@ namespace TagLib {
       /*!
        * Sets the element ID of the frame to \a eID. If \a eID isn't
        * null terminated, a null char is appended automatically.
-       * 
+       *
        * \see elementID()
        */
       void setElementID(const ByteVector &eID);
-      
+
       /*!
        * Sets time of chapter's start (in miliseconds) to \a sT.
-       * 
+       *
        * \see startTime()
        */
       void setStartTime(const uint &sT);
-      
+
       /*!
        * Sets time of chapter's end (in miliseconds) to \a eT.
-       * 
+       *
        * \see endTime()
        */
       void setEndTime(const uint &eT);
-      
+
       /*!
        * Sets zero based byte offset (count of bytes from the beginning
        * of the audio file) of chapter's start to \a sO.
-       * 
+       *
        * \see startOffset()
        */
       void setStartOffset(const uint &sO);
-      
+
       /*!
        * Sets zero based byte offset (count of bytes from the beginning
        * of the audio file) of chapter's end to \a eO.
-       * 
+       *
        * \see endOffset()
        */
       void setEndOffset(const uint &eO);
-      
+
       /*!
        * Returns a reference to the frame list map.  This is an FrameListMap of
        * all of the frames embedded in the CHAP frame.
        *
-       * This is the most convenient structure for accessing the CHAP frame's 
-       * embedded frames. Many frame types allow multiple instances of the same 
-       * frame type so this is a map of lists. In most cases however there will 
+       * This is the most convenient structure for accessing the CHAP frame's
+       * embedded frames. Many frame types allow multiple instances of the same
+       * frame type so this is a map of lists. In most cases however there will
        * only be a single frame of a certain type.
        *
        * \warning You should not modify this data structure directly, instead
@@ -156,13 +157,13 @@ namespace TagLib {
        * \see embeddedFrameList()
        */
       const FrameListMap &embeddedFrameListMap() const;
-      
+
       /*!
-       * Returns a reference to the embedded frame list.  This is an FrameList 
+       * Returns a reference to the embedded frame list.  This is an FrameList
        * of all of the frames embedded in the CHAP frame in the order that they
        * were parsed.
        *
-       * This can be useful if for example you want iterate over the CHAP frame's 
+       * This can be useful if for example you want iterate over the CHAP frame's
        * embedded frames in the order that they occur in the CHAP frame.
        *
        * \warning You should not modify this data structure directly, instead
@@ -171,7 +172,7 @@ namespace TagLib {
       const FrameList &embeddedFrameList() const;
 
       /*!
-       * Returns the embedded frame list for frames with the id \a frameID 
+       * Returns the embedded frame list for frames with the id \a frameID
        * or an empty list if there are no embedded frames of that type.  This
        * is just a convenience and is equivalent to:
        *
@@ -184,7 +185,7 @@ namespace TagLib {
       const FrameList &embeddedFrameList(const ByteVector &frameID) const;
 
       /*!
-       * Add an embedded frame to the CHAP frame.  At this point the CHAP frame 
+       * Add an embedded frame to the CHAP frame.  At this point the CHAP frame
        * takes ownership of the embedded frame and will handle freeing its memory.
        *
        * \note Using this method will invalidate any pointers on the list
@@ -193,7 +194,7 @@ namespace TagLib {
       void addEmbeddedFrame(Frame *frame);
 
       /*!
-       * Remove an embedded frame from the CHAP frame.  If \a del is true the frame's 
+       * Remove an embedded frame from the CHAP frame.  If \a del is true the frame's
        * memory will be freed; if it is false, it must be deleted by the user.
        *
        * \note Using this method will invalidate any pointers on the list
@@ -202,7 +203,7 @@ namespace TagLib {
       void removeEmbeddedFrame(Frame *frame, bool del = true);
 
       /*!
-       * Remove all embedded frames of type \a id from the CHAP frame and free their 
+       * Remove all embedded frames of type \a id from the CHAP frame and free their
        * memory.
        *
        * \note Using this method will invalidate any pointers on the list

diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index 72377e0ad36b9540380f7fb8394a776a5e1985dc..f70edd6959c16575f6784f1e032eba493945a287 100644 (file)
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -54,7 +54,8 @@ TableOfContentsFrame::TableOfContentsFrame(const ByteVector &data) :
   setData(data);
 }
 
-TableOfContentsFrame::TableOfContentsFrame(const ByteVector &eID, const ByteVectorList &ch, const FrameList &eF) :
+TableOfContentsFrame::TableOfContentsFrame(const ByteVector &eID, const ByteVectorList &ch,
+                                           const FrameList &eF) :
     ID3v2::Frame("CTOC")
 {
   d = new TableOfContentsFramePrivate;
@@ -185,7 +186,8 @@ PropertyMap TableOfContentsFrame::asProperties() const
   return map;
 }
 
-TableOfContentsFrame *TableOfContentsFrame::findByElementID(const ID3v2::Tag *tag, const ByteVector &eID) // static
+TableOfContentsFrame *TableOfContentsFrame::findByElementID(const ID3v2::Tag *tag,
+                                                            const ByteVector &eID) // static
 {
   ID3v2::FrameList tablesOfContents = tag->frameList("CTOC");
 
@@ -221,7 +223,9 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
 {
   uint size = data.size();
   if(size < 6) {
-    debug("A CTOC frame must contain at least 6 bytes (1 byte element ID terminated by null, 1 byte flags, 1 byte entry count and 1 byte child element ID terminated by null.");
+    debug("A CTOC frame must contain at least 6 bytes (1 byte element ID terminated by "
+          "null, 1 byte flags, 1 byte entry count and 1 byte child element ID terminated "
+          "by null.");
     return;
   }