diff options
| author | Einar Johan Trøan Sømåen | 2012-07-26 19:41:18 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-26 19:41:18 +0200 |
| commit | 4eda234611bd77f053defe9e61d592b308270eaa (patch) | |
| tree | cb0a437641b74b60b325ac9ccaa9b63dacab897d /engines/wintermute/ui/ui_window.cpp | |
| parent | eb22e36d5e12b64442ce23c656227483dd9cf61e (diff) | |
| download | scummvm-rg350-4eda234611bd77f053defe9e61d592b308270eaa.tar.gz scummvm-rg350-4eda234611bd77f053defe9e61d592b308270eaa.tar.bz2 scummvm-rg350-4eda234611bd77f053defe9e61d592b308270eaa.zip | |
WINTERMUTE: Replace BaseArray with a templated subclass of Common::Array.
This needs additional cleanup, but compiles and runs at this point.
Diffstat (limited to 'engines/wintermute/ui/ui_window.cpp')
| -rw-r--r-- | engines/wintermute/ui/ui_window.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<UIObject *, UIObject *> &objects, bool interactiveOnly) {
+bool UIWindow::getWindowObjects(BaseArray<UIObject *> &objects, bool interactiveOnly) {
for (int i = 0; i < _widgets.getSize(); i++) {
UIObject *control = _widgets[i];
if (control->_disable && interactiveOnly) {
|