No reason to store this in the d-pointer

diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp
index 3180e1e067de88a7570bbeb701053ca250e9c697..6bf705047a74c4e4974b3f81a92e4cba82875996 100644 (file)
--- a/taglib/mpeg/id3v2/frames/chapterframe.cpp
+++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp
@@ -41,7 +41,6 @@ public:
   uint endTime;
   uint startOffset;
   uint endOffset;
-  const FrameFactory *factory;
   FrameListMap embeddedFrameListMap;
   FrameList embeddedFrameList;
 };
@@ -54,7 +53,6 @@ ChapterFrame::ChapterFrame(const ByteVector &data) :
     ID3v2::Frame(data)
 {
   d = new ChapterFramePrivate;
-  d->factory = FrameFactory::instance();
   setData(data);
 }
 
@@ -70,7 +68,6 @@ ChapterFrame::ChapterFrame(const ByteVector &eID, const uint &sT, const uint &eT
   FrameList l = eF;
   for(FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
     addEmbeddedFrame(*it);
-  d->factory = FrameFactory::instance();
 }
 
 ChapterFrame::~ChapterFrame()
@@ -225,7 +222,7 @@ void ChapterFrame::parseFields(const ByteVector &data)
   size -= pos;
   while((uint)embPos < size - Frame::headerSize(4))
   {
-    Frame *frame = d->factory->createFrame(data.mid(pos + embPos));
+    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos));
 
     if(!frame)
       return;
@@ -261,6 +258,5 @@ ChapterFrame::ChapterFrame(const ByteVector &data, Header *h) :
   Frame(h)
 {
   d = new ChapterFramePrivate;
-  d->factory = FrameFactory::instance();
   parseFields(fieldData(data));
 }

diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index 9ba0022716fd9766073a269756153203155b8ebe..72377e0ad36b9540380f7fb8394a776a5e1985dc 100644 (file)
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -39,7 +39,6 @@ public:
   bool isTopLevel;
   bool isOrdered;
   ByteVectorList childElements;
-  const FrameFactory *factory;
   FrameListMap embeddedFrameListMap;
   FrameList embeddedFrameList;
 };
@@ -52,7 +51,6 @@ TableOfContentsFrame::TableOfContentsFrame(const ByteVector &data) :
     ID3v2::Frame(data)
 {
   d = new TableOfContentsFramePrivate;
-  d->factory = FrameFactory::instance();
   setData(data);
 }
 
@@ -65,7 +63,6 @@ TableOfContentsFrame::TableOfContentsFrame(const ByteVector &eID, const ByteVect
   FrameList l = eF;
   for(FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
     addEmbeddedFrame(*it);
-  d->factory = FrameFactory::instance();
 }
 
 TableOfContentsFrame::~TableOfContentsFrame()
@@ -244,7 +241,7 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
   size -= pos;
   while((uint)embPos < size - Frame::headerSize(4))
   {
-    Frame *frame = d->factory->createFrame(data.mid(pos + embPos));
+    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos));
 
     if(!frame)
       return;
@@ -288,6 +285,5 @@ TableOfContentsFrame::TableOfContentsFrame(const ByteVector &data, Header *h) :
   Frame(h)
 {
   d = new TableOfContentsFramePrivate;
-  d->factory = FrameFactory::instance();
   parseFields(fieldData(data));
 }