From 07bcb5179ccad90d18a9e5a8f3c86d9d7ee3f910 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 18 Jun 2008 21:02:52 +0000
Subject: Renamed M4Surface::empty() to clear() (two reason: empty is not a
 verb, and in class String it is used for a bool property)

svn-id: r32733
---
 engines/m4/converse.cpp  |  2 +-
 engines/m4/graphics.cpp  |  6 +++---
 engines/m4/graphics.h    |  2 +-
 engines/m4/m4_views.cpp  |  2 +-
 engines/m4/mads_anim.cpp | 16 ++++++++--------
 engines/m4/viewmgr.cpp   |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'engines/m4')

diff --git a/engines/m4/converse.cpp b/engines/m4/converse.cpp
index 729af6c40f..a07a175066 100644
--- a/engines/m4/converse.cpp
+++ b/engines/m4/converse.cpp
@@ -153,7 +153,7 @@ void ConversationView::setNode(int32 nodeIndex) {
 void ConversationView::onRefresh(RectList *rects, M4Surface *destSurface) {
 	//if (!this->isVisible())
 	//	return;
-	empty();
+	clear();
 
 	if (_entriesShown) {
 		// Write out the conversation options
diff --git a/engines/m4/graphics.cpp b/engines/m4/graphics.cpp
index beda178344..1846f1c1e7 100644
--- a/engines/m4/graphics.cpp
+++ b/engines/m4/graphics.cpp
@@ -320,7 +320,7 @@ byte *M4Surface::getBasePtr(int x, int y) {
 void M4Surface::freeData() {
 }
 
-void M4Surface::empty() {
+void M4Surface::clear() {
 	Common::set_to((byte *) pixels, (byte *) pixels + w * h, _vm->_palette->BLACK);
 }
 
@@ -389,7 +389,7 @@ void M4Surface::loadBackgroundRiddle(const char *sceneName) {
 }
 
 void M4Surface::loadBackground(int sceneNumber, RGBList **palData) {
-	this->empty();		// clear previous scene
+	clear();		// clear previous scene
 
 	if (_vm->isM4() || (_vm->getGameType() == GType_RexNebular)) {
 		char resourceName[20];
@@ -502,7 +502,7 @@ void M4Surface::madsLoadBackground(int roomNumber, RGBList **palData) {
 
 		//printf("Tile: %i, compressed size: %i\n", i, compressedTileDataSize);
 
-		newTile->empty();
+		newTile->clear();
 
 		byte *compressedTileData = new byte[compressedTileDataSize];
 
diff --git a/engines/m4/graphics.h b/engines/m4/graphics.h
index 60e608c148..84fc77656f 100644
--- a/engines/m4/graphics.h
+++ b/engines/m4/graphics.h
@@ -128,7 +128,7 @@ public:
 	byte *getData();
 	byte *getBasePtr(int x, int y);
 	void freeData();
-	void empty();
+	void clear();
 	void frameRect(const Common::Rect &r, uint8 color);
 	void fillRect(const Common::Rect &r, uint8 color);
 	void copyFrom(M4Surface *src, const Common::Rect &srcBounds, int destX, int destY,
diff --git a/engines/m4/m4_views.cpp b/engines/m4/m4_views.cpp
index 9bf964ee96..777356467b 100644
--- a/engines/m4/m4_views.cpp
+++ b/engines/m4/m4_views.cpp
@@ -331,7 +331,7 @@ bool GameInterfaceView::onEvent(M4EventType eventType, int param, int x, int y,
 }
 		
 void GameInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
-	empty();
+	clear();
 
 	_statusText.onRefresh();
 	_inventory.onRefresh();
diff --git a/engines/m4/mads_anim.cpp b/engines/m4/mads_anim.cpp
index 3e80d0f1e0..c51daa84c4 100644
--- a/engines/m4/mads_anim.cpp
+++ b/engines/m4/mads_anim.cpp
@@ -61,9 +61,9 @@ TextviewView::TextviewView(M4Engine *vm):
 
 	_vm->_font->setColors(5, 6, 4);
 
-	empty();
-	_bgSurface.empty();
-	_textSurface.empty();
+	clear();
+	_bgSurface.clear();
+	_textSurface.clear();
 
 	int y = (height() - MADS_SURFACE_HEIGHT) / 2;
 	setColor(2);
@@ -83,8 +83,8 @@ TextviewView::~TextviewView() {
 }
 
 void TextviewView::reset() {
-	_bgSurface.empty();
-	_textSurface.empty();
+	_bgSurface.clear();
+	_textSurface.clear();
 	_animating = false;
 	_panX = 0;
 	_panY = 0;
@@ -456,8 +456,8 @@ AnimviewView::AnimviewView(M4Engine *vm):
 	// Set up system palette colors
 	_vm->_palette->setMadsSystemPalette();
 
-	empty();
-	_bgSurface.empty();
+	clear();
+	_bgSurface.clear();
 
 	int y = (height() - MADS_SURFACE_HEIGHT) / 2;
 	setColor(2);
@@ -471,7 +471,7 @@ AnimviewView::~AnimviewView() {
 }
 
 void AnimviewView::reset() {
-	_bgSurface.empty();
+	_bgSurface.clear();
 	_soundDriverLoaded = false;
 }
 
diff --git a/engines/m4/viewmgr.cpp b/engines/m4/viewmgr.cpp
index 3a8b5d24a8..b74e598c6c 100644
--- a/engines/m4/viewmgr.cpp
+++ b/engines/m4/viewmgr.cpp
@@ -380,7 +380,7 @@ void ViewManager::updateState() {
 }
 
 void ViewManager::refreshAll() {
-	_vm->_screen->empty();
+	_vm->_screen->clear();
 
 	for (ListIterator i = _views.begin(); i != _views.end(); ++i) {
 		View *v = *i;
-- 
cgit v1.2.3