summaryrefslogtreecommitdiff
path: root/src/CGALEvaluator.h
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-09-30 23:36:30 (GMT)
committerMarius Kintel <marius@kintel.net>2011-09-30 23:36:30 (GMT)
commit84e98b178ad60b22ae6a3b60ea3f6296b1f71989 (patch)
tree6fba1e961976c3e8fc16e5b6c44afd64d4b2ae14 /src/CGALEvaluator.h
parent0c2053caf9c7e521c31bbf603e8a1980d2eee3b2 (diff)
Cleaned up some unnecessary includes
Diffstat (limited to 'src/CGALEvaluator.h')
-rw-r--r--src/CGALEvaluator.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/CGALEvaluator.h b/src/CGALEvaluator.h
index c1b5ae8..0ac716c 100644
--- a/src/CGALEvaluator.h
+++ b/src/CGALEvaluator.h
@@ -3,7 +3,6 @@
#include "myqhash.h"
#include "visitor.h"
-#include "Tree.h"
#include "CGAL_Nef_polyhedron.h"
#include "PolySetCGALEvaluator.h"
@@ -11,16 +10,11 @@
#include <map>
#include <list>
-using std::string;
-using std::map;
-using std::list;
-using std::pair;
-
class CGALEvaluator : public Visitor
{
public:
enum CsgOp {CGE_UNION, CGE_INTERSECTION, CGE_DIFFERENCE, CGE_MINKOWSKI};
- CGALEvaluator(const Tree &tree) : tree(tree), psevaluator(*this) {}
+ CGALEvaluator(const class Tree &tree) : tree(tree), psevaluator(*this) {}
virtual ~CGALEvaluator() {}
virtual Response visit(State &state, const AbstractNode &node);
@@ -42,9 +36,9 @@ private:
CGAL_Nef_polyhedron applyToChildren(const AbstractNode &node, CGALEvaluator::CsgOp op);
CGAL_Nef_polyhedron applyHull(const CgaladvNode &node);
- string currindent;
- typedef list<pair<const AbstractNode *, string> > ChildList;
- map<int, ChildList> visitedchildren;
+ std::string currindent;
+ typedef std::list<std::pair<const AbstractNode *, std::string> > ChildList;
+ std::map<int, ChildList> visitedchildren;
const Tree &tree;
public:
contact: Jan Huwald // Impressum