Remove the body of deprecated function Ogg::Page::getCopyWithNewPageSequenceNumber().

diff --git a/NEWS b/NEWS
index a3e5c93af10c452bd0c76b7d78e53ad9e56bd64e..d9aa57b75dcc9d305bcd065eb58f68658c6de966 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@
  * Marked ByteVector::null and ByteVector::isNull() deprecated.
  * Marked String::null and ByteVector::isNull() deprecated.
  * Marked XiphComment::removeField() deprecated.
+ * Marked Ogg::Page::getCopyWithNewPageSequenceNumber() deprecated. It returns null.
  * Marked custom integer types deprecated.
  * Many smaller bug fixes and performance improvements.
 

diff --git a/taglib/ogg/oggpage.cpp b/taglib/ogg/oggpage.cpp
index 9f3b3dc484f33cf0dd3211cc700ce7d53b284629..75aea22a274f87545283369e5e4ce97b7299de48 100644 (file)
--- a/taglib/ogg/oggpage.cpp
+++ b/taglib/ogg/oggpage.cpp
@@ -269,27 +269,10 @@ List<Ogg::Page *> Ogg::Page::paginate(const ByteVectorList &packets,
   return l;
 }
 
-Ogg::Page* Ogg::Page::getCopyWithNewPageSequenceNumber(int sequenceNumber)
+Ogg::Page* Ogg::Page::getCopyWithNewPageSequenceNumber(int /*sequenceNumber*/)
 {
-  Page *pResultPage = NULL;
-
-  // TODO: a copy constructor would be helpful
-
-  if(d->file == 0) {
-    pResultPage = new Page(
-        d->packets,
-        d->header.streamSerialNumber(),
-        sequenceNumber,
-        d->header.firstPacketContinued(),
-        d->header.lastPacketCompleted(),
-        d->header.lastPageOfStream());
-  }
-  else
-  {
-    pResultPage = new Page(d->file, d->fileOffset);
-    pResultPage->d->header.setPageSequenceNumber(sequenceNumber);
-  }
-  return pResultPage;
+  debug("Ogg::Page::getCopyWithNewPageSequenceNumber() -- This function is obsolete. Returning null.");
+  return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/taglib/ogg/oggpage.h b/taglib/ogg/oggpage.h
index 3fbf75d720445f5863b131b9c80c20a585077cb4..13e3e7f9831841f319b77ea435c51cbcf11546c0 100644 (file)
--- a/taglib/ogg/oggpage.h
+++ b/taglib/ogg/oggpage.h
@@ -91,7 +91,7 @@ namespace TagLib {
        * \see header()
        * \see PageHeader::setPageSequenceNumber()
        *
-       * \deprecated
+       * \deprecated Always returns null.
        */
       Page* getCopyWithNewPageSequenceNumber(int sequenceNumber);