song: convert header to C++

This commit is contained in:
Max Kellermann
2013-07-28 13:25:12 +02:00
parent 43f613d9be
commit ba161ec572
91 changed files with 643 additions and 691 deletions

View File

@@ -26,7 +26,7 @@
#include "DatabaseLock.hxx"
#include "DatabaseSimple.hxx"
#include "Directory.hxx"
#include "song.h"
#include "Song.hxx"
#include "PlaylistVector.hxx"
#include "PlaylistRegistry.hxx"
#include "Mapper.hxx"
@@ -109,7 +109,7 @@ remove_excluded_from_directory(Directory *directory,
}
}
struct song *song, *ns;
Song *song, *ns;
directory_for_each_song_safe(song, ns, directory) {
assert(song->parent == directory);
@@ -138,7 +138,7 @@ purge_deleted_from_directory(Directory *directory)
modified = true;
}
struct song *song, *ns;
Song *song, *ns;
directory_for_each_song_safe(song, ns, directory) {
const Path path = map_song_fs(song);
if (path.IsNull() || !FileExists(path)) {
@@ -414,7 +414,7 @@ directory_make_child_checked(Directory *parent, const char *name_utf8)
/* if we're adding directory paths, make sure to delete filenames
with potentially the same name */
db_lock();
struct song *conflicting = parent->FindSong(name_utf8);
Song *conflicting = parent->FindSong(name_utf8);
if (conflicting)
delete_song(parent, conflicting);