diff options
-rw-r--r-- | include/ingen/Log.hpp | 2 | ||||
-rw-r--r-- | include/ingen/Parser.hpp | 6 | ||||
-rw-r--r-- | include/ingen/client/BlockModel.hpp | 4 | ||||
-rw-r--r-- | src/gui/App.cpp | 1 | ||||
-rw-r--r-- | src/gui/ConnectWindow.cpp | 3 | ||||
-rw-r--r-- | src/gui/GraphPortModule.cpp | 2 | ||||
-rw-r--r-- | src/gui/NodeModule.cpp | 2 | ||||
-rw-r--r-- | src/gui/Port.cpp | 2 | ||||
-rw-r--r-- | src/gui/PortMenu.cpp | 2 | ||||
-rw-r--r-- | src/gui/WidgetFactory.hpp | 2 | ||||
-rw-r--r-- | src/gui/ingen_gui_lv2.cpp | 2 | ||||
-rw-r--r-- | src/server/ArcImpl.hpp | 4 | ||||
-rw-r--r-- | src/server/Engine.hpp | 7 | ||||
-rw-r--r-- | src/server/GraphImpl.hpp | 4 | ||||
-rw-r--r-- | src/server/InputPort.hpp | 2 | ||||
-rw-r--r-- | src/server/JackDriver.hpp | 4 | ||||
-rw-r--r-- | src/server/PortAudioDriver.hpp | 2 | ||||
-rw-r--r-- | src/server/events/Delta.hpp | 5 | ||||
-rw-r--r-- | src/server/events/Mark.hpp | 4 | ||||
-rw-r--r-- | src/server/ingen_engine.cpp | 2 | ||||
-rw-r--r-- | src/server/ingen_portaudio.cpp | 2 | ||||
-rw-r--r-- | src/server/util.hpp | 2 | ||||
-rw-r--r-- | tests/test_utils.hpp | 2 |
23 files changed, 25 insertions, 43 deletions
diff --git a/include/ingen/Log.hpp b/include/ingen/Log.hpp index 44bf0e2e..173127a1 100644 --- a/include/ingen/Log.hpp +++ b/include/ingen/Log.hpp @@ -18,7 +18,7 @@ #define INGEN_LOG_HPP #include <ingen/LV2Features.hpp> -#include <ingen/fmt.hpp> // IWYU pragma: export +#include <ingen/fmt.hpp> #include <ingen/ingen.h> #include <lv2/core/lv2.h> #include <lv2/log/log.h> diff --git a/include/ingen/Parser.hpp b/include/ingen/Parser.hpp index 5834a349..8db64104 100644 --- a/include/ingen/Parser.hpp +++ b/include/ingen/Parser.hpp @@ -18,11 +18,11 @@ #define INGEN_PARSER_HPP #include <ingen/FilePath.hpp> -#include <ingen/Properties.hpp> // IWYU pragma: keep +#include <ingen/Properties.hpp> #include <ingen/URI.hpp> #include <ingen/ingen.h> -#include <raul/Path.hpp> // IWYU pragma: keep -#include <raul/Symbol.hpp> // IWYU pragma: keep +#include <raul/Path.hpp> +#include <raul/Symbol.hpp> #include <optional> #include <set> diff --git a/include/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp index dc5b2c53..db41f4ef 100644 --- a/include/ingen/client/BlockModel.hpp +++ b/include/ingen/client/BlockModel.hpp @@ -20,7 +20,7 @@ #include <ingen/Node.hpp> #include <ingen/URI.hpp> #include <ingen/client/ObjectModel.hpp> -#include <ingen/client/PluginModel.hpp> // IWYU pragma: keep +#include <ingen/client/PluginModel.hpp> #include <ingen/client/signal.hpp> #include <ingen/ingen.h> @@ -29,8 +29,6 @@ #include <string> #include <vector> -// IWYU pragma: no_include <algorithm> - namespace raul { class Path; class Symbol; diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 48ed3a61..7c1a626c 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -47,6 +47,7 @@ #include <ingen/client/PluginModel.hpp> #include <ingen/client/PortModel.hpp> #include <ingen/client/SigClientInterface.hpp> +#include <ingen/fmt.hpp> #include <ingen/runtime_paths.hpp> #include <lilv/lilv.h> #include <lv2/urid/urid.h> diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 8f89a283..7265796a 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -33,9 +33,10 @@ #include <ingen/URIs.hpp> #include <ingen/World.hpp> #include <ingen/client/ClientStore.hpp> -#include <ingen/client/GraphModel.hpp> // IWYU pragma: keep +#include <ingen/client/GraphModel.hpp> #include <ingen/client/SigClientInterface.hpp> #include <ingen/client/SocketClient.hpp> +#include <ingen/fmt.hpp> #include <ingen/paths.hpp> #include <raul/Path.hpp> #include <raul/Process.hpp> diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp index 2ccf8289..cd471d97 100644 --- a/src/gui/GraphPortModule.cpp +++ b/src/gui/GraphPortModule.cpp @@ -29,7 +29,7 @@ #include <ingen/URI.hpp> #include <ingen/URIs.hpp> #include <ingen/World.hpp> -#include <ingen/client/GraphModel.hpp> // IWYU pragma: keep +#include <ingen/client/GraphModel.hpp> #include <ingen/client/PortModel.hpp> #include <raul/Symbol.hpp> diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 29d02901..deb8fe52 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -40,7 +40,7 @@ #include <ingen/URIs.hpp> #include <ingen/World.hpp> #include <ingen/client/BlockModel.hpp> -#include <ingen/client/GraphModel.hpp> // IWYU pragma: keep +#include <ingen/client/GraphModel.hpp> #include <ingen/client/PluginModel.hpp> #include <ingen/client/PluginUI.hpp> #include <ingen/client/PortModel.hpp> diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index a950f553..4d11e309 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -38,7 +38,7 @@ #include <ingen/URIs.hpp> #include <ingen/World.hpp> #include <ingen/client/BlockModel.hpp> -#include <ingen/client/GraphModel.hpp> // IWYU pragma: keep +#include <ingen/client/GraphModel.hpp> #include <ingen/client/ObjectModel.hpp> #include <ingen/client/PluginModel.hpp> #include <ingen/client/PortModel.hpp> diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 26f9da6a..373425cf 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -27,7 +27,7 @@ #include <ingen/URI.hpp> #include <ingen/URIs.hpp> #include <ingen/client/BlockModel.hpp> -#include <ingen/client/GraphModel.hpp> // IWYU pragma: keep +#include <ingen/client/GraphModel.hpp> #include <ingen/client/ObjectModel.hpp> #include <ingen/client/PortModel.hpp> #include <ingen/paths.hpp> diff --git a/src/gui/WidgetFactory.hpp b/src/gui/WidgetFactory.hpp index 474071ec..d10a5e1a 100644 --- a/src/gui/WidgetFactory.hpp +++ b/src/gui/WidgetFactory.hpp @@ -19,7 +19,7 @@ #include <glibmm/refptr.h> #include <glibmm/ustring.h> -#include <gtkmm/builder.h> // IWYU pragma: keep +#include <gtkmm/builder.h> #include <string> diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index 43527acf..67290c76 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -27,7 +27,7 @@ #include <ingen/URIs.hpp> #include <ingen/World.hpp> #include <ingen/client/ClientStore.hpp> -#include <ingen/client/GraphModel.hpp> // IWYU pragma: keep +#include <ingen/client/GraphModel.hpp> #include <ingen/client/SigClientInterface.hpp> #include <ingen/ingen.h> #include <ingen/paths.hpp> diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp index 1a2412b5..b0914929 100644 --- a/src/server/ArcImpl.hpp +++ b/src/server/ArcImpl.hpp @@ -26,10 +26,8 @@ #include <cstdint> -// IWYU pragma: no_include "raul/Path.hpp" - namespace raul { -class Path; // IWYU pragma: keep +class Path; } // namespace raul namespace ingen::server { diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index 688297ee..e6c543d9 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -19,6 +19,7 @@ #include "Event.hpp" #include "Load.hpp" +#include "RunContext.hpp" #include "server.h" #include "types.hpp" @@ -35,12 +36,9 @@ #include <random> #include <vector> -// IWYU pragma: no_include "RunContext.hpp" -// IWYU pragma: no_include "raul/RingBuffer.hpp" - namespace raul { class Maid; -class RingBuffer; // IWYU pragma: keep +class RingBuffer; } // namespace raul namespace ingen { @@ -63,7 +61,6 @@ class GraphImpl; class LV2Options; class PostProcessor; class PreProcessor; -class RunContext; // IWYU pragma: keep class SocketListener; class Task; class UndoStack; diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp index 234483bd..6c852106 100644 --- a/src/server/GraphImpl.hpp +++ b/src/server/GraphImpl.hpp @@ -34,8 +34,6 @@ #include <memory> #include <utility> -// IWYU pragma: no_include "CompiledGraph.hpp" - namespace raul { class Symbol; } // namespace raul @@ -44,7 +42,7 @@ namespace ingen::server { class ArcImpl; class BufferFactory; -class CompiledGraph; // IWYU pragma: keep +class CompiledGraph; class Engine; class PortImpl; class RunContext; diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp index 19e9af74..00834dc1 100644 --- a/src/server/InputPort.hpp +++ b/src/server/InputPort.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_ENGINE_INPUTPORT_HPP #define INGEN_ENGINE_INPUTPORT_HPP -#include "ArcImpl.hpp" // IWYU pragma: keep +#include "ArcImpl.hpp" #include "PortImpl.hpp" #include "types.hpp" diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp index 987976e9..192604f4 100644 --- a/src/server/JackDriver.hpp +++ b/src/server/JackDriver.hpp @@ -18,11 +18,11 @@ #define INGEN_ENGINE_JACKAUDIODRIVER_HPP #include "Driver.hpp" -#include "EnginePort.hpp" // IWYU pragma: keep +#include "EnginePort.hpp" #include "types.hpp" #include <ingen/URI.hpp> -#include <ingen/memory.hpp> // IWYU pragma: keep +#include <ingen/memory.hpp> #include <lv2/atom/forge.h> #include <raul/Semaphore.hpp> diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp index d54791c1..77d91461 100644 --- a/src/server/PortAudioDriver.hpp +++ b/src/server/PortAudioDriver.hpp @@ -18,7 +18,7 @@ #define INGEN_ENGINE_PORTAUDIODRIVER_HPP #include "Driver.hpp" -#include "EnginePort.hpp" // IWYU pragma: keep +#include "EnginePort.hpp" #include "types.hpp" #include <ingen/URI.hpp> diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index 1bbfe1ec..a2a63a71 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -18,6 +18,7 @@ #define INGEN_EVENTS_DELTA_HPP #include "ClientUpdate.hpp" +#include "CompiledGraph.hpp" #include "ControlBindings.hpp" #include "Event.hpp" #include "SetPortValue.hpp" @@ -33,9 +34,6 @@ #include <optional> #include <vector> -// IWYU pragma: no_include "CompiledGraph.hpp" -// IWYU pragma: no_include <algorithm> - namespace ingen { class Interface; @@ -45,7 +43,6 @@ struct SetProperty; namespace server { -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 eb99c5a9..c98ca0d9 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -17,14 +17,13 @@ #ifndef INGEN_EVENTS_MARK_HPP #define INGEN_EVENTS_MARK_HPP +#include "CompiledGraph.hpp" #include "Event.hpp" #include "types.hpp" #include <map> #include <memory> -// IWYU pragma: no_include "CompiledGraph.hpp" - namespace ingen { class Interface; @@ -33,7 +32,6 @@ struct BundleEnd; namespace server { -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 a45c6d7c..48955143 100644 --- a/src/server/ingen_engine.cpp +++ b/src/server/ingen_engine.cpp @@ -22,8 +22,6 @@ #include <memory> -// IWYU pragma: no_include "ingen/Atom.hpp" - namespace ingen { struct EngineModule : public Module { diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp index 36cedbe0..68b1b0bc 100644 --- a/src/server/ingen_portaudio.cpp +++ b/src/server/ingen_portaudio.cpp @@ -23,8 +23,6 @@ #include <memory> -// IWYU pragma: no_include "ingen/FilePath.hpp" - namespace ingen::server { class Driver; diff --git a/src/server/util.hpp b/src/server/util.hpp index f1fddf05..abfa06b6 100644 --- a/src/server/util.hpp +++ b/src/server/util.hpp @@ -20,7 +20,7 @@ #include <ingen/Log.hpp> #ifdef __SSE__ -#include <xmmintrin.h> // IWYU pragma: keep +#include <xmmintrin.h> #endif #ifdef __clang__ diff --git a/tests/test_utils.hpp b/tests/test_utils.hpp index e00d25f9..4c358739 100644 --- a/tests/test_utils.hpp +++ b/tests/test_utils.hpp @@ -19,8 +19,6 @@ #include <iostream> #include <string> -// IWYU pragma: no_include "ingen/FilePath.hpp" - #define EXPECT_TRUE(value) \ do { \ if (!(value)) { \ |