Merge branch 'master' into visitortests

Conflicts:
	src/polyset.h

1 files changed, 16 insertions, 24 deletions

diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h
index ac22906..cca6c91 100644
--- a/src/CSGTermEvaluator.h
+++ b/src/CSGTermEvaluator.h
@@ -1,39 +1,31 @@
 #ifndef CSGTERMEVALUATOR_H_
 #define CSGTERMEVALUATOR_H_
 
-#include <string>
 #include <map>
 #include <list>
 #include <vector>
-#include "Tree.h"
 #include "visitor.h"
-#include "node.h"
-
-using std::string;
-using std::map;
-using std::list;
-using std::vector;
 
 class CSGTermEvaluator : public Visitor
 {
 public:
-	CSGTermEvaluator(const Tree &tree, class PolySetEvaluator *psevaluator = NULL)
+	CSGTermEvaluator(const class Tree &tree, class PolySetEvaluator *psevaluator = NULL)
 		: tree(tree), psevaluator(psevaluator) {
 	}
   virtual ~CSGTermEvaluator() {}
 
-  virtual Response visit(State &state, const AbstractNode &node);
- 	virtual Response visit(State &state, const AbstractIntersectionNode &node);
- 	virtual Response visit(State &state, const AbstractPolyNode &node);
- 	virtual Response visit(State &state, const CsgNode &node);
- 	virtual Response visit(State &state, const TransformNode &node);
-	virtual Response visit(State &state, const ColorNode &node);
- 	virtual Response visit(State &state, const RenderNode &node);
- 	virtual Response visit(State &state, const CgaladvNode &node);
+  virtual Response visit(State &state, const class AbstractNode &node);
+ 	virtual Response visit(State &state, const class AbstractIntersectionNode &node);
+ 	virtual Response visit(State &state, const class AbstractPolyNode &node);
+ 	virtual Response visit(State &state, const class CsgNode &node);
+ 	virtual Response visit(State &state, const class TransformNode &node);
+	virtual Response visit(State &state, const class ColorNode &node);
+ 	virtual Response visit(State &state, const class RenderNode &node);
+ 	virtual Response visit(State &state, const class CgaladvNode &node);
 
 	class CSGTerm *evaluateCSGTerm(const AbstractNode &node,
-																 vector<CSGTerm*> &highlights, 
-																 vector<CSGTerm*> &background);
+																 std::vector<CSGTerm*> &highlights, 
+																 std::vector<CSGTerm*> &background);
 
 private:
 	enum CsgOp {CSGT_UNION, CSGT_INTERSECTION, CSGT_DIFFERENCE, CSGT_MINKOWSKI};
@@ -41,14 +33,14 @@ private:
 	void applyToChildren(const AbstractNode &node, CSGTermEvaluator::CsgOp op);
 
   const AbstractNode *root;
-  typedef list<const AbstractNode *> ChildList;
-  map<int, ChildList> visitedchildren;
+  typedef std::list<const AbstractNode *> ChildList;
+	std::map<int, ChildList> visitedchildren;
 
 public:
-  map<int, class CSGTerm*> stored_term; // The term evaluated from each node index
+	std::map<int, class CSGTerm*> stored_term; // The term evaluated from each node index
 
-	vector<CSGTerm*> highlights;
-	vector<CSGTerm*> background;
+	std::vector<CSGTerm*> highlights;
+	std::vector<CSGTerm*> background;
 	const Tree &tree;
 	class PolySetEvaluator *psevaluator;
 };