diff options
| author | Einar Johan Trøan Sømåen | 2013-04-19 17:16:57 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-19 17:17:53 +0200 |
| commit | 72d0affe014026125168f1a6785ef0f57447c6df (patch) | |
| tree | 6baea0011df938d2cdd34ce64945093d0e27c64f /engines/wintermute/ui/ui_window.cpp | |
| parent | 60a474d452440ea7ea736cc95d92a1561fc50442 (diff) | |
| download | scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.tar.gz scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.tar.bz2 scummvm-rg350-72d0affe014026125168f1a6785ef0f57447c6df.zip | |
WINTERMUTE: Rename transfer(void *) to transferPtr(void *) to avoid overload-misses.
Diffstat (limited to 'engines/wintermute/ui/ui_window.cpp')
| -rw-r--r-- | engines/wintermute/ui/ui_window.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index 460ec1877b..2ce9f68605 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -1257,24 +1257,24 @@ bool UIWindow::persist(BasePersistenceManager *persistMgr) { UIObject::persist(persistMgr); - persistMgr->transfer(TMEMBER(_backInactive)); + persistMgr->transferPtr(TMEMBER_PTR(_backInactive)); persistMgr->transfer(TMEMBER(_clipContents)); persistMgr->transfer(TMEMBER(_dragFrom)); persistMgr->transfer(TMEMBER(_dragging)); persistMgr->transfer(TMEMBER(_dragRect)); persistMgr->transfer(TMEMBER(_fadeBackground)); persistMgr->transfer(TMEMBER(_fadeColor)); - persistMgr->transfer(TMEMBER(_fontInactive)); - persistMgr->transfer(TMEMBER(_imageInactive)); + persistMgr->transferPtr(TMEMBER_PTR(_fontInactive)); + persistMgr->transferPtr(TMEMBER_PTR(_imageInactive)); persistMgr->transfer(TMEMBER(_inGame)); persistMgr->transfer(TMEMBER(_isMenu)); persistMgr->transfer(TMEMBER_INT(_mode)); - persistMgr->transfer(TMEMBER(_shieldButton)); - persistMgr->transfer(TMEMBER(_shieldWindow)); + persistMgr->transferPtr(TMEMBER_PTR(_shieldButton)); + persistMgr->transferPtr(TMEMBER_PTR(_shieldWindow)); persistMgr->transfer(TMEMBER_INT(_titleAlign)); persistMgr->transfer(TMEMBER(_titleRect)); persistMgr->transfer(TMEMBER(_transparent)); - persistMgr->transfer(TMEMBER(_viewport)); + persistMgr->transferPtr(TMEMBER_PTR(_viewport)); persistMgr->transfer(TMEMBER(_pauseMusic)); _widgets.persist(persistMgr); |