merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

1 files changed, 10 insertions, 13 deletions

diff --git a/src/dxfdata.h b/src/dxfdata.h
index e71a740..bada031 100644
--- a/src/dxfdata.h
+++ b/src/dxfdata.h
@@ -1,8 +1,7 @@
 #ifndef DXFDATA_H_
 #define DXFDATA_H_
 
-#include <QList>
-#include <QString>
+#include <vector>
 #include <Eigen/Dense>
 
 using Eigen::Vector2d;
@@ -11,7 +10,7 @@ class DxfData
 {
 public:
 	struct Path {
-		QList<Vector2d*> points;
+		std::vector<int> indices; // indices into DxfData::points
 		bool is_closed, is_inner;
 		Path() : is_closed(false), is_inner(false) { }
 	};
@@ -20,7 +19,7 @@ public:
 		double coords[7][2];
 		double angle;
 		double length;
-		QString name;
+		std::string name;
 		Dim() {
 			for (int i = 0; i < 7; i++)
 			for (int j = 0; j < 2; j++)
@@ -31,19 +30,17 @@ public:
 		}
 	};
 
-	QList<Vector2d> points;
-	QList<Path> paths;
-	QList<Dim> dims;
+	std::vector<Vector2d> points;
+	std::vector<Path> paths;
+	std::vector<Dim> dims;
 
 	DxfData();
-	DxfData(double fn, double fs, double fa, QString filename, QString layername = QString(), double xorigin = 0.0, double yorigin = 0.0, double scale = 1.0);
-#ifdef ENABLE_CGAL
-	DxfData(const struct CGAL_Nef_polyhedron &N);
-#endif
+	DxfData(double fn, double fs, double fa, 
+					const std::string &filename, const std::string &layername = "",
+					double xorigin = 0.0, double yorigin = 0.0, double scale = 1.0);
 
-	Vector2d *addPoint(double x, double y);
+	int addPoint(double x, double y);
 
-private:
 	void fixup_path_direction();
 };