summaryrefslogtreecommitdiffstats
path: root/src/util/expression-evaluator.h
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2013-10-12 22:24:05 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2013-10-12 22:24:05 +0000
commita970dc423d59ea844bdb1af48d5d9419a5e2a287 (patch)
tree8f6a51df0574fe048ae7e791f276e72716aa090c /src/util/expression-evaluator.h
parentFix crash with experimental lpe tool. (diff)
downloadinkscape-a970dc423d59ea844bdb1af48d5d9419a5e2a287.tar.gz
inkscape-a970dc423d59ea844bdb1af48d5d9419a5e2a287.zip
Units: stop newing Unit objects. pass around pointers to "undeletable" Unit objects in the UnitTable. I think we should move to using indexed units, and pass around the index of the unit in the unittable, or smth like that... ?
(bzr r12679)
Diffstat (limited to 'src/util/expression-evaluator.h')
-rw-r--r--src/util/expression-evaluator.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util/expression-evaluator.h b/src/util/expression-evaluator.h
index 6412dfea7..50ff3fb70 100644
--- a/src/util/expression-evaluator.h
+++ b/src/util/expression-evaluator.h
@@ -133,13 +133,13 @@ public:
class ExpressionEvaluator
{
public:
- ExpressionEvaluator(const char *string, Unit *unit = NULL);
+ ExpressionEvaluator(const char *string, Unit const *unit = NULL);
EvaluatorQuantity evaluate();
private:
const char *string;
- Unit *unit;
+ Unit const *unit;
EvaluatorToken current_token;
const char *start_of_current_token;
@@ -160,7 +160,7 @@ private:
static bool isUnitIdentifierStart(gunichar c);
static int getIdentifierSize(const char *s, int start);
- static bool resolveUnit(const char *identifier, EvaluatorQuantity *result, Unit *unit);
+ static bool resolveUnit(const char *identifier, EvaluatorQuantity *result, Unit const *unit);
void throwError(const char *msg);
};