From 2f6bec60c6bd0f4bac2a8a5f47b1994b65ed7ed0 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 19 Jul 2022 09:55:33 -0400
Subject: Clean up includes

---
 src/AlsaDriver.cpp      | 3 +--
 src/Canvas.cpp          | 8 ++++++--
 src/CanvasModule.cpp    | 3 +++
 src/Configuration.cpp   | 3 ++-
 src/Configuration.hpp   | 1 -
 src/Drivers.cpp         | 1 +
 src/JackDbusDriver.cpp  | 6 +++---
 src/Patchage.cpp        | 6 ++++++
 src/Reactor.cpp         | 4 +++-
 src/event_to_string.cpp | 2 +-
 src/handle_event.cpp    | 4 +---
 11 files changed, 27 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 41ee7c4..a1b2caa 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -17,7 +17,7 @@
 
 PATCHAGE_DISABLE_FMT_WARNINGS
 #include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt/ostream.h> // IWYU pragma: keep
 PATCHAGE_RESTORE_WARNINGS
 
 #include <alsa/asoundlib.h>
@@ -28,7 +28,6 @@ PATCHAGE_RESTORE_WARNINGS
 #include <cassert>
 #include <cstdint>
 #include <functional>
-#include <iosfwd>
 #include <limits>
 #include <memory>
 #include <set>
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
index b244972..9b7760a 100644
--- a/src/Canvas.cpp
+++ b/src/Canvas.cpp
@@ -4,13 +4,16 @@
 #include "Canvas.hpp"
 
 #include "Action.hpp"
+#include "ActionSink.hpp"
 #include "CanvasModule.hpp"
 #include "CanvasPort.hpp"
+#include "ClientID.hpp"
 #include "ClientInfo.hpp"
 #include "Configuration.hpp"
 #include "Coord.hpp"
 #include "ILog.hpp"
 #include "Metadata.hpp"
+#include "PortID.hpp"
 #include "PortInfo.hpp"
 #include "PortNames.hpp"
 #include "Setting.hpp"
@@ -18,16 +21,18 @@
 #include "warnings.hpp"
 
 PATCHAGE_DISABLE_GANV_WARNINGS
+#include "ganv/Canvas.hpp"
 #include "ganv/Edge.hpp"
 #include "ganv/Module.hpp"
 #include "ganv/Node.hpp"
 #include "ganv/Port.hpp"
 #include "ganv/module.h"
+#include "ganv/types.h"
 PATCHAGE_RESTORE_WARNINGS
 
 PATCHAGE_DISABLE_FMT_WARNINGS
 #include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt/ostream.h> // IWYU pragma: keep
 PATCHAGE_RESTORE_WARNINGS
 
 #include <boost/optional/optional.hpp>
@@ -38,7 +43,6 @@ PATCHAGE_RESTORE_WARNINGS
 #include <cassert>
 #include <cstdlib>
 #include <functional>
-#include <iosfwd>
 #include <set>
 #include <string>
 #include <utility>
diff --git a/src/CanvasModule.cpp b/src/CanvasModule.cpp
index b567212..eddc261 100644
--- a/src/CanvasModule.cpp
+++ b/src/CanvasModule.cpp
@@ -4,13 +4,16 @@
 #include "CanvasModule.hpp"
 
 #include "Action.hpp"
+#include "ActionSink.hpp"
 #include "Canvas.hpp"
 #include "CanvasPort.hpp"
+#include "ClientID.hpp"
 #include "PortID.hpp"
 #include "SignalDirection.hpp"
 #include "warnings.hpp"
 
 PATCHAGE_DISABLE_GANV_WARNINGS
+#include "ganv/Module.hpp"
 #include "ganv/Port.hpp"
 PATCHAGE_RESTORE_WARNINGS
 
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index 679feb1..44b61d0 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -3,6 +3,7 @@
 
 #include "Configuration.hpp"
 
+#include "Coord.hpp"
 #include "PortType.hpp"
 #include "Setting.hpp"
 #include "SignalDirection.hpp"
@@ -11,9 +12,9 @@
 #include <cctype>
 #include <cstdlib>
 #include <fstream>
-#include <ios>
 #include <iostream>
 #include <limits>
+#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/src/Configuration.hpp b/src/Configuration.hpp
index cf99ad1..6a59076 100644
--- a/src/Configuration.hpp
+++ b/src/Configuration.hpp
@@ -16,7 +16,6 @@
 #include <map>
 #include <string>
 #include <tuple>
-#include <utility>
 
 #define N_PORT_TYPES 5
 
diff --git a/src/Drivers.cpp b/src/Drivers.cpp
index 6341a63..6de2459 100644
--- a/src/Drivers.cpp
+++ b/src/Drivers.cpp
@@ -4,6 +4,7 @@
 #include "Drivers.hpp"
 
 #include "AudioDriver.hpp"
+#include "ClientType.hpp"
 #include "Driver.hpp"
 #include "Event.hpp"
 #include "make_alsa_driver.hpp"
diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
index 4e9b23c..22e64b5 100644
--- a/src/JackDbusDriver.cpp
+++ b/src/JackDbusDriver.cpp
@@ -15,7 +15,7 @@
 
 PATCHAGE_DISABLE_FMT_WARNINGS
 #include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt/ostream.h> // IWYU pragma: keep
 PATCHAGE_RESTORE_WARNINGS
 
 #include <dbus/dbus-glib-lowlevel.h>
@@ -51,10 +51,10 @@ class JackDriver : public AudioDriver
 public:
   explicit JackDriver(ILog& log, EventSink emit_event);
 
-  JackDriver(const JackDriver&) = delete;
+  JackDriver(const JackDriver&)            = delete;
   JackDriver& operator=(const JackDriver&) = delete;
 
-  JackDriver(JackDriver&&) = delete;
+  JackDriver(JackDriver&&)            = delete;
   JackDriver& operator=(JackDriver&&) = delete;
 
   ~JackDriver() override;
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index e74b812..122aae2 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -11,10 +11,16 @@
 #include "Configuration.hpp"
 #include "Coord.hpp"
 #include "Driver.hpp"
+#include "Drivers.hpp"
 #include "Event.hpp"
 #include "Legend.hpp"
+#include "Options.hpp"
+#include "PortType.hpp"
+#include "Reactor.hpp"
 #include "Setting.hpp"
+#include "TextViewLog.hpp"
 #include "UIFile.hpp"
+#include "Widget.hpp"
 #include "event_to_string.hpp"
 #include "handle_event.hpp"
 #include "patchage_config.h" // IWYU pragma: keep
diff --git a/src/Reactor.cpp b/src/Reactor.cpp
index 6c9a508..02eb108 100644
--- a/src/Reactor.cpp
+++ b/src/Reactor.cpp
@@ -3,6 +3,7 @@
 
 #include "Reactor.hpp"
 
+#include "Action.hpp"
 #include "Canvas.hpp"
 #include "CanvasModule.hpp"
 #include "CanvasPort.hpp"
@@ -13,6 +14,7 @@
 #include "ILog.hpp"
 #include "PortID.hpp"
 #include "Setting.hpp"
+#include "SignalDirection.hpp"
 #include "warnings.hpp"
 
 #include "ganv/Module.hpp"
@@ -20,7 +22,7 @@
 
 PATCHAGE_DISABLE_FMT_WARNINGS
 #include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt/ostream.h> // IWYU pragma: keep
 PATCHAGE_RESTORE_WARNINGS
 
 #include <boost/variant/apply_visitor.hpp>
diff --git a/src/event_to_string.cpp b/src/event_to_string.cpp
index 159a863..366859a 100644
--- a/src/event_to_string.cpp
+++ b/src/event_to_string.cpp
@@ -15,7 +15,7 @@
 
 PATCHAGE_DISABLE_FMT_WARNINGS
 #include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt/ostream.h> // IWYU pragma: keep
 PATCHAGE_RESTORE_WARNINGS
 
 #include <boost/optional/optional.hpp>
diff --git a/src/handle_event.cpp b/src/handle_event.cpp
index 373b74a..d5d8ed7 100644
--- a/src/handle_event.cpp
+++ b/src/handle_event.cpp
@@ -16,13 +16,11 @@
 
 PATCHAGE_DISABLE_FMT_WARNINGS
 #include <fmt/core.h>
-#include <fmt/ostream.h>
+#include <fmt/ostream.h> // IWYU pragma: keep
 PATCHAGE_RESTORE_WARNINGS
 
 #include <boost/variant/apply_visitor.hpp>
 
-#include <iosfwd>
-
 namespace patchage {
 
 namespace {
-- 
cgit v1.2.1