diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp index ebbf0aee..764079f2 100644 --- a/bindings/c/tag_c.cpp +++ b/bindings/c/tag_c.cpp @@ -235,7 +235,7 @@ BOOL taglib_file_save(TagLib_File *file) char *taglib_tag_title(const TagLib_Tag *tag) { - const Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); char *s = stringToCharArray(t->title()); if(stringManagementEnabled) strings.append(s); @@ -244,7 +244,7 @@ char *taglib_tag_title(const TagLib_Tag *tag) char *taglib_tag_artist(const TagLib_Tag *tag) { - const Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); char *s = stringToCharArray(t->artist()); if(stringManagementEnabled) strings.append(s); @@ -253,7 +253,7 @@ char *taglib_tag_artist(const TagLib_Tag *tag) char *taglib_tag_album(const TagLib_Tag *tag) { - const Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); char *s = stringToCharArray(t->album()); if(stringManagementEnabled) strings.append(s); @@ -262,7 +262,7 @@ char *taglib_tag_album(const TagLib_Tag *tag) char *taglib_tag_comment(const TagLib_Tag *tag) { - const Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); char *s = stringToCharArray(t->comment()); if(stringManagementEnabled) strings.append(s); @@ -271,7 +271,7 @@ char *taglib_tag_comment(const TagLib_Tag *tag) char *taglib_tag_genre(const TagLib_Tag *tag) { - const Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); char *s = stringToCharArray(t->genre()); if(stringManagementEnabled) strings.append(s); @@ -280,55 +280,55 @@ char *taglib_tag_genre(const TagLib_Tag *tag) unsigned int taglib_tag_year(const TagLib_Tag *tag) { - const Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); return t->year(); } unsigned int taglib_tag_track(const TagLib_Tag *tag) { - const Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); return t->track(); } void taglib_tag_set_title(TagLib_Tag *tag, const char *title) { - Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); t->setTitle(charArrayToString(title)); } void taglib_tag_set_artist(TagLib_Tag *tag, const char *artist) { - Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); t->setArtist(charArrayToString(artist)); } void taglib_tag_set_album(TagLib_Tag *tag, const char *album) { - Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); t->setAlbum(charArrayToString(album)); } void taglib_tag_set_comment(TagLib_Tag *tag, const char *comment) { - Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); t->setComment(charArrayToString(comment)); } void taglib_tag_set_genre(TagLib_Tag *tag, const char *genre) { - Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); t->setGenre(charArrayToString(genre)); } void taglib_tag_set_year(TagLib_Tag *tag, unsigned int year) { - Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); t->setYear(year); } void taglib_tag_set_track(TagLib_Tag *tag, unsigned int track) { - Tag *t = reinterpret_cast(tag); + auto t = reinterpret_cast(tag); t->setTrack(track); } @@ -617,15 +617,15 @@ TagLib_Complex_Property_Attribute*** taglib_complex_property_get( return NULL; } - TagLib_Complex_Property_Attribute ***props = static_cast( + auto props = static_cast( malloc(sizeof(TagLib_Complex_Property_Attribute **) * (variantMaps.size() + 1))); TagLib_Complex_Property_Attribute ***propPtr = props; for(const auto &variantMap : variantMaps) { if(!variantMap.isEmpty()) { - TagLib_Complex_Property_Attribute **attrs = static_cast( + auto attrs = static_cast( malloc(sizeof(TagLib_Complex_Property_Attribute *) * (variantMap.size() + 1))); - TagLib_Complex_Property_Attribute *attr = static_cast( + auto attr = static_cast( malloc(sizeof(TagLib_Complex_Property_Attribute) * variantMap.size())); TagLib_Complex_Property_Attribute **attrPtr = attrs; // The next assignment is redundant to silence the clang analyzer, @@ -673,7 +673,7 @@ TagLib_Complex_Property_Attribute*** taglib_complex_property_get( } case Variant::StringList: { attr->value.type = TagLib_Variant_StringList; - StringList strs = v.value(); + auto strs = v.value(); auto strPtr = static_cast(malloc(sizeof(char *) * (strs.size() + 1))); attr->value.value.stringListValue = strPtr; attr->value.size = strs.size(); diff --git a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp index db1ce445..8b88b983 100644 --- a/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp +++ b/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp @@ -192,7 +192,7 @@ void AttachedPictureFrameV22::parseFields(const ByteVector &data) int pos = 1; - String fixedString = String(data.mid(pos, 3), String::Latin1); + auto fixedString = String(data.mid(pos, 3), String::Latin1); pos += 3; // convert fixed string image type to mime string if (fixedString.upper() == "JPG") { diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index f194aca3..f7db96b0 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -332,9 +332,9 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const tag->frameList("TDRC").size() == 1 && tag->frameList("TDAT").size() == 1) { - TextIdentificationFrame *tdrc = + auto tdrc = dynamic_cast(tag->frameList("TDRC").front()); - UnknownFrame *tdat = dynamic_cast(tag->frameList("TDAT").front()); + auto tdat = dynamic_cast(tag->frameList("TDAT").front()); if(tdrc && tdrc->fieldList().size() == 1 && @@ -346,7 +346,7 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const if(date.length() == 4) { tdrc->setText(tdrc->toString() + '-' + date.substr(2, 2) + '-' + date.substr(0, 2)); if(tag->frameList("TIME").size() == 1) { - UnknownFrame *timeframe = dynamic_cast(tag->frameList("TIME").front()); + auto timeframe = dynamic_cast(tag->frameList("TIME").front()); if(timeframe && timeframe->data().size() >= 5) { String time(timeframe->data().mid(1), static_cast(timeframe->data()[0])); if(time.length() == 4) { diff --git a/tests/test_apetag.cpp b/tests/test_apetag.cpp index 73691a43..404ae56e 100644 --- a/tests/test_apetag.cpp +++ b/tests/test_apetag.cpp @@ -89,10 +89,10 @@ public: void testPropertyInterface2() { APE::Tag tag; - APE::Item item1 = APE::Item("TRACK", String("17")); + APE::Item item1("TRACK", String("17")); tag.setItem("TRACK", item1); - APE::Item item2 = APE::Item(); + APE::Item item2; item2.setType(APE::Item::Binary); ByteVector binaryData1("first"); item2.setBinaryData(binaryData1); @@ -117,7 +117,7 @@ public: tag.removeUnsupportedProperties(properties.unsupportedData()); CPPUNIT_ASSERT(!tag.itemListMap().contains("TESTBINARY")); - APE::Item item3 = APE::Item("TRACKNUMBER", String("29")); + APE::Item item3("TRACKNUMBER", String("29")); tag.setItem("TRACKNUMBER", item3); properties = tag.properties(); CPPUNIT_ASSERT_EQUAL(static_cast(2), properties["TRACKNUMBER"].size()); @@ -151,7 +151,7 @@ public: void testTextBinary() { - APE::Item item = APE::Item("DUMMY", String("Test Text")); + APE::Item item("DUMMY", String("Test Text")); CPPUNIT_ASSERT_EQUAL(String("Test Text"), item.toString()); CPPUNIT_ASSERT_EQUAL(ByteVector(), item.binaryData()); diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp index 44f1211c..41c172c9 100644 --- a/tests/test_bytevector.cpp +++ b/tests/test_bytevector.cpp @@ -420,7 +420,7 @@ public: void testResize() { - ByteVector a = ByteVector("0123456789"); + auto a = ByteVector("0123456789"); ByteVector b = a.mid(3, 4); b.resize(6, 'A'); CPPUNIT_ASSERT_EQUAL(static_cast(6), b.size()); diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp index 0b3055c0..0416c636 100644 --- a/tests/test_id3v2.cpp +++ b/tests/test_id3v2.cpp @@ -293,13 +293,13 @@ public: void testParseAPICv22() { ID3v2::FrameFactory *factory = ID3v2::FrameFactory::instance(); - ByteVector data = ByteVector("PIC" - "\x00\x00\x08" - "\x00" - "JPG" - "\x01" - "d\x00" - "\x00", 14); + auto data = ByteVector("PIC" + "\x00\x00\x08" + "\x00" + "JPG" + "\x01" + "d\x00" + "\x00", 14); ID3v2::Header header; header.setMajorVersion(2); auto frame = @@ -337,13 +337,13 @@ public: void testDontRender22() { ID3v2::FrameFactory *factory = ID3v2::FrameFactory::instance(); - ByteVector data = ByteVector("FOO" - "\x00\x00\x08" - "\x00" - "JPG" - "\x01" - "d\x00" - "\x00", 14); + auto data = ByteVector("FOO" + "\x00\x00\x08" + "\x00" + "JPG" + "\x01" + "d\x00" + "\x00", 14); ID3v2::Header header; header.setMajorVersion(2); auto frame = @@ -798,10 +798,10 @@ public: void testParsePodcastFrame() { ID3v2::FrameFactory *factory = ID3v2::FrameFactory::instance(); - ByteVector data = ByteVector("PCST" - "\x00\x00\x00\x04" - "\x00\x00" - "\x00\x00\x00\x00", 14); + auto data = ByteVector("PCST" + "\x00\x00\x00\x04" + "\x00\x00" + "\x00\x00\x00\x00", 14); const ID3v2::Header header; ID3v2::Frame *frame = factory->createFrame(data, &header); CPPUNIT_ASSERT(dynamic_cast(frame)); @@ -921,11 +921,11 @@ public: { // "Refinement" is the same as the ID3v1 genre - duplicate ID3v2::FrameFactory *factory = ID3v2::FrameFactory::instance(); - ByteVector data = ByteVector("TCON" // Frame ID - "\x00\x00\x00\x10" // Frame size - "\x00\x00" // Frame flags - "\x00" // Encoding - "(22)Death Metal", 26); // Text + auto data = ByteVector("TCON" // Frame ID + "\x00\x00\x00\x10" // Frame size + "\x00\x00" // Frame flags + "\x00" // Encoding + "(22)Death Metal", 26); // Text ID3v2::Header header; header.setMajorVersion(3); auto frame = @@ -942,11 +942,11 @@ public: { // "Refinement" is different from the ID3v1 genre ID3v2::FrameFactory *factory = ID3v2::FrameFactory::instance(); - ByteVector data = ByteVector("TCON" // Frame ID - "\x00\x00\x00\x0d" // Frame size - "\x00\x00" // Frame flags - "\x00" // Encoding - "(4)Eurodisco", 23); // Text + auto data = ByteVector("TCON" // Frame ID + "\x00\x00\x00\x0d" // Frame size + "\x00\x00" // Frame flags + "\x00" // Encoding + "(4)Eurodisco", 23); // Text ID3v2::Header header; header.setMajorVersion(3); auto frame = @@ -964,11 +964,11 @@ public: { // Multiple references and a refinement ID3v2::FrameFactory *factory = ID3v2::FrameFactory::instance(); - ByteVector data = ByteVector("TCON" // Frame ID - "\x00\x00\x00\x15" // Frame size - "\x00\x00" // Frame flags - "\x00" // Encoding - "(9)(138)Viking Metal", 31); // Text + auto data = ByteVector("TCON" // Frame ID + "\x00\x00\x00\x15" // Frame size + "\x00\x00" // Frame flags + "\x00" // Encoding + "(9)(138)Viking Metal", 31); // Text ID3v2::Header header; header.setMajorVersion(3); auto frame = @@ -986,11 +986,11 @@ public: void testUpdateGenre24() { ID3v2::FrameFactory *factory = ID3v2::FrameFactory::instance(); - ByteVector data = ByteVector("TCON" // Frame ID - "\x00\x00\x00\x0D" // Frame size - "\x00\x00" // Frame flags - "\0" // Encoding - "14\0Eurodisco", 23); // Text + auto data = ByteVector("TCON" // Frame ID + "\x00\x00\x00\x0D" // Frame size + "\x00\x00" // Frame flags + "\0" // Encoding + "14\0Eurodisco", 23); // Text ID3v2::Header header; auto frame = dynamic_cast(factory->createFrame(data, &header)); @@ -1121,7 +1121,7 @@ public: CPPUNIT_ASSERT(f.ID3v2Tag()->frameListMap().contains("APIC")); if(zlib::isAvailable()) { - ID3v2::AttachedPictureFrame *frame + auto frame = dynamic_cast(f.ID3v2Tag()->frameListMap()["APIC"].front()); CPPUNIT_ASSERT(frame); assert(frame != nullptr); // to silence the clang analyzer @@ -1134,7 +1134,7 @@ public: // Skip the test if ZLIB is not installed. // The message "Compressed frames are currently not supported." will be displayed. - ID3v2::UnknownFrame *frame + auto frame = dynamic_cast(f.ID3v2Tag()->frameListMap()["APIC"].front()); CPPUNIT_ASSERT(frame); } @@ -1144,8 +1144,8 @@ public: { MPEG::File f(TEST_FILE_PATH_C("w000.mp3"), false); CPPUNIT_ASSERT(f.ID3v2Tag()->frameListMap().contains("W000")); - ID3v2::UrlLinkFrame *frame = - dynamic_cast(f.ID3v2Tag()->frameListMap()["W000"].front()); + auto frame = + dynamic_cast(f.ID3v2Tag()->frameListMap()["W000"].front()); CPPUNIT_ASSERT(frame); assert(frame != nullptr); // to silence the clang analyzer CPPUNIT_ASSERT_EQUAL(String("lukas.lalinsky@example.com____"), frame->url()); @@ -1386,7 +1386,7 @@ public: { ID3v2::Header header; - ByteVector chapterData = + auto chapterData = ByteVector("CHAP" // Frame ID "\x00\x00\x00\x20" // Frame size "\x00\x00" // Frame flags @@ -1395,7 +1395,7 @@ public: "\x00\x00\x00\x05" // End time "\x00\x00\x00\x02" // Start offset "\x00\x00\x00\x03", 28); // End offset - ByteVector embeddedFrameData = + auto embeddedFrameData = ByteVector("TIT2" // Embedded frame ID "\x00\x00\x00\x04" // Embedded frame size "\x00\x00" // Embedded frame flags @@ -1436,7 +1436,7 @@ public: eF->setText("CH1"); f1.addEmbeddedFrame(eF); - ByteVector expected = + auto expected = ByteVector("CHAP" // Frame ID "\x00\x00\x00\x20" // Frame size "\x00\x00" // Frame flags