Some renaming (ironic in the light of Fingolfin's recent namespace

suggestion, but I prepared the patch long before reading the mail :-).

Also, the remaining parts of the control panel etc. have been moved into a
class of their own.

This is still work in progress. I'm well aware that some of the classes
aren't as well separated as they ought to be, and that using global
variables to keep track of the different classes probably isn't pretty.

svn-id: r10561

1 files changed, 3 insertions, 3 deletions

diff --git a/sword2/mem_view.cpp b/sword2/mem_view.cpp
index 26164e8798..49a8ad32be 100644
--- a/sword2/mem_view.cpp
+++ b/sword2/mem_view.cpp
@@ -27,7 +27,7 @@
 // has to be global because a local in Fetch_mem_owner is destroyed on exit
 char buf[50];
 
-void MemoryManager::displayMemory(void) {
+void Sword2MemoryManager::displayMemory(void) {
 	int pass, found_end, k, j, free = 0;
 	_standardHeader	*file_header;
 	int scrolls = 0;
@@ -120,7 +120,7 @@ void MemoryManager::displayMemory(void) {
 		(free * 100) / _totalFreeMemory);
 }
 
-const char *MemoryManager::fetchOwner(uint32 uid) {
+const char *Sword2MemoryManager::fetchOwner(uint32 uid) {
 	switch (uid) {
 	case UID_memman:
 		return "MEMMAN";
@@ -146,7 +146,7 @@ const char *MemoryManager::fetchOwner(uint32 uid) {
 	}
 }
 
-void MemoryManager::memoryString(char *string) {
+void Sword2MemoryManager::memoryString(char *string) {
 	int blockNo = _baseMemBlock;
 	int blocksUsed = 0;
 	int mem_free = 0;