diff options
Diffstat (limited to 'src/value.h')
| -rw-r--r-- | src/value.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/value.h b/src/value.h index 3491cbb..9140912 100644 --- a/src/value.h +++ b/src/value.h @@ -1,8 +1,8 @@ #ifndef VALUE_H_ #define VALUE_H_ -#include <QVector> -#include <QString> +#include <vector> +#include <string> class Value { @@ -20,18 +20,18 @@ public: bool b; double num; - QVector<Value*> vec; + std::vector<Value*> vec; double range_begin; double range_step; double range_end; - QString text; + std::string text; Value(); ~Value(); Value(bool v); Value(double v); - Value(const QString &t); + Value(const std::string &t); Value(const Value &v); Value& operator = (const Value &v); @@ -59,10 +59,18 @@ public: bool getv2(double &x, double &y) const; bool getv3(double &x, double &y, double &z) const; - QString dump() const; + std::string toString() const; + + void append(Value *val); private: void reset_undef(); }; +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 |