aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-08-10 19:40:45 +0200
committerMax Kellermann <max@duempel.org>2013-08-10 19:40:45 +0200
commit7af24c4d3a17e10a1130bdd39f1e1d12f72e4d8b (patch)
tree8393e8af1793ebc55179dc571e39dd6d57357c7f
parent7f0ce4e94e0b2366b1422a6864393eb37a64d546 (diff)
downloadmpd-7af24c4d3a17e10a1130bdd39f1e1d12f72e4d8b.tar.gz
mpd-7af24c4d3a17e10a1130bdd39f1e1d12f72e4d8b.tar.xz
mpd-7af24c4d3a17e10a1130bdd39f1e1d12f72e4d8b.zip
playlist_error: convert to C++
-rw-r--r--Makefile.am2
-rw-r--r--src/CommandError.hxx2
-rw-r--r--src/Playlist.hxx2
-rw-r--r--src/PlaylistError.hxx (renamed from src/playlist_error.h)6
-rw-r--r--src/PlaylistQueue.hxx2
-rw-r--r--src/PlaylistSave.hxx2
6 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index a3e1b34f7..16fba526c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,6 @@ mpd_headers = \
src/AudioCompress/compress.h \
src/open.h \
src/Playlist.hxx \
- src/playlist_error.h \
src/poison.h \
src/riff.h \
src/aiff.h \
@@ -180,6 +179,7 @@ src_mpd_SOURCES = \
src/PlayerThread.cxx src/PlayerThread.hxx \
src/PlayerControl.cxx src/PlayerControl.hxx \
src/Playlist.cxx \
+ src/PlaylistError.hxx \
src/PlaylistGlobal.cxx src/PlaylistGlobal.hxx \
src/PlaylistControl.cxx \
src/PlaylistEdit.cxx \
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/playlist_error.h b/src/PlaylistError.hxx
index 9871a0365..2750b82ba 100644
--- a/src/playlist_error.h
+++ b/src/PlaylistError.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
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_PLAYLIST_ERROR_H
-#define MPD_PLAYLIST_ERROR_H
+#ifndef MPD_PLAYLIST_ERROR_HXX
+#define MPD_PLAYLIST_ERROR_HXX
#include "gcc.h"
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 <stdio.h>