1 files changed, 20 insertions, 19 deletions

diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index b44a1fe7..5124face 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -19,24 +19,24 @@
 #include "App.hpp"
 #include "ThreadedLoader.hpp"
 
-#include "ingen/Atom.hpp"
-#include "ingen/Configuration.hpp"
-#include "ingen/FilePath.hpp"
-#include "ingen/Forge.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/runtime_paths.hpp"
-#include "raul/Path.hpp"
-
-#include <boost/optional/optional.hpp>
+#include <ingen/Atom.hpp>
+#include <ingen/Configuration.hpp>
+#include <ingen/FilePath.hpp>
+#include <ingen/Forge.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/runtime_paths.hpp>
+#include <raul/Path.hpp>
+#include <raul/Symbol.hpp>
+
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
-#include <glibmm/signalproxy.h>
 #include <glibmm/slisthandle.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
@@ -52,6 +52,7 @@
 #include <list>
 #include <map>
 #include <memory>
+#include <optional>
 #include <sstream>
 #include <string>
 #include <utility>
@@ -187,8 +188,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();
@@ -198,7 +199,7 @@ LoadGraphWindow::ok_clicked()
 			true, FilePath(get_filename()), parent, symbol, _initial_data);
 
 	} else {
-		std::list<Glib::ustring> uri_list = get_filenames();
+		const std::list<Glib::ustring> uri_list = get_filenames();
 		for (const auto& u : uri_list) {
 			// Cascade
 			Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
@@ -237,14 +238,14 @@ raul::Symbol
 LoadGraphWindow::symbol_from_filename(const Glib::ustring& filename)
 {
 	std::string symbol_str = Glib::path_get_basename(get_filename());
-	symbol_str = symbol_str.substr(0, symbol_str.find('.'));
+	symbol_str.resize(symbol_str.find('.'));
 	return raul::Symbol::symbolify(symbol_str);
 }
 
 raul::Symbol
 LoadGraphWindow::avoid_symbol_clash(const raul::Symbol& symbol)
 {
-	unsigned offset = _app->store()->child_name_offset(
+	const unsigned offset = _app->store()->child_name_offset(
 		_graph->path(), symbol);
 
 	if (offset != 0) {