From 37b5ee24f520e46eae28c703d189939e0b18c65b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 19 Dec 2014 22:45:00 -0500
Subject: ACCESS: Rename ASurface copyFrom methods to avoid clash with
 Graphics::Surface

---
 engines/access/asurface.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/access/asurface.h')

diff --git a/engines/access/asurface.h b/engines/access/asurface.h
index 763e3e629e..4fb47b9c09 100644
--- a/engines/access/asurface.h
+++ b/engines/access/asurface.h
@@ -95,19 +95,19 @@ public:
 
 	virtual void drawRect();
 
-	virtual void transCopyFrom(ASurface *src, const Common::Point &destPos);
+	virtual void transBlitFrom(ASurface *src, const Common::Point &destPos);
 
-	virtual void transCopyFrom(ASurface *src, const Common::Rect &bounds);
+	virtual void transBlitFrom(ASurface *src, const Common::Rect &bounds);
 
-	virtual void transCopyFrom(ASurface &src);
+	virtual void transBlitFrom(ASurface &src);
 
-	virtual void copyFrom(Graphics::Surface &src);
+	virtual void blitFrom(Graphics::Surface &src);
 
 	virtual void copyBuffer(Graphics::Surface *src);
 
 	virtual void addDirtyRect(const Common::Rect &r) {}
 
-	void copyTo(ASurface *dest) { dest->copyFrom(*this); }
+	void copyTo(ASurface *dest) { dest->blitFrom(*this); }
 
 	void saveBlock(const Common::Rect &bounds);
 
-- 
cgit v1.2.3