summaryrefslogtreecommitdiff
path: root/src/function.h
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-09-03 04:10:36 (GMT)
committerMarius Kintel <marius@kintel.net>2011-09-03 04:10:36 (GMT)
commit6f632190a05417d44193e3b16a7b3000b2cc1145 (patch)
tree9ddccef57c10361a7019274f79f1d86edb7630d3 /src/function.h
parent3129189342f3da7322efa0b860ff3ff676ba7b77 (diff)
Ported a bunch of stuff from Qt to STL
Diffstat (limited to 'src/function.h')
-rw-r--r--src/function.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/function.h b/src/function.h
index 7b58e38..623ef7e 100644
--- a/src/function.h
+++ b/src/function.h
@@ -2,43 +2,43 @@
#define FUNCTION_H_
#include "value.h"
-#include <QString>
-#include <QVector>
+#include <string>
+#include <vector>
class AbstractFunction
{
public:
virtual ~AbstractFunction();
- virtual Value evaluate(const class Context *ctx, const QVector<QString> &call_argnames, const QVector<Value> &call_argvalues) const;
- virtual QString dump(QString indent, QString name) const;
+ virtual Value evaluate(const class Context *ctx, const std::vector<std::string> &call_argnames, const std::vector<Value> &call_argvalues) const;
+ virtual std::string dump(const std::string &indent, const std::string &name) const;
};
class BuiltinFunction : public AbstractFunction
{
public:
- typedef Value (*eval_func_t)(const Context *ctx, const QVector<QString> &argnames, const QVector<Value> &args);
+ typedef Value (*eval_func_t)(const Context *ctx, const std::vector<std::string> &argnames, const std::vector<Value> &args);
eval_func_t eval_func;
BuiltinFunction(eval_func_t f) : eval_func(f) { }
virtual ~BuiltinFunction();
- virtual Value evaluate(const Context *ctx, const QVector<QString> &call_argnames, const QVector<Value> &call_argvalues) const;
- virtual QString dump(QString indent, QString name) const;
+ virtual Value evaluate(const Context *ctx, const std::vector<std::string> &call_argnames, const std::vector<Value> &call_argvalues) const;
+ virtual std::string dump(const std::string &indent, const std::string &name) const;
};
class Function : public AbstractFunction
{
public:
- QVector<QString> argnames;
- QVector<class Expression*> argexpr;
+ std::vector<std::string> argnames;
+ std::vector<class Expression*> argexpr;
Expression *expr;
Function() { }
virtual ~Function();
- virtual Value evaluate(const Context *ctx, const QVector<QString> &call_argnames, const QVector<Value> &call_argvalues) const;
- virtual QString dump(QString indent, QString name) const;
+ virtual Value evaluate(const Context *ctx, const std::vector<std::string> &call_argnames, const std::vector<Value> &call_argvalues) const;
+ virtual std::string dump(const std::string &indent, const std::string &name) const;
};
#endif
contact: Jan Huwald // Impressum