Add support for taglib 2, part 2.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4a0485854f)

amarok/src/metadata/m4a/mp4file.cpp

@@ -131,12 +131,12 @@ uint MP4::File::readSystemsLen()
   uint length = 0;
   uint nbytes = 0;
   ByteVector   input;
-  TagLib::uchar tmp_input;
+  uchar        tmp_input;
 
   do
   {
     input = readBlock(1);
-    tmp_input = static_cast<TagLib::uchar>(input[0]);
+    tmp_input = static_cast<uchar>(input[0]);
     nbytes++;
     length = (length<<7) | (tmp_input&0x7F);
   } while( (tmp_input&0x80) && (nbytes<4) );

amarok/src/metadata/m4a/mp4isofullbox.cpp

@@ -55,7 +55,7 @@ void  MP4::Mp4IsoFullBox::parsebox()
   parse();
 }
 
-TagLib::uchar MP4::Mp4IsoFullBox::version()
+uchar MP4::Mp4IsoFullBox::version()
 {
   return d->version;
 }