From 65e608f304e2249de9588fe05bea80c6d6657ea3 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Sun, 20 Apr 2008 17:29:37 +0000
Subject: unlink function name causing conflicts. Renaming to unlinkItem.

svn-id: r31622
---
 engines/m4/hotspot.cpp | 4 ++--
 engines/m4/hotspot.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/m4')

diff --git a/engines/m4/hotspot.cpp b/engines/m4/hotspot.cpp
index bf791e09fc..48f568431b 100644
--- a/engines/m4/hotspot.cpp
+++ b/engines/m4/hotspot.cpp
@@ -125,11 +125,11 @@ int HotSpotList::add(HotSpot *hotspot, bool head) {
 }
 
 void HotSpotList::remove(HotSpot *hotspot) {
-	unlink(hotspot);
+	unlinkItem(hotspot);
 	delete hotspot; //TODO: check this?
 }
 
-void HotSpotList::unlink(HotSpot *hotspot) {
+void HotSpotList::unlinkItem(HotSpot *hotspot) {
 	uint index = 0;
 	while (index < _hotspots.size()) {
 		if (_hotspots[index] == hotspot) {
diff --git a/engines/m4/hotspot.h b/engines/m4/hotspot.h
index bcd2aba919..0a0a7d6998 100644
--- a/engines/m4/hotspot.h
+++ b/engines/m4/hotspot.h
@@ -97,7 +97,7 @@ public:
 	int add(HotSpot *hotspot, bool head = false);
 	HotSpot *get(int index) { return _hotspots[index]; }
 	void remove(HotSpot *hotspot);
-	void unlink(HotSpot *hotspot);
+	void unlinkItem(HotSpot *hotspot);
 	void clear();
 	HotSpot *findByXY(int x, int y);
 	void setActive(const char *name, bool active);
-- 
cgit v1.2.3