From 0b62ba15305ddd86108192c62288985c1644cb13 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Thu, 28 Jan 2016 12:00:27 +0900 Subject: [PATCH] Remove the body of deprecated function Ogg::Page::getCopyWithNewPageSequenceNumber(). --- NEWS | 1 + taglib/ogg/oggpage.cpp | 23 +++-------------------- taglib/ogg/oggpage.h | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/NEWS b/NEWS index a3e5c93a..d9aa57b7 100644 --- 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 9f3b3dc4..75aea22a 100644 --- a/taglib/ogg/oggpage.cpp +++ b/taglib/ogg/oggpage.cpp @@ -269,27 +269,10 @@ List 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 3fbf75d7..13e3e7f9 100644 --- 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); -- 2.40.0