Revert changes concerning the smart pointer

taglib/mp4/mp4coverart.cpp

@@ -33,35 +33,43 @@
 
 using namespace TagLib;
 
-class MP4::CoverArt::CoverArtPrivate
+class MP4::CoverArt::CoverArtPrivate : public RefCounter
 {
 public:
-  CoverArtPrivate() : format(MP4::CoverArt::JPEG) {}
+  CoverArtPrivate() : RefCounter(), format(MP4::CoverArt::JPEG) {}
 
   Format format;
   ByteVector data;
 };
 
 MP4::CoverArt::CoverArt(Format format, const ByteVector &data)
-  : d(new CoverArtPrivate())
 {
+  d = new CoverArtPrivate;
   d->format = format;
   d->data = data;
 }
 
 MP4::CoverArt::CoverArt(const CoverArt &item) : d(item.d)
 {
+  d->ref();
 }
 
 MP4::CoverArt &
 MP4::CoverArt::operator=(const CoverArt &item)
 {
+  if(d->deref()) {
+    delete d;
+  }
   d = item.d;
+  d->ref();
   return *this;
 }
 
 MP4::CoverArt::~CoverArt()
 {
+  if(d->deref()) {
+    delete d;
+  }
 }
 
 MP4::CoverArt::Format

taglib/mp4/mp4coverart.h

@@ -63,7 +63,7 @@ namespace TagLib {
 
     private:
       class CoverArtPrivate;
-      RefCountPtr<CoverArtPrivate> d;
+      CoverArtPrivate *d;
     };
 
     typedef List<CoverArt> CoverArtList;

taglib/mp4/mp4item.cpp

@@ -33,10 +33,10 @@
 
 using namespace TagLib;
 
-class MP4::Item::ItemPrivate 
+class MP4::Item::ItemPrivate : public RefCounter
 {
 public:
-  ItemPrivate() : valid(true), atomDataType(TypeUndefined) {}
+  ItemPrivate() : RefCounter(), valid(true), atomDataType(TypeUndefined) {}
 
   bool valid;
   AtomDataType atomDataType;
@@ -54,78 +54,86 @@ public:
 };
 
 MP4::Item::Item()
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->valid = false;
 }
 
 MP4::Item::Item(const Item &item) : d(item.d)
 {
+  d->ref();
 }
 
 MP4::Item &
 MP4::Item::operator=(const Item &item)
 {
+  if(d->deref()) {
+    delete d;
+  }
   d = item.d;
+  d->ref();
   return *this;
 }
 
 MP4::Item::~Item()
 {
+  if(d->deref()) {
+    delete d;
+  }
 }
 
 MP4::Item::Item(bool value)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_bool = value;
 }
 
 MP4::Item::Item(int value)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_int = value;
 }
 
 MP4::Item::Item(uchar value)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_byte = value;
 }
 
 MP4::Item::Item(uint value)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_uint = value;
 }
 
 MP4::Item::Item(long long value)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_longlong = value;
 }
 
 MP4::Item::Item(int value1, int value2)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_intPair.first = value1;
   d->m_intPair.second = value2;
 }
 
 MP4::Item::Item(const ByteVectorList &value)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_byteVectorList = value;
 }
 
 MP4::Item::Item(const StringList &value)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_stringList = value;
 }
 
 MP4::Item::Item(const MP4::CoverArtList &value)
-  : d(new ItemPrivate())
 {
+  d = new ItemPrivate;
   d->m_coverArtList = value;
 }
 

taglib/mp4/mp4item.h

@@ -73,7 +73,7 @@ namespace TagLib {
 
     private:
       class ItemPrivate;
-      RefCountPtr<ItemPrivate> d;
+      ItemPrivate *d;
     };
 
   }