From 98dbc959133272d7339496f92a7f6750919e35c6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 25 Sep 2012 12:10:12 +0200 Subject: rename CommandError.h to CommandError.hxx --- src/AllCommands.cxx | 1 - src/CommandError.cxx | 2 +- src/CommandError.h | 41 ----------------------------------------- src/CommandError.hxx | 37 +++++++++++++++++++++++++++++++++++++ src/DatabaseCommands.cxx | 2 +- src/OtherCommands.cxx | 2 +- src/PlayerCommands.cxx | 2 +- src/PlaylistCommands.cxx | 2 +- src/QueueCommands.cxx | 2 +- 9 files changed, 43 insertions(+), 48 deletions(-) delete mode 100644 src/CommandError.h create mode 100644 src/CommandError.hxx (limited to 'src') diff --git a/src/AllCommands.cxx b/src/AllCommands.cxx index 762ae73d7..003fcbe3b 100644 --- a/src/AllCommands.cxx +++ b/src/AllCommands.cxx @@ -27,7 +27,6 @@ #include "StickerCommands.hxx" #include "MessageCommands.hxx" #include "OtherCommands.hxx" -#include "CommandError.h" #include "permission.h" #include "tag.h" diff --git a/src/CommandError.cxx b/src/CommandError.cxx index 96b0095ae..428a615e5 100644 --- a/src/CommandError.cxx +++ b/src/CommandError.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "CommandError.h" +#include "CommandError.hxx" #include "db_error.h" extern "C" { diff --git a/src/CommandError.h b/src/CommandError.h deleted file mode 100644 index f43afdb3d..000000000 --- a/src/CommandError.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2003-2012 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_COMMAND_ERROR_H -#define MPD_COMMAND_ERROR_H - -#include "command.h" -#include "playlist_error.h" - -#include - -G_BEGIN_DECLS - -enum command_return -print_playlist_result(struct client *client, enum playlist_result result); - -/** - * Send the GError to the client and free the GError. - */ -enum command_return -print_error(struct client *client, GError *error); - -G_END_DECLS - -#endif diff --git a/src/CommandError.hxx b/src/CommandError.hxx new file mode 100644 index 000000000..a90e24427 --- /dev/null +++ b/src/CommandError.hxx @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2003-2012 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_COMMAND_ERROR_HXX +#define MPD_COMMAND_ERROR_HXX + +#include "command.h" +#include "playlist_error.h" + +#include + +enum command_return +print_playlist_result(struct client *client, enum playlist_result result); + +/** + * Send the GError to the client and free the GError. + */ +enum command_return +print_error(struct client *client, GError *error); + +#endif diff --git a/src/DatabaseCommands.cxx b/src/DatabaseCommands.cxx index 14e83e96a..c3c22482e 100644 --- a/src/DatabaseCommands.cxx +++ b/src/DatabaseCommands.cxx @@ -23,7 +23,7 @@ #include "DatabasePlaylist.hxx" #include "DatabasePrint.hxx" #include "DatabaseSelection.hxx" -#include "CommandError.h" +#include "CommandError.hxx" #include "client_internal.h" #include "tag.h" #include "uri.h" diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx index 29ddd9962..1442ef05a 100644 --- a/src/OtherCommands.cxx +++ b/src/OtherCommands.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "OtherCommands.hxx" #include "DatabaseCommands.hxx" -#include "CommandError.h" +#include "CommandError.hxx" #include "directory.h" #include "song.h" diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx index 030e8016d..015ac9a15 100644 --- a/src/PlayerCommands.cxx +++ b/src/PlayerCommands.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "PlayerCommands.hxx" -#include "CommandError.h" +#include "CommandError.hxx" #include "PlaylistPrint.hxx" extern "C" { diff --git a/src/PlaylistCommands.cxx b/src/PlaylistCommands.cxx index d6be3ff30..2789e6c43 100644 --- a/src/PlaylistCommands.cxx +++ b/src/PlaylistCommands.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "PlaylistCommands.hxx" #include "DatabasePlaylist.hxx" -#include "CommandError.h" +#include "CommandError.hxx" #include "PlaylistPrint.hxx" extern "C" { diff --git a/src/QueueCommands.cxx b/src/QueueCommands.cxx index 5dac6a8a0..cdd58d31e 100644 --- a/src/QueueCommands.cxx +++ b/src/QueueCommands.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "QueueCommands.hxx" -#include "CommandError.h" +#include "CommandError.hxx" #include "DatabaseQueue.hxx" #include "SongFilter.hxx" #include "PlaylistPrint.hxx" -- cgit v1.2.3