Use std::optional

4 files changed, 28 insertions, 32 deletions

diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 3acd510d..74542c87 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -61,7 +61,6 @@
 #include "raul/Symbol.hpp"
 #include "sord/sordmm.hpp"
 
-#include <boost/optional/optional.hpp>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms-compat.h>
 #include <gdkmm/window.h>
@@ -94,6 +93,7 @@
 #include <map>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <string>
@@ -727,7 +727,7 @@ GraphCanvas::paste()
 	              {{uris.rdf_type, Property(uris.ingen_Graph)}});
 
 	// Parse clipboard text into clipboard store
-	boost::optional<URI> base_uri = parser->parse_string(
+	std::optional<URI> base_uri = parser->parse_string(
 		_app.world(), clipboard, str, main_uri());
 
 	// Figure out the copy graph base path
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index b44a1fe7..61796de4 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -31,7 +31,6 @@
 #include "ingen/runtime_paths.hpp"
 #include "raul/Path.hpp"
 
-#include <boost/optional/optional.hpp>
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/propertyproxy.h>
@@ -52,6 +51,7 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <optional>
 #include <sstream>
 #include <string>
 #include <utility>
@@ -187,8 +187,8 @@ LoadGraphWindow::ok_clicked()
 
 	if (_import) {
 		// If unset load_graph will load value
-		boost::optional<raul::Path>   parent;
-		boost::optional<raul::Symbol> symbol;
+		std::optional<raul::Path>   parent;
+		std::optional<raul::Symbol> symbol;
 		if (!_graph->path().is_root()) {
 			parent = _graph->path().parent();
 			symbol = _graph->symbol();
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index d3672bda..0e5f1b01 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -26,7 +26,6 @@
 #include "ingen/client/GraphModel.hpp"
 #include "raul/Path.hpp"
 
-#include <boost/optional/optional.hpp>
 #include <glibmm/ustring.h>
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/adaptors/retype_return.h>
@@ -35,12 +34,11 @@
 #include <cassert>
 #include <filesystem>
 #include <memory>
+#include <optional>
 #include <string>
 #include <string_view>
 #include <utility>
 
-using boost::optional;
-
 namespace ingen {
 
 class Interface;
@@ -85,20 +83,20 @@ ThreadedLoader::run()
 }
 
 void
-ThreadedLoader::load_graph(bool                          merge,
-                           const FilePath&               file_path,
-                           const optional<raul::Path>&   engine_parent,
-                           const optional<raul::Symbol>& engine_symbol,
-                           const optional<Properties>&   engine_data)
+ThreadedLoader::load_graph(bool                               merge,
+                           const FilePath&                    file_path,
+                           const std::optional<raul::Path>&   engine_parent,
+                           const std::optional<raul::Symbol>& engine_symbol,
+                           const std::optional<Properties>&   engine_data)
 {
 	std::lock_guard<std::mutex> lock(_mutex);
 
 	Glib::ustring engine_base = "";
 	if (engine_parent) {
 		if (merge) {
-			engine_base = engine_parent.get();
+			engine_base = *engine_parent;
 		} else {
-			engine_base = engine_parent.get().base();
+			engine_base = engine_parent->base();
 		}
 	}
 
@@ -113,10 +111,11 @@ ThreadedLoader::load_graph(bool                          merge,
 }
 
 void
-ThreadedLoader::load_graph_event(const FilePath&               file_path,
-                                 const optional<raul::Path>&   engine_parent,
-                                 const optional<raul::Symbol>& engine_symbol,
-                                 const optional<Properties>&   engine_data)
+ThreadedLoader::load_graph_event(
+    const FilePath&                    file_path,
+    const std::optional<raul::Path>&   engine_parent,
+    const std::optional<raul::Symbol>& engine_symbol,
+    const std::optional<Properties>&   engine_data)
 {
 	std::lock_guard<std::mutex> lock(_app.world().rdf_mutex());
 
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index d338b63f..83860461 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -25,12 +25,9 @@
 #include <list>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <thread>
 
-namespace boost {
-template <class T> class optional;
-} // namespace boost
-
 namespace raul {
 class Path;
 class Symbol;
@@ -70,11 +67,11 @@ public:
 
 	~ThreadedLoader();
 
-	void load_graph(bool                                 merge,
-	                const FilePath&                      file_path,
-	                const boost::optional<raul::Path>&   engine_parent,
-	                const boost::optional<raul::Symbol>& engine_symbol,
-	                const boost::optional<Properties>&   engine_data);
+	void load_graph(bool                               merge,
+	                const FilePath&                    file_path,
+	                const std::optional<raul::Path>&   engine_parent,
+	                const std::optional<raul::Symbol>& engine_symbol,
+	                const std::optional<Properties>&   engine_data);
 
 	void save_graph(const std::shared_ptr<const client::GraphModel>& model,
 	                const URI&                                       uri);
@@ -82,10 +79,10 @@ public:
 	std::shared_ptr<Parser> parser();
 
 private:
-	void load_graph_event(const FilePath&                      file_path,
-	                      const boost::optional<raul::Path>&   engine_parent,
-	                      const boost::optional<raul::Symbol>& engine_symbol,
-	                      const boost::optional<Properties>&   engine_data);
+	void load_graph_event(const FilePath&                    file_path,
+	                      const std::optional<raul::Path>&   engine_parent,
+	                      const std::optional<raul::Symbol>& engine_symbol,
+	                      const std::optional<Properties>&   engine_data);
 
 	void
 	save_graph_event(const std::shared_ptr<const client::GraphModel>& model,