From 4b56cdf7a925dafd5e4ac085874d2afe294ec456 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 13 Dec 2022 01:16:41 -0500
Subject: Use std::filesystem and std::make_unique

---
 src/server/LV2Block.hpp      | 6 +++---
 src/server/events/Copy.cpp   | 1 +
 src/server/events/Delete.cpp | 1 +
 src/server/events/Delta.cpp  | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/server')

diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index 9e907ffa..fa3979cd 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -38,6 +38,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
+#include <filesystem>
 #include <memory>
 #include <mutex>
 
@@ -59,7 +60,6 @@ struct constant_time_size;
 
 namespace ingen {
 
-class FilePath;
 class Resource;
 class URIs;
 class World;
@@ -91,7 +91,7 @@ public:
 	bool instantiate(BufferFactory& bufs, const LilvState* state);
 
 	LilvInstance* instance() override { return instance(0); }
-	bool          save_state(const FilePath& dir) const override;
+	bool          save_state(const std::filesystem::path& dir) const override;
 
 	BlockImpl* duplicate(Engine&             engine,
 	                     const raul::Symbol& symbol,
@@ -121,7 +121,7 @@ public:
 	                     const BufferRef& buf,
 	                     SampleCount      offset) override;
 
-	static StatePtr load_state(World& world, const FilePath& path);
+	static StatePtr load_state(World& world, const std::filesystem::path& path);
 
 protected:
 	struct Instance : public raul::Noncopyable {
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index beb5224c..06a71fdc 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -40,6 +40,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
+#include <string_view>
 #include <utility>
 
 namespace ingen {
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index aba49adb..ec1af085 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -48,6 +48,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
+#include <string_view>
 
 namespace ingen {
 namespace server {
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 71d4b48f..af3d5b59 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -53,6 +53,7 @@
 #include <mutex>
 #include <set>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
-- 
cgit v1.2.1