Remove superfluous using namespace declarations

5 files changed, 9 insertions, 17 deletions

diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index e91277d9..123b9050 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -26,8 +26,6 @@
 #include "ingen/client/PortModel.hpp"
 #include "ingen/client/SigClientInterface.hpp"
 
-using namespace std;
-
 namespace Ingen {
 namespace Client {
 
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index e9fce5c4..762ed8ed 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -22,8 +22,6 @@
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/client/GraphModel.hpp"
 
-using namespace std;
-
 namespace Ingen {
 namespace Client {
 
@@ -99,7 +97,7 @@ GraphModel::clear()
 SPtr<ArcModel>
 GraphModel::get_arc(const Node* tail, const Node* head)
 {
-	Arcs::iterator i = _arcs.find(make_pair(tail, head));
+	Arcs::iterator i = _arcs.find(std::make_pair(tail, head));
 	if (i != _arcs.end()) {
 		return dynamic_ptr_cast<ArcModel>(i->second);
 	} else {
@@ -136,9 +134,9 @@ GraphModel::add_arc(SPtr<ArcModel> arc)
 		assert(arc->tail() == existing->tail());
 		assert(arc->head() == existing->head());
 	} else {
-		_arcs.insert(make_pair(make_pair(arc->tail().get(),
-		                                 arc->head().get()),
-		                       arc));
+		_arcs.emplace(std::make_pair(arc->tail().get(),
+		                             arc->head().get()),
+		              arc);
 		_signal_new_arc.emit(arc);
 	}
 }
@@ -146,7 +144,7 @@ GraphModel::add_arc(SPtr<ArcModel> arc)
 void
 GraphModel::remove_arc(const Node* tail, const Node* head)
 {
-	Arcs::iterator i = _arcs.find(make_pair(tail, head));
+	Arcs::iterator i = _arcs.find(std::make_pair(tail, head));
 	if (i != _arcs.end()) {
 		SPtr<ArcModel> arc = dynamic_ptr_cast<ArcModel>(i->second);
 		_signal_removed_arc.emit(arc);
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 42422b12..e8bdf12a 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -30,7 +30,7 @@
 
 #include "ingen_config.h"
 
-using namespace std;
+using std::string;
 
 namespace Ingen {
 namespace Client {
@@ -221,9 +221,9 @@ PluginModel::port_scale_points(uint32_t i) const
 		LilvScalePoints* sp   = lilv_port_get_scale_points(_lilv_plugin, port);
 		LILV_FOREACH(scale_points, i, sp) {
 			const LilvScalePoint* p = lilv_scale_points_get(sp, i);
-			points.insert(
-				make_pair(lilv_node_as_float(lilv_scale_point_get_value(p)),
-				          lilv_node_as_string(lilv_scale_point_get_label(p))));
+			points.emplace(
+				lilv_node_as_float(lilv_scale_point_get_value(p)),
+				lilv_node_as_string(lilv_scale_point_get_label(p)));
 		}
 	}
 	return points;
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index e74b316e..e523c25a 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -23,8 +23,6 @@
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
 
-using namespace std;
-
 namespace Ingen {
 namespace Client {
 
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index f99242b8..fe9d6605 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -19,8 +19,6 @@
 
 #include "ingen_config.h"
 
-using namespace Ingen;
-
 struct IngenClientModule : public Ingen::Module {
 	void load(Ingen::World* world) {}
 };