1 files changed, 30 insertions, 36 deletions
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index ffa50779..67290c76 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 <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>
+#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 <cstdint>
 #include <cstring>
@@ -49,7 +49,8 @@
 namespace ingen {
 
 /** A sink that writes atoms to a port via the UI extension. */
-struct IngenLV2AtomSink : public AtomSink {
+class IngenLV2AtomSink : public AtomSink {
+public:
 	IngenLV2AtomSink(URIs&                uris,
 	                 LV2UI_Write_Function ui_write,
 	                 LV2UI_Controller     ui_controller)
@@ -67,25 +68,18 @@ struct IngenLV2AtomSink : public AtomSink {
 		return true;
 	}
 
+private:
 	URIs&                _uris;
 	LV2UI_Write_Function _ui_write;
 	LV2UI_Controller     _ui_controller;
 };
 
 struct IngenLV2UI {
-	IngenLV2UI()
-		: argc(0)
-		, argv(nullptr)
-		, forge(nullptr)
-		, world(nullptr)
-		, sink(nullptr)
-	{}
-
-	int                                         argc;
-	char**                                      argv;
-	Forge*                                      forge;
-	World*                                      world;
-	IngenLV2AtomSink*                           sink;
+	int                                         argc{0};
+	char**                                      argv{nullptr};
+	Forge*                                      forge{nullptr};
+	World*                                      world{nullptr};
+	IngenLV2AtomSink*                           sink{nullptr};
 	std::shared_ptr<gui::App>                   app;
 	std::shared_ptr<gui::GraphBox>              view;
 	std::shared_ptr<Interface>                  engine;