From 0f7ea1ddc0d695726c9f66591cfedf50c5310561 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Wed, 26 Oct 2011 16:59:26 +0200
Subject: Minor namespace fixes


diff --git a/src/Tree.h b/src/Tree.h
index aaa61d7..41ae613 100644
--- a/src/Tree.h
+++ b/src/Tree.h
@@ -3,8 +3,6 @@
 
 #include "nodecache.h"
 
-using std::string;
-
 /*!  
 	For now, just an abstraction of the node tree which keeps a dump
 	cache based on node indices around.
@@ -20,8 +18,8 @@ public:
 	void setRoot(const AbstractNode *root);
 	const AbstractNode *root() const { return this->root_node; }
 
-	const string &getString(const AbstractNode &node) const;
-	const string &getIdString(const AbstractNode &node) const;
+	const std::string &getString(const AbstractNode &node) const;
+	const std::string &getIdString(const AbstractNode &node) const;
 
 private:
 	const AbstractNode *root_node;
diff --git a/src/color.cc b/src/color.cc
index ee8f872..3c6942c 100644
--- a/src/color.cc
+++ b/src/color.cc
@@ -42,8 +42,6 @@ public:
 	virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const;
 };
 
-using std::string;
-
 AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const
 {
 	ColorNode *node = new ColorNode(inst);
@@ -87,7 +85,7 @@ AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiatio
 	return node;
 }
 
-string ColorNode::toString() const
+std::string ColorNode::toString() const
 {
 	std::stringstream stream;
 
@@ -96,7 +94,7 @@ string ColorNode::toString() const
 	return stream.str();
 }
 
-string ColorNode::name() const
+std::string ColorNode::name() const
 {
 	return "color";
 }
diff --git a/src/nodedumper.h b/src/nodedumper.h
index efaf4fa..aca17ed 100644
--- a/src/nodedumper.h
+++ b/src/nodedumper.h
@@ -7,10 +7,6 @@
 #include "visitor.h"
 #include "nodecache.h"
 
-using std::string;
-using std::map;
-using std::list;
-
 class NodeDumper : public Visitor
 {
 public:
@@ -26,15 +22,15 @@ private:
   void handleVisitedChildren(const State &state, const AbstractNode &node);
   bool isCached(const AbstractNode &node) const;
   void handleIndent(const State &state);
-	string dumpChildren(const AbstractNode &node);
+	std::string dumpChildren(const AbstractNode &node);
 
   NodeCache &cache;
 	bool idprefix;
 
-  string currindent;
+  std::string currindent;
   const AbstractNode *root;
-  typedef list<const AbstractNode *> ChildList;
-  map<int, ChildList> visitedchildren;
+  typedef std::list<const AbstractNode *> ChildList;
+	std::map<int, ChildList> visitedchildren;
 };
 
 #endif
-- 
cgit v0.10.1