From 7099e0d3b55f5ebea9e4cb74490b396a4bb29d1e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 24 Nov 2024 17:48:39 -0500 Subject: Use angle brackets for library includes --- src/AtomForge.cpp | 18 +++++----- src/AtomReader.cpp | 30 ++++++++-------- src/AtomWriter.cpp | 32 ++++++++--------- src/ClashAvoider.cpp | 12 +++---- src/ColorContext.cpp | 3 +- src/Configuration.cpp | 30 ++++++++++------ src/Forge.cpp | 13 ++++--- src/LV2Features.cpp | 4 +-- src/Library.cpp | 3 +- src/Log.cpp | 20 +++++------ src/Parser.cpp | 44 ++++++++++++----------- src/Resource.cpp | 10 +++--- src/Serialiser.cpp | 50 +++++++++++++------------- src/SocketReader.cpp | 24 ++++++------- src/SocketWriter.cpp | 8 +++-- src/Store.cpp | 8 ++--- src/StreamWriter.cpp | 7 ++-- src/TurtleWriter.cpp | 15 ++++---- src/URI.cpp | 8 ++--- src/URIMap.cpp | 8 ++--- src/URIs.cpp | 39 +++++++++++---------- src/World.cpp | 46 ++++++++++++------------ src/client/BlockModel.cpp | 30 ++++++++++------ src/client/ClientStore.cpp | 38 +++++++++++--------- src/client/GraphModel.cpp | 25 +++++++------ src/client/ObjectModel.cpp | 25 +++++++------ src/client/PluginModel.cpp | 20 +++++++---- src/client/PluginUI.cpp | 34 +++++++++--------- src/client/PortModel.cpp | 15 ++++---- src/client/ingen_client.cpp | 2 +- src/gui/App.cpp | 44 ++++++++++++----------- src/gui/App.hpp | 14 ++++---- src/gui/Arc.cpp | 11 +++--- src/gui/Arc.hpp | 2 +- src/gui/BreadCrumbs.cpp | 9 +++-- src/gui/BreadCrumbs.hpp | 8 ++--- src/gui/ConnectWindow.cpp | 36 ++++++++++--------- src/gui/ConnectWindow.hpp | 4 +-- src/gui/GraphBox.cpp | 38 ++++++++++---------- src/gui/GraphBox.hpp | 2 +- src/gui/GraphCanvas.cpp | 69 +++++++++++++++++++----------------- src/gui/GraphCanvas.hpp | 12 +++---- src/gui/GraphPortModule.cpp | 23 ++++++------ src/gui/GraphPortModule.hpp | 4 +-- src/gui/GraphTreeWindow.cpp | 21 +++++------ src/gui/GraphTreeWindow.hpp | 2 +- src/gui/GraphView.cpp | 12 +++---- src/gui/LoadGraphWindow.cpp | 25 ++++++------- src/gui/LoadGraphWindow.hpp | 4 +-- src/gui/LoadPluginWindow.cpp | 24 +++++++------ src/gui/LoadPluginWindow.hpp | 6 ++-- src/gui/MessagesWindow.cpp | 4 +-- src/gui/MessagesWindow.hpp | 2 +- src/gui/NewSubgraphWindow.cpp | 21 +++++------ src/gui/NewSubgraphWindow.hpp | 2 +- src/gui/NodeMenu.cpp | 21 +++++------ src/gui/NodeMenu.hpp | 2 +- src/gui/NodeModule.cpp | 38 ++++++++++---------- src/gui/NodeModule.hpp | 4 +-- src/gui/ObjectMenu.cpp | 13 +++---- src/gui/ObjectMenu.hpp | 2 +- src/gui/PluginMenu.cpp | 10 +++--- src/gui/PluginMenu.hpp | 2 +- src/gui/Port.cpp | 37 ++++++++++---------- src/gui/Port.hpp | 2 +- src/gui/PortMenu.cpp | 28 +++++++-------- src/gui/PropertiesWindow.cpp | 26 +++++++------- src/gui/PropertiesWindow.hpp | 6 ++-- src/gui/RDFS.cpp | 17 ++++----- src/gui/RDFS.hpp | 4 +-- src/gui/RenameWindow.cpp | 18 +++++----- src/gui/Style.cpp | 4 +-- src/gui/SubgraphModule.cpp | 14 ++++---- src/gui/ThreadedLoader.cpp | 21 +++++------ src/gui/ThreadedLoader.hpp | 4 +-- src/gui/URIEntry.cpp | 5 +-- src/gui/URIEntry.hpp | 4 +-- src/gui/WidgetFactory.cpp | 2 +- src/gui/WindowFactory.cpp | 12 ++++--- src/gui/WindowFactory.hpp | 4 +-- src/gui/ingen_gui.cpp | 16 ++++----- src/gui/ingen_gui_lv2.cpp | 44 +++++++++++------------ src/ingen/ingen.cpp | 30 ++++++++-------- src/runtime_paths.cpp | 5 +-- src/server/ArcImpl.cpp | 4 +-- src/server/ArcImpl.hpp | 4 +-- src/server/BlockFactory.cpp | 21 +++++------ src/server/BlockFactory.hpp | 4 +-- src/server/BlockImpl.cpp | 10 ++++-- src/server/BlockImpl.hpp | 14 ++++---- src/server/Broadcaster.cpp | 2 +- src/server/Broadcaster.hpp | 8 ++--- src/server/Buffer.cpp | 12 +++---- src/server/Buffer.hpp | 6 ++-- src/server/BufferFactory.cpp | 10 +++--- src/server/BufferFactory.hpp | 8 ++--- src/server/ClientUpdate.cpp | 13 ++++--- src/server/ClientUpdate.hpp | 8 ++--- src/server/CompiledGraph.cpp | 12 +++---- src/server/CompiledGraph.hpp | 2 +- src/server/ControlBindings.cpp | 24 ++++++------- src/server/ControlBindings.hpp | 4 +-- src/server/DirectDriver.hpp | 2 +- src/server/Driver.hpp | 4 +-- src/server/DuplexPort.cpp | 17 ++++----- src/server/DuplexPort.hpp | 6 ++-- src/server/Engine.cpp | 42 +++++++++++----------- src/server/Engine.hpp | 6 ++-- src/server/EnginePort.hpp | 4 +-- src/server/Event.hpp | 12 +++---- src/server/EventWriter.cpp | 21 +++++------ src/server/EventWriter.hpp | 6 ++-- src/server/GraphImpl.cpp | 18 +++++----- src/server/GraphImpl.hpp | 4 +-- src/server/GraphPlugin.hpp | 8 ++--- src/server/InputPort.cpp | 12 +++---- src/server/InputPort.hpp | 4 +-- src/server/InternalBlock.cpp | 4 +-- src/server/InternalPlugin.cpp | 7 ++-- src/server/InternalPlugin.hpp | 6 ++-- src/server/JackDriver.cpp | 27 +++++++------- src/server/JackDriver.hpp | 8 ++--- src/server/LV2Block.cpp | 40 +++++++++++---------- src/server/LV2Block.hpp | 16 ++++----- src/server/LV2Options.hpp | 8 ++--- src/server/LV2Plugin.cpp | 13 +++---- src/server/LV2Plugin.hpp | 6 ++-- src/server/LV2ResizeFeature.hpp | 4 +-- src/server/NodeImpl.cpp | 13 +++---- src/server/NodeImpl.hpp | 10 +++--- src/server/OutputPort.hpp | 2 +- src/server/PluginImpl.hpp | 10 +++--- src/server/PortAudioDriver.cpp | 15 +++++--- src/server/PortAudioDriver.hpp | 4 +-- src/server/PortImpl.cpp | 21 +++++------ src/server/PortImpl.hpp | 10 +++--- src/server/PortType.hpp | 7 ++-- src/server/PreProcessor.cpp | 10 +++--- src/server/PreProcessor.hpp | 2 +- src/server/RunContext.cpp | 18 +++++----- src/server/RunContext.hpp | 4 +-- src/server/SocketListener.cpp | 12 +++---- src/server/SocketListener.hpp | 2 +- src/server/SocketServer.hpp | 22 ++++++------ src/server/State.hpp | 2 +- src/server/Task.cpp | 2 +- src/server/UndoStack.cpp | 16 ++++----- src/server/UndoStack.hpp | 12 +++---- src/server/Worker.cpp | 12 +++---- src/server/Worker.hpp | 10 +++--- src/server/events.hpp | 28 +++++++-------- src/server/events/Connect.cpp | 16 +++++---- src/server/events/Connect.hpp | 6 ++-- src/server/events/Copy.cpp | 25 ++++++------- src/server/events/Copy.hpp | 2 +- src/server/events/CreateBlock.cpp | 28 +++++++-------- src/server/events/CreateBlock.hpp | 2 +- src/server/events/CreateGraph.cpp | 29 +++++++-------- src/server/events/CreateGraph.hpp | 4 +-- src/server/events/CreatePort.cpp | 31 ++++++++-------- src/server/events/CreatePort.hpp | 8 ++--- src/server/events/Delete.cpp | 23 ++++++------ src/server/events/Delete.hpp | 8 ++--- src/server/events/Delta.cpp | 31 ++++++++-------- src/server/events/Delta.hpp | 6 ++-- src/server/events/Disconnect.cpp | 19 +++++----- src/server/events/Disconnect.hpp | 4 +-- src/server/events/DisconnectAll.cpp | 15 ++++---- src/server/events/DisconnectAll.hpp | 2 +- src/server/events/Get.cpp | 21 +++++------ src/server/events/Get.hpp | 2 +- src/server/events/Mark.cpp | 8 ++--- src/server/events/Move.cpp | 11 +++--- src/server/events/Move.hpp | 2 +- src/server/events/SetPortValue.cpp | 11 +++--- src/server/events/SetPortValue.hpp | 2 +- src/server/events/Undo.cpp | 10 +++--- src/server/ingen_engine.cpp | 4 +-- src/server/ingen_jack.cpp | 10 +++--- src/server/ingen_lv2.cpp | 70 ++++++++++++++++++------------------- src/server/ingen_portaudio.cpp | 6 ++-- src/server/internals/BlockDelay.cpp | 14 ++++---- src/server/internals/Controller.cpp | 23 ++++++------ src/server/internals/Note.cpp | 22 ++++++------ src/server/internals/Note.hpp | 4 +-- src/server/internals/Time.cpp | 18 +++++----- src/server/internals/Trigger.cpp | 22 ++++++------ src/server/mix.cpp | 4 +-- src/server/util.hpp | 2 +- 189 files changed, 1392 insertions(+), 1263 deletions(-) (limited to 'src') diff --git a/src/AtomForge.cpp b/src/AtomForge.cpp index 6a62a609..95edb2ea 100644 --- a/src/AtomForge.cpp +++ b/src/AtomForge.cpp @@ -14,14 +14,16 @@ along with Ingen. If not, see . */ -#include "ingen/AtomForge.hpp" - -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/atom/util.h" -#include "lv2/urid/urid.h" -#include "sord/sord.h" -#include "sord/sordmm.hpp" +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/AtomReader.cpp b/src/AtomReader.cpp index df9a8e4b..21cb9e40 100644 --- a/src/AtomReader.cpp +++ b/src/AtomReader.cpp @@ -14,21 +14,21 @@ along with Ingen. If not, see . */ -#include "ingen/AtomReader.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/Message.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/paths.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "raul/Path.hpp" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp index ce18337f..f2132a39 100644 --- a/src/AtomWriter.cpp +++ b/src/AtomWriter.cpp @@ -47,22 +47,22 @@ * manipulating data in this model which resemble HTTP methods. */ -#include "ingen/AtomWriter.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/AtomForge.hpp" -#include "ingen/AtomSink.hpp" -#include "ingen/Message.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/paths.hpp" -#include "lv2/atom/forge.h" -#include "lv2/urid/urid.h" -#include "raul/Path.hpp" -#include "serd/serd.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ClashAvoider.cpp b/src/ClashAvoider.cpp index 0ed1da73..098c9b6d 100644 --- a/src/ClashAvoider.cpp +++ b/src/ClashAvoider.cpp @@ -14,12 +14,12 @@ along with Ingen. If not, see . */ -#include "ingen/ClashAvoider.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ColorContext.cpp b/src/ColorContext.cpp index a4e60ca5..9706cb81 100644 --- a/src/ColorContext.cpp +++ b/src/ColorContext.cpp @@ -14,7 +14,8 @@ along with Ingen. If not, see . */ -#include "ingen/ColorContext.hpp" +#include + #include "ingen_config.h" #if USE_ISATTY diff --git a/src/Configuration.cpp b/src/Configuration.cpp index b8a717ba..9abdc288 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -14,26 +14,34 @@ along with Ingen. If not, see . */ -#include "ingen/Configuration.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URIMap.hpp" -#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" -#include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include #include #include #include +#include +#include #include +#include +#include +#include #include #include #include diff --git a/src/Forge.cpp b/src/Forge.cpp index abce74f2..8b222c64 100644 --- a/src/Forge.cpp +++ b/src/Forge.cpp @@ -14,13 +14,16 @@ along with Ingen. If not, see . */ -#include "ingen/Forge.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "lv2/atom/forge.h" -#include "lv2/urid/urid.h" +#include +#include +#include +#include +#include +#include +#include #include +#include namespace ingen { diff --git a/src/LV2Features.cpp b/src/LV2Features.cpp index 5cdeca44..c33ba4c4 100644 --- a/src/LV2Features.cpp +++ b/src/LV2Features.cpp @@ -14,9 +14,9 @@ along with Ingen. If not, see . */ -#include "ingen/LV2Features.hpp" +#include -#include "lv2/core/lv2.h" +#include #include #include diff --git a/src/Library.cpp b/src/Library.cpp index a8a7107e..4add6577 100644 --- a/src/Library.cpp +++ b/src/Library.cpp @@ -14,7 +14,8 @@ along with Ingen. If not, see . */ -#include "ingen/Library.hpp" +#include +#include #ifdef _WIN32 # include diff --git a/src/Log.cpp b/src/Log.cpp index 7ace4ce3..5c582cfa 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -14,16 +14,16 @@ along with Ingen. If not, see . */ -#include "ingen/Log.hpp" - -#include "ingen/ColorContext.hpp" -#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 + +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Parser.cpp b/src/Parser.cpp index 04a10f23..c03f0abf 100644 --- a/src/Parser.cpp +++ b/src/Parser.cpp @@ -14,27 +14,29 @@ along with Ingen. If not, see . */ -#include "ingen/Parser.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/AtomForge.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/paths.hpp" -#include "lv2/atom/atom.h" -#include "lv2/core/lv2.h" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" -#include "serd/serd.h" -#include "sord/sord.h" -#include "sord/sordmm.hpp" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Resource.cpp b/src/Resource.cpp index 2171c438..362e6b08 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -14,11 +14,13 @@ along with Ingen. If not, see . */ -#include "ingen/Resource.hpp" +#include -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URIs.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp index 860334d6..785e12ba 100644 --- a/src/Serialiser.cpp +++ b/src/Serialiser.cpp @@ -14,30 +14,32 @@ along with Ingen. If not, see . */ -#include "ingen/Serialiser.hpp" - -#include "ingen/Arc.hpp" -#include "ingen/Atom.hpp" -#include "ingen/FilePath.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/Node.hpp" -#include "ingen/Resource.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/core/lv2.h" -#include "lv2/state/state.h" -#include "lv2/ui/ui.h" -#include "lv2/urid/urid.h" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" -#include "serd/serd.h" -#include "sord/sord.h" -#include "sord/sordmm.hpp" -#include "sratom/sratom.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp index d1014a95..5499fb66 100644 --- a/src/SocketReader.cpp +++ b/src/SocketReader.cpp @@ -14,18 +14,18 @@ along with Ingen. If not, see . */ -#include "ingen/SocketReader.hpp" - -#include "ingen/AtomForge.hpp" -#include "ingen/AtomReader.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/World.hpp" -#include "lv2/urid/urid.h" -#include "raul/Socket.hpp" -#include "serd/serd.h" -#include "sord/sord.h" -#include "sord/sordmm.hpp" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp index 47427e7f..7512ecbd 100644 --- a/src/SocketWriter.cpp +++ b/src/SocketWriter.cpp @@ -14,10 +14,12 @@ along with Ingen. If not, see . */ -#include "ingen/SocketWriter.hpp" +#include -#include "ingen/URI.hpp" -#include "raul/Socket.hpp" +#include +#include +#include +#include #include #include diff --git a/src/Store.cpp b/src/Store.cpp index d85d5932..ab8425cb 100644 --- a/src/Store.cpp +++ b/src/Store.cpp @@ -14,11 +14,11 @@ along with Ingen. If not, see . */ -#include "ingen/Store.hpp" +#include -#include "ingen/Node.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include #include #include diff --git a/src/StreamWriter.cpp b/src/StreamWriter.cpp index 0d3d97d6..c40389e4 100644 --- a/src/StreamWriter.cpp +++ b/src/StreamWriter.cpp @@ -14,10 +14,11 @@ along with Ingen. If not, see . */ -#include "ingen/StreamWriter.hpp" +#include -#include "ingen/ColorContext.hpp" -#include "ingen/URI.hpp" +#include +#include +#include namespace ingen { diff --git a/src/TurtleWriter.cpp b/src/TurtleWriter.cpp index 61f8b543..e19c14e2 100644 --- a/src/TurtleWriter.cpp +++ b/src/TurtleWriter.cpp @@ -14,12 +14,15 @@ along with Ingen. If not, see . */ -#include "ingen/TurtleWriter.hpp" - -#include "ingen/URIMap.hpp" -#include "lv2/atom/atom.h" -#include "serd/serd.h" -#include "sratom/sratom.h" +#include + +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/URI.cpp b/src/URI.cpp index 81dd5686..3161b7d2 100644 --- a/src/URI.cpp +++ b/src/URI.cpp @@ -14,11 +14,11 @@ along with Ingen. If not, see . */ -#include "ingen/URI.hpp" +#include -#include "ingen/FilePath.hpp" -#include "serd/serd.h" -#include "sord/sordmm.hpp" +#include +#include +#include #include diff --git a/src/URIMap.cpp b/src/URIMap.cpp index bb484529..25764762 100644 --- a/src/URIMap.cpp +++ b/src/URIMap.cpp @@ -14,11 +14,11 @@ along with Ingen. If not, see . */ -#include "ingen/URIMap.hpp" +#include -#include "ingen/Log.hpp" -#include "ingen/URI.hpp" -#include "lv2/urid/urid.h" +#include +#include +#include #include #include diff --git a/src/URIs.cpp b/src/URIs.cpp index 27e2e8f1..49eb1707 100644 --- a/src/URIs.cpp +++ b/src/URIs.cpp @@ -14,26 +14,27 @@ along with Ingen. If not, see . */ -#include "ingen/URIs.hpp" +#include -#include "ingen/Forge.hpp" -#include "ingen/ingen.h" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/buf-size/buf-size.h" -#include "lv2/core/lv2.h" -#include "lv2/log/log.h" -#include "lv2/midi/midi.h" -#include "lv2/morph/morph.h" -#include "lv2/options/options.h" -#include "lv2/parameters/parameters.h" -#include "lv2/patch/patch.h" -#include "lv2/port-props/port-props.h" -#include "lv2/presets/presets.h" -#include "lv2/resize-port/resize-port.h" -#include "lv2/state/state.h" -#include "lv2/time/time.h" -#include "lv2/worker/worker.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ingen { diff --git a/src/World.cpp b/src/World.cpp index 03a47773..7e643002 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -14,29 +14,29 @@ along with Ingen. If not, see . */ -#include "ingen/World.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/DataAccess.hpp" -#include "ingen/EngineBase.hpp" -#include "ingen/Forge.hpp" -#include "ingen/InstanceAccess.hpp" -#include "ingen/LV2Features.hpp" -#include "ingen/Library.hpp" -#include "ingen/Log.hpp" -#include "ingen/Module.hpp" -#include "ingen/Parser.hpp" -#include "ingen/Serialiser.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp index 8ba446ab..c8f76195 100644 --- a/src/client/BlockModel.cpp +++ b/src/client/BlockModel.cpp @@ -14,17 +14,21 @@ along with Ingen. If not, see . */ -#include "ingen/client/BlockModel.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "lilv/lilv.h" -#include "lv2/core/lv2.h" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include @@ -35,6 +39,10 @@ #include #include +namespace ingen { +class Node; +} // namespace ingen + namespace ingen::client { BlockModel::BlockModel(URIs& uris, diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 66a8d3b6..9f224db3 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -14,23 +14,27 @@ along with Ingen. If not, see . */ -#include "ingen/client/ClientStore.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/ArcModel.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "ingen/client/SigClientInterface.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp index 0837f738..fe119361 100644 --- a/src/client/GraphModel.cpp +++ b/src/client/GraphModel.cpp @@ -14,16 +14,17 @@ along with Ingen. If not, see . */ -#include "ingen/client/GraphModel.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/ArcModel.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "raul/Path.hpp" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -31,6 +32,10 @@ #include #include +namespace ingen { +class Node; +} // namespace ingen + namespace ingen::client { GraphModel::GraphModel(URIs& uris, const raul::Path& graph_path) diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 0c3bf517..d233dd1a 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -14,16 +14,17 @@ along with Ingen. If not, see . */ -#include "ingen/client/ObjectModel.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/Node.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URIs.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -31,6 +32,10 @@ #include #include +namespace ingen { +class URI; +} // namespace ingen + namespace ingen::client { ObjectModel::ObjectModel(URIs& uris, const raul::Path& path) diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 3036f2e8..f4dfccd2 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -14,13 +14,19 @@ along with Ingen. If not, see . */ -#include "ingen/client/PluginModel.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/client/PluginUI.hpp" -#include "lilv/lilv.h" -#include "lv2/core/lv2.h" -#include "raul/Symbol.hpp" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index 61813cab..c4aa748f 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -14,22 +14,24 @@ along with Ingen. If not, see . */ -#include "ingen/client/PluginUI.hpp" - -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "lilv/lilv.h" -#include "lv2/atom/atom.h" -#include "lv2/core/lv2.h" -#include "lv2/ui/ui.h" -#include "raul/Symbol.hpp" -#include "suil/suil.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp index 46129875..14a5297e 100644 --- a/src/client/PortModel.cpp +++ b/src/client/PortModel.cpp @@ -14,13 +14,14 @@ along with Ingen. If not, see . */ -#include "ingen/client/PortModel.hpp" - -#include "ingen/Properties.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "lv2/urid/urid.h" +#include + +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp index 63705ebc..2f1a8aa6 100644 --- a/src/client/ingen_client.cpp +++ b/src/client/ingen_client.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see . */ -#include "ingen/Module.hpp" +#include namespace ingen { diff --git a/src/gui/App.cpp b/src/gui/App.cpp index bd57696e..48ed3a61 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -27,26 +27,30 @@ #include "WindowFactory.hpp" #include "rgba.hpp" -#include "ingen/Atom.hpp" -#include "ingen/ColorContext.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/EngineBase.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/QueuedInterface.hpp" -#include "ingen/Status.hpp" -#include "ingen/StreamWriter.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "ingen/client/SigClientInterface.hpp" -#include "ingen/runtime_paths.hpp" -#include "lilv/lilv.h" -#include "lv2/urid/urid.h" -#include "suil/suil.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/App.hpp b/src/gui/App.hpp index 36800898..0138f25a 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_GUI_APP_HPP #define INGEN_GUI_APP_HPP -#include "ingen/Message.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "ingen/World.hpp" -#include "ingen/ingen.h" -#include "lilv/lilv.h" +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/gui/Arc.cpp b/src/gui/Arc.cpp index 17cd57df..c13cf4a7 100644 --- a/src/gui/Arc.cpp +++ b/src/gui/Arc.cpp @@ -16,11 +16,12 @@ #include "Arc.hpp" -#include "ingen/URI.hpp" -#include "ingen/client/ArcModel.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "ingen/client/PortModel.hpp" +#include +#include +#include +#include +#include +#include #include diff --git a/src/gui/Arc.hpp b/src/gui/Arc.hpp index 82467a5a..ad1bc6f2 100644 --- a/src/gui/Arc.hpp +++ b/src/gui/Arc.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_GUI_ARC_HPP #define INGEN_GUI_ARC_HPP -#include "ganv/Edge.hpp" +#include #include diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp index 982c3b06..5bd4d30a 100644 --- a/src/gui/BreadCrumbs.cpp +++ b/src/gui/BreadCrumbs.cpp @@ -19,9 +19,12 @@ #include "App.hpp" #include "GraphView.hpp" -#include "ingen/client/SigClientInterface.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp index 931d2ba8..89a339f2 100644 --- a/src/gui/BreadCrumbs.hpp +++ b/src/gui/BreadCrumbs.hpp @@ -19,10 +19,10 @@ #include "GraphView.hpp" -#include "ingen/Message.hpp" -#include "ingen/URI.hpp" -#include "ingen/client/GraphModel.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include #include #include diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 3c9f7e89..8f89a283 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -20,23 +20,25 @@ #include "Window.hpp" #include "WindowFactory.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/EngineBase.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/QueuedInterface.hpp" -#include "ingen/Status.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" // IWYU pragma: keep -#include "ingen/client/SigClientInterface.hpp" -#include "ingen/client/SocketClient.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Process.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index 269a4d76..cd9059e1 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -19,8 +19,8 @@ #include "Window.hpp" -#include "ingen/Message.hpp" -#include "ingen/URI.hpp" +#include +#include #include #include diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp index 0cbd7303..b47393f3 100644 --- a/src/gui/GraphBox.cpp +++ b/src/gui/GraphBox.cpp @@ -29,25 +29,25 @@ #include "WindowFactory.hpp" #include "ingen_config.h" -#include "ganv/canvas.h" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "ingen/fmt.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp index cfc4a67f..07962a3d 100644 --- a/src/gui/GraphBox.hpp +++ b/src/gui/GraphBox.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_GUI_GRAPH_BOX_HPP #define INGEN_GUI_GRAPH_BOX_HPP -#include "ingen/ingen.h" +#include #include #include diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp index 7b0fb095..22edbf15 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -28,39 +28,42 @@ #include "WidgetFactory.hpp" #include "WindowFactory.hpp" -#include "ganv/Canvas.hpp" -#include "ganv/Edge.hpp" -#include "ganv/Module.hpp" -#include "ganv/Node.hpp" -#include "ganv/Port.hpp" -#include "ganv/canvas.h" -#include "ganv/edge.h" -#include "ganv/module.h" -#include "ganv/types.h" -#include "ingen/Arc.hpp" -#include "ingen/Atom.hpp" -#include "ingen/ClashAvoider.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/Node.hpp" -#include "ingen/Parser.hpp" -#include "ingen/Serialiser.hpp" -#include "ingen/Store.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/ArcModel.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" -#include "sord/sordmm.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp index 3ebd61df..38f3ab08 100644 --- a/src/gui/GraphCanvas.hpp +++ b/src/gui/GraphCanvas.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_GUI_GRAPHCANVAS_HPP #define INGEN_GUI_GRAPHCANVAS_HPP -#include "ganv/Canvas.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "lilv/lilv.h" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include #include diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp index ccbfbebf..2ccf8289 100644 --- a/src/gui/GraphPortModule.cpp +++ b/src/gui/GraphPortModule.cpp @@ -20,17 +20,18 @@ #include "GraphCanvas.hpp" #include "Port.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "raul/Symbol.hpp" - -#include "ingen/Configuration.hpp" -#include "ingen/Interface.hpp" -#include "ingen/client/GraphModel.hpp" // IWYU pragma: keep -#include "ingen/client/PortModel.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include #include #include diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp index 56b4521a..a8091f38 100644 --- a/src/gui/GraphPortModule.hpp +++ b/src/gui/GraphPortModule.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_GUI_GRAPHPORTMODULE_HPP #define INGEN_GUI_GRAPHPORTMODULE_HPP -#include "ganv/Module.hpp" -#include "ingen/URI.hpp" +#include +#include #include #include diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp index 9c3c4b3d..d32b2a17 100644 --- a/src/gui/GraphTreeWindow.cpp +++ b/src/gui/GraphTreeWindow.cpp @@ -20,16 +20,17 @@ #include "Window.hpp" #include "WindowFactory.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp index 16eb4647..6f33f258 100644 --- a/src/gui/GraphTreeWindow.hpp +++ b/src/gui/GraphTreeWindow.hpp @@ -19,7 +19,7 @@ #include "Window.hpp" -#include "ingen/URI.hpp" +#include #include #include diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp index 5464b7c4..6c46776f 100644 --- a/src/gui/GraphView.cpp +++ b/src/gui/GraphView.cpp @@ -20,12 +20,12 @@ #include "GraphCanvas.hpp" #include "WidgetFactory.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/GraphModel.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp index b118effb..5124face 100644 --- a/src/gui/LoadGraphWindow.cpp +++ b/src/gui/LoadGraphWindow.cpp @@ -19,18 +19,19 @@ #include "App.hpp" #include "ThreadedLoader.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/FilePath.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/runtime_paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp index adb6bce1..bfa2590e 100644 --- a/src/gui/LoadGraphWindow.hpp +++ b/src/gui/LoadGraphWindow.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_GUI_LOADGRAPHWINDOW_HPP #define INGEN_GUI_LOADGRAPHWINDOW_HPP -#include "ingen/Properties.hpp" -#include "raul/Symbol.hpp" +#include +#include #include #include diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index c19baa87..56551318 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -19,17 +19,19 @@ #include "App.hpp" #include "Window.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/paths.hpp" -#include "lilv/lilv.h" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index 2f98b3ae..eab48913 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -19,9 +19,9 @@ #include "Window.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URI.hpp" -#include "ingen/client/ClientStore.hpp" +#include +#include +#include #include #include diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp index 62bcfd00..993fbb33 100644 --- a/src/gui/MessagesWindow.cpp +++ b/src/gui/MessagesWindow.cpp @@ -20,8 +20,8 @@ #include "Window.hpp" #include "ingen_config.h" -#include "ingen/URIs.hpp" -#include "lv2/urid/urid.h" +#include +#include #include #include diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp index 27b6a417..c0de6b61 100644 --- a/src/gui/MessagesWindow.hpp +++ b/src/gui/MessagesWindow.hpp @@ -19,7 +19,7 @@ #include "Window.hpp" -#include "lv2/urid/urid.h" +#include #include #include diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp index 3f2fcecb..3d6bf019 100644 --- a/src/gui/NewSubgraphWindow.cpp +++ b/src/gui/NewSubgraphWindow.cpp @@ -19,16 +19,17 @@ #include "App.hpp" #include "Window.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp index acb6c977..b0fb24d2 100644 --- a/src/gui/NewSubgraphWindow.hpp +++ b/src/gui/NewSubgraphWindow.hpp @@ -19,7 +19,7 @@ #include "Window.hpp" -#include "ingen/Properties.hpp" +#include #include diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index e18ff6b9..b18101e3 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -19,16 +19,17 @@ #include "App.hpp" #include "ObjectMenu.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index 7168bc7a..0427672c 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -19,7 +19,7 @@ #include "ObjectMenu.hpp" -#include "ingen/URI.hpp" +#include #include #include diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 20cfdbb3..29d02901 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -27,24 +27,26 @@ #include "WindowFactory.hpp" #include "ingen_config.h" -#include "ganv/Port.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/GraphModel.hpp" // IWYU pragma: keep -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PluginUI.hpp" -#include "ingen/client/PortModel.hpp" -#include "lv2/atom/util.h" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 226dccd1..64ad8f66 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_GUI_NODEMODULE_HPP #define INGEN_GUI_NODEMODULE_HPP -#include "ganv/Module.hpp" -#include "ingen/URI.hpp" +#include +#include #include #include diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 1e9e0e94..8c41ff10 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -19,12 +19,13 @@ #include "App.hpp" #include "WindowFactory.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/ObjectModel.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index de105364..5a4c83f4 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_GUI_OBJECTMENU_HPP #define INGEN_GUI_OBJECTMENU_HPP -#include "ingen/URI.hpp" +#include #include diff --git a/src/gui/PluginMenu.cpp b/src/gui/PluginMenu.cpp index 53917b1e..26bbed08 100644 --- a/src/gui/PluginMenu.cpp +++ b/src/gui/PluginMenu.cpp @@ -16,11 +16,11 @@ #include "PluginMenu.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/PluginModel.hpp" -#include "lilv/lilv.h" +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/PluginMenu.hpp b/src/gui/PluginMenu.hpp index 82e2f13b..eb0a565a 100644 --- a/src/gui/PluginMenu.hpp +++ b/src/gui/PluginMenu.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_GUI_PLUGINMENU_HPP #define INGEN_GUI_PLUGINMENU_HPP -#include "lilv/lilv.h" +#include #include #include diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index ecba0ac7..a950f553 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -27,24 +27,25 @@ #include "ingen_config.h" #include "rgba.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/GraphModel.hpp" // IWYU pragma: keep -#include "ingen/client/ObjectModel.hpp" -#include "ingen/client/PluginModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "lilv/lilv.h" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" -#include "sord/sordmm.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index 8e8077bc..bfd8e15d 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_GUI_PORT_HPP #define INGEN_GUI_PORT_HPP -#include "ganv/Port.hpp" +#include #include #include diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 6cd30066..26f9da6a 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -19,20 +19,20 @@ #include "App.hpp" #include "ObjectMenu.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/GraphModel.hpp" // IWYU pragma: keep -#include "ingen/client/ObjectModel.hpp" -#include "ingen/client/PortModel.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index 91473c1a..770e4a40 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -21,18 +21,20 @@ #include "URIEntry.hpp" #include "Window.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "lilv/lilv.h" -#include "lv2/urid/urid.h" -#include "raul/Path.hpp" -#include "sord/sordmm.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp index 3210ceaa..e788d140 100644 --- a/src/gui/PropertiesWindow.hpp +++ b/src/gui/PropertiesWindow.hpp @@ -19,9 +19,9 @@ #include "Window.hpp" -#include "ingen/Atom.hpp" -#include "ingen/URI.hpp" -#include "lv2/urid/urid.h" +#include +#include +#include #include #include diff --git a/src/gui/RDFS.cpp b/src/gui/RDFS.cpp index 64aa893b..09af81af 100644 --- a/src/gui/RDFS.cpp +++ b/src/gui/RDFS.cpp @@ -14,16 +14,17 @@ along with Ingen. If not, see . */ -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "lilv/lilv.h" - #include "RDFS.hpp" +#include +#include +#include +#include +#include +#include +#include +#include + #include namespace ingen::gui::rdfs { diff --git a/src/gui/RDFS.hpp b/src/gui/RDFS.hpp index ad4e22e8..e4c2b673 100644 --- a/src/gui/RDFS.hpp +++ b/src/gui/RDFS.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_GUI_RDF_HPP #define INGEN_GUI_RDF_HPP -#include "ingen/URI.hpp" -#include "lilv/lilv.h" +#include +#include #include #include diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index 0b6bdae9..569baea8 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -19,15 +19,15 @@ #include "App.hpp" #include "Window.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp index 9a9e7478..f1f1b12b 100644 --- a/src/gui/Style.cpp +++ b/src/gui/Style.cpp @@ -18,8 +18,8 @@ #include "App.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/PortModel.hpp" +#include +#include #include diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp index a2f13b8a..a1b14bb6 100644 --- a/src/gui/SubgraphModule.cpp +++ b/src/gui/SubgraphModule.cpp @@ -20,13 +20,13 @@ #include "NodeModule.hpp" #include "WindowFactory.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URIs.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/GraphModel.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 170b9a0e..abbedbaf 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -18,16 +18,17 @@ #include "App.hpp" -#include "ingen/Log.hpp" -#include "ingen/Parser.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Serialiser.hpp" -#include "ingen/URI.hpp" -#include "ingen/World.hpp" -#include "ingen/client/GraphModel.hpp" -#include "raul/Path.hpp" -#include "raul/Semaphore.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index 32430277..148124fc 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_GUI_THREADEDLOADER_HPP #define INGEN_GUI_THREADEDLOADER_HPP -#include "ingen/FilePath.hpp" -#include "raul/Semaphore.hpp" +#include +#include #include diff --git a/src/gui/URIEntry.cpp b/src/gui/URIEntry.cpp index fa03a05b..92320009 100644 --- a/src/gui/URIEntry.cpp +++ b/src/gui/URIEntry.cpp @@ -19,8 +19,9 @@ #include "App.hpp" #include "RDFS.hpp" -#include "ingen/World.hpp" -#include "lilv/lilv.h" +#include +#include +#include #include #include diff --git a/src/gui/URIEntry.hpp b/src/gui/URIEntry.hpp index 52c9db66..45fa6894 100644 --- a/src/gui/URIEntry.hpp +++ b/src/gui/URIEntry.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_GUI_URI_ENTRY_HPP #define INGEN_GUI_URI_ENTRY_HPP -#include "ingen/URI.hpp" -#include "lilv/lilv.h" +#include +#include #include #include diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp index b2d27e90..33660d77 100644 --- a/src/gui/WidgetFactory.cpp +++ b/src/gui/WidgetFactory.cpp @@ -16,7 +16,7 @@ #include "WidgetFactory.hpp" -#include "ingen/runtime_paths.hpp" +#include #include #include diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 802fc016..daaadfd3 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -26,11 +26,11 @@ #include "RenameWindow.hpp" #include "WidgetFactory.hpp" -#include "ingen/Log.hpp" -#include "ingen/client/BlockModel.hpp" -#include "ingen/client/GraphModel.hpp" -#include "ingen/client/ObjectModel.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include #include #include @@ -45,6 +45,8 @@ namespace ingen { +class Properties; + using client::BlockModel; using client::GraphModel; using client::ObjectModel; diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index 2e772da2..e643505a 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_GUI_WINDOWFACTORY_HPP #define INGEN_GUI_WINDOWFACTORY_HPP -#include "ingen/Properties.hpp" -#include "raul/Path.hpp" +#include +#include #include diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp index 8ddacb04..133286f6 100644 --- a/src/gui/ingen_gui.cpp +++ b/src/gui/ingen_gui.cpp @@ -16,14 +16,14 @@ #include "App.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Module.hpp" -#include "ingen/QueuedInterface.hpp" -#include "ingen/URI.hpp" -#include "ingen/World.hpp" -#include "ingen/client/SigClientInterface.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index 31ec22c5..43527acf 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -17,28 +17,28 @@ #include "App.hpp" #include "GraphBox.hpp" -#include "ingen/AtomReader.hpp" -#include "ingen/AtomSink.hpp" -#include "ingen/AtomWriter.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/client/ClientStore.hpp" -#include "ingen/client/GraphModel.hpp" // IWYU pragma: keep -#include "ingen/client/SigClientInterface.hpp" -#include "ingen/ingen.h" -#include "ingen/paths.hpp" -#include "ingen/runtime_paths.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2.h" -#include "lv2/log/log.h" -#include "lv2/ui/ui.h" -#include "lv2/urid/urid.h" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // IWYU pragma: keep +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp index cfe529b8..7f1a587e 100644 --- a/src/ingen/ingen.cpp +++ b/src/ingen/ingen.cpp @@ -14,21 +14,21 @@ along with Ingen. If not, see . */ -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/EngineBase.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Message.hpp" -#include "ingen/Parser.hpp" -#include "ingen/URI.hpp" -#include "ingen/World.hpp" -#include "ingen/fmt.hpp" -#include "ingen/paths.hpp" -#include "ingen/runtime_paths.hpp" -#include "ingen_config.h" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" -#include "serd/serd.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if USE_SOCKET #include "ingen/client/SocketClient.hpp" diff --git a/src/runtime_paths.cpp b/src/runtime_paths.cpp index cca9490d..17167e9a 100644 --- a/src/runtime_paths.cpp +++ b/src/runtime_paths.cpp @@ -14,9 +14,10 @@ along with Ingen. If not, see . */ -#include "ingen/runtime_paths.hpp" +#include + +#include -#include "ingen/FilePath.hpp" #include "ingen_config.h" #include diff --git a/src/server/ArcImpl.cpp b/src/server/ArcImpl.cpp index 5c8f384b..2c5b4ee1 100644 --- a/src/server/ArcImpl.cpp +++ b/src/server/ArcImpl.cpp @@ -22,8 +22,8 @@ #include "PortImpl.hpp" #include "PortType.hpp" -#include "ingen/URIs.hpp" -#include "raul/Path.hpp" +#include +#include #include #include diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp index b1565390..1a2412b5 100644 --- a/src/server/ArcImpl.hpp +++ b/src/server/ArcImpl.hpp @@ -19,8 +19,8 @@ #include "BufferRef.hpp" -#include "ingen/Arc.hpp" -#include "raul/Noncopyable.hpp" +#include +#include #include diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp index 124a0f61..9c9b9e98 100644 --- a/src/server/BlockFactory.cpp +++ b/src/server/BlockFactory.cpp @@ -22,16 +22,17 @@ #include "PortType.hpp" #include "ThreadManager.hpp" -#include "ingen/LV2Features.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "internals/BlockDelay.hpp" -#include "internals/Controller.hpp" -#include "internals/Note.hpp" -#include "internals/Time.hpp" -#include "internals/Trigger.hpp" -#include "lilv/lilv.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp index 17c11bb4..68699d8a 100644 --- a/src/server/BlockFactory.hpp +++ b/src/server/BlockFactory.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_ENGINE_BLOCKFACTORY_HPP #define INGEN_ENGINE_BLOCKFACTORY_HPP -#include "ingen/URI.hpp" -#include "raul/Noncopyable.hpp" +#include +#include #include #include diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp index 308f1e78..31f66c7b 100644 --- a/src/server/BlockImpl.cpp +++ b/src/server/BlockImpl.cpp @@ -24,15 +24,19 @@ #include "RunContext.hpp" #include "ThreadManager.hpp" -#include "lv2/urid/urid.h" -#include "raul/Array.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include #include #include #include #include +namespace ingen { +class Resource; +} // namespace ingen + namespace ingen::server { BlockImpl::BlockImpl(PluginImpl* plugin, diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index 0c823219..5589d979 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -22,13 +22,13 @@ #include "State.hpp" #include "types.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "lilv/lilv.h" -#include "lv2/urid/urid.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp index e7406dc6..76b21fc6 100644 --- a/src/server/Broadcaster.cpp +++ b/src/server/Broadcaster.cpp @@ -19,7 +19,7 @@ #include "BlockFactory.hpp" #include "PluginImpl.hpp" -#include "ingen/Interface.hpp" +#include #include #include diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp index 9bae44b1..4cdf65ca 100644 --- a/src/server/Broadcaster.hpp +++ b/src/server/Broadcaster.hpp @@ -19,10 +19,10 @@ #include "BlockFactory.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Message.hpp" -#include "ingen/URI.hpp" -#include "raul/Noncopyable.hpp" +#include +#include +#include +#include #include #include diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp index 68b75931..0c4c0951 100644 --- a/src/server/Buffer.cpp +++ b/src/server/Buffer.cpp @@ -22,12 +22,12 @@ #include "RunContext.hpp" #include "ingen_config.h" -#include "ingen/Atom.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIs.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/urid/urid.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp index 5997281e..2c32076b 100644 --- a/src/server/Buffer.hpp +++ b/src/server/Buffer.hpp @@ -22,9 +22,9 @@ #include "server.h" #include "types.hpp" -#include "ingen/URIs.hpp" -#include "lv2/atom/atom.h" -#include "lv2/urid/urid.h" +#include +#include +#include #include #include diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index 0df5a025..b8f6ee35 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -19,11 +19,11 @@ #include "Buffer.hpp" #include "Engine.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/atom/atom.h" -#include "lv2/urid/urid.h" +#include +#include +#include +#include +#include #include #include diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp index 2f6c95ba..dbadaede 100644 --- a/src/server/BufferFactory.hpp +++ b/src/server/BufferFactory.hpp @@ -17,13 +17,13 @@ #ifndef INGEN_ENGINE_BUFFERFACTORY_HPP #define INGEN_ENGINE_BUFFERFACTORY_HPP -#include "ingen/URIs.hpp" -#include "lv2/urid/urid.h" -#include "server.h" - #include "BufferRef.hpp" +#include "server.h" #include "types.hpp" +#include +#include + #include #include #include diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp index 167cd294..008e9843 100644 --- a/src/server/ClientUpdate.cpp +++ b/src/server/ClientUpdate.cpp @@ -23,11 +23,14 @@ #include "PortImpl.hpp" #include "PortType.hpp" -#include "ingen/Arc.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/URIs.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/server/ClientUpdate.hpp b/src/server/ClientUpdate.hpp index 9fadae90..1d16e6d6 100644 --- a/src/server/ClientUpdate.hpp +++ b/src/server/ClientUpdate.hpp @@ -17,10 +17,10 @@ #ifndef INGEN_ENGINE_CLIENTUPDATE_HPP #define INGEN_ENGINE_CLIENTUPDATE_HPP -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include #include #include diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp index 57c4537c..89fc8843 100644 --- a/src/server/CompiledGraph.cpp +++ b/src/server/CompiledGraph.cpp @@ -21,12 +21,12 @@ #include "GraphImpl.hpp" #include "ThreadManager.hpp" -#include "ingen/Atom.hpp" -#include "ingen/ColorContext.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Log.hpp" -#include "ingen/World.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include #include diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp index acf7ed88..1949563d 100644 --- a/src/server/CompiledGraph.hpp +++ b/src/server/CompiledGraph.hpp @@ -19,7 +19,7 @@ #include "Task.hpp" -#include "raul/Noncopyable.hpp" +#include #include #include diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index e9002f99..0d280e43 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -23,18 +23,18 @@ #include "RunContext.hpp" #include "ThreadManager.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/atom/util.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp index 4c806265..0e6dbf63 100644 --- a/src/server/ControlBindings.hpp +++ b/src/server/ControlBindings.hpp @@ -19,8 +19,8 @@ #include "BufferRef.hpp" -#include "lv2/atom/forge.h" -#include "raul/Maid.hpp" +#include +#include #include #include diff --git a/src/server/DirectDriver.hpp b/src/server/DirectDriver.hpp index 46187527..bc52fc3a 100644 --- a/src/server/DirectDriver.hpp +++ b/src/server/DirectDriver.hpp @@ -24,7 +24,7 @@ #include "RunContext.hpp" #include "types.hpp" -#include "raul/Path.hpp" +#include #include diff --git a/src/server/Driver.hpp b/src/server/Driver.hpp index 7f0f4c40..112fb8ba 100644 --- a/src/server/Driver.hpp +++ b/src/server/Driver.hpp @@ -19,8 +19,8 @@ #include "types.hpp" -#include "ingen/URI.hpp" -#include "raul/Noncopyable.hpp" +#include +#include #include diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp index ce47fa86..f1b3af61 100644 --- a/src/server/DuplexPort.cpp +++ b/src/server/DuplexPort.cpp @@ -25,14 +25,15 @@ #include "NodeImpl.hpp" #include "PortType.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Node.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URIs.hpp" -#include "lv2/urid/urid.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/DuplexPort.hpp b/src/server/DuplexPort.hpp index c06ad85f..da00b4bf 100644 --- a/src/server/DuplexPort.hpp +++ b/src/server/DuplexPort.hpp @@ -22,9 +22,9 @@ #include "server.h" #include "types.hpp" -#include "ingen/URI.hpp" -#include "lv2/urid/urid.h" -#include "raul/Maid.hpp" +#include +#include +#include #include diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index c9921889..8a250d77 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -42,26 +42,28 @@ #include "SocketListener.hpp" #endif -#include "ingen/Atom.hpp" -#include "ingen/AtomReader.hpp" -#include "ingen/ColorContext.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/LV2Features.hpp" -#include "ingen/Log.hpp" -#include "ingen/Resource.hpp" -#include "ingen/Store.hpp" -#include "ingen/StreamWriter.hpp" -#include "ingen/Tee.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/buf-size/buf-size.h" -#include "lv2/state/state.h" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" -#include "raul/RingBuffer.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index 6557ac53..688297ee 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -22,9 +22,9 @@ #include "server.h" #include "types.hpp" -#include "ingen/Clock.hpp" -#include "ingen/EngineBase.hpp" -#include "ingen/Properties.hpp" +#include +#include +#include #include #include diff --git a/src/server/EnginePort.hpp b/src/server/EnginePort.hpp index 7a25bda5..d7e73f63 100644 --- a/src/server/EnginePort.hpp +++ b/src/server/EnginePort.hpp @@ -19,8 +19,8 @@ #include "DuplexPort.hpp" -#include "raul/Deletable.hpp" -#include "raul/Noncopyable.hpp" +#include +#include #include diff --git a/src/server/Event.hpp b/src/server/Event.hpp index de1f2384..3c9c5c26 100644 --- a/src/server/Event.hpp +++ b/src/server/Event.hpp @@ -19,12 +19,12 @@ #include "types.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Status.hpp" -#include "ingen/URI.hpp" -#include "ingen/paths.hpp" -#include "raul/Deletable.hpp" -#include "raul/Noncopyable.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp index 2feef347..fff9226a 100644 --- a/src/server/EventWriter.cpp +++ b/src/server/EventWriter.cpp @@ -18,16 +18,17 @@ #include "Engine.hpp" -#include "events/Connect.hpp" -#include "events/Copy.hpp" -#include "events/Delete.hpp" -#include "events/Delta.hpp" -#include "events/Disconnect.hpp" -#include "events/DisconnectAll.hpp" -#include "events/Get.hpp" -#include "events/Mark.hpp" -#include "events/Move.hpp" -#include "events/Undo.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp index ea35ceea..55ee1158 100644 --- a/src/server/EventWriter.hpp +++ b/src/server/EventWriter.hpp @@ -20,9 +20,9 @@ #include "Event.hpp" #include "types.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Message.hpp" -#include "ingen/URI.hpp" +#include +#include +#include #include diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index 8435818b..0d381175 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -28,15 +28,15 @@ #include "PortImpl.hpp" #include "ThreadManager.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/urid/urid.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp index b09dbb6a..234483bd 100644 --- a/src/server/GraphImpl.hpp +++ b/src/server/GraphImpl.hpp @@ -23,8 +23,8 @@ #include "server.h" #include "types.hpp" -#include "lv2/urid/urid.h" -#include "raul/Maid.hpp" +#include +#include #include #include diff --git a/src/server/GraphPlugin.hpp b/src/server/GraphPlugin.hpp index ac89c7a9..302141e7 100644 --- a/src/server/GraphPlugin.hpp +++ b/src/server/GraphPlugin.hpp @@ -19,10 +19,10 @@ #include "PluginImpl.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "lilv/lilv.h" -#include "raul/Symbol.hpp" +#include +#include +#include +#include #include diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 5d3c4eb7..c22e8510 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -27,12 +27,12 @@ #include "RunContext.hpp" #include "mix.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Node.hpp" -#include "ingen/URIs.hpp" -#include "lv2/urid/urid.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp index a90e7390..19e9af74 100644 --- a/src/server/InputPort.hpp +++ b/src/server/InputPort.hpp @@ -21,8 +21,8 @@ #include "PortImpl.hpp" #include "types.hpp" -#include "lv2/urid/urid.h" -#include "raul/Maid.hpp" +#include +#include #include #include diff --git a/src/server/InternalBlock.cpp b/src/server/InternalBlock.cpp index 68e1f3e8..a1eb0027 100644 --- a/src/server/InternalBlock.cpp +++ b/src/server/InternalBlock.cpp @@ -23,8 +23,8 @@ #include "PluginImpl.hpp" #include "PortImpl.hpp" -#include "ingen/URIs.hpp" -#include "raul/Array.hpp" +#include +#include #include diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp index b2f2bae7..7670c931 100644 --- a/src/server/InternalPlugin.cpp +++ b/src/server/InternalPlugin.cpp @@ -24,9 +24,10 @@ #include "internals/Trigger.hpp" #include "types.hpp" -#include "ingen/URIs.hpp" -#include "lilv/lilv.h" -#include "raul/Symbol.hpp" +#include +#include +#include +#include #include diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp index 9dfabc5f..5fffcb17 100644 --- a/src/server/InternalPlugin.hpp +++ b/src/server/InternalPlugin.hpp @@ -19,9 +19,9 @@ #include "PluginImpl.hpp" -#include "ingen/URI.hpp" -#include "lilv/lilv.h" -#include "raul/Symbol.hpp" +#include +#include +#include #define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#" diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index b1541df1..d796f289 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -29,19 +29,20 @@ #include "ingen_config.h" #include "util.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Log.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/forge.h" -#include "lv2/atom/util.h" -#include "raul/Path.hpp" -#include "raul/Semaphore.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp index d652ebae..987976e9 100644 --- a/src/server/JackDriver.hpp +++ b/src/server/JackDriver.hpp @@ -21,10 +21,10 @@ #include "EnginePort.hpp" // IWYU pragma: keep #include "types.hpp" -#include "ingen/URI.hpp" -#include "ingen/memory.hpp" // IWYU pragma: keep -#include "lv2/atom/forge.h" -#include "raul/Semaphore.hpp" +#include +#include // IWYU pragma: keep +#include +#include #include #include diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index 07d3da48..1cc266bf 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -28,25 +28,27 @@ #include "RunContext.hpp" #include "Worker.hpp" -#include "ingen/Atom.hpp" -#include "ingen/FilePath.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lilv/lilv.h" -#include "lv2/core/lv2.h" -#include "lv2/options/options.h" -#include "lv2/state/state.h" -#include "lv2/urid/urid.h" -#include "lv2/worker/worker.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index 4c0c5ea9..7b7466bb 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -22,14 +22,14 @@ #include "State.hpp" #include "types.hpp" -#include "ingen/LV2Features.hpp" -#include "ingen/Properties.hpp" -#include "ingen/URI.hpp" -#include "lilv/lilv.h" -#include "lv2/worker/worker.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Noncopyable.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/LV2Options.hpp b/src/server/LV2Options.hpp index 02824be6..b1b57429 100644 --- a/src/server/LV2Options.hpp +++ b/src/server/LV2Options.hpp @@ -17,10 +17,10 @@ #ifndef INGEN_ENGINE_LV2OPTIONS_HPP #define INGEN_ENGINE_LV2OPTIONS_HPP -#include "ingen/LV2Features.hpp" -#include "ingen/URIs.hpp" -#include "lv2/core/lv2.h" -#include "lv2/options/options.h" +#include +#include +#include +#include #include #include diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp index e304e9c0..87072ab0 100644 --- a/src/server/LV2Plugin.cpp +++ b/src/server/LV2Plugin.cpp @@ -19,12 +19,13 @@ #include "Engine.hpp" #include "LV2Block.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lilv/lilv.h" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp index fa007327..c657f8d8 100644 --- a/src/server/LV2Plugin.hpp +++ b/src/server/LV2Plugin.hpp @@ -19,9 +19,9 @@ #include "PluginImpl.hpp" -#include "ingen/URI.hpp" -#include "lilv/lilv.h" -#include "raul/Symbol.hpp" +#include +#include +#include namespace ingen { diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp index 485695d7..66720e0d 100644 --- a/src/server/LV2ResizeFeature.hpp +++ b/src/server/LV2ResizeFeature.hpp @@ -21,8 +21,8 @@ #include "Buffer.hpp" #include "PortImpl.hpp" -#include "ingen/LV2Features.hpp" -#include "lv2/resize-port/resize-port.h" +#include +#include #include diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp index 4461ffc1..6d5843a0 100644 --- a/src/server/NodeImpl.cpp +++ b/src/server/NodeImpl.cpp @@ -20,16 +20,17 @@ #include "GraphImpl.hpp" #include "ThreadManager.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Properties.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include #include #include -namespace raul { -class Symbol; -} // namespace raul +namespace ingen { +class URI; +} // namespace ingen namespace ingen::server { diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp index 8acce161..614f18de 100644 --- a/src/server/NodeImpl.hpp +++ b/src/server/NodeImpl.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ENGINE_NODEIMPL_HPP #define INGEN_ENGINE_NODEIMPL_HPP -#include "ingen/Node.hpp" -#include "ingen/URI.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include #include diff --git a/src/server/OutputPort.hpp b/src/server/OutputPort.hpp index 61fb44f5..b19cd361 100644 --- a/src/server/OutputPort.hpp +++ b/src/server/OutputPort.hpp @@ -20,7 +20,7 @@ #include "PortImpl.hpp" #include "PortType.hpp" -#include "lv2/urid/urid.h" +#include #include #include diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp index 3184be11..8e3642c0 100644 --- a/src/server/PluginImpl.hpp +++ b/src/server/PluginImpl.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ENGINE_PLUGINIMPL_HPP #define INGEN_ENGINE_PLUGINIMPL_HPP -#include "ingen/Atom.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" -#include "lilv/lilv.h" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp index 11bca592..4dc85352 100644 --- a/src/server/PortAudioDriver.cpp +++ b/src/server/PortAudioDriver.cpp @@ -21,11 +21,12 @@ #include "FrameTimer.hpp" #include "PortType.hpp" #include "RunContext.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "raul/Path.hpp" + +#include +#include +#include +#include +#include #include @@ -33,6 +34,10 @@ #include #include +namespace ingen { +class URI; +} // namespace ingen + namespace ingen::server { static bool diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp index c8a83479..d54791c1 100644 --- a/src/server/PortAudioDriver.hpp +++ b/src/server/PortAudioDriver.hpp @@ -21,8 +21,8 @@ #include "EnginePort.hpp" // IWYU pragma: keep #include "types.hpp" -#include "ingen/URI.hpp" -#include "raul/Semaphore.hpp" +#include +#include #include #include diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index 2c9ab3ac..a812882d 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -23,16 +23,17 @@ #include "PortType.hpp" #include "ThreadManager.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Node.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/urid/urid.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index 3a1500bc..c202d4a0 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -24,11 +24,11 @@ #include "server.h" #include "types.hpp" -#include "ingen/Atom.hpp" -#include "ingen/URIs.hpp" -#include "lv2/urid/urid.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp index c403ba5b..294c056a 100644 --- a/src/server/PortType.hpp +++ b/src/server/PortType.hpp @@ -17,10 +17,9 @@ #ifndef INGEN_ENGINE_PORTTYPE_HPP #define INGEN_ENGINE_PORTTYPE_HPP -#include "ingen/URI.hpp" - -#include "lv2/atom/atom.h" -#include "lv2/core/lv2.h" +#include +#include +#include namespace ingen { diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp index 6cadf53b..bcca7d0a 100644 --- a/src/server/PreProcessor.cpp +++ b/src/server/PreProcessor.cpp @@ -24,11 +24,11 @@ #include "ThreadManager.hpp" #include "UndoStack.hpp" -#include "ingen/Atom.hpp" -#include "ingen/AtomWriter.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/World.hpp" -#include "raul/Semaphore.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp index e0b0cc4a..03ba5dd7 100644 --- a/src/server/PreProcessor.hpp +++ b/src/server/PreProcessor.hpp @@ -19,7 +19,7 @@ #include "Event.hpp" -#include "raul/Semaphore.hpp" +#include #include #include diff --git a/src/server/RunContext.cpp b/src/server/RunContext.cpp index 95d68f57..29985ccf 100644 --- a/src/server/RunContext.cpp +++ b/src/server/RunContext.cpp @@ -22,15 +22,15 @@ #include "PortImpl.hpp" #include "Task.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Log.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/urid/urid.h" -#include "raul/RingBuffer.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp index a91a3e17..44304c5e 100644 --- a/src/server/RunContext.hpp +++ b/src/server/RunContext.hpp @@ -19,8 +19,8 @@ #include "types.hpp" -#include "lv2/urid/urid.h" -#include "raul/RingBuffer.hpp" +#include +#include #include #include diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp index a3139660..fb961ee2 100644 --- a/src/server/SocketListener.cpp +++ b/src/server/SocketListener.cpp @@ -19,12 +19,12 @@ #include "Engine.hpp" #include "SocketServer.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Log.hpp" -#include "ingen/URI.hpp" -#include "ingen/World.hpp" -#include "raul/Socket.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/SocketListener.hpp b/src/server/SocketListener.hpp index 8979a768..a96105ef 100644 --- a/src/server/SocketListener.hpp +++ b/src/server/SocketListener.hpp @@ -14,7 +14,7 @@ along with Ingen. If not, see . */ -#include "raul/Socket.hpp" +#include #include #include diff --git a/src/server/SocketServer.hpp b/src/server/SocketServer.hpp index 92bab5eb..608d180d 100644 --- a/src/server/SocketServer.hpp +++ b/src/server/SocketServer.hpp @@ -21,17 +21,17 @@ #include "Engine.hpp" -#include "ingen/Atom.hpp" -#include "ingen/ColorContext.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Interface.hpp" -#include "ingen/SocketReader.hpp" -#include "ingen/SocketWriter.hpp" -#include "ingen/StreamWriter.hpp" -#include "ingen/Tee.hpp" -#include "ingen/URI.hpp" -#include "ingen/World.hpp" -#include "raul/Socket.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/State.hpp b/src/server/State.hpp index 673b175b..976cf67d 100644 --- a/src/server/State.hpp +++ b/src/server/State.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_ENGINE_STATE_HPP #define INGEN_ENGINE_STATE_HPP -#include "lilv/lilv.h" +#include #include diff --git a/src/server/Task.cpp b/src/server/Task.cpp index 2b8ff0cd..345a4711 100644 --- a/src/server/Task.cpp +++ b/src/server/Task.cpp @@ -19,7 +19,7 @@ #include "BlockImpl.hpp" #include "RunContext.hpp" -#include "raul/Path.hpp" +#include #include #include diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp index abb9fe46..c6555123 100644 --- a/src/server/UndoStack.cpp +++ b/src/server/UndoStack.cpp @@ -16,14 +16,14 @@ #include "UndoStack.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/ingen.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/patch/patch.h" -#include "serd/serd.h" -#include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp index 58528647..443497cc 100644 --- a/src/server/UndoStack.hpp +++ b/src/server/UndoStack.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_ENGINE_UNDOSTACK_HPP #define INGEN_ENGINE_UNDOSTACK_HPP -#include "ingen/AtomSink.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "serd/serd.h" -#include "server.h" -#include "sratom/sratom.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp index cf252d37..f917897d 100644 --- a/src/server/Worker.cpp +++ b/src/server/Worker.cpp @@ -20,12 +20,12 @@ #include "GraphImpl.hpp" #include "LV2Block.hpp" -#include "ingen/Log.hpp" -#include "ingen/Node.hpp" -#include "lv2/core/lv2.h" -#include "lv2/worker/worker.h" -#include "raul/RingBuffer.hpp" -#include "raul/Semaphore.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp index e26ff224..b2ad6d4b 100644 --- a/src/server/Worker.hpp +++ b/src/server/Worker.hpp @@ -17,11 +17,11 @@ #ifndef INGEN_ENGINE_WORKER_HPP #define INGEN_ENGINE_WORKER_HPP -#include "ingen/LV2Features.hpp" -#include "lv2/core/lv2.h" -#include "lv2/worker/worker.h" -#include "raul/RingBuffer.hpp" -#include "raul/Semaphore.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events.hpp b/src/server/events.hpp index 5f77b431..7ab20ca7 100644 --- a/src/server/events.hpp +++ b/src/server/events.hpp @@ -17,19 +17,19 @@ #ifndef INGEN_ENGINE_EVENTS_HPP #define INGEN_ENGINE_EVENTS_HPP -#include "events/Connect.hpp" -#include "events/Copy.hpp" -#include "events/CreateBlock.hpp" -#include "events/CreateGraph.hpp" -#include "events/CreatePort.hpp" -#include "events/Delete.hpp" -#include "events/Delta.hpp" -#include "events/Disconnect.hpp" -#include "events/DisconnectAll.hpp" -#include "events/Get.hpp" -#include "events/Mark.hpp" -#include "events/Move.hpp" -#include "events/SetPortValue.hpp" -#include "events/Undo.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif // INGEN_ENGINE_EVENTS_HPP diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index e1854ef2..6e20be8f 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -16,6 +16,7 @@ #include "Connect.hpp" +#include "../internals/BlockDelay.hpp" #include "ArcImpl.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" @@ -26,15 +27,16 @@ #include "InputPort.hpp" #include "PortImpl.hpp" #include "PreProcessContext.hpp" -#include "internals/BlockDelay.hpp" #include "types.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "ingen/paths.hpp" -#include "raul/Maid.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index 4224f109..5c295dca 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -21,9 +21,9 @@ #include "PortImpl.hpp" #include "types.hpp" -#include "ingen/Message.hpp" -#include "ingen/Properties.hpp" -#include "raul/Maid.hpp" +#include +#include +#include #include diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index 74398ea4..e75bf1c5 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see . */ -#include "events/Copy.hpp" +#include "Copy.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" @@ -23,17 +23,18 @@ #include "GraphImpl.hpp" #include "PreProcessContext.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Parser.hpp" -#include "ingen/Serialiser.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/World.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp index 744a61c2..ee26ab43 100644 --- a/src/server/events/Copy.hpp +++ b/src/server/events/Copy.hpp @@ -20,7 +20,7 @@ #include "Event.hpp" #include "types.hpp" -#include "ingen/Message.hpp" +#include #include diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index 7f50411c..b8170702 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -28,20 +28,20 @@ #include "State.hpp" #include "types.hpp" -#include "ingen/FilePath.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index e8a49ea0..41918175 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -21,7 +21,7 @@ #include "Event.hpp" #include "types.hpp" -#include "raul/Path.hpp" +#include #include #include diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index 7a8a973d..3f1b1f45 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -14,29 +14,30 @@ along with Ingen. If not, see . */ -#include "events/CreateGraph.hpp" +#include "CreateGraph.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" #include "CompiledGraph.hpp" +#include "CreatePort.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "PreProcessContext.hpp" -#include "events/CreatePort.hpp" #include "types.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Resource.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/paths.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index b083ae8c..2140c991 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -21,8 +21,8 @@ #include "Event.hpp" #include "types.hpp" -#include "ingen/Properties.hpp" -#include "raul/Path.hpp" +#include +#include #include #include diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index a4dbbf3f..a975fd07 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -25,21 +25,22 @@ #include "PortImpl.hpp" #include "PortType.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIMap.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/paths.hpp" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index acf81dd1..6e1066f0 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -22,10 +22,10 @@ #include "PortType.hpp" #include "types.hpp" -#include "ingen/Properties.hpp" -#include "lv2/urid/urid.h" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include #include #include diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index b42f0652..1a5fb93d 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -30,17 +30,18 @@ #include "PortImpl.hpp" #include "PreProcessContext.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/paths.hpp" -#include "raul/Array.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index 87cde2c7..246adc21 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -22,10 +22,10 @@ #include "GraphImpl.hpp" #include "types.hpp" -#include "ingen/Message.hpp" -#include "ingen/Store.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include #include #include diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 96f13ee5..9072e34d 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -32,20 +32,23 @@ #include "PortType.hpp" #include "SetPortValue.hpp" -#include "ingen/Atom.hpp" -#include "ingen/FilePath.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/Message.hpp" -#include "ingen/Node.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/paths.hpp" -#include "lilv/lilv.h" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index ed04f8c9..1bbfe1ec 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -24,9 +24,9 @@ #include "State.hpp" #include "types.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Resource.hpp" -#include "ingen/URI.hpp" +#include +#include +#include #include #include diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index bdb18ef9..7189fdd0 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see . */ -#include "events/Disconnect.hpp" +#include "Disconnect.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" @@ -30,14 +30,15 @@ #include "PreProcessContext.hpp" #include "ThreadManager.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index ad3d07b0..c89b6e95 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -21,8 +21,8 @@ #include "PortImpl.hpp" #include "types.hpp" -#include "ingen/Message.hpp" -#include "raul/Maid.hpp" +#include +#include #include diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index 639b289f..8e7bfbbe 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -14,25 +14,26 @@ along with Ingen. If not, see . */ -#include "events/DisconnectAll.hpp" +#include "DisconnectAll.hpp" #include "ArcImpl.hpp" #include "BlockImpl.hpp" #include "Broadcaster.hpp" #include "CompiledGraph.hpp" +#include "Disconnect.hpp" #include "Engine.hpp" #include "GraphImpl.hpp" #include "InputPort.hpp" #include "NodeImpl.hpp" #include "PortImpl.hpp" #include "PreProcessContext.hpp" -#include "events/Disconnect.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index aeb180de..753460de 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -21,7 +21,7 @@ #include "Event.hpp" #include "types.hpp" -#include "ingen/Message.hpp" +#include #include #include diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index ab369c80..45e7ea94 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -22,16 +22,17 @@ #include "GraphImpl.hpp" #include "PortImpl.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Node.hpp" -#include "ingen/Properties.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/paths.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index 1ec49bfa..c434d0d8 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_EVENTS_GET_HPP #define INGEN_EVENTS_GET_HPP -#include "ingen/Message.hpp" +#include #include "BlockFactory.hpp" #include "ClientUpdate.hpp" diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp index 87bc1035..b60b0432 100644 --- a/src/server/events/Mark.cpp +++ b/src/server/events/Mark.cpp @@ -14,10 +14,7 @@ along with Ingen. If not, see . */ -#include "events/Mark.hpp" - -#include "ingen/Message.hpp" -#include "ingen/Status.hpp" +#include "Mark.hpp" #include "CompiledGraph.hpp" #include "Engine.hpp" @@ -25,6 +22,9 @@ #include "PreProcessContext.hpp" #include "UndoStack.hpp" +#include +#include + #include #include #include diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index 3af0ce6c..80ae5a11 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -14,16 +14,17 @@ along with Ingen. If not, see . */ -#include "events/Move.hpp" +#include "Move.hpp" #include "Broadcaster.hpp" #include "Driver.hpp" #include "Engine.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Status.hpp" -#include "ingen/Store.hpp" -#include "raul/Path.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp index 3940e825..2b79a58b 100644 --- a/src/server/events/Move.hpp +++ b/src/server/events/Move.hpp @@ -20,7 +20,7 @@ #include "Event.hpp" #include "types.hpp" -#include "ingen/Message.hpp" +#include #include diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index 04da7338..ba6859dd 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -24,11 +24,12 @@ #include "PortImpl.hpp" #include "RunContext.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Status.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "lv2/atom/atom.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp index 69d742b8..548f5475 100644 --- a/src/server/events/SetPortValue.hpp +++ b/src/server/events/SetPortValue.hpp @@ -22,7 +22,7 @@ #include "Event.hpp" #include "types.hpp" -#include "ingen/Atom.hpp" +#include #include #include diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp index ea8c7d69..db7c1c86 100644 --- a/src/server/events/Undo.cpp +++ b/src/server/events/Undo.cpp @@ -19,11 +19,11 @@ #include "Engine.hpp" #include "EventWriter.hpp" -#include "ingen/AtomReader.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Message.hpp" -#include "ingen/Status.hpp" -#include "lv2/atom/atom.h" +#include +#include +#include +#include +#include #include #include diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp index db1794de..a45c6d7c 100644 --- a/src/server/ingen_engine.cpp +++ b/src/server/ingen_engine.cpp @@ -17,8 +17,8 @@ #include "Engine.hpp" #include "util.hpp" -#include "ingen/Module.hpp" -#include "ingen/World.hpp" +#include +#include #include diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index 9aedacad..16369d0c 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -17,11 +17,11 @@ #include "Engine.hpp" #include "JackDriver.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/Log.hpp" -#include "ingen/Module.hpp" -#include "ingen/World.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 3dcdd54d..192a8450 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -25,41 +25,41 @@ #include "ThreadManager.hpp" #include "types.hpp" -#include "ingen/AtomReader.hpp" -#include "ingen/AtomSink.hpp" -#include "ingen/AtomWriter.hpp" -#include "ingen/Configuration.hpp" -#include "ingen/EngineBase.hpp" -#include "ingen/FilePath.hpp" -#include "ingen/Forge.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Log.hpp" -#include "ingen/Node.hpp" -#include "ingen/Parser.hpp" -#include "ingen/Serialiser.hpp" -#include "ingen/Store.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "ingen/World.hpp" -#include "ingen/ingen.h" -#include "ingen/memory.hpp" -#include "ingen/runtime_paths.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/buf-size/buf-size.h" -#include "lv2/core/lv2.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/options/options.h" -#include "lv2/state/state.h" -#include "lv2/urid/urid.h" -#include "raul/Maid.hpp" -#include "raul/Path.hpp" -#include "raul/RingBuffer.hpp" -#include "raul/Semaphore.hpp" -#include "raul/Symbol.hpp" -#include "serd/serd.h" -#include "sord/sordmm.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp index 6de5a40c..36cedbe0 100644 --- a/src/server/ingen_portaudio.cpp +++ b/src/server/ingen_portaudio.cpp @@ -17,9 +17,9 @@ #include "Engine.hpp" #include "PortAudioDriver.hpp" -#include "ingen/Log.hpp" -#include "ingen/Module.hpp" -#include "ingen/World.hpp" +#include +#include +#include #include diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp index 516b7cf4..b929f2e9 100644 --- a/src/server/internals/BlockDelay.cpp +++ b/src/server/internals/BlockDelay.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see . */ -#include "internals/BlockDelay.hpp" +#include "BlockDelay.hpp" #include "BlockImpl.hpp" #include "Buffer.hpp" @@ -24,12 +24,12 @@ #include "OutputPort.hpp" #include "PortType.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include #include diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index ec400075..cbc62eea 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -14,6 +14,8 @@ along with Ingen. If not, see . */ +#include "Controller.hpp" + #include "Buffer.hpp" #include "BufferFactory.hpp" #include "BufferRef.hpp" @@ -23,17 +25,16 @@ #include "PortType.hpp" #include "RunContext.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "internals/Controller.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/midi/midi.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 94598fb7..960bca85 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see . */ -#include "internals/Note.hpp" +#include "Note.hpp" #include "BlockImpl.hpp" #include "Buffer.hpp" @@ -25,16 +25,16 @@ #include "PortType.hpp" #include "RunContext.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/midi/midi.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index 3aa3217e..2cf6c1e2 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -20,8 +20,8 @@ #include "InternalBlock.hpp" #include "types.hpp" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" +#include +#include #include diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp index d8f1ddef..2ea09b0b 100644 --- a/src/server/internals/Time.cpp +++ b/src/server/internals/Time.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see . */ -#include "internals/Time.hpp" +#include "Time.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" @@ -26,14 +26,14 @@ #include "PortType.hpp" #include "RunContext.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "lv2/atom/atom.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 9b3b8f98..f033a345 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see . */ -#include "internals/Trigger.hpp" +#include "Trigger.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" @@ -25,16 +25,16 @@ #include "PortType.hpp" #include "RunContext.hpp" -#include "ingen/Atom.hpp" -#include "ingen/Forge.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/midi/midi.h" -#include "raul/Array.hpp" -#include "raul/Maid.hpp" -#include "raul/Symbol.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/server/mix.cpp b/src/server/mix.cpp index db491e28..32500f97 100644 --- a/src/server/mix.cpp +++ b/src/server/mix.cpp @@ -20,8 +20,8 @@ #include "RunContext.hpp" #include "types.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" +#include +#include namespace ingen::server { diff --git a/src/server/util.hpp b/src/server/util.hpp index 2076aa62..f1fddf05 100644 --- a/src/server/util.hpp +++ b/src/server/util.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_ENGINE_UTIL_HPP #define INGEN_ENGINE_UTIL_HPP -#include "ingen/Log.hpp" +#include #ifdef __SSE__ #include // IWYU pragma: keep -- cgit v1.2.1