From 4eda234611bd77f053defe9e61d592b308270eaa Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Thu, 26 Jul 2012 19:41:18 +0200 Subject: WINTERMUTE: Replace BaseArray with a templated subclass of Common::Array. This needs additional cleanup, but compiles and runs at this point. --- engines/wintermute/ui/ui_window.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/wintermute/ui/ui_window.cpp') diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index f221405f15..b9e2ad056f 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -113,7 +113,7 @@ void UIWindow::cleanup() { for (int i = 0; i < _widgets.getSize(); i++) { delete _widgets[i]; } - _widgets.removeAll(); + _widgets.clear(); } @@ -994,7 +994,7 @@ bool UIWindow::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack for (int i = 0; i < _widgets.getSize(); i++) { if (_widgets[i] == obj) { delete _widgets[i]; - _widgets.removeAt(i); + _widgets.remove_at(i); if (val->getType() == VAL_VARIABLE_REF) { val->setNULL(); } @@ -1415,7 +1415,7 @@ void UIWindow::makeFreezable(bool freezable) { ////////////////////////////////////////////////////////////////////////// -bool UIWindow::getWindowObjects(BaseArray &objects, bool interactiveOnly) { +bool UIWindow::getWindowObjects(BaseArray &objects, bool interactiveOnly) { for (int i = 0; i < _widgets.getSize(); i++) { UIObject *control = _widgets[i]; if (control->_disable && interactiveOnly) { -- cgit v1.2.3