Cleaned up some unnecessary includes

openscad · Sep 30, 2011 · 84e98b1 · 84e98b1
1 parent 0c2053c
commit 84e98b1
Show file tree

Hide file tree

Showing 39 changed files with 71 additions and 123 deletions.
diff --git a/openscad.pro b/openscad.pro
@@ -166,6 +166,8 @@ HEADERS += src/renderer.h \
            src/Tree.h \
            src/mathc99.h \
            src/memory.h \
+           src/linalg.h \
+           src/system-gl.h \
            src/stl-utils.h
 
 SOURCES += src/openscad.cc \

diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc
@@ -11,6 +11,7 @@
 #include "polyset.h"
 #include "dxfdata.h"
 #include "dxftess.h"
+#include "Tree.h"
 
 #include "CGALCache.h"
 #include "cgal.h"

diff --git a/src/CGALEvaluator.h b/src/CGALEvaluator.h
@@ -3,24 +3,18 @@
 
 #include "myqhash.h"
 #include "visitor.h"
-#include "Tree.h"
 #include "CGAL_Nef_polyhedron.h"
 #include "PolySetCGALEvaluator.h"
 
 #include <string>
 #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 @@ class CGALEvaluator : public Visitor
 	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:

diff --git a/src/CGALRenderer.h b/src/CGALRenderer.h
@@ -2,12 +2,11 @@
 #define CGALRENDERER_H_
 
 #include "renderer.h"
-#include "CGAL_Nef_polyhedron.h"
 
 class CGALRenderer : public Renderer
 {
 public:
-	CGALRenderer(const CGAL_Nef_polyhedron &root);
+	CGALRenderer(const class CGAL_Nef_polyhedron &root);
 	~CGALRenderer();
 	void draw(bool showfaces, bool showedges) const;
 

diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc
@@ -86,8 +86,8 @@ Response CSGTermEvaluator::visit(State &state, const AbstractIntersectionNode &n
 }
 
 static CSGTerm *evaluate_csg_term_from_ps(const State &state, 
-																					vector<CSGTerm*> &highlights, 
-																					vector<CSGTerm*> &background, 
+																					std::vector<CSGTerm*> &highlights, 
+																					std::vector<CSGTerm*> &background, 
 																					const shared_ptr<PolySet> &ps, 
 																					const ModuleInstantiation *modinst, 
 																					const AbstractNode &node)

diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h
@@ -1,54 +1,46 @@
 #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};
   void addToParent(const State &state, const AbstractNode &node);
 	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;
 };

diff --git a/src/GLView.h b/src/GLView.h
@@ -1,11 +1,7 @@
 #ifndef GLVIEW_H_
 #define GLVIEW_H_
 
-#ifdef ENABLE_OPENCSG
-// this must be included before the GL headers
-#  include <GL/glew.h>
-#endif
-
+#include "system-gl.h"
 #include <QGLWidget>
 #include <QLabel>
 

diff --git a/src/MainWindow.h b/src/MainWindow.h
@@ -6,9 +6,7 @@
 #include "openscad.h"
 #include "context.h"
 #include "module.h"
-#include "polyset.h"
 #include "Tree.h"
-#include <QPointer>
 #include <vector>
 
 class MainWindow : public QMainWindow, public Ui::MainWindow

diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc
@@ -24,7 +24,7 @@
  *
  */
 
-#include <GL/glew.h>
+#include "system-gl.h"
 #include "OpenCSGRenderer.h"
 #include "polyset.h"
 #include "csgterm.h"

diff --git a/src/OpenCSGRenderer.h b/src/OpenCSGRenderer.h
@@ -2,8 +2,7 @@
 #define OPENCSGRENDERER_H_
 
 #include "renderer.h"
-#include <GL/glew.h> // this must be included before the GL headers
-#include <qgl.h>
+#include "system-gl.h"
 
 class OpenCSGRenderer : public Renderer
 {

diff --git a/src/PolySetEvaluator.cc b/src/PolySetEvaluator.cc
@@ -2,6 +2,7 @@
 #include "PolySetEvaluator.h"
 #include "printutils.h"
 #include "polyset.h"
+#include "Tree.h"
 
 /*!
 	The task of PolySetEvaluator is to create, keep track of and cache PolySet instances.

diff --git a/src/PolySetEvaluator.h b/src/PolySetEvaluator.h
@@ -1,19 +1,17 @@
 #ifndef POLYSETEVALUATOR_H_
 #define POLYSETEVALUATOR_H_
 
-#include "node.h"
-#include "Tree.h"
 #include "memory.h"
 
 class PolySetEvaluator
 {
 public:
-	PolySetEvaluator(const Tree &tree) : tree(tree) {}
+	PolySetEvaluator(const class Tree &tree) : tree(tree) {}
 	virtual ~PolySetEvaluator() {}
 
 	const Tree &getTree() const { return this->tree; }
 
-	virtual shared_ptr<PolySet> getPolySet(const class AbstractNode &, bool cache);
+	virtual shared_ptr<class PolySet> getPolySet(const class AbstractNode &, bool cache);
 
 	virtual PolySet *evaluatePolySet(const class ProjectionNode &) { return NULL; }
 	virtual PolySet *evaluatePolySet(const class LinearExtrudeNode &) { return NULL; }

diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc
@@ -28,8 +28,7 @@
 #include "polyset.h"
 #include "csgterm.h"
 
-#include <GL/glew.h> // this must be included before the GL headers
-#include <qgl.h>
+#include "system-gl.h"
 
 ThrownTogetherRenderer::ThrownTogetherRenderer(CSGChain *root_chain, 
 																							 CSGChain *highlights_chain,

diff --git a/src/cgaladv.cc b/src/cgaladv.cc
@@ -28,7 +28,6 @@
 #include "module.h"
 #include "context.h"
 #include "builtin.h"
-#include "printutils.h"
 #include "PolySetEvaluator.h"
 #include <sstream>
 #include <assert.h>

diff --git a/src/cgaladv_minkowski2.cc b/src/cgaladv_minkowski2.cc
@@ -26,7 +26,6 @@
 
 #ifdef ENABLE_CGAL
 
-#include "node.h"
 #include "printutils.h"
 #include "grid.h"
 #include "cgal.h"

diff --git a/src/color.cc b/src/color.cc
@@ -29,7 +29,6 @@
 #include "context.h"
 #include "builtin.h"
 #include "printutils.h"
-#include "visitor.h"
 #include <sstream>
 #include <assert.h>
 #include <QColor>

diff --git a/src/csgops.cc b/src/csgops.cc
@@ -29,7 +29,6 @@
 #include "module.h"
 #include "csgterm.h"
 #include "builtin.h"
-#include "printutils.h"
 #include <sstream>
 #include <assert.h>
 

diff --git a/src/csgterm.h b/src/csgterm.h
@@ -3,8 +3,10 @@
 
 #include <string>
 #include <vector>
-#include "polyset.h"
 #include "memory.h"
+#include "linalg.h"
+
+class PolySet;
 
 class CSGTerm
 {

diff --git a/src/dxftess-glu.cc b/src/dxftess-glu.cc
@@ -4,13 +4,11 @@
 #include "grid.h"
 #include <stdio.h>
 
-#ifdef ENABLE_OPENCSG
-// this must be included before the GL headers
-#  include <GL/glew.h>
-#endif
-#include <qgl.h>
+#include "system-gl.h"
 #include "mathc99.h"
 
+#include <QVector>
+
 #ifdef WIN32
 #  define STDCALL __stdcall
 #else

diff --git a/src/export.h b/src/export.h
@@ -5,8 +5,7 @@
 
 #include <iostream>
 
-void cgal_nef3_to_polyset(class PolySet *ps, class CGAL_Nef_polyhedron *root_N);
-void export_stl(CGAL_Nef_polyhedron *root_N, std::ostream &output, class QProgressDialog *pd);
+void export_stl(class CGAL_Nef_polyhedron *root_N, std::ostream &output, class QProgressDialog *pd);
 void export_off(CGAL_Nef_polyhedron *root_N, std::ostream &output, QProgressDialog *pd);
 void export_dxf(CGAL_Nef_polyhedron *root_N, std::ostream &output, QProgressDialog *pd);
 #endif

diff --git a/src/func.cc b/src/func.cc
@@ -27,7 +27,6 @@
 #include "function.h"
 #include "expression.h"
 #include "context.h"
-#include "dxfdim.h"
 #include "builtin.h"
 #include <sstream>
 #include <ctime>

diff --git a/src/linalg.h b/src/linalg.h
@@ -0,0 +1,10 @@
+#ifndef LINALG_H_
+#define LINALG_H_
+
+#include <Eigen/Core>
+#include <Eigen/Geometry>
+
+using Eigen::Vector3d;
+typedef Eigen::AlignedBox<double, 3> BoundingBox;
+
+#endif
diff --git a/src/linearextrude.cc b/src/linearextrude.cc
@@ -30,11 +30,6 @@
 #include "context.h"
 #include "printutils.h"
 #include "builtin.h"
-#include "dxfdata.h"
-#include "dxftess.h"
-#include "polyset.h"
-#include "progress.h"
-#include "visitor.h"
 #include "PolySetEvaluator.h"
 #include "openscad.h" // get_fragments_from_r()
 
@@ -124,7 +119,7 @@ void register_builtin_dxf_linear_extrude()
 	builtin_modules["linear_extrude"] = new LinearExtrudeModule();
 }
 
-PolySet *LinearExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) const
+class PolySet *LinearExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) const
 {
 	if (!evaluator) {
 		PRINTF("WARNING: No suitable PolySetEvaluator found for %s module!", this->name().c_str());

diff --git a/src/mainwin.cc b/src/mainwin.cc
@@ -33,13 +33,10 @@
 #include "polyset.h"
 #include "csgterm.h"
 #include "highlighter.h"
-#include "grid.h"
-#include "dxfdata.h"
-#include "dxfdim.h"
 #include "export.h"
 #include "builtin.h"
-#include "dxftess.h"
 #include "progress.h"
+#include "dxfdim.h"
 #ifdef ENABLE_OPENCSG
 #include "CSGTermEvaluator.h"
 #include "OpenCSGRenderer.h"

diff --git a/src/node.cc b/src/node.cc
@@ -24,17 +24,13 @@
  *
  */
 
-#include "printutils.h"
 #include "node.h"
 #include "module.h"
-#include "csgterm.h"
 #include "progress.h"
-#include "polyset.h"
 #include "visitor.h"
-#include "nodedumper.h"
 #include "stl-utils.h"
 
-#include <sstream>
+#include <iostream>
 #include <algorithm>
 
 size_t AbstractNode::idx_counter;

diff --git a/src/node.h b/src/node.h
@@ -3,7 +3,6 @@
 
 #include <vector>
 #include <string>
-
 #include "traverser.h"
 
 extern int progress_report_count;