song_sort: convert to C++

Makefile.am

@@ -88,7 +88,6 @@ mpd_headers = \
 	src/replay_gain_ape.h \
 	src/TimePrint.cxx src/TimePrint.hxx \
 	src/song.h \
-	src/song_sort.c src/song_sort.h \
 	src/stats.h \
 	src/tag.h \
 	src/tag_internal.h \
@@ -226,6 +225,7 @@ src_mpd_SOURCES = \
 	src/SongUpdate.cxx \
 	src/SongPrint.cxx src/SongPrint.hxx \
 	src/SongSave.cxx src/SongSave.hxx \
+	src/SongSort.cxx src/SongSort.hxx \
 	src/resolver.c src/resolver.h \
 	src/SocketUtil.cxx src/SocketUtil.hxx \
 	src/StateFile.cxx src/StateFile.hxx \
@@ -1054,7 +1054,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/Directory.cxx src/DirectorySave.cxx \
 	src/PlaylistVector.cxx src/PlaylistDatabase.cxx \
 	src/DatabaseLock.cxx src/DatabaseSave.cxx \
-	src/Song.cxx src/song_sort.c src/SongSave.cxx \
+	src/Song.cxx src/SongSave.cxx src/SongSort.cxx \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
 	src/SongFilter.cxx \
 	src/TextFile.cxx

src/Directory.cxx

@@ -22,10 +22,10 @@
 #include "SongFilter.hxx"
 #include "PlaylistVector.hxx"
 #include "DatabaseLock.hxx"
+#include "SongSort.hxx"
 
 extern "C" {
 #include "song.h"
-#include "song_sort.h"
 #include "util/list_sort.h"
 }
 

src/song_sort.c → src/SongSort.cxx

 /*
- * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,12 +18,15 @@
  */
 
 #include "config.h"
-#include "song_sort.h"
+#include "SongSort.hxx"
 #include "song.h"
 #include "util/list.h"
-#include "util/list_sort.h"
 #include "tag.h"
 
+extern "C" {
+#include "util/list_sort.h"
+}
+
 #include <glib.h>
 
 #include <assert.h>

src/song_sort.h → src/SongSort.hxx

 /*
- * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_SONG_SORT_H
-#define MPD_SONG_SORT_H
+#ifndef MPD_SONG_SORT_HXX
+#define MPD_SONG_SORT_HXX
 
 struct list_head;