1 files changed, 27 insertions, 18 deletions
diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp
index 2d249cf3..b0fb24d2 100644
--- a/src/gui/NewSubgraphWindow.hpp
+++ b/src/gui/NewSubgraphWindow.hpp
@@ -19,18 +19,27 @@
 
 #include "Window.hpp"
 
-#include "ingen/Node.hpp"
-#include "ingen/types.hpp"
+#include <ingen/Properties.hpp>
 
-#include <gtkmm/builder.h>
-#include <gtkmm/button.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/label.h>
-#include <gtkmm/spinbutton.h>
+#include <memory>
+
+namespace Glib {
+template <class T> class RefPtr;
+} // namespace Glib
+
+namespace Gtk {
+class Builder;
+class Button;
+class Entry;
+class Label;
+class SpinButton;
+} // namespace Gtk
 
 namespace ingen {
 
-namespace client { class GraphModel; }
+namespace client {
+class GraphModel;
+} // namespace client
 
 namespace gui {
 
@@ -46,24 +55,24 @@ public:
 	NewSubgraphWindow(BaseObjectType*                   cobject,
 	                  const Glib::RefPtr<Gtk::Builder>& xml);
 
-	void set_graph(SPtr<const client::GraphModel> graph);
+	void set_graph(std::shared_ptr<const client::GraphModel> graph);
 
-	void present(SPtr<const client::GraphModel> graph,
-	             Properties                     data);
+	void present(std::shared_ptr<const client::GraphModel> graph,
+	             const Properties&                         data);
 
 private:
 	void name_changed();
 	void ok_clicked();
 	void cancel_clicked();
 
-	Properties                     _initial_data;
-	SPtr<const client::GraphModel> _graph;
+	Properties                                _initial_data;
+	std::shared_ptr<const client::GraphModel> _graph;
 
-	Gtk::Entry*      _name_entry;
-	Gtk::Label*      _message_label;
-	Gtk::SpinButton* _poly_spinbutton;
-	Gtk::Button*     _ok_button;
-	Gtk::Button*     _cancel_button;
+	Gtk::Entry*      _name_entry{nullptr};
+	Gtk::Label*      _message_label{nullptr};
+	Gtk::SpinButton* _poly_spinbutton{nullptr};
+	Gtk::Button*     _ok_button{nullptr};
+	Gtk::Button*     _cancel_button{nullptr};
 };
 
 } // namespace gui