diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-28 23:58:17 +0100 |
| commit | 20597b3632d3b6e25ba532716106f90d5b64d0e8 (patch) | |
| tree | fa6dabaff127150caf3cf4723257f15ef2c3e0f8 /src/tag | |
| parent | 4728735acf20fba24d0d03ab431160e250325869 (diff) | |
| download | mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.gz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.tar.xz mpd-20597b3632d3b6e25ba532716106f90d5b64d0e8.zip | |
*: use nullptr instead of NULL
Diffstat (limited to 'src/tag')
| -rw-r--r-- | src/tag/Tag.hxx | 6 | ||||
| -rw-r--r-- | src/tag/TagId3.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx index 4d8f1a4e8..5846e7a9d 100644 --- a/src/tag/Tag.hxx +++ b/src/tag/Tag.hxx @@ -131,7 +131,7 @@ struct Tag { static Tag *Merge(const Tag &base, const Tag &add); /** - * Merges the data from two tags. Any of the two may be NULL. Both + * Merges the data from two tags. Any of the two may be nullptr. Both * are freed by this function. * * @return a newly allocated tag @@ -140,8 +140,8 @@ struct Tag { static Tag *MergeReplace(Tag *base, Tag *add); /** - * Returns the first value of the specified tag type, or NULL if none - * is present in this tag object. + * Returns the first value of the specified tag type, or + * nullptr if none is present in this tag object. */ gcc_pure const char *GetValue(TagType type) const; diff --git a/src/tag/TagId3.hxx b/src/tag/TagId3.hxx index 44d890337..749166116 100644 --- a/src/tag/TagId3.hxx +++ b/src/tag/TagId3.hxx @@ -42,7 +42,7 @@ tag_id3_import(struct id3_tag *); * Loads the ID3 tags from the file into a libid3tag object. The * return value must be freed with id3_tag_delete(). * - * @return NULL on error or if no ID3 tag was found in the file (no + * @return nullptr on error or if no ID3 tag was found in the file (no * Error will be set) */ struct id3_tag * |