diff options
| author | Max Horn | 2006-06-05 17:43:30 +0000 |
|---|---|---|
| committer | Max Horn | 2006-06-05 17:43:30 +0000 |
| commit | 0f18020010d36f4dce5e73edc3fd4f87c434e5e1 (patch) | |
| tree | 3dfcf6bb4fea8daa8478c826520797f42444aa55 /gui/theme-config.cpp | |
| parent | 6d0a06463a56df53571c8a41ff72512d91fb710a (diff) | |
| download | scummvm-rg350-0f18020010d36f4dce5e73edc3fd4f87c434e5e1.tar.gz scummvm-rg350-0f18020010d36f4dce5e73edc3fd4f87c434e5e1.tar.bz2 scummvm-rg350-0f18020010d36f4dce5e73edc3fd4f87c434e5e1.zip | |
Some more string usage tweaks
svn-id: r22936
Diffstat (limited to 'gui/theme-config.cpp')
| -rw-r--r-- | gui/theme-config.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index dd4f54036e..a4fc16d4f6 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -424,13 +424,13 @@ void Theme::processSingleLine(const String §ion, const String &prefix, const to += postfixes[i]; _evaluator->setAlias(selfpostfixes[i], to); - _evaluator->setVar(to.c_str(), EVAL_UNDEF_VAR); + _evaluator->setVar(to, EVAL_UNDEF_VAR); } for (i = 0; i < str.size(); i++) { if (isspace(str[i]) && level == 0) { value = _evaluator->eval(String(&(str.c_str()[start]), i - start), section, name + postfixes[npostfix], start); - _evaluator->setVar((prefixedname + postfixes[npostfix++]).c_str(), value); + _evaluator->setVar(prefixedname + postfixes[npostfix++], value); start = i + 1; } if (str[i] == '(') @@ -453,15 +453,15 @@ void Theme::processSingleLine(const String §ion, const String &prefix, const // process VAR=VALUE construct if (npostfix == 0) - _evaluator->setVar(name.c_str(), value); + _evaluator->setVar(name, value); else - _evaluator->setVar((prefixedname + postfixes[npostfix]).c_str(), value); + _evaluator->setVar(prefixedname + postfixes[npostfix], value); // If we have all 4 parameters, set .x2 and .y2 if (npostfix == 3) { - _evaluator->setVar((prefixedname + ".x2").c_str(), + _evaluator->setVar(prefixedname + ".x2", _evaluator->getVar(prefixedname + ".x") + _evaluator->getVar(prefixedname + ".w")); - _evaluator->setVar((prefixedname + ".y2").c_str(), + _evaluator->setVar(prefixedname + ".y2", _evaluator->getVar(prefixedname + ".y") + _evaluator->getVar(prefixedname + ".h")); } @@ -487,7 +487,7 @@ void Theme::processResSection(Common::ConfigFile &config, const String &name, bo } if (iterk->key.hasPrefix("def_")) { if (!skipDefs) - _evaluator->setVar(name, (prefix + iterk->key).c_str(), iterk->value); + _evaluator->setVar(name, prefix + iterk->key, iterk->value); continue; } if (iterk->key == "use") { |