diff --git a/platform/frt/frt.h b/platform/frt/frt.h index a3627c15be..931f9b9480 100644 --- a/platform/frt/frt.h +++ b/platform/frt/frt.h @@ -89,10 +89,10 @@ struct EventHandler { struct Value { enum Type { - Bool, - Int, - Float, - String, + BOOL, + INT, + FLOAT, + STRING, } t; union { bool b; @@ -101,13 +101,13 @@ struct Value { const char *s; } u; Value(bool v) - : t(Bool) { u.b = v; } + : t(BOOL) { u.b = v; } Value(int v) - : t(Int) { u.i = v; } + : t(INT) { u.i = v; } Value(float v) - : t(Float) { u.f = v; } + : t(FLOAT) { u.f = v; } Value(const char *v) - : t(String) { u.s = v; } + : t(STRING) { u.s = v; } }; struct Param { diff --git a/platform/frt/frt_options.cpp b/platform/frt/frt_options.cpp index 6c7af9a74d..f4dfea9f6b 100644 --- a/platform/frt/frt_options.cpp +++ b/platform/frt/frt_options.cpp @@ -107,7 +107,7 @@ void parse_frt_param(const char *name, const char *value) { } Value &v = p->value; switch (v.t) { - case Value::Bool: + case Value::BOOL: if (!strcmp(value, "true")) { v.u.b = true; } else if (!strcmp(value, "false")) { @@ -117,13 +117,13 @@ void parse_frt_param(const char *name, const char *value) { exit(1); } break; - case Value::Int: + case Value::INT: v.u.i = atoi(value); break; - case Value::Float: + case Value::FLOAT: v.u.f = (float)atof(value); break; - case Value::String: + case Value::STRING: v.u.s = value; break; } diff --git a/platform/frt/os_frt.cpp b/platform/frt/os_frt.cpp index 66340b9e22..3c2ffc10be 100644 --- a/platform/frt/os_frt.cpp +++ b/platform/frt/os_frt.cpp @@ -283,16 +283,16 @@ class OS_FRT : public OS_Unix, public Runnable { p->source = Param::ProjectSettings; Value &v = p->value; switch (v.t) { - case Value::Bool: + case Value::BOOL: v.u.b = bool(project_settings->get(name)); break; - case Value::Int: + case Value::INT: v.u.i = int(project_settings->get(name)); break; - case Value::Float: + case Value::FLOAT: v.u.f = float(project_settings->get(name)); break; - case Value::String: { + case Value::STRING: { String s = String(project_settings->get(name)); v.u.s = strdup(s.ascii()); // TODO: keep track and dealloc string copy