diff options
author | Max Horn | 2006-06-05 12:35:33 +0000 |
---|---|---|
committer | Max Horn | 2006-06-05 12:35:33 +0000 |
commit | 5f76cd0d9eba28b8bba0be970725fbdd2ad7358f (patch) | |
tree | 5b430122ae26984165506630bdb7fcce6fc49825 | |
parent | 110718603ce0d84e53337384b56e884020655d24 (diff) | |
download | scummvm-rg350-5f76cd0d9eba28b8bba0be970725fbdd2ad7358f.tar.gz scummvm-rg350-5f76cd0d9eba28b8bba0be970725fbdd2ad7358f.tar.bz2 scummvm-rg350-5f76cd0d9eba28b8bba0be970725fbdd2ad7358f.zip |
cleanup
svn-id: r22930
-rw-r--r-- | gui/ThemeNew.cpp | 1 | ||||
-rw-r--r-- | gui/eval.cpp | 19 | ||||
-rw-r--r-- | gui/eval.h | 18 | ||||
-rw-r--r-- | gui/theme-config.cpp | 2 | ||||
-rw-r--r-- | gui/widget.cpp | 2 |
5 files changed, 19 insertions, 23 deletions
diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index 1ad9f7daa5..1a33eaec5c 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -22,7 +22,6 @@ #ifndef DISABLE_FANCY_THEMES #include "gui/theme.h" -#include "gui/eval.h" #include "graphics/imageman.h" #include "graphics/imagedec.h" diff --git a/gui/eval.cpp b/gui/eval.cpp index 5b1428ffc1..70d057aa52 100644 --- a/gui/eval.cpp +++ b/gui/eval.cpp @@ -30,6 +30,21 @@ namespace GUI { +enum TokenTypes { + tDelimiter, + tVariable, + tNumber, + tString +}; + +enum EvalErrors { + eSyntaxError, + eExtraBracket, + eUnclosedBracket, + eBadExpr, + eUndefVar +}; + static bool isdelim(char c) { if (strchr(" ;,+-<>/*%^=()", c) || c == 9 || c == '\n' || !c) return true; @@ -302,10 +317,6 @@ int Eval::getVar_(const char *s, bool includeAliases) { return EVAL_UNDEF_VAR; } -void Eval::setAlias(const String §ion, const char *name, const String &value) { - _aliases[name + 4] = value; -} - void Eval::setVar(const String §ion, const char *name, const String &value) { _vars[name + 4] = eval(value, section, name, 0); } diff --git a/gui/eval.h b/gui/eval.h index 89853adbe7..59511b76bb 100644 --- a/gui/eval.h +++ b/gui/eval.h @@ -32,21 +32,8 @@ namespace GUI { using Common::String; using Common::HashMap; -#define EVAL_UNDEF_VAR -13375 - -enum tokenTypes { - tDelimiter, - tVariable, - tNumber, - tString -}; - -enum evalErrors { - eSyntaxError, - eExtraBracket, - eUnclosedBracket, - eBadExpr, - eUndefVar +enum { + EVAL_UNDEF_VAR = -13375 }; class Eval { @@ -55,7 +42,6 @@ public: ~Eval(); int eval(const String &input, const String §ion, const String &name, int startpos); - void setAlias(const String §ion, const char *name, const String &value); void setVar(const String §ion, const char *name, const String &value); void setParent(const String &name); diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index e9c23bf628..dd4f54036e 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -482,7 +482,7 @@ void Theme::processResSection(Common::ConfigFile &config, const String &name, bo continue; } if (iterk->key.hasPrefix("set_")) { - _evaluator->setAlias(name, iterk->key.c_str(), prefix + iterk->value); + _evaluator->setAlias(iterk->key.c_str() + 4, prefix + iterk->value); continue; } if (iterk->key.hasPrefix("def_")) { diff --git a/gui/widget.cpp b/gui/widget.cpp index 4af135a7ee..5053b0317e 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -156,7 +156,7 @@ StaticTextWidget::StaticTextWidget(GuiObject *boss, const String &name, const St _align = (Graphics::TextAlignment)g_gui.evaluator()->getVar(name + ".align"); - if (_align == EVAL_UNDEF_VAR) + if (_align == (int)EVAL_UNDEF_VAR) _align = kTextAlignLeft; } |