aboutsummaryrefslogtreecommitdiffstats
path: root/src/Directory.hxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-07-28 13:25:12 +0200
committerMax Kellermann <max@duempel.org>2013-07-28 13:25:12 +0200
commitba161ec572b98d3bcf9f735ff122133319fe896a (patch)
treea211690e3a8b7fce1fb6db540228122bead1f2bc /src/Directory.hxx
parent43f613d9be9aa2953dcfc0aacfbdfb56d5d1a708 (diff)
downloadmpd-ba161ec572b98d3bcf9f735ff122133319fe896a.tar.gz
mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.tar.xz
mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.zip
song: convert header to C++
Diffstat (limited to 'src/Directory.hxx')
-rw-r--r--src/Directory.hxx14
1 files changed, 7 insertions, 7 deletions
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<song *>(cthis->FindSong(name_utf8));
+ return const_cast<Song *>(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.