mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-26 17:04:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mark deprected methods and remove internal usage

Browse Source 
This does not put the deprecated marker on methods that will or could resolve
to the same overload, e.g.:

void foo(bool bar = true); // <-- not marked
void foo(Bar bar) // <-- since this will have a default argument in the new version
This commit is contained in:
Scott Wheeler
2019-09-11 00:37:02 +02:00
parent b8dc105ae3
commit c05fa78406
53 changed files with 114 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
taglib/dsdiff/dsdiffdiintag.cpp
View File

@ -88,7 +88,7 @@ unsigned int DSDIFF::DIIN::Tag::track() const
void DSDIFF::DIIN::Tag::setTitle(const String &title)
{
if(title.isNull() || title.isEmpty())
if(title.isEmpty())
d->title = String();
else
d->title = title;
@ -96,7 +96,7 @@ void DSDIFF::DIIN::Tag::setTitle(const String &title)
void DSDIFF::DIIN::Tag::setArtist(const String &artist)
{
if(artist.isNull() || artist.isEmpty())
if(artist.isEmpty())
d->artist = String();
else
d->artist = artist;

10
taglib/dsdiff/dsdifffile.cpp
View File

@ -230,7 +230,7 @@ bool DSDIFF::File::save()
if(d->hasDiin) {
DSDIFF::DIIN::Tag *diinTag = d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false);
if(!diinTag->title().isNull() && !diinTag->title().isEmpty()) {
if(!diinTag->title().isEmpty()) {
ByteVector diinTitle;
diinTitle.append(ByteVector::fromUInt(diinTag->title().size(), d->endianness == BigEndian));
diinTitle.append(ByteVector::fromCString(diinTag->title().toCString()));
@ -239,7 +239,7 @@ bool DSDIFF::File::save()
else
setChildChunkData("DITI", ByteVector(), DIINChunk);
if(!diinTag->artist().isNull() && !diinTag->artist().isEmpty()) {
if(!diinTag->artist().isEmpty()) {
ByteVector diinArtist;
diinArtist.append(ByteVector::fromUInt(diinTag->artist().size(), d->endianness == BigEndian));
diinArtist.append(ByteVector::fromCString(diinTag->artist().toCString()));
@ -264,7 +264,7 @@ bool DSDIFF::File::save()
void DSDIFF::File::setRootChunkData(unsigned int i, const ByteVector &data)
{
if(data.isNull() || data.isEmpty()) {
if(data.isEmpty()) {
// Null data: remove chunk
// Update global size
unsigned long long removedChunkTotalSize = d->chunks[i].size + d->chunks[i].padding + 12;
@ -344,7 +344,7 @@ void DSDIFF::File::setChildChunkData(unsigned int i,
{
std::vector<Chunk64> &childChunks = d->childChunks[childChunkNum];
if(data.isNull() || data.isEmpty()) {
if(data.isEmpty()) {
// Null data: remove chunk
// Update global size
unsigned long long removedChunkTotalSize = childChunks[i].size + childChunks[i].padding + 12;
@ -426,7 +426,7 @@ void DSDIFF::File::setChildChunkData(const ByteVector &name,
}
// Do not attempt to remove a non existing chunk
if(data.isNull() || data.isEmpty())
if(data.isEmpty())
return;
// Couldn't find an existing chunk, so let's create a new one.