Use List::isEmpty() rather than size() to check if the list is empty.

std::list::empty() is guaranteed to be an O(1) operation.

diff --git a/taglib/ape/apeitem.cpp b/taglib/ape/apeitem.cpp
index 49c3a6653a40c238054f967274affc8c7106c386..442dce63d3eb0731c53ddb63bcffe6abd1b6fedb 100644 (file)
--- a/taglib/ape/apeitem.cpp
+++ b/taglib/ape/apeitem.cpp
@@ -177,7 +177,7 @@ int APE::Item::size() const
   int result = 8 + d->key.size() /* d->key.data(String::UTF8).size() */ + 1;
   switch (d->type) {
     case Text:
-      if(d->text.size()) {
+      if(!d->text.isEmpty()) {
         StringList::ConstIterator it = d->text.begin();
 
         result += it->data(String::UTF8).size();
@@ -249,7 +249,7 @@ void APE::Item::parse(const ByteVector &data)
   setReadOnly(flags & 1);
   setType(ItemTypes((flags >> 1) & 3));
 
-  if(Text == d->type) 
+  if(Text == d->type)
     d->text = StringList(ByteVectorList::split(value, '\0'), String::UTF8);
   else
     d->value = value;

diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp
index 312533fee726b0e72a1a1d949d6d0d7f8ad895d2..7115fb4713653f66ab27e5ca50bfadab090677d0 100644 (file)
--- a/taglib/ape/apetag.cpp
+++ b/taglib/ape/apetag.cpp
@@ -247,7 +247,7 @@ PropertyMap APE::Tag::setProperties(const PropertyMap &origProps)
     if(!checkKey(tagName))
       invalid.insert(it->first, it->second);
     else if(!(itemListMap().contains(tagName)) || !(itemListMap()[tagName].values() == it->second)) {
-      if(it->second.size() == 0)
+      if(it->second.isEmpty())
         removeItem(tagName);
       else {
         StringList::ConstIterator valueIt = it->second.begin();

diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index a84f54e54f2227493fca2ed7e075f38875525a0d..771fc59a5e3efc30d7a92a6ddeca47ac5fe8a160 100644 (file)
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -161,7 +161,7 @@ void
 MP4::Tag::parseInt(const MP4::Atom *atom)
 {
   ByteVectorList data = parseData(atom);
-  if(data.size()) {
+  if(!data.isEmpty()) {
     addItem(atom->name, (int)data[0].toShort());
   }
 }
@@ -170,7 +170,7 @@ void
 MP4::Tag::parseUInt(const MP4::Atom *atom)
 {
   ByteVectorList data = parseData(atom);
-  if(data.size()) {
+  if(!data.isEmpty()) {
     addItem(atom->name, data[0].toUInt());
   }
 }
@@ -179,7 +179,7 @@ void
 MP4::Tag::parseLongLong(const MP4::Atom *atom)
 {
   ByteVectorList data = parseData(atom);
-  if(data.size()) {
+  if(!data.isEmpty()) {
     addItem(atom->name, data[0].toLongLong());
   }
 }
@@ -188,7 +188,7 @@ void
 MP4::Tag::parseByte(const MP4::Atom *atom)
 {
   ByteVectorList data = parseData(atom);
-  if(data.size()) {
+  if(!data.isEmpty()) {
     addItem(atom->name, (uchar)data[0].at(0));
   }
 }
@@ -197,7 +197,7 @@ void
 MP4::Tag::parseGnre(const MP4::Atom *atom)
 {
   ByteVectorList data = parseData(atom);
-  if(data.size()) {
+  if(!data.isEmpty()) {
     int idx = (int)data[0].toShort();
     if(idx > 0) {
       addItem("\251gen", StringList(ID3v1::genre(idx - 1)));
@@ -209,7 +209,7 @@ void
 MP4::Tag::parseIntPair(const MP4::Atom *atom)
 {
   ByteVectorList data = parseData(atom);
-  if(data.size()) {
+  if(!data.isEmpty()) {
     const int a = data[0].toShort(2U);
     const int b = data[0].toShort(4U);
     addItem(atom->name, MP4::Item(a, b));
@@ -220,7 +220,7 @@ void
 MP4::Tag::parseBool(const MP4::Atom *atom)
 {
   ByteVectorList data = parseData(atom);
-  if(data.size()) {
+  if(!data.isEmpty()) {
     bool value = data[0].size() ? data[0][0] != '\0' : false;
     addItem(atom->name, value);
   }
@@ -230,7 +230,7 @@ void
 MP4::Tag::parseText(const MP4::Atom *atom, int expectedFlags)
 {
   ByteVectorList data = parseData(atom, expectedFlags);
-  if(data.size()) {
+  if(!data.isEmpty()) {
     StringList value;
     for(ByteVectorList::ConstIterator it = data.begin(); it != data.end(); ++it) {
       value.append(String(*it, String::UTF8));
@@ -426,7 +426,7 @@ ByteVector
 MP4::Tag::renderFreeForm(const String &name, const MP4::Item &item) const
 {
   StringList header = StringList::split(name, ":");
-  if (header.size() != 3) {
+  if(header.size() != 3) {
     debug("MP4: Invalid free-form item name \"" + name + "\"");
     return ByteVector::null;
   }
@@ -937,7 +937,7 @@ PropertyMap MP4::Tag::setProperties(const PropertyMap &props)
       if((it->first == "TRACKNUMBER" || it->first == "DISCNUMBER") && !it->second.isEmpty()) {
         int first = 0, second = 0;
         StringList parts = StringList::split(it->second.front(), "/");
-        if(parts.size() > 0) {
+        if(!parts.isEmpty()) {
           first = parts[0].toInt();
           if(parts.size() > 1) {
             second = parts[1].toInt();

diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp
index 9462607f4c1d432e4bd6ca7e80dd631c2cfeeedf..1da0edac79e495b71458c0a5210bddd84db0eee3 100644 (file)
--- a/taglib/ogg/xiphcomment.cpp
+++ b/taglib/ogg/xiphcomment.cpp
@@ -214,7 +214,7 @@ PropertyMap Ogg::XiphComment::setProperties(const PropertyMap &properties)
       invalid.insert(it->first, it->second);
     else if(!d->fieldListMap.contains(it->first) || !(it->second == d->fieldListMap[it->first])) {
       const StringList &sl = it->second;
-      if(sl.size() == 0)
+      if(sl.isEmpty())
         // zero size string list -> remove the tag with all values
         removeField(it->first);
       else {

diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp
index 7fe6f108d7c168d24d2a11bdf57a723f73d48a69..3625d21337a3c741e733d9e8f87e53e3866b28ac 100644 (file)
--- a/taglib/xm/xmfile.cpp
+++ b/taglib/xm/xmfile.cpp
@@ -635,7 +635,7 @@ void XM::File::read(bool)
 
   d->properties.setSampleCount(sumSampleCount);
   String comment(intrumentNames.toString("\n"));
-  if(sampleNames.size() > 0) {
+  if(!sampleNames.isEmpty()) {
     comment += "\n";
     comment += sampleNames.toString("\n");
   }