aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/base.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-29 00:27:50 +0200
committerEinar Johan Trøan Sømåen2012-07-29 00:27:50 +0200
commit6dc1e09da93c0ba0507fd0ceadbbb504469deccc (patch)
treedae477f4ed7c6b9be7a5dd38174d81cdbae48c58 /engines/wintermute/base/base.cpp
parente841bf16d6b955f779e5e30535848bd650d22352 (diff)
downloadscummvm-rg350-6dc1e09da93c0ba0507fd0ceadbbb504469deccc.tar.gz
scummvm-rg350-6dc1e09da93c0ba0507fd0ceadbbb504469deccc.tar.bz2
scummvm-rg350-6dc1e09da93c0ba0507fd0ceadbbb504469deccc.zip
WINTERMUTE: Replace const char* with const Common::String & in fonts, gfx, particles, sound and files.
Diffstat (limited to 'engines/wintermute/base/base.cpp')
-rw-r--r--engines/wintermute/base/base.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp
index d5163fa7a6..074bd0db68 100644
--- a/engines/wintermute/base/base.cpp
+++ b/engines/wintermute/base/base.cpp
@@ -54,7 +54,7 @@ BaseClass::~BaseClass() {
//////////////////////////////////////////////////////////////////////////
-const char *BaseClass::getEditorProp(const char *propName, const char *initVal) {
+Common::String BaseClass::getEditorProp(const Common::String &propName, const Common::String &initVal) {
_editorPropsIter = _editorProps.find(propName);
if (_editorPropsIter != _editorProps.end()) {
return _editorPropsIter->_value.c_str();
@@ -65,12 +65,12 @@ const char *BaseClass::getEditorProp(const char *propName, const char *initVal)
//////////////////////////////////////////////////////////////////////////
-bool BaseClass::setEditorProp(const char *propName, const char *propValue) {
- if (propName == NULL) {
+bool BaseClass::setEditorProp(const Common::String &propName, const Common::String &propValue) {
+ if (propName.size() == 0) {
return STATUS_FAILED;
}
- if (propValue == NULL) {
+ if (propValue.size() == 0) {
_editorProps.erase(propName);
} else {
_editorProps[propName] = propValue;