Permalink
Browse files

Fix compilation errors

  • Loading branch information...
1 parent 76222cb commit 8e67b40bdc21fac1d1f5f00d2ea1f1938d21134f @lalinsky lalinsky committed Mar 17, 2012
View
@@ -177,7 +177,7 @@ void APE::Tag::setTrack(uint i)
// conversions of tag keys between what we use in PropertyMap and what's usual
// for APE tags
-static const uint keyConversionsSize = 5; //usual, APE
+static const TagLib::uint keyConversionsSize = 5; //usual, APE
static const char *keyConversions[][2] = {{"TRACKNUMBER", "TRACK" },
{"DATE", "YEAR" },
{"ALBUMARTIST", "ALBUM ARTIST"},
View
@@ -73,12 +73,12 @@ String Mod::Tag::genre() const
return String::null;
}
-uint Mod::Tag::year() const
+TagLib::uint Mod::Tag::year() const
{
return 0;
}
-uint Mod::Tag::track() const
+TagLib::uint Mod::Tag::track() const
{
return 0;
}
@@ -120,7 +120,7 @@ void TextIdentificationFrame::setTextEncoding(String::Type encoding)
}
// array of allowed TIPL prefixes and their corresponding key value
-static const uint involvedPeopleSize = 5;
+static const TagLib::uint involvedPeopleSize = 5;
static const char* involvedPeople[][2] = {
{"ARRANGER", "ARRANGER"},
{"ENGINEER", "ENGINEER"},
@@ -314,7 +314,7 @@ String::Type Frame::checkTextEncoding(const StringList &fields, String::Type enc
return checkEncoding(fields, encoding, header()->version());
}
-static const uint frameTranslationSize = 51;
+static const TagLib::uint frameTranslationSize = 51;
static const char *frameTranslation[][2] = {
// Text information frames
{ "TALB", "ALBUM"},
@@ -390,7 +390,7 @@ Map<ByteVector, String> &idMap()
}
// list of deprecated frames and their successors
-static const uint deprecatedFramesSize = 4;
+static const TagLib::uint deprecatedFramesSize = 4;
static const char *deprecatedFrames[][2] = {
{"TRDA", "TDRC"}, // 2.3 -> 2.4 (http://en.wikipedia.org/wiki/ID3)
{"TDAT", "TDRC"}, // 2.3 -> 2.4
@@ -402,7 +402,7 @@ Map<ByteVector,ByteVector> &deprecationMap()
{
static Map<ByteVector,ByteVector> depMap;
if(depMap.isEmpty())
- for(uint i = 0; i < deprecatedFramesSize; ++i)
+ for(TagLib::uint i = 0; i < deprecatedFramesSize; ++i)
depMap[deprecatedFrames[i][0]] = deprecatedFrames[i][1];
return depMap;
}
View
@@ -557,12 +557,12 @@ class TestID3v2 : public CppUnit::TestFixture
string newname = copy.fileName();
MPEG::File f(newname.c_str());
PropertyMap dict = f.ID3v2Tag(false)->properties();
- CPPUNIT_ASSERT_EQUAL(uint(6), dict.size());
+ CPPUNIT_ASSERT_EQUAL(TagLib::uint(6), dict.size());
CPPUNIT_ASSERT(dict.contains("USERTEXTDESCRIPTION1"));
CPPUNIT_ASSERT(dict.contains("QuodLibet::USERTEXTDESCRIPTION2"));
- CPPUNIT_ASSERT_EQUAL(uint(2), dict["USERTEXTDESCRIPTION1"].size());
- CPPUNIT_ASSERT_EQUAL(uint(2), dict["QuodLibet::USERTEXTDESCRIPTION2"].size());
+ CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), dict["USERTEXTDESCRIPTION1"].size());
+ CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), dict["QuodLibet::USERTEXTDESCRIPTION2"].size());
CPPUNIT_ASSERT_EQUAL(String("userTextData1"), dict["USERTEXTDESCRIPTION1"][0]);
CPPUNIT_ASSERT_EQUAL(String("userTextData2"), dict["USERTEXTDESCRIPTION1"][1]);
CPPUNIT_ASSERT_EQUAL(String("userTextData1"), dict["QuodLibet::USERTEXTDESCRIPTION2"][0]);
View
@@ -61,7 +61,7 @@ class TestOGG : public CppUnit::TestFixture
Vorbis::File *f = new Vorbis::File(newname.c_str());
- CPPUNIT_ASSERT_EQUAL(uint(0), f->tag()->properties().size());
+ CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f->tag()->properties().size());
PropertyMap newTags;
StringList values("value 1");
@@ -70,8 +70,8 @@ class TestOGG : public CppUnit::TestFixture
f->tag()->setProperties(newTags);
PropertyMap map = f->tag()->properties();
- CPPUNIT_ASSERT_EQUAL(uint(1), map.size());
- CPPUNIT_ASSERT_EQUAL(uint(2), map["ARTIST"].size());
+ CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), map.size());
+ CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), map["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL(String("value 1"), map["ARTIST"][0]);
delete f;
@@ -85,7 +85,7 @@ class TestOGG : public CppUnit::TestFixture
Vorbis::File *f = new Vorbis::File(newname.c_str());
PropertyMap tags = f->tag()->properties();
- CPPUNIT_ASSERT_EQUAL(uint(2), tags["UNUSUALTAG"].size());
+ CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), tags["UNUSUALTAG"].size());
CPPUNIT_ASSERT_EQUAL(String("usual value"), tags["UNUSUALTAG"][0]);
CPPUNIT_ASSERT_EQUAL(String("another value"), tags["UNUSUALTAG"][1]);
CPPUNIT_ASSERT_EQUAL(String(L"öäüoΣø"), tags["UNICODETAG"][0]);

0 comments on commit 8e67b40

Please sign in to comment.