summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.includes.imp28
-rw-r--r--src/AlsaDriver.cpp1
-rw-r--r--src/Canvas.cpp1
-rw-r--r--src/Canvas.hpp3
-rw-r--r--src/CanvasModule.cpp1
-rw-r--r--src/CanvasModule.hpp3
-rw-r--r--src/Configuration.cpp1
-rw-r--r--src/Configuration.hpp5
-rw-r--r--src/Drivers.hpp2
-rw-r--r--src/Legend.hpp4
-rw-r--r--src/Patchage.hpp3
-rw-r--r--src/Reactor.cpp1
-rw-r--r--src/Reactor.hpp3
13 files changed, 30 insertions, 26 deletions
diff --git a/.includes.imp b/.includes.imp
index cd4dd3b..d79b174 100644
--- a/.includes.imp
+++ b/.includes.imp
@@ -1,15 +1,17 @@
[
- { "symbol": [ "GdkEvent", "private", "<gdk/gdk.h>", "public" ] },
- { "symbol": [ "fmt::format", "private", "<fmt/core.h>", "public" ] },
- { "symbol": [ "std::exception", "private", "<exception>", "public" ] },
- { "symbol": [ "std::ifstream", "private", "<fstream>", "public" ] },
- { "symbol": [ "std::ofstream", "private", "<fstream>", "public" ] },
- { "symbol": [ "std::ostream", "private", "<ostream>", "public" ] },
- { "symbol": [ "std::ostream", "private", "<iosfwd>", "public" ] },
- { "symbol": [ "std::stringstream", "private", "<sstream>", "public" ] },
- { "include": [ "<alsa/error.h>", "public", "<alsa/asoundlib.h>", "public", ] },
- { "include": [ "<alsa/seq.h>", "public", "<alsa/asoundlib.h>", "public", ] },
- { "include": [ "<alsa/seq_event.h>", "public", "<alsa/asoundlib.h>", "public", ] },
- { "include": [ "<alsa/seqmid.h>", "public", "<alsa/asoundlib.h>", "public", ] },
- { "include": [ "<bits/stdint-uintn.h>", "public", "<stdint.h>", "public", ] }
+ { "symbol": [ "GdkEvent", "private", "<gdk/gdk.h>", "public" ] },
+ { "symbol": [ "fmt::format", "private", "<fmt/core.h>", "public" ] },
+ { "symbol": [ "std::exception", "private", "<exception>", "public" ] },
+ { "symbol": [ "std::ifstream", "private", "<fstream>", "public" ] },
+ { "symbol": [ "std::ofstream", "private", "<fstream>", "public" ] },
+ { "symbol": [ "std::ostream", "private", "<iosfwd>", "public" ] },
+ { "symbol": [ "std::ostream", "private", "<ostream>", "public" ] },
+ { "symbol": [ "std::stringstream", "private", "<sstream>", "public" ] },
+
+ { "include": [ "<alsa/error.h>", "public", "<alsa/asoundlib.h>", "public" ] },
+ { "include": [ "<alsa/seq.h>", "public", "<alsa/asoundlib.h>", "public" ] },
+ { "include": [ "<alsa/seq_event.h>", "public", "<alsa/asoundlib.h>", "public" ] },
+ { "include": [ "<alsa/seqmid.h>", "public", "<alsa/asoundlib.h>", "public" ] },
+ { "include": [ "<bits/stdint-uintn.h>", "public", "<stdint.h>", "public" ] },
+ { "include": [ "<sigc++/type_traits.h>", "public", "<sigc++/adaptors/bind.h>", "public" ] }
]
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 7057b12..2771abd 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -29,7 +29,6 @@ PATCHAGE_RESTORE_WARNINGS
#include <memory>
#include <optional>
#include <set>
-#include <string>
#include <utility>
namespace patchage {
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
index 700fa74..7b9203a 100644
--- a/src/Canvas.cpp
+++ b/src/Canvas.cpp
@@ -9,6 +9,7 @@
#include "CanvasPort.hpp"
#include "ClientID.hpp"
#include "ClientInfo.hpp"
+#include "ClientType.hpp"
#include "Configuration.hpp"
#include "Coord.hpp"
#include "ILog.hpp"
diff --git a/src/Canvas.hpp b/src/Canvas.hpp
index 4eef24e..81e4d61 100644
--- a/src/Canvas.hpp
+++ b/src/Canvas.hpp
@@ -7,7 +7,6 @@
#include "ActionSink.hpp"
#include "ClientID.hpp"
#include "PortID.hpp"
-#include "SignalDirection.hpp"
#include "warnings.hpp"
PATCHAGE_DISABLE_GANV_WARNINGS
@@ -25,6 +24,8 @@ class Node;
namespace patchage {
+enum class SignalDirection;
+
struct PortInfo;
class CanvasModule;
diff --git a/src/CanvasModule.cpp b/src/CanvasModule.cpp
index 3b45b6f..4015819 100644
--- a/src/CanvasModule.cpp
+++ b/src/CanvasModule.cpp
@@ -18,7 +18,6 @@ PATCHAGE_DISABLE_GANV_WARNINGS
#include "ganv/Port.hpp"
PATCHAGE_RESTORE_WARNINGS
-#include <glibmm/helperlist.h>
#include <gtkmm/menu.h>
#include <gtkmm/menu_elems.h>
#include <gtkmm/menuitem.h>
diff --git a/src/CanvasModule.hpp b/src/CanvasModule.hpp
index a8bca70..e15a6b8 100644
--- a/src/CanvasModule.hpp
+++ b/src/CanvasModule.hpp
@@ -6,7 +6,6 @@
#include "ActionSink.hpp"
#include "ClientID.hpp"
-#include "SignalDirection.hpp"
#include "warnings.hpp"
PATCHAGE_DISABLE_GANV_WARNINGS
@@ -21,6 +20,8 @@ PATCHAGE_RESTORE_WARNINGS
namespace patchage {
+enum class SignalDirection;
+
struct PortID;
class Canvas;
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index 5edbbf1..a4d71e9 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -14,7 +14,6 @@
#include <fstream>
#include <iostream>
#include <limits>
-#include <type_traits>
#include <utility>
#include <vector>
diff --git a/src/Configuration.hpp b/src/Configuration.hpp
index 7b031b5..a92d4af 100644
--- a/src/Configuration.hpp
+++ b/src/Configuration.hpp
@@ -5,9 +5,7 @@
#define PATCHAGE_CONFIGURATION_HPP
#include "Coord.hpp"
-#include "PortType.hpp"
#include "Setting.hpp"
-#include "SignalDirection.hpp"
#include <cstdint>
#include <functional>
@@ -18,6 +16,9 @@
namespace patchage {
+enum class SignalDirection;
+enum class PortType;
+
class Configuration
{
public:
diff --git a/src/Drivers.hpp b/src/Drivers.hpp
index eea0fbc..6bb9eb4 100644
--- a/src/Drivers.hpp
+++ b/src/Drivers.hpp
@@ -5,7 +5,6 @@
#define PATCHAGE_DRIVERS_HPP
#include "AudioDriver.hpp"
-#include "ClientType.hpp"
#include "Driver.hpp"
#include <memory>
@@ -13,6 +12,7 @@
namespace patchage {
class ILog;
+enum class ClientType;
/// Manager for all drivers
class Drivers
diff --git a/src/Legend.hpp b/src/Legend.hpp
index e690120..c73a74e 100644
--- a/src/Legend.hpp
+++ b/src/Legend.hpp
@@ -4,8 +4,6 @@
#ifndef PATCHAGE_LEGEND_HPP
#define PATCHAGE_LEGEND_HPP
-#include "PortType.hpp"
-
#include <gtkmm/box.h>
#include <sigc++/signal.h>
@@ -18,6 +16,8 @@ class ColorButton;
namespace patchage {
+enum class PortType;
+
class Configuration;
class Legend : public Gtk::HBox
diff --git a/src/Patchage.hpp b/src/Patchage.hpp
index c3295bf..8f3cca0 100644
--- a/src/Patchage.hpp
+++ b/src/Patchage.hpp
@@ -17,7 +17,6 @@
#include "Event.hpp"
#include "Metadata.hpp"
#include "Options.hpp"
-#include "PortType.hpp"
#include "Reactor.hpp"
#include "Setting.hpp"
#include "TextViewLog.hpp"
@@ -55,6 +54,8 @@ class Window;
namespace patchage {
+enum class PortType;
+
class Canvas;
class ILog;
class Legend;
diff --git a/src/Reactor.cpp b/src/Reactor.cpp
index 9fdb317..49cbe5a 100644
--- a/src/Reactor.cpp
+++ b/src/Reactor.cpp
@@ -17,7 +17,6 @@
#include "SignalDirection.hpp"
#include "warnings.hpp"
-#include "ganv/Module.hpp"
#include "ganv/Port.hpp"
PATCHAGE_DISABLE_FMT_WARNINGS
diff --git a/src/Reactor.hpp b/src/Reactor.hpp
index 74b1a07..a5bc9e9 100644
--- a/src/Reactor.hpp
+++ b/src/Reactor.hpp
@@ -5,12 +5,13 @@
#define PATCHAGE_REACTOR_HPP
#include "Action.hpp"
-#include "SignalDirection.hpp"
#include <string>
namespace patchage {
+enum class SignalDirection;
+
struct ClientID;
struct PortID;