From 1953452f3dc0c919b17f6f1ee555f5642480db44 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 8 Dec 2019 15:28:51 +0100 Subject: Cleanup: Fix some includes and forward declarations --- ingen/AtomWriter.hpp | 1 + ingen/Parser.hpp | 2 -- ingen/Serialiser.hpp | 1 + src/Configuration.cpp | 1 + src/LV2Features.cpp | 2 ++ src/Log.cpp | 2 ++ src/SocketWriter.cpp | 2 +- src/World.cpp | 3 +-- src/server/Broadcaster.cpp | 2 +- src/server/Buffer.hpp | 1 - src/server/BufferFactory.cpp | 1 + src/server/CompiledGraph.cpp | 2 ++ src/server/Engine.hpp | 1 + src/server/InputPort.cpp | 2 +- src/server/InternalBlock.cpp | 15 +++++++++++++++ src/server/InternalBlock.hpp | 5 +++++ src/server/LV2Block.hpp | 3 +++ src/server/PreProcessor.cpp | 2 ++ src/server/SocketListener.cpp | 11 ++++++----- src/server/events/CreateBlock.cpp | 2 +- 20 files changed, 47 insertions(+), 14 deletions(-) diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp index 6c1786f4..f9052d93 100644 --- a/ingen/AtomWriter.hpp +++ b/ingen/AtomWriter.hpp @@ -22,6 +22,7 @@ #include "ingen/Message.hpp" #include "ingen/Properties.hpp" #include "ingen/Resource.hpp" +#include "ingen/URI.hpp" #include "ingen/ingen.h" #include "lv2/atom/forge.h" #include "lv2/urid/urid.h" diff --git a/ingen/Parser.hpp b/ingen/Parser.hpp index acaf3b90..8d868a8c 100644 --- a/ingen/Parser.hpp +++ b/ingen/Parser.hpp @@ -30,8 +30,6 @@ #include #include -namespace Raul { class Path; } -namespace Raul { class Symbol; } namespace Sord { class World; } namespace ingen { diff --git a/ingen/Serialiser.hpp b/ingen/Serialiser.hpp index c19ff19c..4980a36d 100644 --- a/ingen/Serialiser.hpp +++ b/ingen/Serialiser.hpp @@ -17,6 +17,7 @@ #ifndef INGEN_SERIALISER_HPP #define INGEN_SERIALISER_HPP +#include "ingen/FilePath.hpp" #include "ingen/Properties.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" diff --git a/src/Configuration.cpp b/src/Configuration.cpp index a79a2bf7..a00cea98 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -21,6 +21,7 @@ #include "ingen/fmt.hpp" #include "ingen/ingen.h" #include "ingen/runtime_paths.hpp" +#include "lv2/urid/urid.h" #include "serd/serd.h" #include "sord/sord.h" #include "sord/sordmm.hpp" diff --git a/src/LV2Features.cpp b/src/LV2Features.cpp index 460bc46a..fe2304a2 100644 --- a/src/LV2Features.cpp +++ b/src/LV2Features.cpp @@ -16,6 +16,8 @@ #include "ingen/LV2Features.hpp" +#include "lv2/core/lv2.h" + #include namespace ingen { diff --git a/src/Log.cpp b/src/Log.cpp index 1fb3ff24..756bb8c3 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -20,7 +20,9 @@ #include "ingen/Node.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" +#include "lv2/core/lv2.h" #include "lv2/log/log.h" +#include "lv2/urid/urid.h" #include "raul/Path.hpp" #include diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp index 83895701..910f67f3 100644 --- a/src/SocketWriter.cpp +++ b/src/SocketWriter.cpp @@ -21,8 +21,8 @@ #include -#include #include +#include #include #ifndef MSG_NOSIGNAL diff --git a/src/World.cpp b/src/World.cpp index 693f9427..69a0f0bc 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -32,15 +32,14 @@ #include "ingen/URI.hpp" #include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" -#include "ingen/filesystem.hpp" #include "ingen/ingen.h" #include "ingen/runtime_paths.hpp" #include "lilv/lilv.h" #include "lv2/log/log.h" +#include "lv2/urid/urid.h" #include "sord/sordmm.hpp" #include -#include #include #include #include diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp index 779145df..c3fb82ef 100644 --- a/src/server/Broadcaster.cpp +++ b/src/server/Broadcaster.cpp @@ -16,8 +16,8 @@ #include "Broadcaster.hpp" -#include "PluginImpl.hpp" #include "BlockFactory.hpp" +#include "PluginImpl.hpp" #include "ingen/Interface.hpp" diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp index 61123c43..c67f9fd7 100644 --- a/src/server/Buffer.hpp +++ b/src/server/Buffer.hpp @@ -22,7 +22,6 @@ #include "PortType.hpp" #include "types.hpp" -#include "ingen/Atom.hpp" #include "ingen/URIs.hpp" #include "ingen/ingen.h" #include "ingen/types.hpp" diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index 8d921dab..d4f9da33 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -23,6 +23,7 @@ #include "ingen/URIs.hpp" #include "ingen/World.hpp" #include "lv2/atom/atom.h" +#include "lv2/urid/urid.h" #include diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp index 1e0c4048..d75c9910 100644 --- a/src/server/CompiledGraph.cpp +++ b/src/server/CompiledGraph.cpp @@ -16,6 +16,7 @@ #include "CompiledGraph.hpp" +#include "BlockImpl.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "ThreadManager.hpp" @@ -29,6 +30,7 @@ #include #include #include +#include #include namespace ingen { diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index 2c2277f8..d1f2da3d 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -19,6 +19,7 @@ #include "Event.hpp" #include "Load.hpp" +#include "types.hpp" #include "ingen/Clock.hpp" #include "ingen/EngineBase.hpp" diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 093546e1..a82458f1 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -31,8 +31,8 @@ #include "ingen/URIs.hpp" #include "raul/Array.hpp" -#include #include +#include namespace ingen { namespace server { diff --git a/src/server/InternalBlock.cpp b/src/server/InternalBlock.cpp index a1f5b5b1..298f5471 100644 --- a/src/server/InternalBlock.cpp +++ b/src/server/InternalBlock.cpp @@ -17,16 +17,31 @@ #include "InternalBlock.hpp" #include "Buffer.hpp" +#include "BufferFactory.hpp" #include "Engine.hpp" #include "InternalPlugin.hpp" +#include "PluginImpl.hpp" #include "PortImpl.hpp" +#include "ingen/URIs.hpp" +#include "raul/Array.hpp" + #include #include +namespace Raul { +class Symbol; +} + namespace ingen { + +class Atom; + namespace server { +class GraphImpl; +class RunContext; + InternalBlock::InternalBlock(PluginImpl* plugin, const Raul::Symbol& symbol, bool poly, diff --git a/src/server/InternalBlock.hpp b/src/server/InternalBlock.hpp index 47c1c09f..e7f0ca95 100644 --- a/src/server/InternalBlock.hpp +++ b/src/server/InternalBlock.hpp @@ -22,6 +22,11 @@ namespace ingen { namespace server { +class Engine; +class GraphImpl; +class PluginImpl; +class RunContext; + /** An internal Block implemented inside Ingen. * * \ingroup engine diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index 9c99126d..e10775a0 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -36,6 +36,9 @@ #include namespace ingen { + +class FilePath; + namespace server { class LV2Plugin; diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp index 14f8e241..127e91b5 100644 --- a/src/server/PreProcessor.cpp +++ b/src/server/PreProcessor.cpp @@ -24,6 +24,7 @@ #include "ThreadManager.hpp" #include "UndoStack.hpp" +#include "ingen/Atom.hpp" #include "ingen/AtomWriter.hpp" #include "ingen/Configuration.hpp" #include "ingen/World.hpp" @@ -31,6 +32,7 @@ #include #include #include +#include namespace ingen { namespace server { diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp index 76596e55..0853962b 100644 --- a/src/server/SocketListener.cpp +++ b/src/server/SocketListener.cpp @@ -16,25 +16,26 @@ #include "SocketListener.hpp" +#include "Engine.hpp" #include "SocketServer.hpp" -#include "../server/Engine.hpp" #include "ingen/Configuration.hpp" #include "ingen/Log.hpp" #include "ingen/World.hpp" #include "raul/Socket.hpp" +#include +#include +#include + #include +#include #include #include #include -#include -#include #include #include -#include #include -#include namespace ingen { namespace server { diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index e1991b5f..b9c844cb 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -21,9 +21,9 @@ #include "Broadcaster.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" +#include "LV2Block.hpp" #include "PluginImpl.hpp" #include "PreProcessContext.hpp" -#include "LV2Block.hpp" #include "ingen/Forge.hpp" #include "ingen/Store.hpp" -- cgit v1.2.1