1 files changed, 25 insertions, 25 deletions

diff --git a/src/mapper.h b/src/Mapper.hxx
index d6184a175..2ced38a10 100644
--- a/src/mapper.h
+++ b/src/Mapper.hxx
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -21,15 +21,15 @@
  * Maps directory and song objects to file system paths.
  */
 
-#ifndef MPD_MAPPER_H
-#define MPD_MAPPER_H
+#ifndef MPD_MAPPER_HXX
+#define MPD_MAPPER_HXX
 
-#include <glib.h>
-#include <stdbool.h>
+#include "gcc.h"
+#include "gerror.h"
 
 #define PLAYLIST_FILE_SUFFIX ".m3u"
 
-struct directory;
+struct Directory;
 struct song;
 
 void mapper_init(const char *_music_dir, const char *_playlist_dir);
@@ -39,7 +39,7 @@ void mapper_finish(void);
 /**
  * Return the absolute path of the music directory encoded in UTF-8.
  */
-G_GNUC_CONST
+gcc_const
 const char *
 mapper_get_music_directory_utf8(void);
 
@@ -47,18 +47,18 @@ mapper_get_music_directory_utf8(void);
  * Return the absolute path of the music directory encoded in the
  * filesystem character set.
  */
-G_GNUC_CONST
+gcc_const
 const char *
 mapper_get_music_directory_fs(void);
 
 /**
  * Returns true if a music directory was configured.
  */
-G_GNUC_CONST
+gcc_const
 static inline bool
 mapper_has_music_directory(void)
 {
-	return mapper_get_music_directory_utf8() != NULL;
+	return mapper_get_music_directory_utf8() != nullptr;
 }
 
 /**
@@ -66,7 +66,7 @@ mapper_has_music_directory(void)
  * this function converts it to a relative path.  If not, it returns
  * the unmodified string pointer.
  */
-G_GNUC_PURE
+gcc_pure
 const char *
 map_to_relative_path(const char *path_utf8);
 
@@ -75,7 +75,7 @@ map_to_relative_path(const char *path_utf8);
  * is basically done by converting the URI to the file system charset
  * and prepending the music directory.
  */
-G_GNUC_MALLOC
+gcc_malloc
 char *
 map_uri_fs(const char *uri);
 
@@ -83,11 +83,11 @@ map_uri_fs(const char *uri);
  * Determines the file system path of a directory object.
  *
  * @param directory the directory object
- * @return the path in file system encoding, or NULL if mapping failed
+ * @return the path in file system encoding, or nullptr if mapping failed
  */
-G_GNUC_MALLOC
+gcc_malloc
 char *
-map_directory_fs(const struct directory *directory);
+map_directory_fs(const Directory *directory);
 
 /**
  * Determines the file system path of a directory's child (may be a
@@ -95,20 +95,20 @@ map_directory_fs(const struct directory *directory);
  *
  * @param directory the parent directory object
  * @param name the child's name in UTF-8
- * @return the path in file system encoding, or NULL if mapping failed
+ * @return the path in file system encoding, or nullptr if mapping failed
  */
-G_GNUC_MALLOC
+gcc_malloc
 char *
-map_directory_child_fs(const struct directory *directory, const char *name);
+map_directory_child_fs(const Directory *directory, const char *name);
 
 /**
  * Determines the file system path of a song.  This must not be a
  * remote song.
  *
  * @param song the song object
- * @return the path in file system encoding, or NULL if mapping failed
+ * @return the path in file system encoding, or nullptr if mapping failed
  */
-G_GNUC_MALLOC
+gcc_malloc
 char *
 map_song_fs(const struct song *song);
 
@@ -117,16 +117,16 @@ map_song_fs(const struct song *song);
  * absolute) to a relative path in UTF-8 encoding.
  *
  * @param path_fs a path in file system encoding
- * @return the relative path in UTF-8, or NULL if mapping failed
+ * @return the relative path in UTF-8, or nullptr if mapping failed
  */
-G_GNUC_MALLOC
+gcc_malloc
 char *
 map_fs_to_utf8(const char *path_fs);
 
 /**
  * Returns the playlist directory.
  */
-G_GNUC_CONST
+gcc_const
 const char *
 map_spl_path(void);
 
@@ -135,9 +135,9 @@ map_spl_path(void);
  * path.  The return value is allocated on the heap and must be freed
  * with g_free().
  *
- * @return the path in file system encoding, or NULL if mapping failed
+ * @return the path in file system encoding, or nullptr if mapping failed
  */
-G_GNUC_PURE
+gcc_pure
 char *
 map_spl_utf8_to_fs(const char *name);