Renamed some files and classnames for clarification

10 files changed, 46 insertions, 46 deletions

diff --git a/openscad.pro b/openscad.pro
index 6e79b29..765ff6b 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -139,8 +139,8 @@ HEADERS += src/renderer.h \
            src/module.h \
            src/node.h \
            src/csgnode.h \
-           src/dxflinextrudenode.h \
-           src/dxfrotextrudenode.h \
+           src/linearextrudenode.h \
+           src/rotateextrudenode.h \
            src/projectionnode.h \
            src/cgaladvnode.h \
            src/importnode.h \
@@ -197,8 +197,8 @@ SOURCES += src/openscad.cc \
            src/dxftess-glu.cc \
            src/dxftess-cgal.cc \
            src/dxfdim.cc \
-           src/dxflinextrude.cc \
-           src/dxfrotextrude.cc \
+           src/linearextrude.cc \
+           src/rotateextrude.cc \
            src/highlighter.cc \
            src/printutils.cc \
            src/Preferences.cc \
diff --git a/src/PolySetCGALEvaluator.cc b/src/PolySetCGALEvaluator.cc
index b019ad5..7f62d0a 100644
--- a/src/PolySetCGALEvaluator.cc
+++ b/src/PolySetCGALEvaluator.cc
@@ -4,8 +4,8 @@
 #include "polyset.h"
 #include "CGALEvaluator.h"
 #include "projectionnode.h"
-#include "dxflinextrudenode.h"
-#include "dxfrotextrudenode.h"
+#include "linearextrudenode.h"
+#include "rotateextrudenode.h"
 #include "cgaladvnode.h"
 #include "rendernode.h"
 #include "dxfdata.h"
@@ -251,7 +251,7 @@ static void add_slice(PolySet *ps, const DxfData &dxf, DxfData::Path &path, doub
 	}
 }
 
-PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfLinearExtrudeNode &node)
+PolySet *PolySetCGALEvaluator::evaluatePolySet(const LinearExtrudeNode &node)
 {
 	DxfData *dxf;
 
@@ -283,7 +283,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfLinearExtrudeNode &node)
 	return ps;
 }
 
-PolySet *PolySetCGALEvaluator::extrudeDxfData(const DxfLinearExtrudeNode &node, DxfData &dxf)
+PolySet *PolySetCGALEvaluator::extrudeDxfData(const LinearExtrudeNode &node, DxfData &dxf)
 {
 	PolySet *ps = new PolySet();
 	ps->convexity = node.convexity;
@@ -349,7 +349,7 @@ PolySet *PolySetCGALEvaluator::extrudeDxfData(const DxfLinearExtrudeNode &node,
 	return ps;
 }
 
-PolySet *PolySetCGALEvaluator::evaluatePolySet(const DxfRotateExtrudeNode &node)
+PolySet *PolySetCGALEvaluator::evaluatePolySet(const RotateExtrudeNode &node)
 {
 	DxfData *dxf;
 
@@ -398,7 +398,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const RenderNode &node)
 	return ps;
 }
 
-PolySet *PolySetCGALEvaluator::rotateDxfData(const DxfRotateExtrudeNode &node, DxfData &dxf)
+PolySet *PolySetCGALEvaluator::rotateDxfData(const RotateExtrudeNode &node, DxfData &dxf)
 {
 	PolySet *ps = new PolySet();
 	ps->convexity = node.convexity;
diff --git a/src/PolySetCGALEvaluator.h b/src/PolySetCGALEvaluator.h
index 2aa5b13..dddcfc5 100644
--- a/src/PolySetCGALEvaluator.h
+++ b/src/PolySetCGALEvaluator.h
@@ -13,14 +13,14 @@ public:
 	PolySetCGALEvaluator(class CGALEvaluator &cgalevaluator);
 	virtual ~PolySetCGALEvaluator() { }
 	virtual PolySet *evaluatePolySet(const ProjectionNode &node);
-	virtual PolySet *evaluatePolySet(const DxfLinearExtrudeNode &node);
-	virtual PolySet *evaluatePolySet(const DxfRotateExtrudeNode &node);
+	virtual PolySet *evaluatePolySet(const LinearExtrudeNode &node);
+	virtual PolySet *evaluatePolySet(const RotateExtrudeNode &node);
 	virtual PolySet *evaluatePolySet(const CgaladvNode &node);
 	virtual PolySet *evaluatePolySet(const RenderNode &node);
 
 protected:
-	PolySet *extrudeDxfData(const DxfLinearExtrudeNode &node, class DxfData &dxf);
-	PolySet *rotateDxfData(const DxfRotateExtrudeNode &node, class DxfData &dxf);
+	PolySet *extrudeDxfData(const LinearExtrudeNode &node, class DxfData &dxf);
+	PolySet *rotateDxfData(const RotateExtrudeNode &node, class DxfData &dxf);
 
 	CGALEvaluator &cgalevaluator;
 };
diff --git a/src/PolySetEvaluator.h b/src/PolySetEvaluator.h
index 833b079..8d7d1a8 100644
--- a/src/PolySetEvaluator.h
+++ b/src/PolySetEvaluator.h
@@ -16,8 +16,8 @@ public:
 	virtual shared_ptr<PolySet> getPolySet(const class AbstractNode &, bool cache);
 
 	virtual PolySet *evaluatePolySet(const class ProjectionNode &) { return NULL; }
-	virtual PolySet *evaluatePolySet(const class DxfLinearExtrudeNode &) { return NULL; }
-	virtual PolySet *evaluatePolySet(const class DxfRotateExtrudeNode &) { return NULL; }
+	virtual PolySet *evaluatePolySet(const class LinearExtrudeNode &) { return NULL; }
+	virtual PolySet *evaluatePolySet(const class RotateExtrudeNode &) { return NULL; }
 	virtual PolySet *evaluatePolySet(const class CgaladvNode &) { return NULL; }
 	virtual PolySet *evaluatePolySet(const class RenderNode &) { return NULL; }
 
diff --git a/src/dxflinextrude.cc b/src/linearextrude.cc
index 8bb246f..4ce87db 100644
--- a/src/dxflinextrude.cc
+++ b/src/linearextrude.cc
@@ -24,7 +24,7 @@
  *
  */
 
-#include "dxflinextrudenode.h"
+#include "linearextrudenode.h"
 
 #include "module.h"
 #include "context.h"
@@ -44,16 +44,16 @@ using namespace boost::assign; // bring 'operator+=()' into scope
 
 #include <QFileInfo>
 
-class DxfLinearExtrudeModule : public AbstractModule
+class LinearExtrudeModule : public AbstractModule
 {
 public:
-	DxfLinearExtrudeModule() { }
+	LinearExtrudeModule() { }
 	virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const;
 };
 
-AbstractNode *DxfLinearExtrudeModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const
+AbstractNode *LinearExtrudeModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const
 {
-	DxfLinearExtrudeNode *node = new DxfLinearExtrudeNode(inst);
+	LinearExtrudeNode *node = new LinearExtrudeNode(inst);
 
 	std::vector<std::string> argnames;
 	argnames += "file", "layer", "height", "origin", "scale", "center", "twist", "slices";
@@ -120,11 +120,11 @@ AbstractNode *DxfLinearExtrudeModule::evaluate(const Context *ctx, const ModuleI
 
 void register_builtin_dxf_linear_extrude()
 {
-	builtin_modules["dxf_linear_extrude"] = new DxfLinearExtrudeModule();
-	builtin_modules["linear_extrude"] = new DxfLinearExtrudeModule();
+	builtin_modules["dxf_linear_extrude"] = new LinearExtrudeModule();
+	builtin_modules["linear_extrude"] = new LinearExtrudeModule();
 }
 
-PolySet *DxfLinearExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) const
+PolySet *LinearExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) const
 {
 	if (!evaluator) {
 		PRINTF("WARNING: No suitable PolySetEvaluator found for %s module!", this->name().c_str());
@@ -140,7 +140,7 @@ PolySet *DxfLinearExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) con
 	return ps;
 }
 
-std::string DxfLinearExtrudeNode::toString() const
+std::string LinearExtrudeNode::toString() const
 {
 	std::stringstream stream;
 
diff --git a/src/dxflinextrudenode.h b/src/linearextrudenode.h
index 360fd28..503f1bd 100644
--- a/src/dxflinextrudenode.h
+++ b/src/linearextrudenode.h
@@ -1,13 +1,13 @@
-#ifndef DXFLINEXTRUDENODE_H_
-#define DXFLINEXTRUDENODE_H_
+#ifndef LINEAREXTRUDENODE_H_
+#define LINEAREXTRUDENODE_H_
 
 #include "node.h"
 #include "visitor.h"
 
-class DxfLinearExtrudeNode : public AbstractPolyNode
+class LinearExtrudeNode : public AbstractPolyNode
 {
 public:
-	DxfLinearExtrudeNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) {
+	LinearExtrudeNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) {
 		convexity = slices = 0;
 		fn = fs = fa = height = twist = 0;
 		origin_x = origin_y = scale = 0;
diff --git a/src/dxfrotextrude.cc b/src/rotateextrude.cc
index 646b643..3a6eb55 100644
--- a/src/dxfrotextrude.cc
+++ b/src/rotateextrude.cc
@@ -24,7 +24,7 @@
  *
  */
 
-#include "dxfrotextrudenode.h"
+#include "rotateextrudenode.h"
 #include "module.h"
 #include "context.h"
 #include "printutils.h"
@@ -42,16 +42,16 @@ using namespace boost::assign; // bring 'operator+=()' into scope
 
 #include <QFileInfo>
 
-class DxfRotateExtrudeModule : public AbstractModule
+class RotateExtrudeModule : public AbstractModule
 {
 public:
-	DxfRotateExtrudeModule() { }
+	RotateExtrudeModule() { }
 	virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const;
 };
 
-AbstractNode *DxfRotateExtrudeModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const
+AbstractNode *RotateExtrudeModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const
 {
-	DxfRotateExtrudeNode *node = new DxfRotateExtrudeNode(inst);
+	RotateExtrudeNode *node = new RotateExtrudeNode(inst);
 
 	std::vector<std::string> argnames;
 	argnames += "file", "layer", "origin", "scale";
@@ -96,11 +96,11 @@ AbstractNode *DxfRotateExtrudeModule::evaluate(const Context *ctx, const ModuleI
 
 void register_builtin_dxf_rotate_extrude()
 {
-	builtin_modules["dxf_rotate_extrude"] = new DxfRotateExtrudeModule();
-	builtin_modules["rotate_extrude"] = new DxfRotateExtrudeModule();
+	builtin_modules["dxf_rotate_extrude"] = new RotateExtrudeModule();
+	builtin_modules["rotate_extrude"] = new RotateExtrudeModule();
 }
 
-PolySet *DxfRotateExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) const
+PolySet *RotateExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) const
 {
 	if (!evaluator) {
 		PRINTF("WARNING: No suitable PolySetEvaluator found for %s module!", this->name().c_str());
@@ -116,7 +116,7 @@ PolySet *DxfRotateExtrudeNode::evaluate_polyset(PolySetEvaluator *evaluator) con
 	return ps;
 }
 
-std::string DxfRotateExtrudeNode::toString() const
+std::string RotateExtrudeNode::toString() const
 {
 	std::stringstream stream;
 
diff --git a/src/dxfrotextrudenode.h b/src/rotateextrudenode.h
index e0ade82..613d44b 100644
--- a/src/dxfrotextrudenode.h
+++ b/src/rotateextrudenode.h
@@ -1,13 +1,13 @@
-#ifndef DXFROTEXTRUDENODE_H_
-#define DXFROTEXTRUDENODE_H_
+#ifndef ROTATEEXTRUDENODE_H_
+#define ROTATEEXTRUDENODE_H_
 
 #include "node.h"
 #include "visitor.h"
 
-class DxfRotateExtrudeNode : public AbstractPolyNode
+class RotateExtrudeNode : public AbstractPolyNode
 {
 public:
-	DxfRotateExtrudeNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) {
+	RotateExtrudeNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) {
 		convexity = 0;
 		fn = fs = fa = 0;
 		origin_x = origin_y = scale = 0;
diff --git a/src/visitor.h b/src/visitor.h
index f4846b8..fe350f8 100644
--- a/src/visitor.h
+++ b/src/visitor.h
@@ -22,10 +22,10 @@ public:
   virtual Response visit(class State &state, const class CsgNode &node) {
 		return visit(state, (const class AbstractNode &)node);
 	}
-  virtual Response visit(class State &state, const class DxfLinearExtrudeNode &node) {
+  virtual Response visit(class State &state, const class LinearExtrudeNode &node) {
 		return visit(state, (const class AbstractPolyNode &)node);
 	}
-  virtual Response visit(class State &state, const class DxfRotateExtrudeNode &node) {
+  virtual Response visit(class State &state, const class RotateExtrudeNode &node) {
 		return visit(state, (const class AbstractPolyNode &)node);
 	}
   virtual Response visit(class State &state, const class ImportNode &node) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b92ee22..4b6a9dd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -103,8 +103,8 @@ set(COMMON_SOURCES
   ../src/dxfdata.cc 
   ../src/dxftess.cc 
   ../src/dxfdim.cc 
-  ../src/dxflinextrude.cc 
-  ../src/dxfrotextrude.cc 
+  ../src/linearextrude.cc 
+  ../src/rotateextrude.cc 
   ../src/printutils.cc 
   ../src/progress.cc 
   ../src/nodedumper.cc