diff options
| author | Einar Johan Trøan Sømåen | 2013-10-28 18:23:05 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-10-28 18:23:05 +0100 |
| commit | ad586412425e66e0e678f0cfd7b8c78c58a8a855 (patch) | |
| tree | f2c5d918ee991e4caaf299bb3fcc147ef405d808 /engines/wintermute/base/base.h | |
| parent | 5653a89e81d600b2388831cfe05c36d3068813b5 (diff) | |
| download | scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.tar.gz scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.tar.bz2 scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.zip | |
WINTERMUTE: Fix compile errors in XCode 5 caused by nullptr-issues.
Diffstat (limited to 'engines/wintermute/base/base.h')
| -rw-r--r-- | engines/wintermute/base/base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/wintermute/base/base.h b/engines/wintermute/base/base.h index f4b0976019..8767cc9bdd 100644 --- a/engines/wintermute/base/base.h +++ b/engines/wintermute/base/base.h @@ -44,7 +44,7 @@ class BaseClass { public: bool _persistable; bool setEditorProp(const Common::String &propName, const Common::String &propValue); - Common::String getEditorProp(const Common::String &propName, const Common::String &initVal = nullptr); + Common::String getEditorProp(const Common::String &propName, const Common::String &initVal = Common::String()); BaseClass(TDynamicConstructor, TDynamicConstructor) {} bool parseEditorProperty(char *buffer, bool complete = true); virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent = 0); |