From 764ca7a51a27210ca7a66a6ab2f01714029af09c Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 31 Aug 2012 14:21:33 +0200 Subject: WINTERMUTE: Fix some of the clang++ warnings listed by LordHoto --- engines/wintermute/ui/ui_button.h | 3 ++- engines/wintermute/ui/ui_entity.h | 3 ++- engines/wintermute/ui/ui_object.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'engines/wintermute/ui') diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h index 61cdef476e..88ba8dafc7 100644 --- a/engines/wintermute/ui/ui_button.h +++ b/engines/wintermute/ui/ui_button.h @@ -44,7 +44,8 @@ public: uint32 _oneTimePressTime; DECLARE_PERSISTENT(UIButton, UIObject) void press(); - virtual bool display(int offsetX = 0, int offsetY = 0); + virtual bool display() { return display(0, 0); } + virtual bool display(int offsetX, int offsetY); bool _press; bool _hover; void correctSize(); diff --git a/engines/wintermute/ui/ui_entity.h b/engines/wintermute/ui/ui_entity.h index bc44c1f112..aeb32a6ffb 100644 --- a/engines/wintermute/ui/ui_entity.h +++ b/engines/wintermute/ui/ui_entity.h @@ -42,7 +42,8 @@ public: bool loadBuffer(byte *buffer, bool complete); virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent); - virtual bool display(int offsetX = 0, int offsetY = 0); + virtual bool display() { return display(0, 0); } + virtual bool display(int offsetX, int offsetY); AdEntity *_entity; bool setEntity(const char *filename); diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h index 8059207a9a..b0a34fe61e 100644 --- a/engines/wintermute/ui/ui_object.h +++ b/engines/wintermute/ui/ui_object.h @@ -49,7 +49,8 @@ public: DECLARE_PERSISTENT(UIObject, BaseObject) UIObject *_parent; virtual bool display() { return display(0, 0); } - virtual bool display(int offsetX = 0, int offsetY = 0); + virtual bool display(int offsetX) { return display(offsetX, 0); } + virtual bool display(int offsetX, int offsetY); virtual void correctSize(); bool _sharedFonts; bool _sharedImages; -- cgit v1.2.3