From 70f4bcdde45e94dbe27300a5069994aebc523cab Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 28 Apr 2012 01:10:26 +0000
Subject: Remove using declarations from headers.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4288 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/LoadPluginWindow.hpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

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

diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index d580f367..86ec5b2a 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -30,13 +30,9 @@
 
 #include "Window.hpp"
 
-using namespace Ingen::Shared;
-
 namespace Ingen {
 
 namespace Client { class PatchModel; class PluginModel; }
-using Ingen::Client::PluginModel;
-using Ingen::Client::PatchModel;
 
 namespace GUI {
 
@@ -52,12 +48,13 @@ public:
 	LoadPluginWindow(BaseObjectType*                   cobject,
 	                 const Glib::RefPtr<Gtk::Builder>& xml);
 
-	void set_patch(SharedPtr<const PatchModel> patch);
+	void set_patch(SharedPtr<const Client::PatchModel> patch);
 	void set_plugins(SharedPtr<const Client::ClientStore::Plugins> plugins);
 
-	void add_plugin(SharedPtr<const PluginModel> plugin);
+	void add_plugin(SharedPtr<const Client::PluginModel> plugin);
 
-	void present(SharedPtr<const PatchModel> patch, GraphObject::Properties data);
+	void present(SharedPtr<const Client::PatchModel> patch,
+	             GraphObject::Properties             data);
 
 protected:
 	void on_show();
@@ -81,7 +78,7 @@ private:
 		Gtk::TreeModelColumn<Glib::ustring>              _col_uri;
 
 		// Not displayed:
-		Gtk::TreeModelColumn< SharedPtr<const PluginModel> > _col_plugin;
+		Gtk::TreeModelColumn< SharedPtr<const Client::PluginModel> > _col_plugin;
 	};
 
 	/** Column for the filter criteria combo box. */
@@ -103,8 +100,8 @@ private:
 	void name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event);
 #endif
 
-	void set_row(Gtk::TreeModel::Row& row, SharedPtr<const PluginModel> plugin);
-	void new_plugin(SharedPtr<const PluginModel> plugin);
+	void set_row(Gtk::TreeModel::Row& row, SharedPtr<const Client::PluginModel> plugin);
+	void new_plugin(SharedPtr<const Client::PluginModel> plugin);
 
 	void plugin_property_changed(const Raul::URI&  plugin,
 	                             const Raul::URI&  predicate,
@@ -113,14 +110,15 @@ private:
 	void plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col);
 	void plugin_selection_changed();
 
-	std::string generate_module_name(SharedPtr<const PluginModel> plugin,
-	                                 int                          offset=0);
+	std::string generate_module_name(
+		SharedPtr<const Client::PluginModel> plugin,
+		int                                  offset=0);
 
 	void load_plugin(const Gtk::TreeModel::iterator& iter);
 
 	GraphObject::Properties _initial_data;
 
-	SharedPtr<const PatchModel> _patch;
+	SharedPtr<const Client::PatchModel> _patch;
 
 	typedef std::map<Raul::URI, Gtk::TreeModel::iterator> Rows;
 	Rows _rows;
-- 
cgit v1.2.1