aboutsummaryrefslogtreecommitdiff
path: root/engines/tony/mpal/memory.cpp
diff options
context:
space:
mode:
authorStrangerke2012-06-07 21:14:59 +0200
committerStrangerke2012-06-07 21:14:59 +0200
commitcd15e483ed64274049142a2e6838962d794c3ff5 (patch)
tree33a1487e084aa4066a648fe46d599dc95d458f7c /engines/tony/mpal/memory.cpp
parenta7a619e1b41b771726b6fb611ddb640e38a78185 (diff)
downloadscummvm-rg350-cd15e483ed64274049142a2e6838962d794c3ff5.tar.gz
scummvm-rg350-cd15e483ed64274049142a2e6838962d794c3ff5.tar.bz2
scummvm-rg350-cd15e483ed64274049142a2e6838962d794c3ff5.zip
TONY: Some more renaming
Diffstat (limited to 'engines/tony/mpal/memory.cpp')
-rw-r--r--engines/tony/mpal/memory.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/tony/mpal/memory.cpp b/engines/tony/mpal/memory.cpp
index 04cb906431..b5bd77f838 100644
--- a/engines/tony/mpal/memory.cpp
+++ b/engines/tony/mpal/memory.cpp
@@ -53,7 +53,7 @@ MemoryItem::~MemoryItem() {
* Returns a pointer to the resource
*/
MemoryItem::operator void *() {
- return DataPointer();
+ return dataPointer();
}
/****************************************************************************\
@@ -81,7 +81,7 @@ MemoryManager::~MemoryManager() {
MemoryItem &MemoryManager::allocate(uint32 size, uint flags) {
MemoryItem *newItem = new MemoryItem(size);
if ((flags & GMEM_ZEROINIT) != 0) {
- byte *dataP = (byte *)newItem->DataPointer();
+ byte *dataP = (byte *)newItem->dataPointer();
Common::fill(dataP, dataP + size, 0);
}
@@ -96,7 +96,7 @@ MemoryItem &MemoryManager::allocate(uint32 size, uint flags) {
*/
HGLOBAL MemoryManager::alloc(uint32 size, uint flags) {
MemoryItem &newItem = allocate(size, flags);
- return (HGLOBAL)newItem.DataPointer();
+ return (HGLOBAL)newItem.dataPointer();
}
/**
@@ -107,7 +107,7 @@ MemoryItem &MemoryManager::getItem(HGLOBAL handle) {
Common::List<MemoryItem *>::iterator i;
for (i = _memoryBlocks.begin(); i != _memoryBlocks.end(); ++i) {
MemoryItem *item = *i;
- if (item->DataPointer() == handle)
+ if (item->dataPointer() == handle)
return *item;
}
@@ -127,7 +127,7 @@ MemoryItem &MemoryManager::operator[](HGLOBAL handle) {
*/
uint32 MemoryManager::getSize(HGLOBAL handle) {
MemoryItem &item = getItem(handle);
- return item.Size();
+ return item.size();
}
/**
@@ -150,7 +150,7 @@ void MemoryManager::erase(HGLOBAL handle) {
* Stand-alone methods
\****************************************************************************/
-void CopyMemory(void *dst, const void *first, int size) {
+void copyMemory(void *dst, const void *first, int size) {
Common::copy((const byte *)first, (const byte *)first + size, (byte *)dst);
}