From 7af24c4d3a17e10a1130bdd39f1e1d12f72e4d8b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 10 Aug 2013 19:40:45 +0200 Subject: playlist_error: convert to C++ --- src/CommandError.hxx | 2 +- src/Playlist.hxx | 2 +- src/PlaylistError.hxx | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/PlaylistQueue.hxx | 2 +- src/PlaylistSave.hxx | 2 +- src/playlist_error.h | 51 --------------------------------------------------- 6 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 src/PlaylistError.hxx delete mode 100644 src/playlist_error.h (limited to 'src') diff --git a/src/CommandError.hxx b/src/CommandError.hxx index 5fb021220..04d0aeb21 100644 --- a/src/CommandError.hxx +++ b/src/CommandError.hxx @@ -21,7 +21,7 @@ #define MPD_COMMAND_ERROR_HXX #include "command.h" -#include "playlist_error.h" +#include "PlaylistError.hxx" #include "gerror.h" class Client; diff --git a/src/Playlist.hxx b/src/Playlist.hxx index a4594368e..82cac37c5 100644 --- a/src/Playlist.hxx +++ b/src/Playlist.hxx @@ -21,7 +21,7 @@ #define MPD_PLAYLIST_HXX #include "Queue.hxx" -#include "playlist_error.h" +#include "PlaylistError.hxx" struct player_control; struct Song; diff --git a/src/PlaylistError.hxx b/src/PlaylistError.hxx new file mode 100644 index 000000000..2750b82ba --- /dev/null +++ b/src/PlaylistError.hxx @@ -0,0 +1,51 @@ +/* + * 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 + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_PLAYLIST_ERROR_HXX +#define MPD_PLAYLIST_ERROR_HXX + +#include "gcc.h" + +#include + +enum playlist_result { + PLAYLIST_RESULT_SUCCESS, + PLAYLIST_RESULT_ERRNO, + PLAYLIST_RESULT_DENIED, + PLAYLIST_RESULT_NO_SUCH_SONG, + PLAYLIST_RESULT_NO_SUCH_LIST, + PLAYLIST_RESULT_LIST_EXISTS, + PLAYLIST_RESULT_BAD_NAME, + PLAYLIST_RESULT_BAD_RANGE, + PLAYLIST_RESULT_NOT_PLAYING, + PLAYLIST_RESULT_TOO_LARGE, + PLAYLIST_RESULT_DISABLED, +}; + +/** + * Quark for GError.domain; the code is an enum #playlist_result. + */ +gcc_const +static inline GQuark +playlist_quark(void) +{ + return g_quark_from_static_string("playlist"); +} + +#endif diff --git a/src/PlaylistQueue.hxx b/src/PlaylistQueue.hxx index cda77c818..5a5cc641d 100644 --- a/src/PlaylistQueue.hxx +++ b/src/PlaylistQueue.hxx @@ -24,7 +24,7 @@ #ifndef MPD_PLAYLIST_QUEUE_HXX #define MPD_PLAYLIST_QUEUE_HXX -#include "playlist_error.h" +#include "PlaylistError.hxx" struct playlist_provider; struct playlist; diff --git a/src/PlaylistSave.hxx b/src/PlaylistSave.hxx index 382df1b19..075ef2ea1 100644 --- a/src/PlaylistSave.hxx +++ b/src/PlaylistSave.hxx @@ -20,7 +20,7 @@ #ifndef MPD_PLAYLIST_SAVE_H #define MPD_PLAYLIST_SAVE_H -#include "playlist_error.h" +#include "PlaylistError.hxx" #include diff --git a/src/playlist_error.h b/src/playlist_error.h deleted file mode 100644 index 9871a0365..000000000 --- a/src/playlist_error.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPD_PLAYLIST_ERROR_H -#define MPD_PLAYLIST_ERROR_H - -#include "gcc.h" - -#include - -enum playlist_result { - PLAYLIST_RESULT_SUCCESS, - PLAYLIST_RESULT_ERRNO, - PLAYLIST_RESULT_DENIED, - PLAYLIST_RESULT_NO_SUCH_SONG, - PLAYLIST_RESULT_NO_SUCH_LIST, - PLAYLIST_RESULT_LIST_EXISTS, - PLAYLIST_RESULT_BAD_NAME, - PLAYLIST_RESULT_BAD_RANGE, - PLAYLIST_RESULT_NOT_PLAYING, - PLAYLIST_RESULT_TOO_LARGE, - PLAYLIST_RESULT_DISABLED, -}; - -/** - * Quark for GError.domain; the code is an enum #playlist_result. - */ -gcc_const -static inline GQuark -playlist_quark(void) -{ - return g_quark_from_static_string("playlist"); -} - -#endif -- cgit v1.2.3