From 607f8d1b51f28dba773a1304b0a46314a326bf09 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 23 Sep 2023 00:25:59 -0400 Subject: Clean up includes and forward declarations --- src/AtomReader.cpp | 3 ++- src/AtomWriter.cpp | 1 - src/Configuration.cpp | 1 - src/Parser.cpp | 2 -- src/Serialiser.cpp | 2 -- src/SocketWriter.cpp | 1 - src/StreamWriter.cpp | 1 - src/TurtleWriter.cpp | 1 + src/URIs.cpp | 1 + src/World.cpp | 1 - src/client/ClientStore.cpp | 1 - src/client/ObjectModel.cpp | 2 ++ src/client/PluginModel.cpp | 2 ++ src/client/PluginUI.cpp | 2 ++ src/gui/App.cpp | 2 +- src/gui/App.hpp | 3 ++- src/gui/Arc.cpp | 12 +++--------- src/gui/BreadCrumbs.cpp | 1 + src/gui/ConnectWindow.cpp | 2 ++ src/gui/ConnectWindow.hpp | 4 ++-- src/gui/GraphCanvas.cpp | 2 +- src/gui/GraphTreeWindow.cpp | 1 + src/gui/GraphTreeWindow.hpp | 1 - src/gui/GraphWindow.cpp | 1 + src/gui/GraphWindow.hpp | 1 - src/gui/LoadGraphWindow.cpp | 1 + src/gui/LoadPluginWindow.cpp | 1 + src/gui/LoadPluginWindow.hpp | 1 - src/gui/MessagesWindow.hpp | 1 - src/gui/NewSubgraphWindow.cpp | 1 + src/gui/NewSubgraphWindow.hpp | 2 -- src/gui/NodeMenu.cpp | 8 +++++++- src/gui/NodeMenu.hpp | 6 ++---- src/gui/PluginMenu.cpp | 2 +- src/gui/Port.cpp | 1 - src/gui/PortMenu.cpp | 2 ++ src/gui/PortMenu.hpp | 3 +-- src/gui/PropertiesWindow.cpp | 1 + src/gui/PropertiesWindow.hpp | 1 - src/gui/RenameWindow.cpp | 1 + src/gui/RenameWindow.hpp | 2 -- src/gui/ThreadedLoader.cpp | 1 + src/gui/URIEntry.cpp | 3 +-- src/gui/WidgetFactory.cpp | 1 - src/gui/WindowFactory.cpp | 1 + src/ingen/ingen.cpp | 1 - src/server/ArcImpl.hpp | 4 ++-- src/server/BlockImpl.cpp | 1 + src/server/BlockImpl.hpp | 9 ++++++--- src/server/ClientUpdate.cpp | 1 - src/server/Engine.cpp | 1 - src/server/Engine.hpp | 7 +++++-- src/server/GraphImpl.cpp | 2 +- src/server/GraphImpl.hpp | 5 +++-- src/server/InternalPlugin.cpp | 2 ++ src/server/JackDriver.cpp | 1 + src/server/LV2Block.cpp | 1 + src/server/LV2Plugin.cpp | 2 ++ src/server/PortImpl.cpp | 1 + src/server/PortImpl.hpp | 1 - src/server/PreProcessor.cpp | 1 + src/server/UndoStack.cpp | 1 - src/server/Worker.cpp | 2 ++ src/server/events/Copy.cpp | 1 + src/server/events/Delete.hpp | 2 +- src/server/events/Delta.hpp | 3 ++- src/server/events/Mark.hpp | 4 +++- src/server/ingen_engine.cpp | 4 ++-- src/server/ingen_lv2.cpp | 1 - src/server/ingen_portaudio.cpp | 4 ++-- src/server/internals/Controller.cpp | 1 - src/server/internals/Note.cpp | 1 - src/server/internals/Time.cpp | 1 - src/server/internals/Trigger.cpp | 1 - 74 files changed, 84 insertions(+), 73 deletions(-) (limited to 'src') diff --git a/src/AtomReader.cpp b/src/AtomReader.cpp index 87c6f541..df9a8e4b 100644 --- a/src/AtomReader.cpp +++ b/src/AtomReader.cpp @@ -22,7 +22,6 @@ #include "ingen/Message.hpp" #include "ingen/Properties.hpp" #include "ingen/Resource.hpp" -#include "ingen/Status.hpp" #include "ingen/URI.hpp" #include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" @@ -38,6 +37,8 @@ namespace ingen { +enum class Status; + AtomReader::AtomReader(URIMap& map, URIs& uris, Log& log, Interface& iface) : _map(map) , _uris(uris) diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp index 604bafdc..e18b48b8 100644 --- a/src/AtomWriter.cpp +++ b/src/AtomWriter.cpp @@ -67,7 +67,6 @@ #include #include #include -#include #include #include diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 7d3d9c40..99675c7b 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Parser.cpp b/src/Parser.cpp index 89e23274..2a22c31b 100644 --- a/src/Parser.cpp +++ b/src/Parser.cpp @@ -42,10 +42,8 @@ #include #include #include -#include #include #include -#include #include #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp index 64a9993b..e5d3cb15 100644 --- a/src/Serialiser.cpp +++ b/src/Serialiser.cpp @@ -44,10 +44,8 @@ #include #include #include -#include #include #include -#include #include #include #include diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp index e6af8750..e736eec8 100644 --- a/src/SocketWriter.cpp +++ b/src/SocketWriter.cpp @@ -16,7 +16,6 @@ #include "ingen/SocketWriter.hpp" -#include "ingen/URI.hpp" #include "raul/Socket.hpp" #include diff --git a/src/StreamWriter.cpp b/src/StreamWriter.cpp index 0d3d97d6..f23a6205 100644 --- a/src/StreamWriter.cpp +++ b/src/StreamWriter.cpp @@ -17,7 +17,6 @@ #include "ingen/StreamWriter.hpp" #include "ingen/ColorContext.hpp" -#include "ingen/URI.hpp" namespace ingen { diff --git a/src/TurtleWriter.cpp b/src/TurtleWriter.cpp index 1f5b0529..61f8b543 100644 --- a/src/TurtleWriter.cpp +++ b/src/TurtleWriter.cpp @@ -19,6 +19,7 @@ #include "ingen/URIMap.hpp" #include "lv2/atom/atom.h" #include "serd/serd.h" +#include "sratom/sratom.h" #include diff --git a/src/URIs.cpp b/src/URIs.cpp index 41706868..27e2e8f1 100644 --- a/src/URIs.cpp +++ b/src/URIs.cpp @@ -18,6 +18,7 @@ #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" diff --git a/src/World.cpp b/src/World.cpp index c03641f5..03a47773 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #include #include diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index f1fd2128..7cfd439d 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -19,7 +19,6 @@ #include "ingen/Atom.hpp" #include "ingen/Forge.hpp" #include "ingen/Log.hpp" -#include "ingen/Node.hpp" #include "ingen/Properties.hpp" #include "ingen/Resource.hpp" #include "ingen/URIs.hpp" diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 86ffa821..0c3bf517 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -22,6 +22,8 @@ #include "ingen/Resource.hpp" #include "ingen/URIs.hpp" #include "ingen/paths.hpp" +#include "raul/Path.hpp" +#include "raul/Symbol.hpp" #include #include diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index 2485fe65..333bf568 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -18,7 +18,9 @@ #include "ingen/Atom.hpp" #include "ingen/client/PluginUI.hpp" +#include "lilv/lilv.h" #include "lv2/core/lv2.h" +#include "raul/Symbol.hpp" #include #include diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index a8ae0ee5..61813cab 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -24,10 +24,12 @@ #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 diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 83c53612..5ae1c8d9 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -31,11 +31,11 @@ #include "ingen/ColorContext.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/QueuedInterface.hpp" +#include "ingen/Status.hpp" #include "ingen/StreamWriter.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" diff --git a/src/gui/App.hpp b/src/gui/App.hpp index 6c77ea2d..d7776896 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -20,7 +20,6 @@ #include "ingen/Message.hpp" #include "ingen/Properties.hpp" #include "ingen/Resource.hpp" -#include "ingen/Status.hpp" #include "ingen/URI.hpp" #include "ingen/World.hpp" #include "ingen/ingen.h" @@ -42,6 +41,8 @@ class Window; namespace ingen { +enum class Status; + class Atom; class Forge; class Interface; diff --git a/src/gui/Arc.cpp b/src/gui/Arc.cpp index 6d13593e..17cd57df 100644 --- a/src/gui/Arc.cpp +++ b/src/gui/Arc.cpp @@ -19,6 +19,7 @@ #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 @@ -27,13 +28,7 @@ #define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#" -namespace ingen { - -namespace client { -class ObjectModel; -} // namespace client - -namespace gui { +namespace ingen::gui { Arc::Arc(Ganv::Canvas& canvas, const std::shared_ptr& model, @@ -51,5 +46,4 @@ Arc::Arc(Ganv::Canvas& canvas, } } -} // namespace gui -} // namespace ingen +} // namespace ingen::gui diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp index 2323afb4..076a259f 100644 --- a/src/gui/BreadCrumbs.cpp +++ b/src/gui/BreadCrumbs.cpp @@ -20,6 +20,7 @@ #include "GraphView.hpp" #include "ingen/client/SigClientInterface.hpp" +#include "raul/Path.hpp" #include "raul/Symbol.hpp" #include diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 6938ae93..f49b8788 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -27,6 +27,7 @@ #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" @@ -43,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index b0e03850..269a4d76 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -20,12 +20,10 @@ #include "Window.hpp" #include "ingen/Message.hpp" -#include "ingen/Status.hpp" #include "ingen/URI.hpp" #include #include -#include #include #include @@ -43,6 +41,8 @@ class SpinButton; namespace ingen { +enum class Status; + class Interface; class World; diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp index 84917c34..896cbf1f 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -58,6 +58,7 @@ #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" @@ -77,7 +78,6 @@ #include #include #include -#include #include #include #include diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp index 0abd086e..b6c55b24 100644 --- a/src/gui/GraphTreeWindow.cpp +++ b/src/gui/GraphTreeWindow.cpp @@ -27,6 +27,7 @@ #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" diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp index dab81c90..16eb4647 100644 --- a/src/gui/GraphTreeWindow.hpp +++ b/src/gui/GraphTreeWindow.hpp @@ -29,7 +29,6 @@ #include #include #include -#include #include diff --git a/src/gui/GraphWindow.cpp b/src/gui/GraphWindow.cpp index 4efaf4ae..a6978e46 100644 --- a/src/gui/GraphWindow.cpp +++ b/src/gui/GraphWindow.cpp @@ -25,6 +25,7 @@ #include #include #include +#include namespace ingen::gui { diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp index d1361ca5..05c555a5 100644 --- a/src/gui/GraphWindow.hpp +++ b/src/gui/GraphWindow.hpp @@ -21,7 +21,6 @@ #include "Window.hpp" #include -#include #include #include diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp index 144a2cc4..c9c18ae9 100644 --- a/src/gui/LoadGraphWindow.cpp +++ b/src/gui/LoadGraphWindow.cpp @@ -30,6 +30,7 @@ #include "ingen/client/GraphModel.hpp" #include "ingen/runtime_paths.hpp" #include "raul/Path.hpp" +#include "raul/Symbol.hpp" #include #include diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index d0bba637..6a4d998c 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index 7a9313e2..2f98b3ae 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp index 97b6187c..27b6a417 100644 --- a/src/gui/MessagesWindow.hpp +++ b/src/gui/MessagesWindow.hpp @@ -23,7 +23,6 @@ #include #include -#include #include #include diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp index 2f7d82f3..f10f8049 100644 --- a/src/gui/NewSubgraphWindow.cpp +++ b/src/gui/NewSubgraphWindow.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include #include diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp index be660da5..acb6c977 100644 --- a/src/gui/NewSubgraphWindow.hpp +++ b/src/gui/NewSubgraphWindow.hpp @@ -21,8 +21,6 @@ #include "ingen/Properties.hpp" -#include - #include namespace Glib { diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 8a03d869..0b511fc1 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -46,9 +46,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -160,6 +160,12 @@ NodeMenu::init(App& app, const std::shared_ptr& block) _enable_signal = true; } +std::shared_ptr +NodeMenu::block() const +{ + return std::dynamic_pointer_cast(_object); +} + void NodeMenu::add_preset(const URI& uri, const std::string& label) { diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index f109c3e4..7168bc7a 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -21,7 +21,6 @@ #include "ingen/URI.hpp" -#include #include #include @@ -35,6 +34,7 @@ template class RefPtr; namespace Gtk { class Builder; class CheckMenuItem; +class Menu; class MenuItem; } // namespace Gtk @@ -66,9 +66,7 @@ public: sigc::signal signal_embed_gui; protected: - std::shared_ptr block() const { - return std::dynamic_pointer_cast(_object); - } + std::shared_ptr block() const; void add_preset(const URI& uri, const std::string& label); diff --git a/src/gui/PluginMenu.cpp b/src/gui/PluginMenu.cpp index f8c7dafc..53917b1e 100644 --- a/src/gui/PluginMenu.cpp +++ b/src/gui/PluginMenu.cpp @@ -20,11 +20,11 @@ #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/Port.cpp b/src/gui/Port.cpp index 8adf8311..7b5988b7 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 96b0788a..95ba88dc 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -24,6 +24,7 @@ #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 @@ -37,6 +38,7 @@ #include #include #include +#include #include #include #include diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index 71a5f48b..cf7f9c62 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -19,8 +19,6 @@ #include "ObjectMenu.hpp" -#include - #include namespace Glib { @@ -29,6 +27,7 @@ template class RefPtr; namespace Gtk { class Builder; +class Menu; class MenuItem; } // namespace Gtk diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index 042718a0..958a73c9 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp index 60b6bda3..3210ceaa 100644 --- a/src/gui/PropertiesWindow.hpp +++ b/src/gui/PropertiesWindow.hpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index e2c1e98c..66d8e918 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp index 42db3ff6..9c97d234 100644 --- a/src/gui/RenameWindow.hpp +++ b/src/gui/RenameWindow.hpp @@ -19,8 +19,6 @@ #include "Window.hpp" -#include - #include namespace Glib { diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index d61bbb31..4cd382a0 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -25,6 +25,7 @@ #include "ingen/World.hpp" #include "ingen/client/GraphModel.hpp" #include "raul/Path.hpp" +#include "raul/Semaphore.hpp" #include #include diff --git a/src/gui/URIEntry.cpp b/src/gui/URIEntry.cpp index c9ef66cb..fa03a05b 100644 --- a/src/gui/URIEntry.cpp +++ b/src/gui/URIEntry.cpp @@ -20,14 +20,13 @@ #include "RDFS.hpp" #include "ingen/World.hpp" +#include "lilv/lilv.h" #include -#include #include #include #include #include -#include #include #include #include diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp index dc08dbde..b2d27e90 100644 --- a/src/gui/WidgetFactory.cpp +++ b/src/gui/WidgetFactory.cpp @@ -16,7 +16,6 @@ #include "WidgetFactory.hpp" -#include "ingen/FilePath.hpp" #include "ingen/runtime_paths.hpp" #include diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 8928b664..010ef704 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -30,6 +30,7 @@ #include "ingen/client/BlockModel.hpp" #include "ingen/client/GraphModel.hpp" #include "ingen/client/ObjectModel.hpp" +#include "raul/Path.hpp" #include #include diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp index a20689ea..6917c9b7 100644 --- a/src/ingen/ingen.cpp +++ b/src/ingen/ingen.cpp @@ -17,7 +17,6 @@ #include "ingen/Atom.hpp" #include "ingen/Configuration.hpp" #include "ingen/EngineBase.hpp" -#include "ingen/FilePath.hpp" #include "ingen/Interface.hpp" #include "ingen/Message.hpp" #include "ingen/Parser.hpp" diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp index 27d7eacb..b1565390 100644 --- a/src/server/ArcImpl.hpp +++ b/src/server/ArcImpl.hpp @@ -17,8 +17,6 @@ #ifndef INGEN_ENGINE_ARC_IMPL_HPP #define INGEN_ENGINE_ARC_IMPL_HPP -// IWYU pragma: no_include "raul/Path.hpp" - #include "BufferRef.hpp" #include "ingen/Arc.hpp" @@ -28,6 +26,8 @@ #include +// IWYU pragma: no_include "raul/Path.hpp" + namespace raul { class Path; // IWYU pragma: keep } // namespace raul diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp index cae6b252..d4285832 100644 --- a/src/server/BlockImpl.cpp +++ b/src/server/BlockImpl.cpp @@ -25,6 +25,7 @@ #include "lv2/urid/urid.h" #include "raul/Array.hpp" +#include "raul/Maid.hpp" #include "raul/Symbol.hpp" #include diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index 3f742bfa..ef76e9bf 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -23,7 +23,6 @@ #include "State.hpp" #include "types.hpp" -#include "ingen/Node.hpp" #include "ingen/Properties.hpp" #include "ingen/Resource.hpp" #include "ingen/URI.hpp" @@ -43,7 +42,10 @@ namespace raul { class Symbol; } // namespace raul -namespace ingen::server { +namespace ingen { +class Node; + +namespace server { class BufferFactory; class Engine; @@ -215,6 +217,7 @@ protected: bool _enabled{true}; }; -} // namespace ingen::server +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_BLOCKIMPL_HPP diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp index c96a0d01..c69f5b49 100644 --- a/src/server/ClientUpdate.cpp +++ b/src/server/ClientUpdate.cpp @@ -26,7 +26,6 @@ #include "ingen/Arc.hpp" #include "ingen/Forge.hpp" #include "ingen/Interface.hpp" -#include "ingen/Node.hpp" #include "ingen/URIs.hpp" #include diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index 9603fcef..c4c492b7 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -19,7 +19,6 @@ #include "BlockFactory.hpp" #include "Broadcaster.hpp" #include "BufferFactory.hpp" -#include "BufferRef.hpp" #include "ControlBindings.hpp" #include "DirectDriver.hpp" #include "Driver.hpp" diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index d224d5b5..f0f19740 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -35,9 +35,12 @@ #include #include +// IWYU pragma: no_include "RunContext.hpp" +// IWYU pragma: no_include "raul/RingBuffer.hpp" + namespace raul { class Maid; -class RingBuffer; +class RingBuffer; // IWYU pragma: keep } // namespace raul namespace ingen { @@ -60,7 +63,7 @@ class GraphImpl; class LV2Options; class PostProcessor; class PreProcessor; -class RunContext; +class RunContext; // IWYU pragma: keep class SocketListener; class Task; class UndoStack; diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index 0eca95b3..0d3c5234 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -30,6 +30,7 @@ #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" @@ -41,7 +42,6 @@ #include #include #include -#include #include namespace ingen::server { diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp index 47993350..c5f978fb 100644 --- a/src/server/GraphImpl.hpp +++ b/src/server/GraphImpl.hpp @@ -23,7 +23,6 @@ #include "server.h" #include "types.hpp" -#include "ingen/Node.hpp" #include "lv2/urid/urid.h" #include "raul/Maid.hpp" @@ -34,6 +33,8 @@ #include #include +// IWYU pragma: no_include "CompiledGraph.hpp" + namespace raul { class Symbol; } // namespace raul @@ -46,7 +47,7 @@ namespace ingen::server { class ArcImpl; class BufferFactory; -class CompiledGraph; +class CompiledGraph; // IWYU pragma: keep class Engine; class PortImpl; class RunContext; diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp index e6535ab2..b2f2bae7 100644 --- a/src/server/InternalPlugin.cpp +++ b/src/server/InternalPlugin.cpp @@ -25,6 +25,8 @@ #include "types.hpp" #include "ingen/URIs.hpp" +#include "lilv/lilv.h" +#include "raul/Symbol.hpp" #include diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index eafa0fa7..d991879e 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -40,6 +40,7 @@ #include "lv2/atom/forge.h" #include "lv2/atom/util.h" #include "raul/Path.hpp" +#include "raul/Semaphore.hpp" #include #include diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index 5a1ee2ec..c5cd73dc 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -37,6 +37,7 @@ #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" diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp index fdf9f2e6..1e88952e 100644 --- a/src/server/LV2Plugin.cpp +++ b/src/server/LV2Plugin.cpp @@ -23,6 +23,8 @@ #include "ingen/Log.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" +#include "lilv/lilv.h" +#include "raul/Symbol.hpp" #include #include diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index fa061640..c7b20f2b 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -24,6 +24,7 @@ #include "ThreadManager.hpp" #include "ingen/Forge.hpp" +#include "ingen/Node.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" #include "lv2/atom/atom.h" diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index 07904cff..64c3322f 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -26,7 +26,6 @@ #include "types.hpp" #include "ingen/Atom.hpp" -#include "ingen/Node.hpp" #include "ingen/URIs.hpp" #include "lv2/urid/urid.h" #include "raul/Array.hpp" diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp index 74550a3e..f9d7ecb3 100644 --- a/src/server/PreProcessor.cpp +++ b/src/server/PreProcessor.cpp @@ -28,6 +28,7 @@ #include "ingen/AtomWriter.hpp" #include "ingen/Configuration.hpp" #include "ingen/World.hpp" +#include "raul/Semaphore.hpp" #include #include diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp index c8ce7d69..abb9fe46 100644 --- a/src/server/UndoStack.cpp +++ b/src/server/UndoStack.cpp @@ -27,7 +27,6 @@ #include #include -#include #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp index c58fe89e..cf252d37 100644 --- a/src/server/Worker.cpp +++ b/src/server/Worker.cpp @@ -24,6 +24,8 @@ #include "ingen/Node.hpp" #include "lv2/core/lv2.h" #include "lv2/worker/worker.h" +#include "raul/RingBuffer.hpp" +#include "raul/Semaphore.hpp" #include #include diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index 4219cef2..f6529da3 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -24,6 +24,7 @@ #include "PreProcessContext.hpp" #include "ingen/Interface.hpp" +#include "ingen/Node.hpp" #include "ingen/Parser.hpp" #include "ingen/Serialiser.hpp" #include "ingen/Status.hpp" diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index c17066a2..87cde2c7 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -17,7 +17,6 @@ #ifndef INGEN_EVENTS_DELETE_HPP #define INGEN_EVENTS_DELETE_HPP -#include "BlockImpl.hpp" #include "ControlBindings.hpp" #include "Event.hpp" #include "GraphImpl.hpp" @@ -41,6 +40,7 @@ class Interface; namespace server { +class BlockImpl; class CompiledGraph; class DuplexPort; class Engine; diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index ca28b05a..ed04f8c9 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -33,6 +33,7 @@ #include #include +// IWYU pragma: no_include "CompiledGraph.hpp" // IWYU pragma: no_include namespace ingen { @@ -44,7 +45,7 @@ struct SetProperty; namespace server { -class CompiledGraph; +class CompiledGraph; // IWYU pragma: keep class Engine; class GraphImpl; class PreProcessContext; diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index db3d6ff6..eb99c5a9 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -23,6 +23,8 @@ #include #include +// IWYU pragma: no_include "CompiledGraph.hpp" + namespace ingen { class Interface; @@ -31,7 +33,7 @@ struct BundleEnd; namespace server { -class CompiledGraph; +class CompiledGraph; // IWYU pragma: keep class Engine; class GraphImpl; class PreProcessContext; diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp index fd4a8ced..db1794de 100644 --- a/src/server/ingen_engine.cpp +++ b/src/server/ingen_engine.cpp @@ -14,8 +14,6 @@ along with Ingen. If not, see . */ -// IWYU pragma: no_include "ingen/Atom.hpp" - #include "Engine.hpp" #include "util.hpp" @@ -24,6 +22,8 @@ #include +// IWYU pragma: no_include "ingen/Atom.hpp" + namespace ingen { struct EngineModule : public Module { diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index f253ee9b..45a193c1 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -15,7 +15,6 @@ */ #include "Buffer.hpp" -#include "BufferRef.hpp" #include "Driver.hpp" #include "DuplexPort.hpp" #include "Engine.hpp" diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp index 0199413f..6de5a40c 100644 --- a/src/server/ingen_portaudio.cpp +++ b/src/server/ingen_portaudio.cpp @@ -14,8 +14,6 @@ along with Ingen. If not, see . */ -// IWYU pragma: no_include "ingen/FilePath.hpp" - #include "Engine.hpp" #include "PortAudioDriver.hpp" @@ -25,6 +23,8 @@ #include +// IWYU pragma: no_include "ingen/FilePath.hpp" + namespace ingen::server { class Driver; diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index 898bd55b..ec400075 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -14,7 +14,6 @@ along with Ingen. If not, see . */ -#include "BlockImpl.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" #include "BufferRef.hpp" diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index dd202451..94598fb7 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -19,7 +19,6 @@ #include "BlockImpl.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" -#include "BufferRef.hpp" #include "InputPort.hpp" #include "InternalPlugin.hpp" #include "OutputPort.hpp" diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp index 0768285a..d8f1ddef 100644 --- a/src/server/internals/Time.cpp +++ b/src/server/internals/Time.cpp @@ -16,7 +16,6 @@ #include "internals/Time.hpp" -#include "BlockImpl.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" #include "BufferRef.hpp" diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 519b6d9f..9b3b8f98 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -16,7 +16,6 @@ #include "internals/Trigger.hpp" -#include "BlockImpl.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" #include "BufferRef.hpp" -- cgit v1.2.1