diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:40:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:40:51 (GMT) |
| commit | f5f06c8e976ca45aebea42fe8c04bf7404357ac8 (patch) | |
| tree | 8d0cdd2698e7806c1b12cc49e743b561e1082961 /src/importnode.h | |
| parent | 007c40848db9efd704694f2e7596cabed80da50f (diff) | |
| parent | 5ac9162f1c67fd21737ead11d7ebc638bf4eef5f (diff) | |
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
Diffstat (limited to 'src/importnode.h')
| -rw-r--r-- | src/importnode.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/importnode.h b/src/importnode.h index 94417b9..c08ecc9 100644 --- a/src/importnode.h +++ b/src/importnode.h @@ -3,9 +3,9 @@ #include "node.h" #include "visitor.h" -#include <QString> enum import_type_e { + TYPE_UNKNOWN, TYPE_STL, TYPE_OFF, TYPE_DXF @@ -22,12 +22,12 @@ public: virtual std::string name() const; import_type_e type; - QString filename; - QString layername; + std::string filename; + std::string layername; int convexity; double fn, fs, fa; double origin_x, origin_y, scale; - virtual PolySet *evaluate_polyset(render_mode_e mode, class PolySetEvaluator *) const; + virtual PolySet *evaluate_polyset(class PolySetEvaluator *) const; }; #endif |