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_object.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_object.cpp')
-rw-r--r-- | engines/wintermute/ui/ui_object.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp index 9dea3dadf9..07efc5e4cb 100644 --- a/engines/wintermute/ui/ui_object.cpp +++ b/engines/wintermute/ui/ui_object.cpp @@ -621,17 +621,17 @@ bool UIObject::persist(BasePersistenceManager *persistMgr) { BaseObject::persist(persistMgr); - persistMgr->transfer(TMEMBER(_back)); + persistMgr->transferPtr(TMEMBER_PTR(_back)); persistMgr->transfer(TMEMBER(_canFocus)); persistMgr->transfer(TMEMBER(_disable)); - persistMgr->transfer(TMEMBER(_focusedWidget)); - persistMgr->transfer(TMEMBER(_font)); + persistMgr->transferPtr(TMEMBER_PTR(_focusedWidget)); + persistMgr->transferPtr(TMEMBER_PTR(_font)); persistMgr->transfer(TMEMBER(_height)); - persistMgr->transfer(TMEMBER(_image)); - persistMgr->transfer(TMEMBER(_listenerObject)); - persistMgr->transfer(TMEMBER(_listenerParamObject)); + persistMgr->transferPtr(TMEMBER_PTR(_image)); + persistMgr->transferPtr(TMEMBER_PTR(_listenerObject)); + persistMgr->transferPtr(TMEMBER_PTR(_listenerParamObject)); persistMgr->transfer(TMEMBER(_listenerParamDWORD)); - persistMgr->transfer(TMEMBER(_parent)); + persistMgr->transferPtr(TMEMBER_PTR(_parent)); persistMgr->transfer(TMEMBER(_parentNotify)); persistMgr->transfer(TMEMBER(_sharedFonts)); persistMgr->transfer(TMEMBER(_sharedImages)); |