From 81945efdff83afe82b645a9edd3681163329d3fb Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Tue, 13 Jun 2017 09:40:01 +0900 Subject: [PATCH] Move deprecated functions setID3v2FrameFactory(). --- taglib/flac/flacfile.cpp | 5 ----- taglib/flac/flacfile.h | 10 ---------- taglib/mpeg/mpegfile.cpp | 5 ----- taglib/mpeg/mpegfile.h | 8 -------- taglib/trueaudio/trueaudiofile.cpp | 5 ----- taglib/trueaudio/trueaudiofile.h | 8 -------- 6 files changed, 41 deletions(-) diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp index 8b82a8fb..642ed90a 100644 --- a/taglib/flac/flacfile.cpp +++ b/taglib/flac/flacfile.cpp @@ -307,11 +307,6 @@ Ogg::XiphComment *FLAC::File::xiphComment(bool create) return d->tag.access(FlacXiphIndex, create); } -void FLAC::File::setID3v2FrameFactory(const ID3v2::FrameFactory *factory) -{ - d->ID3v2FrameFactory = factory; -} - List FLAC::File::pictureList() { List pictures; diff --git a/taglib/flac/flacfile.h b/taglib/flac/flacfile.h index 95c590cb..9fa68804 100644 --- a/taglib/flac/flacfile.h +++ b/taglib/flac/flacfile.h @@ -210,16 +210,6 @@ namespace TagLib { */ Ogg::XiphComment *xiphComment(bool create = false); - /*! - * Set the ID3v2::FrameFactory to something other than the default. This - * can be used to specify the way that ID3v2 frames will be interpreted - * when - * - * \see ID3v2FrameFactory - * \deprecated This value should be passed in via the constructor - */ - void setID3v2FrameFactory(const ID3v2::FrameFactory *factory); - /*! * Returns a list of pictures attached to the FLAC file. */ diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp index 6d4e9686..ec13de9e 100644 --- a/taglib/mpeg/mpegfile.cpp +++ b/taglib/mpeg/mpegfile.cpp @@ -363,11 +363,6 @@ bool MPEG::File::strip(int tags, bool freeMemory) return true; } -void MPEG::File::setID3v2FrameFactory(const ID3v2::FrameFactory *factory) -{ - d->ID3v2FrameFactory = factory; -} - long long MPEG::File::nextFrameOffset(long long position) { ByteVector frameSyncBytes(2, '\0'); diff --git a/taglib/mpeg/mpegfile.h b/taglib/mpeg/mpegfile.h index 175682d3..33c70426 100644 --- a/taglib/mpeg/mpegfile.h +++ b/taglib/mpeg/mpegfile.h @@ -270,14 +270,6 @@ namespace TagLib { // BIC: merge with the method above bool strip(int tags, bool freeMemory); - /*! - * Set the ID3v2::FrameFactory to something other than the default. - * - * \see ID3v2FrameFactory - * \deprecated This value should be passed in via the constructor - */ - void setID3v2FrameFactory(const ID3v2::FrameFactory *factory); - /*! * Returns the position in the file of the first MPEG frame. */ diff --git a/taglib/trueaudio/trueaudiofile.cpp b/taglib/trueaudio/trueaudiofile.cpp index 0e3039c0..a252ea83 100644 --- a/taglib/trueaudio/trueaudiofile.cpp +++ b/taglib/trueaudio/trueaudiofile.cpp @@ -148,11 +148,6 @@ TrueAudio::AudioProperties *TrueAudio::File::audioProperties() const return d->properties; } -void TrueAudio::File::setID3v2FrameFactory(const ID3v2::FrameFactory *factory) -{ - d->ID3v2FrameFactory = factory; -} - bool TrueAudio::File::save() { if(readOnly()) { diff --git a/taglib/trueaudio/trueaudiofile.h b/taglib/trueaudio/trueaudiofile.h index d15ae108..a98ac7ad 100644 --- a/taglib/trueaudio/trueaudiofile.h +++ b/taglib/trueaudio/trueaudiofile.h @@ -151,14 +151,6 @@ namespace TagLib { */ virtual AudioProperties *audioProperties() const; - /*! - * Set the ID3v2::FrameFactory to something other than the default. - * - * \see ID3v2FrameFactory - * \deprecated This value should be passed in via the constructor - */ - void setID3v2FrameFactory(const ID3v2::FrameFactory *factory); - /*! * Saves the file. */