diff options
Diffstat (limited to 'src/db')
-rw-r--r-- | src/db/DatabaseGlue.cxx | 1 | ||||
-rw-r--r-- | src/db/DatabasePlaylist.cxx | 1 | ||||
-rw-r--r-- | src/db/DatabasePrint.cxx | 5 | ||||
-rw-r--r-- | src/db/DatabasePrint.hxx | 2 | ||||
-rw-r--r-- | src/db/DatabaseSong.hxx | 2 | ||||
-rw-r--r-- | src/db/UniqueTags.hxx | 3 | ||||
-rw-r--r-- | src/db/VHelper.cxx | 3 | ||||
-rw-r--r-- | src/db/VHelper.hxx | 1 | ||||
-rw-r--r-- | src/db/plugins/ProxyDatabasePlugin.cxx | 1 | ||||
-rw-r--r-- | src/db/plugins/simple/DatabaseSave.cxx | 1 | ||||
-rw-r--r-- | src/db/plugins/simple/SimpleDatabasePlugin.cxx | 1 | ||||
-rw-r--r-- | src/db/plugins/upnp/ContentDirectoryService.cxx | 3 | ||||
-rw-r--r-- | src/db/plugins/upnp/Directory.cxx | 1 | ||||
-rw-r--r-- | src/db/plugins/upnp/UpnpDatabasePlugin.cxx | 4 | ||||
-rw-r--r-- | src/db/update/Editor.hxx | 1 | ||||
-rw-r--r-- | src/db/update/ExcludeList.cxx | 4 | ||||
-rw-r--r-- | src/db/update/InotifySource.cxx | 1 | ||||
-rw-r--r-- | src/db/update/InotifySource.hxx | 3 | ||||
-rw-r--r-- | src/db/update/InotifyUpdate.hxx | 2 | ||||
-rw-r--r-- | src/db/update/Remove.hxx | 2 | ||||
-rw-r--r-- | src/db/update/UpdateIO.cxx | 2 | ||||
-rw-r--r-- | src/db/update/Walk.cxx | 2 |
22 files changed, 4 insertions, 42 deletions
diff --git a/src/db/DatabaseGlue.cxx b/src/db/DatabaseGlue.cxx index faedcb6de..e67b4ae65 100644 --- a/src/db/DatabaseGlue.cxx +++ b/src/db/DatabaseGlue.cxx @@ -20,7 +20,6 @@ #include "DatabaseGlue.hxx" #include "Interface.hxx" #include "Registry.hxx" -#include "DatabaseError.hxx" #include "util/RuntimeError.hxx" #include "config/Block.hxx" #include "DatabasePlugin.hxx" diff --git a/src/db/DatabasePlaylist.cxx b/src/db/DatabasePlaylist.cxx index 53c9f55f9..19ff73e62 100644 --- a/src/db/DatabasePlaylist.cxx +++ b/src/db/DatabasePlaylist.cxx @@ -19,7 +19,6 @@ #include "DatabasePlaylist.hxx" #include "DatabaseSong.hxx" -#include "Selection.hxx" #include "PlaylistFile.hxx" #include "Interface.hxx" #include "song/DetachedSong.hxx" diff --git a/src/db/DatabasePrint.cxx b/src/db/DatabasePrint.cxx index 1a8567b88..8a63d69f0 100644 --- a/src/db/DatabasePrint.cxx +++ b/src/db/DatabasePrint.cxx @@ -21,15 +21,10 @@ #include "Selection.hxx" #include "SongPrint.hxx" #include "TimePrint.hxx" -#include "TagPrint.hxx" #include "client/Response.hxx" -#include "protocol/RangeArg.hxx" #include "Partition.hxx" -#include "song/DetachedSong.hxx" -#include "song/Filter.hxx" #include "song/LightSong.hxx" #include "tag/Tag.hxx" -#include "tag/Mask.hxx" #include "LightDirectory.hxx" #include "PlaylistInfo.hxx" #include "Interface.hxx" diff --git a/src/db/DatabasePrint.hxx b/src/db/DatabasePrint.hxx index dbfb2a8d9..67e0d264c 100644 --- a/src/db/DatabasePrint.hxx +++ b/src/db/DatabasePrint.hxx @@ -24,10 +24,8 @@ template<typename T> struct ConstBuffer; enum TagType : uint8_t; -class TagMask; class SongFilter; struct DatabaseSelection; -struct RangeArg; struct Partition; class Response; diff --git a/src/db/DatabaseSong.hxx b/src/db/DatabaseSong.hxx index 8238eeeb2..a4d41ca9d 100644 --- a/src/db/DatabaseSong.hxx +++ b/src/db/DatabaseSong.hxx @@ -20,8 +20,6 @@ #ifndef MPD_DATABASE_SONG_HXX #define MPD_DATABASE_SONG_HXX -#include "util/Compiler.h" - struct LightSong; class Database; class Storage; diff --git a/src/db/UniqueTags.hxx b/src/db/UniqueTags.hxx index fb368e206..d2a7eb734 100644 --- a/src/db/UniqueTags.hxx +++ b/src/db/UniqueTags.hxx @@ -22,11 +22,8 @@ #include "tag/Type.h" -#include <map> -#include <set> #include <string> -class TagMask; class Database; struct DatabaseSelection; template<typename Key> class RecursiveMap; diff --git a/src/db/VHelper.cxx b/src/db/VHelper.cxx index 97a84ecd7..0ebebbbc1 100644 --- a/src/db/VHelper.cxx +++ b/src/db/VHelper.cxx @@ -18,9 +18,12 @@ */ #include "VHelper.hxx" +#include "song/DetachedSong.hxx" #include "song/LightSong.hxx" #include "song/Filter.hxx" +#include <algorithm> + #include <assert.h> #include <stdlib.h> #include <string.h> diff --git a/src/db/VHelper.hxx b/src/db/VHelper.hxx index 71ddbb012..50b1e3454 100644 --- a/src/db/VHelper.hxx +++ b/src/db/VHelper.hxx @@ -22,7 +22,6 @@ #include "Visitor.hxx" #include "Selection.hxx" -#include "song/DetachedSong.hxx" #include <vector> diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx index 1c571fd77..fa940f24e 100644 --- a/src/db/plugins/ProxyDatabasePlugin.cxx +++ b/src/db/plugins/ProxyDatabasePlugin.cxx @@ -36,7 +36,6 @@ #include "config/Block.hxx" #include "tag/Builder.hxx" #include "tag/Tag.hxx" -#include "tag/Mask.hxx" #include "tag/ParseName.hxx" #include "util/ConstBuffer.hxx" #include "util/RecursiveMap.hxx" diff --git a/src/db/plugins/simple/DatabaseSave.cxx b/src/db/plugins/simple/DatabaseSave.cxx index 11248f951..bb36d4812 100644 --- a/src/db/plugins/simple/DatabaseSave.cxx +++ b/src/db/plugins/simple/DatabaseSave.cxx @@ -19,7 +19,6 @@ #include "DatabaseSave.hxx" #include "db/DatabaseLock.hxx" -#include "Directory.hxx" #include "DirectorySave.hxx" #include "fs/io/BufferedOutputStream.hxx" #include "fs/io/TextFile.hxx" diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx index ebb34ee14..07e2c359e 100644 --- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx +++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx @@ -33,7 +33,6 @@ #include "DatabaseSave.hxx" #include "db/DatabaseLock.hxx" #include "db/DatabaseError.hxx" -#include "tag/Mask.hxx" #include "fs/io/TextFile.hxx" #include "fs/io/BufferedOutputStream.hxx" #include "fs/io/FileOutputStream.hxx" diff --git a/src/db/plugins/upnp/ContentDirectoryService.cxx b/src/db/plugins/upnp/ContentDirectoryService.cxx index f2eba08bd..8df6eaaa0 100644 --- a/src/db/plugins/upnp/ContentDirectoryService.cxx +++ b/src/db/plugins/upnp/ContentDirectoryService.cxx @@ -23,13 +23,10 @@ #include "lib/upnp/Action.hxx" #include "Directory.hxx" #include "util/NumberParser.hxx" -#include "util/UriUtil.hxx" #include "util/RuntimeError.hxx" #include "util/ScopeExit.hxx" #include "util/StringFormat.hxx" -#include <stdio.h> - static void ReadResultTag(UPnPDirContent &dirbuf, IXML_Document *response) { diff --git a/src/db/plugins/upnp/Directory.cxx b/src/db/plugins/upnp/Directory.cxx index 91f244dd0..0d4865f06 100644 --- a/src/db/plugins/upnp/Directory.cxx +++ b/src/db/plugins/upnp/Directory.cxx @@ -18,7 +18,6 @@ */ #include "Directory.hxx" -#include "lib/upnp/Util.hxx" #include "lib/expat/ExpatParser.hxx" #include "Tags.hxx" #include "tag/Builder.hxx" diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx index c3fc32e27..6e42bd412 100644 --- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx +++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx @@ -34,12 +34,8 @@ #include "song/Filter.hxx" #include "song/TagSongFilter.hxx" #include "db/Stats.hxx" -#include "config/Block.hxx" -#include "tag/Builder.hxx" #include "tag/Table.hxx" -#include "tag/Mask.hxx" #include "fs/Traits.hxx" -#include "Log.hxx" #include "util/ConstBuffer.hxx" #include "util/RecursiveMap.hxx" #include "util/SplitString.hxx" diff --git a/src/db/update/Editor.hxx b/src/db/update/Editor.hxx index 4b200c63b..4e63d4b17 100644 --- a/src/db/update/Editor.hxx +++ b/src/db/update/Editor.hxx @@ -21,7 +21,6 @@ #define MPD_UPDATE_DATABASE_HXX #include "Remove.hxx" -#include "util/Compiler.h" struct Directory; struct Song; diff --git a/src/db/update/ExcludeList.cxx b/src/db/update/ExcludeList.cxx index a93c74ec3..e95b2c7bc 100644 --- a/src/db/update/ExcludeList.cxx +++ b/src/db/update/ExcludeList.cxx @@ -27,13 +27,9 @@ #include "fs/NarrowPath.hxx" #include "input/TextInputStream.hxx" #include "util/StringStrip.hxx" -#include "Log.hxx" #include "config.h" -#include <exception> - #include <assert.h> -#include <string.h> #ifdef HAVE_CLASS_GLOB diff --git a/src/db/update/InotifySource.cxx b/src/db/update/InotifySource.cxx index 3d851d811..285ce7a34 100644 --- a/src/db/update/InotifySource.cxx +++ b/src/db/update/InotifySource.cxx @@ -25,7 +25,6 @@ #include "Log.hxx" #include <sys/inotify.h> -#include <unistd.h> #include <errno.h> #include <stdint.h> #include <limits.h> diff --git a/src/db/update/InotifySource.hxx b/src/db/update/InotifySource.hxx index 3e19e7a45..51cba9427 100644 --- a/src/db/update/InotifySource.hxx +++ b/src/db/update/InotifySource.hxx @@ -21,9 +21,6 @@ #define MPD_INOTIFY_SOURCE_HXX #include "event/SocketMonitor.hxx" -#include "util/Compiler.h" - -class FileDescriptor; typedef void (*mpd_inotify_callback_t)(int wd, unsigned mask, const char *name, void *ctx); diff --git a/src/db/update/InotifyUpdate.hxx b/src/db/update/InotifyUpdate.hxx index e9b0eec3c..f6f5aad49 100644 --- a/src/db/update/InotifyUpdate.hxx +++ b/src/db/update/InotifyUpdate.hxx @@ -20,8 +20,6 @@ #ifndef MPD_INOTIFY_UPDATE_HXX #define MPD_INOTIFY_UPDATE_HXX -#include "util/Compiler.h" - class EventLoop; class Storage; class UpdateService; diff --git a/src/db/update/Remove.hxx b/src/db/update/Remove.hxx index 0035a0b0d..83f8ab9d2 100644 --- a/src/db/update/Remove.hxx +++ b/src/db/update/Remove.hxx @@ -22,12 +22,10 @@ #include "event/DeferEvent.hxx" #include "thread/Mutex.hxx" -#include "util/Compiler.h" #include <forward_list> #include <string> -struct Song; class DatabaseListener; /** diff --git a/src/db/update/UpdateIO.cxx b/src/db/update/UpdateIO.cxx index 8f00ae784..d79e50f4a 100644 --- a/src/db/update/UpdateIO.cxx +++ b/src/db/update/UpdateIO.cxx @@ -26,8 +26,6 @@ #include "fs/AllocatedPath.hxx" #include "Log.hxx" -#include <stdexcept> - #include <errno.h> bool diff --git a/src/db/update/Walk.cxx b/src/db/update/Walk.cxx index 27d168f29..23db623e5 100644 --- a/src/db/update/Walk.cxx +++ b/src/db/update/Walk.cxx @@ -40,7 +40,7 @@ #include "util/UriUtil.hxx" #include "Log.hxx" -#include <stdexcept> +#include <exception> #include <memory> #include <assert.h> |