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/value.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/value.h')
| -rw-r--r-- | src/value.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/value.h b/src/value.h index 9140912..fb6500c 100644 --- a/src/value.h +++ b/src/value.h @@ -61,6 +61,8 @@ public: std::string toString() const; + bool toBool() const; + void append(Value *val); private: @@ -69,8 +71,4 @@ private: std::ostream &operator<<(std::ostream &stream, const Value &value); -// FIXME: Doesn't belong here.. -#include <QString> -std::ostream &operator<<(std::ostream &stream, const QString &str); - #endif |