path: convert to C++

Makefile.am

@@ -98,7 +98,6 @@ mpd_headers = \
 	src/daemon.h \
 	src/AudioCompress/config.h \
 	src/AudioCompress/compress.h \
-	src/path.h \
 	src/open.h \
 	src/page.h \
 	src/Playlist.hxx \
@@ -246,7 +245,7 @@ src_mpd_SOURCES = \
 	src/MusicBuffer.cxx src/MusicBuffer.hxx \
 	src/MusicPipe.cxx src/MusicPipe.hxx \
 	src/MusicChunk.cxx src/MusicChunk.hxx \
-	src/path.c \
+	src/Path.cxx src/Path.hxx \
 	src/Mapper.cxx src/Mapper.hxx \
 	src/page.c \
 	src/Partition.hxx \
@@ -1060,7 +1059,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/DatabaseLock.cxx src/DatabaseSave.cxx \
 	src/Song.cxx src/song_sort.c src/SongSave.cxx \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
-	src/path.c \
+	src/Path.cxx \
 	src/SongFilter.cxx \
 	src/TextFile.cxx \
 	src/ConfigFile.cxx src/tokenizer.c src/utils.c src/string_util.c

src/CommandLine.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "CommandLine.hxx"
-#include "path.h"
 #include "ls.hxx"
 #include "Log.hxx"
 #include "conf.h"

src/ConfigFile.cxx

@@ -26,7 +26,7 @@ extern "C" {
 #include "tokenizer.h"
 }
 
-#include "path.h"
+#include "Path.hxx"
 #include "mpd_error.h"
 
 #include <glib.h>

src/DatabaseSave.cxx

@@ -26,10 +26,7 @@
 #include "TextFile.hxx"
 #include "TagInternal.hxx"
 #include "tag.h"
-
-extern "C" {
-#include "path.h"
-}
+#include "Path.hxx"
 
 #include <glib.h>
 

src/Directory.cxx

@@ -26,7 +26,6 @@
 extern "C" {
 #include "song.h"
 #include "song_sort.h"
-#include "path.h"
 #include "util/list_sort.h"
 }
 

src/ExcludeList.cxx

@@ -24,10 +24,7 @@
 
 #include "config.h"
 #include "ExcludeList.hxx"
-
-extern "C" {
-#include "path.h"
-}
+#include "Path.hxx"
 
 #include <assert.h>
 #include <string.h>

src/InotifyUpdate.cxx

@@ -23,10 +23,7 @@
 #include "InotifyQueue.hxx"
 #include "Mapper.hxx"
 #include "Main.hxx"
-
-extern "C" {
-#include "path.h"
-}
+#include "Path.hxx"
 
 #include <glib.h>
 #include <assert.h>

src/Main.cxx

@@ -47,10 +47,10 @@
 #include "InputInit.hxx"
 #include "event/Loop.hxx"
 #include "IOThread.hxx"
+#include "Path.hxx"
 
 extern "C" {
 #include "daemon.h"
-#include "path.h"
 #include "stats.h"
 #include "audio_config.h"
 #include "pcm_resample.h"

src/Mapper.cxx

@@ -25,10 +25,7 @@
 #include "Mapper.hxx"
 #include "Directory.hxx"
 #include "song.h"
-
-extern "C" {
-#include "path.h"
-}
+#include "Path.hxx"
 
 #include <glib.h>
 

src/path.c → src/Path.cxx

 /*
- * Copyright (C) 2003-2011 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,7 +18,7 @@
  */
 
 #include "config.h"
-#include "path.h"
+#include "Path.hxx"
 #include "conf.h"
 #include "mpd_error.h"
 #include "gcc.h"

src/path.h → src/Path.hxx

 /*
- * Copyright (C) 2003-2011 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,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_PATH_H
-#define MPD_PATH_H
+#ifndef MPD_PATH_HXX
+#define MPD_PATH_HXX
+
+#include "check.h"
 
 #include <limits.h>
 
@@ -32,9 +34,9 @@
 #  endif
 #endif
 
-void path_global_init(void);
+void path_global_init();
 
-void path_global_finish(void);
+void path_global_finish();
 
 /**
  * Converts a file name in the filesystem charset to UTF-8.  Returns
@@ -50,6 +52,6 @@ fs_charset_to_utf8(const char *path_fs);
 char *
 utf8_to_fs_charset(const char *path_utf8);
 
-const char *path_get_fs_charset(void);
+const char *path_get_fs_charset();
 
 #endif

src/PlaylistFile.cxx

@@ -30,9 +30,9 @@
 #include "TextFile.hxx"
 #include "conf.h"
 #include "Idle.hxx"
+#include "Path.hxx"
 
 extern "C" {
-#include "path.h"
 #include "uri.h"
 }
 

src/PlaylistSave.cxx

@@ -24,9 +24,9 @@
 #include "song.h"
 #include "Mapper.hxx"
 #include "Idle.hxx"
+#include "Path.hxx"
 
 extern "C" {
-#include "path.h"
 #include "uri.h"
 }
 

src/PlaylistSong.cxx

@@ -24,11 +24,11 @@
 #include "DatabaseGlue.hxx"
 #include "ls.hxx"
 #include "tag.h"
+#include "Path.hxx"
 
 extern "C" {
 #include "song.h"
 #include "uri.h"
-#include "path.h"
 }
 
 #include <glib.h>

src/SongFilter.cxx

@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "SongFilter.hxx"
-#include "path.h"
 #include "song.h"
 #include "tag.h"
 

src/UpdateWalk.cxx

@@ -31,10 +31,10 @@
 #include "Mapper.hxx"
 #include "ExcludeList.hxx"
 #include "conf.h"
+#include "Path.hxx"
 
 extern "C" {
 #include "uri.h"
-#include "path.h"
 #include "playlist_list.h"
 }