From 6b17aa3694e26d827eafb3e5dee8fe16ec9146c6 Mon Sep 17 00:00:00 2001 From: Urs Fleisch Date: Sat, 20 Jan 2024 17:12:02 +0100 Subject: [PATCH] Inspection: Parameter can be made pointer to const --- bindings/c/tag_c.cpp | 8 ++++---- bindings/c/tag_c.h | 8 ++++---- taglib/dsdiff/dsdifffile.cpp | 2 +- taglib/dsf/dsffile.cpp | 2 +- taglib/mp4/mp4atom.cpp | 8 ++++---- taglib/mp4/mp4file.cpp | 2 +- taglib/mp4/mp4properties.cpp | 2 +- taglib/mp4/mp4properties.h | 2 +- taglib/mpeg/id3v2/frames/textidentificationframe.cpp | 2 +- taglib/mpeg/id3v2/frames/textidentificationframe.h | 2 +- taglib/mpeg/id3v2/frames/urllinkframe.cpp | 2 +- taglib/mpeg/id3v2/frames/urllinkframe.h | 2 +- taglib/riff/aiff/aifffile.cpp | 2 +- taglib/riff/wav/wavfile.cpp | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp index d6d65d84..4eda88e1 100644 --- a/bindings/c/tag_c.cpp +++ b/bindings/c/tag_c.cpp @@ -441,7 +441,7 @@ void taglib_property_set_append(TagLib_File *f, const char *prop, const char *va _taglib_property_set(f, prop, value, true); } -char** taglib_property_keys(TagLib_File *file) +char** taglib_property_keys(const TagLib_File *file) { if(file == NULL) return NULL; @@ -461,7 +461,7 @@ char** taglib_property_keys(TagLib_File *file) return props; } -char **taglib_property_get(TagLib_File *file, const char *prop) +char **taglib_property_get(const TagLib_File *file, const char *prop) { if(file == NULL || prop == NULL) return NULL; @@ -585,7 +585,7 @@ BOOL taglib_complex_property_set_append( return _taglib_complex_property_set(file, key, value, true); } -char** taglib_complex_property_keys(TagLib_File *file) +char** taglib_complex_property_keys(const TagLib_File *file) { if(file == NULL) { return NULL; @@ -608,7 +608,7 @@ char** taglib_complex_property_keys(TagLib_File *file) } TagLib_Complex_Property_Attribute*** taglib_complex_property_get( - TagLib_File *file, const char *key) + const TagLib_File *file, const char *key) { if(file == NULL || key == NULL) { return NULL; diff --git a/bindings/c/tag_c.h b/bindings/c/tag_c.h index 153f8dde..f3f4e315 100644 --- a/bindings/c/tag_c.h +++ b/bindings/c/tag_c.h @@ -354,7 +354,7 @@ TAGLIB_C_EXPORT void taglib_property_set_append(TagLib_File *file, const char *p * \return NULL terminated array of C-strings (char *), only NULL if empty. * It must be freed by the client using taglib_property_free(). */ -TAGLIB_C_EXPORT char** taglib_property_keys(TagLib_File *file); +TAGLIB_C_EXPORT char** taglib_property_keys(const TagLib_File *file); /*! * Get value(s) of property \a prop. @@ -362,7 +362,7 @@ TAGLIB_C_EXPORT char** taglib_property_keys(TagLib_File *file); * \return NULL terminated array of C-strings (char *), only NULL if empty. * It must be freed by the client using taglib_property_free(). */ -TAGLIB_C_EXPORT char** taglib_property_get(TagLib_File *file, const char *prop); +TAGLIB_C_EXPORT char** taglib_property_get(const TagLib_File *file, const char *prop); /*! * Frees the NULL terminated array \a props and the C-strings it contains. @@ -541,7 +541,7 @@ TAGLIB_C_EXPORT BOOL taglib_complex_property_set_append( * \return NULL terminated array of C-strings (char *), only NULL if empty. * It must be freed by the client using taglib_complex_property_free_keys(). */ -TAGLIB_C_EXPORT char** taglib_complex_property_keys(TagLib_File *file); +TAGLIB_C_EXPORT char** taglib_complex_property_keys(const TagLib_File *file); /*! * Get value(s) of complex property \a key. @@ -551,7 +551,7 @@ TAGLIB_C_EXPORT char** taglib_complex_property_keys(TagLib_File *file); * It must be freed by the client using taglib_complex_property_free(). */ TAGLIB_C_EXPORT TagLib_Complex_Property_Attribute*** taglib_complex_property_get( - TagLib_File *file, const char *key); + const TagLib_File *file, const char *key); /*! * Extract the complex property values of a picture. diff --git a/taglib/dsdiff/dsdifffile.cpp b/taglib/dsdiff/dsdifffile.cpp index 2da3b620..21f4d40a 100644 --- a/taglib/dsdiff/dsdifffile.cpp +++ b/taglib/dsdiff/dsdifffile.cpp @@ -86,7 +86,7 @@ namespace class DSDIFF::File::FilePrivate { public: - FilePrivate(ID3v2::FrameFactory *frameFactory) + FilePrivate(const ID3v2::FrameFactory *frameFactory) : ID3v2FrameFactory(frameFactory ? frameFactory : ID3v2::FrameFactory::instance()) { diff --git a/taglib/dsf/dsffile.cpp b/taglib/dsf/dsffile.cpp index de9572b4..2912e35a 100644 --- a/taglib/dsf/dsffile.cpp +++ b/taglib/dsf/dsffile.cpp @@ -34,7 +34,7 @@ using namespace TagLib; class DSF::File::FilePrivate { public: - FilePrivate(ID3v2::FrameFactory *frameFactory) + FilePrivate(const ID3v2::FrameFactory *frameFactory) : ID3v2FrameFactory(frameFactory ? frameFactory : ID3v2::FrameFactory::instance()) { diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp index 574fa7a8..7ee6cd48 100644 --- a/taglib/mp4/mp4atom.cpp +++ b/taglib/mp4/mp4atom.cpp @@ -143,7 +143,7 @@ MP4::Atom::find(const char *name1, const char *name2, const char *name3, const c return this; } auto it = std::find_if(d->children.cbegin(), d->children.cend(), - [&name1](Atom *child) { return child->d->name == name1; }); + [&name1](const Atom *child) { return child->d->name == name1; }); return it != d->children.cend() ? (*it)->find(name2, name3, name4) : nullptr; } @@ -170,7 +170,7 @@ MP4::Atom::path(MP4::AtomList &path, const char *name1, const char *name2, const return true; } auto it = std::find_if(d->children.cbegin(), d->children.cend(), - [&name1](Atom *child) { return child->d->name == name1; }); + [&name1](const Atom *child) { return child->d->name == name1; }); return it != d->children.cend() ? (*it)->path(path, name2, name3) : false; } @@ -243,7 +243,7 @@ MP4::Atom * MP4::Atoms::find(const char *name1, const char *name2, const char *name3, const char *name4) const { auto it = std::find_if(d->atoms.cbegin(), d->atoms.cend(), - [&name1](Atom *atom) { return atom->name() == name1; }); + [&name1](const Atom *atom) { return atom->name() == name1; }); return it != d->atoms.cend() ? (*it)->find(name2, name3, name4) : nullptr; } @@ -252,7 +252,7 @@ MP4::Atoms::path(const char *name1, const char *name2, const char *name3, const { MP4::AtomList path; auto it = std::find_if(d->atoms.cbegin(), d->atoms.cend(), - [&name1](Atom *atom) { return atom->name() == name1; }); + [&name1](const Atom *atom) { return atom->name() == name1; }); if(it != d->atoms.cend()) { if(!(*it)->path(path, name2, name3, name4)) { path.clear(); diff --git a/taglib/mp4/mp4file.cpp b/taglib/mp4/mp4file.cpp index ae80210f..1c0ae8c6 100644 --- a/taglib/mp4/mp4file.cpp +++ b/taglib/mp4/mp4file.cpp @@ -36,7 +36,7 @@ using namespace TagLib; class MP4::File::FilePrivate { public: - FilePrivate(MP4::ItemFactory *mp4ItemFactory) + FilePrivate(const MP4::ItemFactory *mp4ItemFactory) : itemFactory(mp4ItemFactory ? mp4ItemFactory : MP4::ItemFactory::instance()) { diff --git a/taglib/mp4/mp4properties.cpp b/taglib/mp4/mp4properties.cpp index 2e9e4135..b591fb92 100644 --- a/taglib/mp4/mp4properties.cpp +++ b/taglib/mp4/mp4properties.cpp @@ -69,7 +69,7 @@ public: // public members //////////////////////////////////////////////////////////////////////////////// -MP4::Properties::Properties(File *file, MP4::Atoms *atoms, ReadStyle style) : +MP4::Properties::Properties(File *file, const MP4::Atoms *atoms, ReadStyle style) : AudioProperties(style), d(std::make_unique()) { diff --git a/taglib/mp4/mp4properties.h b/taglib/mp4/mp4properties.h index 6b6b5242..a2f1de8d 100644 --- a/taglib/mp4/mp4properties.h +++ b/taglib/mp4/mp4properties.h @@ -44,7 +44,7 @@ namespace TagLib { ALAC }; - Properties(File *file, Atoms *atoms, ReadStyle style = Average); + Properties(File *file, const Atoms *atoms, ReadStyle style = Average); ~Properties() override; Properties(const Properties &) = delete; diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp index 9c94b58c..708c7acf 100644 --- a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp +++ b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp @@ -437,7 +437,7 @@ PropertyMap UserTextIdentificationFrame::asProperties() const } UserTextIdentificationFrame *UserTextIdentificationFrame::find( - ID3v2::Tag *tag, const String &description) // static + const ID3v2::Tag *tag, const String &description) // static { for(const auto &frame : std::as_const(tag->frameList("TXXX"))) { auto f = dynamic_cast(frame); diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.h b/taglib/mpeg/id3v2/frames/textidentificationframe.h index 1dbcdc09..113a43c2 100644 --- a/taglib/mpeg/id3v2/frames/textidentificationframe.h +++ b/taglib/mpeg/id3v2/frames/textidentificationframe.h @@ -300,7 +300,7 @@ namespace TagLib { * Searches for the user defined text frame with the description \a description * in \a tag. This returns null if no matching frames were found. */ - static UserTextIdentificationFrame *find(Tag *tag, const String &description); + static UserTextIdentificationFrame *find(const Tag *tag, const String &description); /*! * Returns an appropriate TXXX frame description for the given free-form tag key. diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/taglib/mpeg/id3v2/frames/urllinkframe.cpp index d7071c65..8f399f90 100644 --- a/taglib/mpeg/id3v2/frames/urllinkframe.cpp +++ b/taglib/mpeg/id3v2/frames/urllinkframe.cpp @@ -173,7 +173,7 @@ PropertyMap UserUrlLinkFrame::asProperties() const return map; } -UserUrlLinkFrame *UserUrlLinkFrame::find(ID3v2::Tag *tag, const String &description) // static +UserUrlLinkFrame *UserUrlLinkFrame::find(const ID3v2::Tag *tag, const String &description) // static { for(const auto &frame : std::as_const(tag->frameList("WXXX"))) { auto f = dynamic_cast(frame); diff --git a/taglib/mpeg/id3v2/frames/urllinkframe.h b/taglib/mpeg/id3v2/frames/urllinkframe.h index afca6cc9..28ee09c0 100644 --- a/taglib/mpeg/id3v2/frames/urllinkframe.h +++ b/taglib/mpeg/id3v2/frames/urllinkframe.h @@ -170,7 +170,7 @@ namespace TagLib { * Searches for the user defined url frame with the description \a description * in \a tag. This returns null if no matching frames were found. */ - static UserUrlLinkFrame *find(Tag *tag, const String &description); + static UserUrlLinkFrame *find(const Tag *tag, const String &description); protected: void parseFields(const ByteVector &data) override; diff --git a/taglib/riff/aiff/aifffile.cpp b/taglib/riff/aiff/aifffile.cpp index 8d513f17..18d74b62 100644 --- a/taglib/riff/aiff/aifffile.cpp +++ b/taglib/riff/aiff/aifffile.cpp @@ -34,7 +34,7 @@ using namespace TagLib; class RIFF::AIFF::File::FilePrivate { public: - FilePrivate(ID3v2::FrameFactory *frameFactory) + FilePrivate(const ID3v2::FrameFactory *frameFactory) : ID3v2FrameFactory(frameFactory ? frameFactory : ID3v2::FrameFactory::instance()) { diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp index f582fcbd..0714285d 100644 --- a/taglib/riff/wav/wavfile.cpp +++ b/taglib/riff/wav/wavfile.cpp @@ -41,7 +41,7 @@ namespace class RIFF::WAV::File::FilePrivate { public: - FilePrivate(ID3v2::FrameFactory *frameFactory) + FilePrivate(const ID3v2::FrameFactory *frameFactory) : ID3v2FrameFactory(frameFactory ? frameFactory : ID3v2::FrameFactory::instance()) {