Skip to content
This repository
Browse code

Fix compilation errors

  • Loading branch information...
commit 8e67b40bdc21fac1d1f5f00d2ea1f1938d21134f 1 parent 76222cb
Lukáš Lalinský lalinsky authored
2  taglib/ape/apetag.cpp
@@ -177,7 +177,7 @@ void APE::Tag::setTrack(uint i)
177 177
178 178 // conversions of tag keys between what we use in PropertyMap and what's usual
179 179 // for APE tags
180   -static const uint keyConversionsSize = 5; //usual, APE
  180 +static const TagLib::uint keyConversionsSize = 5; //usual, APE
181 181 static const char *keyConversions[][2] = {{"TRACKNUMBER", "TRACK" },
182 182 {"DATE", "YEAR" },
183 183 {"ALBUMARTIST", "ALBUM ARTIST"},
4 taglib/mod/modtag.cpp
@@ -73,12 +73,12 @@ String Mod::Tag::genre() const
73 73 return String::null;
74 74 }
75 75
76   -uint Mod::Tag::year() const
  76 +TagLib::uint Mod::Tag::year() const
77 77 {
78 78 return 0;
79 79 }
80 80
81   -uint Mod::Tag::track() const
  81 +TagLib::uint Mod::Tag::track() const
82 82 {
83 83 return 0;
84 84 }
2  taglib/mpeg/id3v2/frames/textidentificationframe.cpp
@@ -120,7 +120,7 @@ void TextIdentificationFrame::setTextEncoding(String::Type encoding)
120 120 }
121 121
122 122 // array of allowed TIPL prefixes and their corresponding key value
123   -static const uint involvedPeopleSize = 5;
  123 +static const TagLib::uint involvedPeopleSize = 5;
124 124 static const char* involvedPeople[][2] = {
125 125 {"ARRANGER", "ARRANGER"},
126 126 {"ENGINEER", "ENGINEER"},
6 taglib/mpeg/id3v2/id3v2frame.cpp
@@ -314,7 +314,7 @@ String::Type Frame::checkTextEncoding(const StringList &fields, String::Type enc
314 314 return checkEncoding(fields, encoding, header()->version());
315 315 }
316 316
317   -static const uint frameTranslationSize = 51;
  317 +static const TagLib::uint frameTranslationSize = 51;
318 318 static const char *frameTranslation[][2] = {
319 319 // Text information frames
320 320 { "TALB", "ALBUM"},
@@ -390,7 +390,7 @@ Map<ByteVector, String> &idMap()
390 390 }
391 391
392 392 // list of deprecated frames and their successors
393   -static const uint deprecatedFramesSize = 4;
  393 +static const TagLib::uint deprecatedFramesSize = 4;
394 394 static const char *deprecatedFrames[][2] = {
395 395 {"TRDA", "TDRC"}, // 2.3 -> 2.4 (http://en.wikipedia.org/wiki/ID3)
396 396 {"TDAT", "TDRC"}, // 2.3 -> 2.4
@@ -402,7 +402,7 @@ Map<ByteVector,ByteVector> &deprecationMap()
402 402 {
403 403 static Map<ByteVector,ByteVector> depMap;
404 404 if(depMap.isEmpty())
405   - for(uint i = 0; i < deprecatedFramesSize; ++i)
  405 + for(TagLib::uint i = 0; i < deprecatedFramesSize; ++i)
406 406 depMap[deprecatedFrames[i][0]] = deprecatedFrames[i][1];
407 407 return depMap;
408 408 }
6 tests/test_id3v2.cpp
@@ -557,12 +557,12 @@ class TestID3v2 : public CppUnit::TestFixture
557 557 string newname = copy.fileName();
558 558 MPEG::File f(newname.c_str());
559 559 PropertyMap dict = f.ID3v2Tag(false)->properties();
560   - CPPUNIT_ASSERT_EQUAL(uint(6), dict.size());
  560 + CPPUNIT_ASSERT_EQUAL(TagLib::uint(6), dict.size());
561 561
562 562 CPPUNIT_ASSERT(dict.contains("USERTEXTDESCRIPTION1"));
563 563 CPPUNIT_ASSERT(dict.contains("QuodLibet::USERTEXTDESCRIPTION2"));
564   - CPPUNIT_ASSERT_EQUAL(uint(2), dict["USERTEXTDESCRIPTION1"].size());
565   - CPPUNIT_ASSERT_EQUAL(uint(2), dict["QuodLibet::USERTEXTDESCRIPTION2"].size());
  564 + CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), dict["USERTEXTDESCRIPTION1"].size());
  565 + CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), dict["QuodLibet::USERTEXTDESCRIPTION2"].size());
566 566 CPPUNIT_ASSERT_EQUAL(String("userTextData1"), dict["USERTEXTDESCRIPTION1"][0]);
567 567 CPPUNIT_ASSERT_EQUAL(String("userTextData2"), dict["USERTEXTDESCRIPTION1"][1]);
568 568 CPPUNIT_ASSERT_EQUAL(String("userTextData1"), dict["QuodLibet::USERTEXTDESCRIPTION2"][0]);
8 tests/test_ogg.cpp
@@ -61,7 +61,7 @@ class TestOGG : public CppUnit::TestFixture
61 61
62 62 Vorbis::File *f = new Vorbis::File(newname.c_str());
63 63
64   - CPPUNIT_ASSERT_EQUAL(uint(0), f->tag()->properties().size());
  64 + CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f->tag()->properties().size());
65 65
66 66 PropertyMap newTags;
67 67 StringList values("value 1");
@@ -70,8 +70,8 @@ class TestOGG : public CppUnit::TestFixture
70 70 f->tag()->setProperties(newTags);
71 71
72 72 PropertyMap map = f->tag()->properties();
73   - CPPUNIT_ASSERT_EQUAL(uint(1), map.size());
74   - CPPUNIT_ASSERT_EQUAL(uint(2), map["ARTIST"].size());
  73 + CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), map.size());
  74 + CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), map["ARTIST"].size());
75 75 CPPUNIT_ASSERT_EQUAL(String("value 1"), map["ARTIST"][0]);
76 76 delete f;
77 77
@@ -85,7 +85,7 @@ class TestOGG : public CppUnit::TestFixture
85 85 Vorbis::File *f = new Vorbis::File(newname.c_str());
86 86 PropertyMap tags = f->tag()->properties();
87 87
88   - CPPUNIT_ASSERT_EQUAL(uint(2), tags["UNUSUALTAG"].size());
  88 + CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), tags["UNUSUALTAG"].size());
89 89 CPPUNIT_ASSERT_EQUAL(String("usual value"), tags["UNUSUALTAG"][0]);
90 90 CPPUNIT_ASSERT_EQUAL(String("another value"), tags["UNUSUALTAG"][1]);
91 91 CPPUNIT_ASSERT_EQUAL(String(L"öäüoΣø"), tags["UNICODETAG"][0]);

0 comments on commit 8e67b40

Please sign in to comment.
Something went wrong with that request. Please try again.