Various uint fixes

We really need to get rid of TagLib::uint...

diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp
index 22fd318440c0f31f274b37cdda1abe8f16720cff..a38e1c401b57c84d15a803266478023bd3cc782a 100644 (file)
--- a/taglib/riff/rifffile.cpp
+++ b/taglib/riff/rifffile.cpp
@@ -191,7 +191,6 @@ void RIFF::File::setChunkData(const ByteVector &name, const ByteVector &data, bo
 
   // Now add the chunk to the file
 
-  long len = length();
   writeChunk(name, data, offset, std::max<long>(0, length() - offset), (offset & 1) ? 1 : 0);
 
   // And update our internal structure

diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp
index 489adc3b5f4b2a8afa8942b6794605ec047ce8e6..0ba40665415467670a32ba3e815e503c6ed98a76 100644 (file)
--- a/taglib/riff/wav/wavfile.cpp
+++ b/taglib/riff/wav/wavfile.cpp
@@ -199,13 +199,13 @@ void RIFF::WAV::File::strip(TagTypes tags)
     removeChunk(d->tagChunkID);
 
   if(tags & Info){
-    uint chunkId = findInfoTagChunk();
-    if(chunkId != -1)
+    TagLib::uint chunkId = findInfoTagChunk();
+    if(chunkId != TagLib::uint(-1))
       removeChunk(chunkId);
   }
 }
 
-uint RIFF::WAV::File::findInfoTagChunk()
+TagLib::uint RIFF::WAV::File::findInfoTagChunk()
 {
   for(uint i = 0; i < chunkCount(); ++i) {
     if(chunkName(i) == "LIST" && chunkData(i).mid(0, 4) == "INFO") {
@@ -213,5 +213,5 @@ uint RIFF::WAV::File::findInfoTagChunk()
     }
   }
   
-  return -1;
+  return TagLib::uint(-1);
 }