From df1447c665e6c3631961297a9d3e9aff4e94c47f Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 12 Jan 2013 23:38:03 +0000
Subject: Remove Raul::SharedPtr and switch to std::shared_ptr. Use project
 local short type aliases for shared_ptr and friends. Move Raul::Disposable
 and Raul::Manageable into Raul::Maid. Use sets to store machina nodes and
 edges to avoid O(n) searches.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4939 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/WindowFactory.hpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/gui/WindowFactory.hpp')

diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index bdeac89d..f68d5847 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -20,7 +20,7 @@
 #include <map>
 
 #include "ingen/Node.hpp"
-#include "raul/SharedPtr.hpp"
+#include "ingen/types.hpp"
 
 namespace Ingen {
 
@@ -55,23 +55,23 @@ public:
 
 	size_t num_open_graph_windows();
 
-	GraphBox*    graph_box(SharedPtr<const Client::GraphModel> graph);
-	GraphWindow* graph_window(SharedPtr<const Client::GraphModel> graph);
-	GraphWindow* parent_graph_window(SharedPtr<const Client::BlockModel> block);
+	GraphBox*    graph_box(SPtr<const Client::GraphModel> graph);
+	GraphWindow* graph_window(SPtr<const Client::GraphModel> graph);
+	GraphWindow* parent_graph_window(SPtr<const Client::BlockModel> block);
 
 	void present_graph(
-		SharedPtr<const Client::GraphModel> model,
-		GraphWindow*                        preferred = NULL,
-		SharedPtr<GraphView>                view      = SharedPtr<GraphView>());
+		SPtr<const Client::GraphModel> model,
+		GraphWindow*                   preferred = NULL,
+		SPtr<GraphView>                view      = SPtr<GraphView>());
 
 	typedef Node::Properties Properties;
 
-	void present_load_plugin(SharedPtr<const Client::GraphModel> graph, Properties data=Properties());
-	void present_load_graph(SharedPtr<const Client::GraphModel> graph, Properties data=Properties());
-	void present_load_subgraph(SharedPtr<const Client::GraphModel> graph, Properties data=Properties());
-	void present_new_subgraph(SharedPtr<const Client::GraphModel> graph, Properties data=Properties());
-	void present_rename(SharedPtr<const Client::ObjectModel> object);
-	void present_properties(SharedPtr<const Client::ObjectModel> object);
+	void present_load_plugin(SPtr<const Client::GraphModel> graph, Properties data=Properties());
+	void present_load_graph(SPtr<const Client::GraphModel> graph, Properties data=Properties());
+	void present_load_subgraph(SPtr<const Client::GraphModel> graph, Properties data=Properties());
+	void present_new_subgraph(SPtr<const Client::GraphModel> graph, Properties data=Properties());
+	void present_rename(SPtr<const Client::ObjectModel> object);
+	void present_properties(SPtr<const Client::ObjectModel> object);
 
 	bool remove_graph_window(GraphWindow* win, GdkEventAny* ignored = NULL);
 
@@ -82,8 +82,8 @@ public:
 private:
 	typedef std::map<Raul::Path, GraphWindow*> GraphWindowMap;
 
-	GraphWindow* new_graph_window(SharedPtr<const Client::GraphModel> graph,
-	                              SharedPtr<GraphView>                view);
+	GraphWindow* new_graph_window(SPtr<const Client::GraphModel> graph,
+	                              SPtr<GraphView>                view);
 
 	App&               _app;
 	GraphBox*          _main_box;
-- 
cgit v1.2.1