Commit 3deca8fc authored by Max Kellermann's avatar Max Kellermann

db_error: convert to C++

parent 7af24c4d
...@@ -123,7 +123,7 @@ src_mpd_SOURCES = \ ...@@ -123,7 +123,7 @@ src_mpd_SOURCES = \
src/DatabasePrint.cxx src/DatabasePrint.hxx \ src/DatabasePrint.cxx src/DatabasePrint.hxx \
src/DatabaseQueue.cxx src/DatabaseQueue.hxx \ src/DatabaseQueue.cxx src/DatabaseQueue.hxx \
src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \ src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \
src/db_error.h \ src/DatabaseError.hxx \
src/DatabaseLock.cxx src/DatabaseLock.hxx \ src/DatabaseLock.cxx src/DatabaseLock.hxx \
src/DatabaseSave.cxx src/DatabaseSave.hxx \ src/DatabaseSave.cxx src/DatabaseSave.hxx \
src/DatabasePlugin.hxx \ src/DatabasePlugin.hxx \
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "CommandError.hxx" #include "CommandError.hxx"
#include "db_error.h" #include "DatabaseError.hxx"
#include "io_error.h" #include "io_error.h"
#include "protocol/Result.hxx" #include "protocol/Result.hxx"
......
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_DB_ERROR_H #ifndef MPD_DB_ERROR_HXX
#define MPD_DB_ERROR_H #define MPD_DB_ERROR_HXX
#include "gcc.h" #include "gcc.h"
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
#include "DatabaseSimple.hxx" #include "DatabaseSimple.hxx"
#include "DatabaseRegistry.hxx" #include "DatabaseRegistry.hxx"
#include "DatabaseSave.hxx" #include "DatabaseSave.hxx"
#include "DatabaseError.hxx"
#include "Directory.hxx" #include "Directory.hxx"
#include "conf.h" #include "conf.h"
extern "C" { extern "C" {
#include "db_error.h"
#include "stats.h" #include "stats.h"
} }
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "ProxyDatabasePlugin.hxx" #include "ProxyDatabasePlugin.hxx"
#include "DatabasePlugin.hxx" #include "DatabasePlugin.hxx"
#include "DatabaseSelection.hxx" #include "DatabaseSelection.hxx"
#include "DatabaseError.hxx"
#include "PlaylistVector.hxx" #include "PlaylistVector.hxx"
#include "Directory.hxx" #include "Directory.hxx"
#include "Song.hxx" #include "Song.hxx"
...@@ -28,10 +29,6 @@ ...@@ -28,10 +29,6 @@
#include "conf.h" #include "conf.h"
#include "Tag.hxx" #include "Tag.hxx"
extern "C" {
#include "db_error.h"
}
#undef MPD_DIRECTORY_H #undef MPD_DIRECTORY_H
#undef MPD_SONG_H #undef MPD_SONG_H
#include <mpd/client.h> #include <mpd/client.h>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "SongFilter.hxx" #include "SongFilter.hxx"
#include "DatabaseSave.hxx" #include "DatabaseSave.hxx"
#include "DatabaseLock.hxx" #include "DatabaseLock.hxx"
#include "db_error.h" #include "DatabaseError.hxx"
#include "TextFile.hxx" #include "TextFile.hxx"
#include "conf.h" #include "conf.h"
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment