From d10796d12fd477215fc024078c0f2d83abc6515e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 14 Dec 2020 20:15:05 +0100
Subject: Avoid "using namespace"

---
 src/gui/App.cpp              | 26 ++++++++++++++++----------
 src/gui/ConnectWindow.cpp    |  8 +++-----
 src/gui/GraphBox.cpp         |  6 +++++-
 src/gui/GraphCanvas.cpp      |  8 ++++++--
 src/gui/GraphPortModule.cpp  | 10 ++++------
 src/gui/GraphTreeWindow.cpp  |  5 +++--
 src/gui/GraphView.cpp        |  2 +-
 src/gui/LoadGraphWindow.cpp  |  2 +-
 src/gui/LoadPluginWindow.cpp |  4 +++-
 src/gui/NodeMenu.cpp         |  3 ---
 src/gui/NodeModule.cpp       |  5 ++++-
 src/gui/ObjectMenu.cpp       |  5 +----
 src/gui/Port.cpp             |  8 ++++++--
 src/gui/PortMenu.cpp         |  4 +++-
 src/gui/PropertiesWindow.cpp |  2 +-
 src/gui/RenameWindow.cpp     |  2 +-
 src/gui/Style.cpp            |  2 --
 src/gui/SubgraphModule.cpp   |  2 +-
 src/gui/WindowFactory.cpp    |  4 +++-
 19 files changed, 62 insertions(+), 46 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 55787d44..ecc20455 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -65,8 +65,6 @@ namespace ingen {
 
 namespace client { class PluginModel; }
 
-using namespace client;
-
 namespace gui {
 
 class Port;
@@ -99,11 +97,14 @@ App::App(ingen::World& world)
 	_about_dialog->property_program_name() = "Ingen";
 	_about_dialog->property_logo_icon_name() = "ingen";
 
-	PluginModel::set_rdf_world(*world.rdf_world());
-	PluginModel::set_lilv_world(world.lilv_world());
+	client::PluginModel::set_rdf_world(*world.rdf_world());
+	client::PluginModel::set_lilv_world(world.lilv_world());
 
-	using namespace std::placeholders;
-	world.log().set_sink(std::bind(&MessagesWindow::log, _messages_window, _1, _2, _3));
+	world.log().set_sink(std::bind(&MessagesWindow::log,
+	                               _messages_window,
+	                               std::placeholders::_1,
+	                               std::placeholders::_2,
+	                               std::placeholders::_3));
 }
 
 App::~App()
@@ -171,8 +172,13 @@ App::attach(const std::shared_ptr<ingen::Interface>& client)
 	}
 
 	_client = client;
-	_store  = std::make_shared<ClientStore>(_world.uris(), _world.log(), sig_client());
+
+	_store = std::make_shared<client::ClientStore>(_world.uris(),
+	                                               _world.log(),
+	                                               sig_client());
+
 	_loader = std::make_shared<ThreadedLoader>(*this, _world.interface());
+
 	if (!_world.store()) {
 		_world.set_store(_store);
 	}
@@ -215,14 +221,14 @@ App::request_plugins_if_necessary()
 	}
 }
 
-std::shared_ptr<SigClientInterface>
+std::shared_ptr<client::SigClientInterface>
 App::sig_client()
 {
 	auto qi = std::dynamic_pointer_cast<QueuedInterface>(_client);
 	if (qi) {
-		return std::dynamic_pointer_cast<SigClientInterface>(qi->sink());
+		return std::dynamic_pointer_cast<client::SigClientInterface>(qi->sink());
 	}
-	return std::dynamic_pointer_cast<SigClientInterface>(_client);
+	return std::dynamic_pointer_cast<client::SigClientInterface>(_client);
 }
 
 std::shared_ptr<Serialiser>
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index ea6c80d6..bf686308 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -69,8 +69,6 @@
 #include <sys/time.h>
 #include <utility>
 
-using namespace ingen::client;
-
 namespace ingen {
 namespace gui {
 
@@ -223,7 +221,7 @@ ConnectWindow::connect_remote(const URI& uri)
 {
 	ingen::World& world = _app->world();
 
-	auto sci = std::make_shared<SigClientInterface>();
+	auto sci = std::make_shared<client::SigClientInterface>();
 	auto qi  = std::make_shared<QueuedInterface>(sci);
 
 	std::shared_ptr<ingen::Interface> iface(world.new_interface(uri, qi));
@@ -513,7 +511,7 @@ ConnectWindow::gtk_callback()
 		if (ms_since_last >= 250) {
 			last = now;
 			if (_mode == Mode::INTERNAL) {
-				auto client = std::make_shared<SigClientInterface>();
+				auto client = std::make_shared<client::SigClientInterface>();
 				_app->world().interface()->set_respondee(client);
 				_app->attach(client);
 				_app->register_callbacks();
@@ -555,7 +553,7 @@ ConnectWindow::gtk_callback()
 		next_stage();
 	} else if (_connect_stage == 4) {
 		if (!_app->store()->empty()) {
-			auto root = std::dynamic_pointer_cast<const GraphModel>(
+			auto root = std::dynamic_pointer_cast<const client::GraphModel>(
 				_app->store()->object(Raul::Path("/")));
 			if (root) {
 				set_connected_to(_app->interface());
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 557c4261..fedde2f9 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -53,7 +53,11 @@
 
 namespace ingen {
 
-using namespace client;
+using client::BlockModel;
+using client::GraphModel;
+using client::ObjectModel;
+using client::PluginModel;
+using client::PortModel;
 
 namespace gui {
 
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 23a3ecf5..a7351483 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -58,7 +58,11 @@ using std::string;
 
 namespace ingen {
 
-using namespace client;
+using client::ArcModel;
+using client::BlockModel;
+using client::GraphModel;
+using client::PluginModel;
+using client::PortModel;
 
 namespace gui {
 
@@ -678,7 +682,7 @@ GraphCanvas::paste()
 	++_paste_count;
 
 	// Make a client store to serve as clipboard
-	ClientStore clipboard(_app.world().uris(), _app.log());
+	client::ClientStore clipboard(_app.world().uris(), _app.log());
 	clipboard.set_plugins(_app.store()->plugins());
 	clipboard.put(main_uri(),
 	              {{uris.rdf_type, Property(uris.ingen_Graph)}});
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index 750a9e5a..3c8c17f1 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -36,9 +36,6 @@
 #include <utility>
 
 namespace ingen {
-
-using namespace client;
-
 namespace gui {
 
 GraphPortModule::GraphPortModule(
@@ -50,7 +47,8 @@ GraphPortModule::GraphPortModule(
 {
 	assert(model);
 
-	assert(std::dynamic_pointer_cast<const GraphModel>(model->parent()));
+	assert(
+	    std::dynamic_pointer_cast<const client::GraphModel>(model->parent()));
 
 	set_stacked(model->polyphonic());
 	if (model->is_input() && !model->is_numeric()) {
@@ -65,8 +63,8 @@ GraphPortModule::GraphPortModule(
 }
 
 GraphPortModule*
-GraphPortModule::create(GraphCanvas&                            canvas,
-                        const std::shared_ptr<const PortModel>& model)
+GraphPortModule::create(GraphCanvas&                                    canvas,
+                        const std::shared_ptr<const client::PortModel>& model)
 {
 	auto* ret  = new GraphPortModule(canvas, model);
 	Port* port = Port::create(canvas.app(), *ret, model, true);
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index 0406184a..0c805b5f 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -28,7 +28,8 @@
 
 namespace ingen {
 
-using namespace client;
+using client::GraphModel;
+using client::ObjectModel;
 
 namespace gui {
 
@@ -67,7 +68,7 @@ GraphTreeWindow::GraphTreeWindow(BaseObjectType*                   cobject,
 }
 
 void
-GraphTreeWindow::init(App& app, ClientStore& store)
+GraphTreeWindow::init(App& app, client::ClientStore& store)
 {
 	init_window(app);
 	store.signal_new_object().connect(
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index 88b3d6fe..5f81a309 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -31,7 +31,7 @@
 
 namespace ingen {
 
-using namespace client;
+using client::GraphModel;
 
 namespace gui {
 
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index 5b8bf84f..0a238c98 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -39,7 +39,7 @@
 
 namespace ingen {
 
-using namespace client;
+using client::GraphModel;
 
 namespace gui {
 
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 134cde1b..04f0bd38 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -35,7 +35,9 @@ using std::string;
 
 namespace ingen {
 
-using namespace client;
+using client::ClientStore;
+using client::GraphModel;
+using client::PluginModel;
 
 namespace gui {
 
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 6c9cf5ce..06a65834 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -40,9 +40,6 @@
 #include <utility>
 
 namespace ingen {
-
-using namespace client;
-
 namespace gui {
 
 NodeMenu::NodeMenu(BaseObjectType*                   cobject,
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index ab197525..4eff5210 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -46,7 +46,10 @@
 
 namespace ingen {
 
-using namespace client;
+using client::BlockModel;
+using client::GraphModel;
+using client::PluginModel;
+using client::PortModel;
 
 namespace gui {
 
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 52fec864..91185cee 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -28,9 +28,6 @@
 #include <memory>
 
 namespace ingen {
-
-using namespace client;
-
 namespace gui {
 
 ObjectMenu::ObjectMenu(BaseObjectType*                   cobject,
@@ -55,7 +52,7 @@ ObjectMenu::ObjectMenu(BaseObjectType*                   cobject,
 }
 
 void
-ObjectMenu::init(App& app, std::shared_ptr<const ObjectModel> object)
+ObjectMenu::init(App& app, std::shared_ptr<const client::ObjectModel> object)
 {
 	_app = &app;
 	_object = object;
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index a1c43aa5..b82fa8d1 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -38,9 +38,13 @@
 #include <memory>
 #include <string>
 
-using namespace ingen::client;
-
 namespace ingen {
+
+using client::BlockModel;
+using client::GraphModel;
+using client::PluginModel;
+using client::PortModel;
+
 namespace gui {
 
 Port*
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index c8b9807e..33e106af 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -28,7 +28,9 @@
 
 namespace ingen {
 
-using namespace client;
+using client::BlockModel;
+using client::GraphModel;
+using client::PortModel;
 
 namespace gui {
 
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index ef832c5b..36d0cefa 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -39,7 +39,7 @@
 
 namespace ingen {
 
-using namespace client;
+using client::ObjectModel;
 
 namespace gui {
 
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index b8bd89b8..dbda594c 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -29,7 +29,7 @@
 
 namespace ingen {
 
-using namespace client;
+using client::ObjectModel;
 
 namespace gui {
 
diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp
index 81c9da2f..e91f6c4b 100644
--- a/src/gui/Style.cpp
+++ b/src/gui/Style.cpp
@@ -34,8 +34,6 @@
 namespace ingen {
 namespace gui {
 
-using namespace ingen::client;
-
 Style::Style(App& app)
 	// Colours from the Tango palette with modified V
 	: _app(app)
diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp
index 828dbb20..e4f3d2df 100644
--- a/src/gui/SubgraphModule.cpp
+++ b/src/gui/SubgraphModule.cpp
@@ -32,7 +32,7 @@
 
 namespace ingen {
 
-using namespace client;
+using client::GraphModel;
 
 namespace gui {
 
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 0f2cb16f..9a21cce3 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -36,7 +36,9 @@
 
 namespace ingen {
 
-using namespace client;
+using client::BlockModel;
+using client::GraphModel;
+using client::ObjectModel;
 
 namespace gui {
 
-- 
cgit v1.2.1