diff options
| -rw-r--r-- | src/importnode.h | 3 | ||||
| -rw-r--r-- | src/linearextrudenode.h | 4 | ||||
| -rw-r--r-- | src/rotateextrudenode.h | 4 | ||||
| -rw-r--r-- | src/surface.cc | 2 | ||||
| -rw-r--r-- | src/value.h | 7 |
5 files changed, 16 insertions, 4 deletions
diff --git a/src/importnode.h b/src/importnode.h index c08ecc9..bcb229f 100644 --- a/src/importnode.h +++ b/src/importnode.h @@ -3,6 +3,7 @@ #include "node.h" #include "visitor.h" +#include "value.h" enum import_type_e { TYPE_UNKNOWN, @@ -22,7 +23,7 @@ public: virtual std::string name() const; import_type_e type; - std::string filename; + Filename filename; std::string layername; int convexity; double fn, fs, fa; diff --git a/src/linearextrudenode.h b/src/linearextrudenode.h index 503f1bd..112eccc 100644 --- a/src/linearextrudenode.h +++ b/src/linearextrudenode.h @@ -3,6 +3,7 @@ #include "node.h" #include "visitor.h" +#include "value.h" class LinearExtrudeNode : public AbstractPolyNode { @@ -23,7 +24,8 @@ public: double fn, fs, fa, height, twist; double origin_x, origin_y, scale; bool center, has_twist; - std::string filename, layername; + Filename filename; + std::string layername; virtual PolySet *evaluate_polyset(class PolySetEvaluator *) const; }; diff --git a/src/rotateextrudenode.h b/src/rotateextrudenode.h index 613d44b..86da356 100644 --- a/src/rotateextrudenode.h +++ b/src/rotateextrudenode.h @@ -3,6 +3,7 @@ #include "node.h" #include "visitor.h" +#include "value.h" class RotateExtrudeNode : public AbstractPolyNode { @@ -21,7 +22,8 @@ public: int convexity; double fn, fs, fa; double origin_x, origin_y, scale; - std::string filename, layername; + Filename filename; + std::string layername; virtual PolySet *evaluate_polyset(class PolySetEvaluator *) const; }; diff --git a/src/surface.cc b/src/surface.cc index cdac4ec..ec5d790 100644 --- a/src/surface.cc +++ b/src/surface.cc @@ -58,7 +58,7 @@ public: virtual std::string toString() const; virtual std::string name() const { return "surface"; } - std::string filename; + Filename filename; bool center; int convexity; virtual PolySet *evaluate_polyset(class PolySetEvaluator *) const; diff --git a/src/value.h b/src/value.h index fb6500c..f3a4fdf 100644 --- a/src/value.h +++ b/src/value.h @@ -4,6 +4,13 @@ #include <vector> #include <string> +class Filename : public std::string +{ +public: + Filename() : std::string() {} + Filename(const std::string &f) : std::string(f) {} +}; + class Value { public: |