From ba161ec572b98d3bcf9f735ff122133319fe896a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 28 Jul 2013 13:25:12 +0200 Subject: song: convert header to C++ --- src/Directory.hxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Directory.hxx') diff --git a/src/Directory.hxx b/src/Directory.hxx index 8fa5c2352..97e4ef32b 100644 --- a/src/Directory.hxx +++ b/src/Directory.hxx @@ -45,7 +45,7 @@ #define directory_for_each_song_safe(pos, n, directory) \ list_for_each_entry_safe(pos, n, &directory->songs, siblings) -struct song; +struct Song; struct db_visitor; class SongFilter; @@ -202,12 +202,12 @@ public: * Caller must lock the #db_mutex. */ gcc_pure - const song *FindSong(const char *name_utf8) const; + const Song *FindSong(const char *name_utf8) const; gcc_pure - song *FindSong(const char *name_utf8) { + Song *FindSong(const char *name_utf8) { const Directory *cthis = this; - return const_cast(cthis->FindSong(name_utf8)); + return const_cast(cthis->FindSong(name_utf8)); } /** @@ -219,20 +219,20 @@ public: * @return the song, or NULL if none was found */ gcc_pure - song *LookupSong(const char *uri); + Song *LookupSong(const char *uri); /** * Add a song object to this directory. Its "parent" attribute must * be set already. */ - void AddSong(song *song); + void AddSong(Song *song); /** * Remove a song object from this directory (which effectively * invalidates the song object, because the "parent" attribute becomes * stale), but does not free it. */ - void RemoveSong(song *song); + void RemoveSong(Song *song); /** * Caller must lock the #db_mutex. -- cgit v1.2.3