From ad586412425e66e0e678f0cfd7b8c78c58a8a855 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 28 Oct 2013 18:23:05 +0100
Subject: WINTERMUTE: Fix compile errors in XCode 5 caused by nullptr-issues.

---
 engines/wintermute/base/base.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/wintermute/base/base.h')

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);
-- 
cgit v1.2.3